diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java index 02c6ce08e..04a24be20 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java @@ -6740,12 +6740,16 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl concat(pli.serial_number,' ',bdl.title_en) as standard_info, - pi.flow_type, + (case pi.flow_type when '32' THEN '2' when '34' THEN '4' else pi.flow_type END) as flow_type, pi.create_by, pi.end_time, pi.STATUS, 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 83c0c130e..b2a5c2563 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 @@ -224,6 +224,8 @@ public class ProcessInfoEOServiceImpl extends ServiceImpl> queryComplianceProcessHistoryList(@RequestParam Map params) { + List list = processHistoryEOService.queryComplianceProcessHistoryList(params); + return Result.OK(list); + } + } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/controller/workFlowController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/controller/workFlowController.java index 664b1a115..66c5596d5 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/controller/workFlowController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/controller/workFlowController.java @@ -77,8 +77,8 @@ public class workFlowController { jsonObject.put("processDefinitionKey", FlowTypeEnum.FGJSPG.getProcessDefinitionKey()); return this.startLawsTechnologyEvaluationProcess(jsonObject); }else if(StringUtils.equals(type,FlowTypeEnum.XGJFWLC.getValue())){ - jsonObject.put("processDefinitionKey", FlowTypeEnum.XGJFWLC.getProcessDefinitionKey()); - return this.startLawsTechnologyEvaluationProcess(jsonObject); + jsonObject.put("id", FlowTypeEnum.XGJFWLC.getProcessDefinitionKey()); + return this.activiti_define_start(jsonObject); }else{ return null; } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/service/IProcessHistoryEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/service/IProcessHistoryEOService.java index 347b0e17f..5c9d6adcd 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/service/IProcessHistoryEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/service/IProcessHistoryEOService.java @@ -70,4 +70,11 @@ public interface IProcessHistoryEOService extends IService { Result processCall(JSONObject jsonObject); void deleteBiActiProcInstIdList(List actiProcInstIdList); + + /** + * 查询符合性流程历史 + * @param params + * @return + */ + List queryComplianceProcessHistoryList(Map params); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/service/impl/ProcessHistoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/service/impl/ProcessHistoryEOServiceImpl.java index f128403b6..9c57fb67f 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/service/impl/ProcessHistoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/service/impl/ProcessHistoryEOServiceImpl.java @@ -180,17 +180,17 @@ public class ProcessHistoryEOServiceImpl extends ServiceImpl queryComplianceProcessHistoryList(Map params) { + String cut = (String) params.get("cut"); + String projectLawsInventoryId = (String) params.get("projectLawsInventoryId"); + if (StringUtils.isEmpty(projectLawsInventoryId)) { + throw new JeroBootException("法规清单id不能为空!"); + } + String flowType = (String) params.get("flowType"); + List flowTypeList = new ArrayList<>(); + flowTypeList.add(flowType); + if(StringUtils.equals(flowType,FlowTypeEnum.SJFHXSHLC.getValue())){ + flowTypeList.add(FlowTypeEnum.SJ_XGJFWLC.getValue()); + }else if(StringUtils.equals(flowType,FlowTypeEnum.YZFHXSCLC.getValue())){ + flowTypeList.add(FlowTypeEnum.YZ_XGJFWLC.getValue()); + } + QueryWrapper piQueryWrap = new QueryWrapper<>(); + piQueryWrap.lambda().eq(ProcessInfoEO::getProjectLawsInventoryId, projectLawsInventoryId); + piQueryWrap.lambda().in(ProcessInfoEO::getFlowType, flowTypeList); + List piInfoList = this.processInfoEOService.list(piQueryWrap); + List actiProcInstIdList = piInfoList.stream().map(ProcessInfoEO::getActiProcInstId).distinct().collect(Collectors.toList()); + + List processHistoryEOList = null; + if(CollectionUtils.isNotEmpty(actiProcInstIdList)){ + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.orderByAsc("create_time"); + queryWrapper.lambda().in(ProcessHistoryEO::getActiProcInstId, actiProcInstIdList); + processHistoryEOList = this.baseMapper.selectList(queryWrapper); + this.disposeData(processHistoryEOList, cut); + } + return processHistoryEOList; + } }