diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryDetailEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryDetailEOServiceImpl.java index 882059144..144f559e2 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryDetailEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryDetailEOServiceImpl.java @@ -222,10 +222,12 @@ public class ProjectTaskInventoryDetailEOServiceImpl extends ServiceImpl processInfoDetailUpdateWrap= new LambdaUpdateWrapper(); - processInfoDetailUpdateWrap.eq(ProcessInfoDetailEO::getTaskId,taskInventoryDetailById.getTaskId()); - processInfoDetailUpdateWrap.set(ProcessInfoDetailEO::getStatus,projectTaskInventoryDetailEO.getStatus()); - this.processInfoDetailEOService.update(processInfoDetailUpdateWrap); + if(taskInventoryDetailById != null){ + LambdaUpdateWrapper processInfoDetailUpdateWrap= new LambdaUpdateWrapper(); + processInfoDetailUpdateWrap.eq(ProcessInfoDetailEO::getTaskId,taskInventoryDetailById.getTaskId()); + processInfoDetailUpdateWrap.set(ProcessInfoDetailEO::getStatus,projectTaskInventoryDetailEO.getStatus()); + this.processInfoDetailEOService.update(processInfoDetailUpdateWrap); + } } } 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 a4c8fd37d..78c88a657 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 @@ -148,8 +148,8 @@ pi.acti_proc_inst_id, pni.project_name, pyni.year_name, - pli.serial_number, - pli.title, + '--' as serial_number, + '' as title, pi.flow_type, 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, 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 bfbac3a96..f25a0ac1b 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 @@ -510,38 +510,40 @@ public class ProcessInfoEOServiceImpl extends ServiceImpl 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); + if(CollectionUtils.isNotEmpty(complianceProcessPrcIdList)){ + 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; + 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; + } } - }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(",")); + return flag; + }).map(ProjectTaskInventoryEO::getDesignPersonChargeFeedback).collect(Collectors.joining(",")); - data.setPersonChargeFeedback(personChargeFeedback); - }); + data.setPersonChargeFeedback(personChargeFeedback); + }); + } } }