diff --git a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/service/impl/CwsSuportServiceImpl.java b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/service/impl/CwsSuportServiceImpl.java index 81442fe..f83447c 100644 --- a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/service/impl/CwsSuportServiceImpl.java +++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/service/impl/CwsSuportServiceImpl.java @@ -1,5 +1,6 @@ package com.casic.missiles.modular.cwscase.service.impl; +import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.baomidou.mybatisplus.mapper.SqlRunner; import com.baomidou.mybatisplus.toolkit.IdWorker; import com.casic.missiles.core.common.service.ICommonPermissionService; @@ -285,4 +286,12 @@ cwsCaseService.cancelCaseState(bizId); } + @Override + public CwsCase selectCaseByProcessId(String processId) { + EntityWrapper wrapper = new EntityWrapper(); + wrapper.eq("process_id", processId); + CwsCase cwsCase = cwsCaseService.selectOne(wrapper); + return cwsCase; + } + } diff --git a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/service/impl/CwsSuportServiceImpl.java b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/service/impl/CwsSuportServiceImpl.java index 81442fe..f83447c 100644 --- a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/service/impl/CwsSuportServiceImpl.java +++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/service/impl/CwsSuportServiceImpl.java @@ -1,5 +1,6 @@ package com.casic.missiles.modular.cwscase.service.impl; +import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.baomidou.mybatisplus.mapper.SqlRunner; import com.baomidou.mybatisplus.toolkit.IdWorker; import com.casic.missiles.core.common.service.ICommonPermissionService; @@ -285,4 +286,12 @@ cwsCaseService.cancelCaseState(bizId); } + @Override + public CwsCase selectCaseByProcessId(String processId) { + EntityWrapper wrapper = new EntityWrapper(); + wrapper.eq("process_id", processId); + CwsCase cwsCase = cwsCaseService.selectOne(wrapper); + return cwsCase; + } + } diff --git a/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/flowable/controller/ProcessController.java b/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/flowable/controller/ProcessController.java index d8c3c96..d7e3183 100644 --- a/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/flowable/controller/ProcessController.java +++ b/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/flowable/controller/ProcessController.java @@ -9,7 +9,6 @@ import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.cwscase.model.CwsCase; import com.casic.missiles.modular.dto.ProcessRecord; -import com.casic.missiles.modular.enums.CaseStateEnum; import com.casic.missiles.modular.enums.CwsRoleEnums; import com.casic.missiles.modular.flowable.constant.FlowConstants; import com.casic.missiles.modular.flowable.dto.ProcessDcmsDto; @@ -77,8 +76,8 @@ } @GetMapping(value = "/cancelTask") - public Object cancelTask(String bizId,String processId,String caseState) { - caseFlowService.cancelActivity(bizId,processId,caseState); + public Object cancelTask(String bizId, String processId, String caseState) { + caseFlowService.cancelActivity(bizId, processId, caseState); return ResponseData.success(); } @@ -127,6 +126,8 @@ HistoricActivityInstanceQuery query = processEngine.getHistoryService().createHistoricActivityInstanceQuery().processInstanceId(processId).activityType("userTask").orderByHistoricActivityInstanceEndTime().asc(); List list = query.list(); List processRecords = new ArrayList<>(); + + CwsCase cwsCase = cwsSuportService.selectCaseByProcessId(processId); for (HistoricActivityInstance task : list) { System.out.println("name = " + task.getExecutionId()); //查询审批意见 @@ -163,7 +164,7 @@ userName = CwsRoleEnums.tipOf(roleTip).getRoleName(); userName = userName + "-"; } - String userId = ToolUtil.isEmpty(processRecord.getUserId())?task.getAssignee():processRecord.getUserId(); + String userId = ToolUtil.isEmpty(processRecord.getUserId()) ? task.getAssignee() : processRecord.getUserId(); if (ToolUtil.isNotEmpty(userId)) { userName = userName + CommonPermissionFactory.me().getUserById(userId, null).getName(); } @@ -171,12 +172,44 @@ processRecord.setDeptName(CommonPermissionFactory.me().getDeptName(processRecord.getDeptId())); processRecord.setUserName(userName); processRecord.setTaskId(task.getTaskId()); + getCurrUser(processRecord, cwsCase); processRecords.add(processRecord); } } return ResponseData.success(processRecords); } + private String getCurrUser(ProcessRecord processRecord, CwsCase cwsCase) { + if ("1".equals(processRecord.getUserId())) { + switch (cwsCase.getSource()) { + case 13: //智慧管网 + if(processRecord.getOperationTypeName().equals("案卷上报")){ + processRecord.setDeptName("城管局指挥中心"); + processRecord.setUserName("智慧管网系统"); + } + break; + case 14: //视频监控 + if(processRecord.getOperationTypeName().equals("案卷上报")){ + processRecord.setDeptName("城管局指挥中心"); + processRecord.setUserName("视频监控系统"); + } + break; + + case 17: //环境监测 + if(processRecord.getOperationTypeName().equals("案卷上报")){ + processRecord.setDeptName("城管局指挥中心"); + processRecord.setUserName("环境监测系统"); + } + break; + } + if(processRecord.getOperationTypeName().equals("立案")||processRecord.getOperationTypeName().equals("立案")){ + processRecord.setDeptName("城管局指挥中心"); + processRecord.setUserName("受理员"); + } + } + return "0"; + } + /** * 生成流程图 * diff --git a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/service/impl/CwsSuportServiceImpl.java b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/service/impl/CwsSuportServiceImpl.java index 81442fe..f83447c 100644 --- a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/service/impl/CwsSuportServiceImpl.java +++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/service/impl/CwsSuportServiceImpl.java @@ -1,5 +1,6 @@ package com.casic.missiles.modular.cwscase.service.impl; +import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.baomidou.mybatisplus.mapper.SqlRunner; import com.baomidou.mybatisplus.toolkit.IdWorker; import com.casic.missiles.core.common.service.ICommonPermissionService; @@ -285,4 +286,12 @@ cwsCaseService.cancelCaseState(bizId); } + @Override + public CwsCase selectCaseByProcessId(String processId) { + EntityWrapper wrapper = new EntityWrapper(); + wrapper.eq("process_id", processId); + CwsCase cwsCase = cwsCaseService.selectOne(wrapper); + return cwsCase; + } + } diff --git a/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/flowable/controller/ProcessController.java b/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/flowable/controller/ProcessController.java index d8c3c96..d7e3183 100644 --- a/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/flowable/controller/ProcessController.java +++ b/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/flowable/controller/ProcessController.java @@ -9,7 +9,6 @@ import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.cwscase.model.CwsCase; import com.casic.missiles.modular.dto.ProcessRecord; -import com.casic.missiles.modular.enums.CaseStateEnum; import com.casic.missiles.modular.enums.CwsRoleEnums; import com.casic.missiles.modular.flowable.constant.FlowConstants; import com.casic.missiles.modular.flowable.dto.ProcessDcmsDto; @@ -77,8 +76,8 @@ } @GetMapping(value = "/cancelTask") - public Object cancelTask(String bizId,String processId,String caseState) { - caseFlowService.cancelActivity(bizId,processId,caseState); + public Object cancelTask(String bizId, String processId, String caseState) { + caseFlowService.cancelActivity(bizId, processId, caseState); return ResponseData.success(); } @@ -127,6 +126,8 @@ HistoricActivityInstanceQuery query = processEngine.getHistoryService().createHistoricActivityInstanceQuery().processInstanceId(processId).activityType("userTask").orderByHistoricActivityInstanceEndTime().asc(); List list = query.list(); List processRecords = new ArrayList<>(); + + CwsCase cwsCase = cwsSuportService.selectCaseByProcessId(processId); for (HistoricActivityInstance task : list) { System.out.println("name = " + task.getExecutionId()); //查询审批意见 @@ -163,7 +164,7 @@ userName = CwsRoleEnums.tipOf(roleTip).getRoleName(); userName = userName + "-"; } - String userId = ToolUtil.isEmpty(processRecord.getUserId())?task.getAssignee():processRecord.getUserId(); + String userId = ToolUtil.isEmpty(processRecord.getUserId()) ? task.getAssignee() : processRecord.getUserId(); if (ToolUtil.isNotEmpty(userId)) { userName = userName + CommonPermissionFactory.me().getUserById(userId, null).getName(); } @@ -171,12 +172,44 @@ processRecord.setDeptName(CommonPermissionFactory.me().getDeptName(processRecord.getDeptId())); processRecord.setUserName(userName); processRecord.setTaskId(task.getTaskId()); + getCurrUser(processRecord, cwsCase); processRecords.add(processRecord); } } return ResponseData.success(processRecords); } + private String getCurrUser(ProcessRecord processRecord, CwsCase cwsCase) { + if ("1".equals(processRecord.getUserId())) { + switch (cwsCase.getSource()) { + case 13: //智慧管网 + if(processRecord.getOperationTypeName().equals("案卷上报")){ + processRecord.setDeptName("城管局指挥中心"); + processRecord.setUserName("智慧管网系统"); + } + break; + case 14: //视频监控 + if(processRecord.getOperationTypeName().equals("案卷上报")){ + processRecord.setDeptName("城管局指挥中心"); + processRecord.setUserName("视频监控系统"); + } + break; + + case 17: //环境监测 + if(processRecord.getOperationTypeName().equals("案卷上报")){ + processRecord.setDeptName("城管局指挥中心"); + processRecord.setUserName("环境监测系统"); + } + break; + } + if(processRecord.getOperationTypeName().equals("立案")||processRecord.getOperationTypeName().equals("立案")){ + processRecord.setDeptName("城管局指挥中心"); + processRecord.setUserName("受理员"); + } + } + return "0"; + } + /** * 生成流程图 * diff --git a/casic-service-support/src/main/java/com/casic/missiles/modular/flowable/service/ICwsSuportService.java b/casic-service-support/src/main/java/com/casic/missiles/modular/flowable/service/ICwsSuportService.java index 2d39b28..3d1cf5e 100644 --- a/casic-service-support/src/main/java/com/casic/missiles/modular/flowable/service/ICwsSuportService.java +++ b/casic-service-support/src/main/java/com/casic/missiles/modular/flowable/service/ICwsSuportService.java @@ -94,4 +94,6 @@ * @param bizId */ void cancelCaseState(String bizId); + + CwsCase selectCaseByProcessId(String processId); }