elink-star
/
esua-epdc-cloud
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

fix:大屏sqid不为空

feature/dangjian
lichao 3 years ago
parent
a6cb38eab8
commit
112ec34e79
6 changed files with 110 additions and 0 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 23
      esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/EvaluationIssueformDTO.java
  2. 6
      esua-epdc/epdc-module/epdc-events/epdc-events-server/pom.xml
  3. 19
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemController.java
  4. 3
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemService.java
  5. 44
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java
  6. 15
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml

23
esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/EvaluationIssueformDTO.java
View File

@ -0,0 +1,23 @@
package com.elink.esua.epdc.dto.item.form;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.io.Serializable;
import java.util.Date;
import java.util.List;
/**
* @Description: 评价下发
* @Author: lichao
* @Date: 2023/6/1 15:50
*/
@Data
public class EvaluationIssueformDTO implements Serializable {
private static final long serialVersionUID = 1L;
@NotBlank(message = "唯一标识不可为空")
private String itemId;
}

6
esua-epdc/epdc-module/epdc-events/epdc-events-server/pom.xml
View File

@ -90,6 +90,12 @@
<artifactId>rocketmq-spring-boot-starter</artifactId>
<version>2.0.3</version>
</dependency>
<dependency>
<groupId>com.esua.epdc.shibei</groupId>
<artifactId>epdc-common-clienttoken</artifactId>
<version>1.0.0</version>
<scope>compile</scope>
</dependency>
</dependencies>
<build>

19
esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemController.java
View File

@ -25,6 +25,8 @@ import com.alibaba.excel.write.style.HorizontalCellStyleStrategy;
import com.alibaba.excel.write.style.column.LongestMatchColumnWidthStyleStrategy;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.elink.esua.epdc.common.token.dto.TokenDto;
import com.elink.esua.epdc.commons.tools.annotation.LoginUser;
import com.elink.esua.epdc.commons.tools.annotation.MaskResponse;
import com.elink.esua.epdc.commons.tools.constant.NumConstant;
import com.elink.esua.epdc.commons.tools.page.PageData;
@ -533,6 +535,23 @@ public class ItemController {
return itemService.pushItemProcess(formDto);
}
/**
* @Description: 下发评价
* @param formDto:
* @Return com.elink.esua.epdc.commons.tools.utils.Result
* @Author: lichao
* @Date: 2023/6/1 15:49
*/
@PostMapping("evaluationIssue")
public Result evaluationIssue(@LoginUser TokenDto userDetail, @RequestBody EvaluationIssueformDTO formDto) {
ValidatorUtils.validateEntity(formDto);
AcceptPlantformProcessDTO acceptPlantformProcessDTO = itemService.evaluationIssue(formDto,userDetail);
ValidatorUtils.validateEntity(acceptPlantformProcessDTO);
return itemService.pushItemProcess(acceptPlantformProcessDTO);
}
/**
* @describe: 数据统计页面-北上诉求列表
* 逻辑同方法 getItemAppealPage

3
esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemService.java
View File

@ -17,6 +17,7 @@
package com.elink.esua.epdc.modules.item.service;
import com.elink.esua.epdc.common.token.dto.TokenDto;
import com.elink.esua.epdc.commons.mybatis.service.BaseService;
import com.elink.esua.epdc.commons.tools.page.PageData;
import com.elink.esua.epdc.commons.tools.utils.Result;
@ -801,4 +802,6 @@ public interface ItemService extends BaseService<ItemEntity> {
* @Date: 2023/5/31 16:06
*/
ResolveTotalLineResultDTO resolveTrend(ScreenTotalFormDTO formDTO);
AcceptPlantformProcessDTO evaluationIssue(EvaluationIssueformDTO formDto, TokenDto userDetail);
}

44
esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java
View File

@ -25,6 +25,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.elink.esua.epdc.common.token.dto.TokenDto;
import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
import com.elink.esua.epdc.commons.tools.constant.NumConstant;
@ -5253,6 +5254,49 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
return resultDTO;
}
@Override
public AcceptPlantformProcessDTO evaluationIssue(EvaluationIssueformDTO formDto, TokenDto userDetail) {
AcceptPlantformProcessDTO acceptPlantformProcessDTO = new AcceptPlantformProcessDTO();
// 获取一下taskid
LambdaQueryWrapper<ItemGridPlatformEntity> itemGridPlatformEntityLambdaQueryWrapper = new LambdaQueryWrapper<ItemGridPlatformEntity>().eq(ItemGridPlatformEntity::getReferenceId,formDto.getItemId()).orderByDesc(ItemGridPlatformEntity::getCreatedTime).last("limit 1");
ItemGridPlatformEntity itemGridPlatformEntity = itemGridPlatformDao.selectOne(itemGridPlatformEntityLambdaQueryWrapper);
if (itemGridPlatformEntity!=null){
// p_recid 就是taskid
acceptPlantformProcessDTO.setP_recId(itemGridPlatformEntity.getTaskid());
// 默认状态为0 下发评价
acceptPlantformProcessDTO.setState("0");
// 取出最后一条记录的内容
LambdaQueryWrapper<ItemHandleProcessEntity> processEntityLambdaQueryWrapper = new LambdaQueryWrapper<ItemHandleProcessEntity>()
.eq(ItemHandleProcessEntity::getItemId,formDto.getItemId()).orderByDesc(ItemHandleProcessEntity::getCreatedTime).last("limit 1");
ItemHandleProcessEntity newProcess = itemHandleProcessDao.selectOne(processEntityLambdaQueryWrapper);
if (StringUtils.isNotBlank(newProcess.getHandleAdvice())){
// 塞入内容
acceptPlantformProcessDTO.setHandleAdvice(newProcess.getHandleAdvice());
}
// 网格员id 用户ID
acceptPlantformProcessDTO.setGridPartyid(userDetail.getUserId());
acceptPlantformProcessDTO.setGridPartyname(userDetail.getRealName());
// 部门id
acceptPlantformProcessDTO.setGridUnitid(String.valueOf(userDetail.getGridId()));
acceptPlantformProcessDTO.setGridUnitname(SecurityUser.getUser().getDeptName());
acceptPlantformProcessDTO.setCreatedTime(new Date());
acceptPlantformProcessDTO.setCreateDate(new Date());
acceptPlantformProcessDTO.setItemId(formDto.getItemId());
}
return acceptPlantformProcessDTO;
}
/**
* 重新上报
*

15
esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml
View File

@ -2883,6 +2883,9 @@
AND item.PEOPLE_FLAG = #{peopleFlag}
</if>
and item.EVALUATION_SCORE is not null
and item.EVALUATION_SCORE !=''
and item.SQID is not null
and item.SQID !=''
group by item.EVALUATION_SCORE
ORDER BY count(item.ID) desc
</select>
@ -2920,6 +2923,9 @@
#{time}
</foreach>
and item.EVALUATION_SCORE is not null
and item.EVALUATION_SCORE !=''
and item.SQID is not null
and item.SQID !=''
group by DATE_FORMAT(item.CREATED_TIME,'%Y-%m-%d')
ORDER BY DATE_FORMAT(item.CREATED_TIME,'%Y-%m-%d') asc
</select>
@ -2958,6 +2964,8 @@
</foreach>
and item.SOLUTION_INFO is not null
and item.SOLUTION_INFO !=''
and item.SQID is not null
and item.SQID !=''
group by DATE_FORMAT(item.CREATED_TIME,'%Y-%m-%d')
ORDER BY DATE_FORMAT(item.CREATED_TIME,'%Y-%m-%d') asc
</select>
@ -2994,6 +3002,9 @@
#{time}
</foreach>
and item.EVALUATION_SCORE is not null
and item.EVALUATION_SCORE !=''
and item.SQID is not null
and item.SQID !=''
group by DATE_FORMAT(item.CREATED_TIME,'%Y-%m')
ORDER BY DATE_FORMAT(item.CREATED_TIME,'%Y-%m') asc
</select>
@ -3031,6 +3042,8 @@
</foreach>
and item.SOLUTION_INFO is not null
and item.SOLUTION_INFO !=''
and item.SQID is not null
and item.SQID !=''
group by DATE_FORMAT(item.CREATED_TIME,'%Y-%m')
ORDER BY DATE_FORMAT(item.CREATED_TIME,'%Y-%m') asc
</select>
@ -3150,6 +3163,8 @@
AND item.PEOPLE_FLAG = #{peopleFlag}
</if>
and item.SOLUTION_INFO is not null
and item.SQID is not null
and item.SQID !=''
and item.SOLUTION_INFO !=''
group by item.SOLUTION_INFO
ORDER BY count(item.ID) desc

Write Preview
Loading…
Cancel
Save