WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

待办中心对接。

Browse Source
This commit is contained in:
wangzhijiang
2022-10-21 17:04:12 +08:00
parent e368f51f3e
commit 8d630e4777
3 changed files with 40 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryDetailEOServiceImpl.java
+6 -4
View File
@@ -222,10 +222,12 @@ public class ProjectTaskInventoryDetailEOServiceImpl extends ServiceImpl<Project
if(StringUtils.equals(projectTaskInventoryDetailEO.getStatus(),TaskStatusEnum.HAVE_DONE.getValue()) if(StringUtils.equals(projectTaskInventoryDetailEO.getStatus(),TaskStatusEnum.HAVE_DONE.getValue())
|| StringUtils.equals(projectTaskInventoryDetailEO.getStatus(),TaskStatusEnum.NOT_DONE.getValue())){ || StringUtils.equals(projectTaskInventoryDetailEO.getStatus(),TaskStatusEnum.NOT_DONE.getValue())){
ProjectTaskInventoryDetailEO taskInventoryDetailById = this.baseMapper.selectById(projectTaskInventoryDetailEO.getId()); ProjectTaskInventoryDetailEO taskInventoryDetailById = this.baseMapper.selectById(projectTaskInventoryDetailEO.getId());
LambdaUpdateWrapper<ProcessInfoDetailEO> processInfoDetailUpdateWrap= new LambdaUpdateWrapper(); if(taskInventoryDetailById != null){
processInfoDetailUpdateWrap.eq(ProcessInfoDetailEO::getTaskId,taskInventoryDetailById.getTaskId()); LambdaUpdateWrapper<ProcessInfoDetailEO> processInfoDetailUpdateWrap= new LambdaUpdateWrapper();
processInfoDetailUpdateWrap.set(ProcessInfoDetailEO::getStatus,projectTaskInventoryDetailEO.getStatus()); processInfoDetailUpdateWrap.eq(ProcessInfoDetailEO::getTaskId,taskInventoryDetailById.getTaskId());
this.processInfoDetailEOService.update(processInfoDetailUpdateWrap); processInfoDetailUpdateWrap.set(ProcessInfoDetailEO::getStatus,projectTaskInventoryDetailEO.getStatus());
this.processInfoDetailEOService.update(processInfoDetailUpdateWrap);
}
} }
} }
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/mapper/xml/ProcessInfoEOMapper.xml
+2 -2
View File
@@ -148,8 +148,8 @@
pi.acti_proc_inst_id, pi.acti_proc_inst_id,
pni.project_name, pni.project_name,
pyni.year_name, pyni.year_name,
pli.serial_number, '--' as serial_number,
pli.title, '' as title,
pi.flow_type, pi.flow_type,
createBy.username AS "create_by", createBy.username AS "create_by",
(select pid.end_time from process_info_detail pid where pid.process_info_id = pi.id and pid.STATUS = 'NotDone' order by pid.end_time asc limit 1) as end_time, (select pid.end_time from process_info_detail pid where pid.process_info_id = pi.id and pid.STATUS = 'NotDone' order by pid.end_time asc limit 1) as end_time,
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ProcessInfoEOServiceImpl.java
+32 -30
View File
@@ -510,38 +510,40 @@ public class ProcessInfoEOServiceImpl extends ServiceImpl<ProcessInfoEOMapper, P
return flag; return flag;
}).map(ProcessInfoVO::getActiProcInstId).collect(Collectors.toList()); }).map(ProcessInfoVO::getActiProcInstId).collect(Collectors.toList());
QueryWrapper<ProjectTaskInventoryEO> taskInventoryQueryWrap = new QueryWrapper<>(); if(CollectionUtils.isNotEmpty(complianceProcessPrcIdList)){
taskInventoryQueryWrap.and(queryWrap -> { QueryWrapper<ProjectTaskInventoryEO> taskInventoryQueryWrap = new QueryWrapper<>();
queryWrap.lambda().in(ProjectTaskInventoryEO::getDesignPId,complianceProcessPrcIdList) taskInventoryQueryWrap.and(queryWrap -> {
.or().in(ProjectTaskInventoryEO::getPrehomoPId,complianceProcessPrcIdList) queryWrap.lambda().in(ProjectTaskInventoryEO::getDesignPId,complianceProcessPrcIdList)
.or().in(ProjectTaskInventoryEO::getVerifyPId,complianceProcessPrcIdList); .or().in(ProjectTaskInventoryEO::getPrehomoPId,complianceProcessPrcIdList)
}); .or().in(ProjectTaskInventoryEO::getVerifyPId,complianceProcessPrcIdList);
//查询出符合性流程相关的任务清单信息。 });
List<ProjectTaskInventoryEO> taskInventoryList = this.projectTaskInventoryEOService.list(taskInventoryQueryWrap); //查询出符合性流程相关的任务清单信息。
List<ProjectTaskInventoryEO> taskInventoryList = this.projectTaskInventoryEOService.list(taskInventoryQueryWrap);
datas.forEach(data -> { datas.forEach(data -> {
boolean designFlowFlag = StringUtils.equals(data.getFlowType(),FlowTypeEnum.SJFHXSHLC.getValue()); boolean designFlowFlag = StringUtils.equals(data.getFlowType(),FlowTypeEnum.SJFHXSHLC.getValue());
boolean preHomoFlowFlag = StringUtils.equals(data.getFlowType(),FlowTypeEnum.PREHOMOQRLC.getValue()); boolean preHomoFlowFlag = StringUtils.equals(data.getFlowType(),FlowTypeEnum.PREHOMOQRLC.getValue());
boolean verifyFlowFlag = StringUtils.equals(data.getFlowType(),FlowTypeEnum.YZFHXSCLC.getValue()); boolean verifyFlowFlag = StringUtils.equals(data.getFlowType(),FlowTypeEnum.YZFHXSCLC.getValue());
String personChargeFeedback = taskInventoryList.stream().filter(taskInventory -> { String personChargeFeedback = taskInventoryList.stream().filter(taskInventory -> {
boolean flag = false; boolean flag = false;
if(designFlowFlag){ if(designFlowFlag){
if(StringUtils.equals(data.getActiProcInstId(),taskInventory.getDesignPId())){ if(StringUtils.equals(data.getActiProcInstId(),taskInventory.getDesignPId())){
flag = true; 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;
}
} }
}else if(preHomoFlowFlag){ return flag;
if(StringUtils.equals(data.getActiProcInstId(),taskInventory.getPrehomoPId())){ }).map(ProjectTaskInventoryEO::getDesignPersonChargeFeedback).collect(Collectors.joining(","));
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); data.setPersonChargeFeedback(personChargeFeedback);
}); });
}
} }
} }