diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/mapper/xml/ProcessInfoEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/mapper/xml/ProcessInfoEOMapper.xml
index 6deb52c63..a4c8fd37d 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/mapper/xml/ProcessInfoEOMapper.xml
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/mapper/xml/ProcessInfoEOMapper.xml
@@ -92,7 +92,7 @@
left join project_laws_inventory pli on pi.project_laws_inventory_id = pli.id
LEFT JOIN sys_user createBy on createBy.id = pi.create_by
- order by pi.create_time desc
+ order by pi.end_time asc
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ProcessInfoEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ProcessInfoEOServiceImpl.java
index c27cdb968..bfbac3a96 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ProcessInfoEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ProcessInfoEOServiceImpl.java
@@ -8,10 +8,12 @@ import com.jero.common.api.vo.Result;
import com.jero.common.exception.JeroBootException;
import com.jero.common.system.vo.LoginUser;
import com.jero.modules.project.entity.ProjectTaskInventoryDetailEO;
+import com.jero.modules.project.entity.ProjectTaskInventoryEO;
import com.jero.modules.project.enums.OperatorTypeEnum;
import com.jero.modules.project.enums.RequestSourceEnum;
import com.jero.modules.project.enums.TaskStatusEnum;
import com.jero.modules.project.service.IProjectTaskInventoryDetailEOService;
+import com.jero.modules.project.service.IProjectTaskInventoryEOService;
import com.jero.modules.system.entity.SysUser;
import com.jero.modules.system.service.ISysUserService;
import com.jero.modules.todoCenter.entity.ProcessInfoDetailEO;
@@ -51,6 +53,8 @@ public class ProcessInfoEOServiceImpl extends ServiceImpl flowTypeList){
- flowTypeList.add(FlowTypeEnum.QDQR.getValue());
+ //flowTypeList.add(FlowTypeEnum.QDQR.getValue());
flowTypeList.add(FlowTypeEnum.RWQRLC.getValue());
flowTypeList.add(FlowTypeEnum.SJFHXSHLC.getValue());
flowTypeList.add(FlowTypeEnum.YZFHXSCLC.getValue());
@@ -390,9 +394,10 @@ public class ProcessInfoEOServiceImpl extends ServiceImpl userIdList = new ArrayList<>();
-
datas.forEach(data -> {
//设置上一个操作人。
for (Map.Entry> detailMap : lastAssigneeDetailMap.entrySet()) {
@@ -487,4 +492,56 @@ public class ProcessInfoEOServiceImpl extends ServiceImpl datas){
+ //符合性流程实例id
+ List complianceProcessPrcIdList = datas.stream().filter(data -> {
+ boolean designFlowFlag = StringUtils.equals(data.getFlowType(),FlowTypeEnum.SJFHXSHLC.getValue());
+ boolean preHomoFlowFlag = StringUtils.equals(data.getFlowType(),FlowTypeEnum.PREHOMOQRLC.getValue());
+ boolean verifyFlowFlag = StringUtils.equals(data.getFlowType(),FlowTypeEnum.YZFHXSCLC.getValue());
+ boolean flag = false;
+ if(designFlowFlag || preHomoFlowFlag || verifyFlowFlag){
+ flag = true;
+ }
+ return flag;
+ }).map(ProcessInfoVO::getActiProcInstId).collect(Collectors.toList());
+
+ QueryWrapper taskInventoryQueryWrap = new QueryWrapper<>();
+ taskInventoryQueryWrap.and(queryWrap -> {
+ queryWrap.lambda().in(ProjectTaskInventoryEO::getDesignPId,complianceProcessPrcIdList)
+ .or().in(ProjectTaskInventoryEO::getPrehomoPId,complianceProcessPrcIdList)
+ .or().in(ProjectTaskInventoryEO::getVerifyPId,complianceProcessPrcIdList);
+ });
+ //查询出符合性流程相关的任务清单信息。
+ List taskInventoryList = this.projectTaskInventoryEOService.list(taskInventoryQueryWrap);
+
+ datas.forEach(data -> {
+ boolean designFlowFlag = StringUtils.equals(data.getFlowType(),FlowTypeEnum.SJFHXSHLC.getValue());
+ boolean preHomoFlowFlag = StringUtils.equals(data.getFlowType(),FlowTypeEnum.PREHOMOQRLC.getValue());
+ boolean verifyFlowFlag = StringUtils.equals(data.getFlowType(),FlowTypeEnum.YZFHXSCLC.getValue());
+ String personChargeFeedback = taskInventoryList.stream().filter(taskInventory -> {
+ boolean flag = false;
+ if(designFlowFlag){
+ if(StringUtils.equals(data.getActiProcInstId(),taskInventory.getDesignPId())){
+ flag = true;
+ }
+ }else if(preHomoFlowFlag){
+ if(StringUtils.equals(data.getActiProcInstId(),taskInventory.getPrehomoPId())){
+ flag = true;
+ }
+ }else if(verifyFlowFlag){
+ if(StringUtils.equals(data.getActiProcInstId(),taskInventory.getVerifyPId())){
+ flag = true;
+ }
+ }
+ return flag;
+ }).map(ProjectTaskInventoryEO::getDesignPersonChargeFeedback).collect(Collectors.joining(","));
+
+ data.setPersonChargeFeedback(personChargeFeedback);
+ });
+ }
}
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/vo/ProcessInfoVO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/vo/ProcessInfoVO.java
index 89626d3c6..e9a5287cc 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/vo/ProcessInfoVO.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/vo/ProcessInfoVO.java
@@ -98,4 +98,6 @@ public class ProcessInfoVO implements Serializable {
private String studioEngineer;
/**任务清单明细表id,任务清单明细数据与待办中心明细表 是taskId一对一的关系**/
private String primaryKeyId;
+ /**符合性流程:责任人填写反馈意见*/
+ private String personChargeFeedback;
}