diff --git a/src/main/java/com/ydw/bat/wkflow/business_activiti/task/TodoTaskController.java b/src/main/java/com/ydw/bat/wkflow/business_activiti/task/TodoTaskController.java index e1691b9c..3da58153 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_activiti/task/TodoTaskController.java +++ b/src/main/java/com/ydw/bat/wkflow/business_activiti/task/TodoTaskController.java @@ -2970,6 +2970,15 @@ public class TodoTaskController extends BaseAction { if(!list2.isEmpty() && "发布".equals(list2.get(0).getName())){ lawsUserInfoService.modSnByProcess(list2.get(0).getId()); } + } else if ("34".equals(busProcessName.getPrcType())) { + // 重点认证标准/政策合规性项目审查流程撤回,如果是从标准跟踪清单下发的流程 则将检查单状态改为未下发 + String mes = busProcessName.getMes(); + JSONObject jsonObject = JSONObject.parseObject(mes); + JSONObject formJson = jsonObject.getJSONObject("form"); + String checklistId = formJson.getString("checklistId"); + if (StringUtils.isNotBlank(checklistId)) { + lawsUserInfoService.processStatusChange(checklistId, 0); + } } } diff --git a/src/main/java/com/ydw/bat/wkflow/business_auth/LawsUserInfoService.java b/src/main/java/com/ydw/bat/wkflow/business_auth/LawsUserInfoService.java index 599ab5e8..c2f2e281 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_auth/LawsUserInfoService.java +++ b/src/main/java/com/ydw/bat/wkflow/business_auth/LawsUserInfoService.java @@ -227,4 +227,13 @@ public interface LawsUserInfoService { @GetMapping("lawss/activiti/selectOnlineFile") ResponseMessage selectOnlineFile(@RequestParam("onlineFileId") String onlineFileId,@RequestParam("standName") String standName,@RequestParam("key") String key); + + /** + * 流程状态变更, 用于流程结束或流程撤回后的状态变更 + * @param trackingChecklistId 跟踪清单ID + * @param processStatus 流程状态, 0 未下发,1 进行中,2 已完成 + * @return + */ + @GetMapping("standardTrackingCheckList/processStatusChange") + ResponseMessage processStatusChange(@RequestParam("trackingChecklistId") String trackingChecklistId,@RequestParam("processStatus") Integer processStatus); } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyComplianceProgramReviewProcess/PolicyComplianceProgramReviewProcess15After.java b/src/main/java/com/ydw/bat/wkflow/listener/policyComplianceProgramReviewProcess/PolicyComplianceProgramReviewProcess15After.java index 6fdd7be9..932b8cfa 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policyComplianceProgramReviewProcess/PolicyComplianceProgramReviewProcess15After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyComplianceProgramReviewProcess/PolicyComplianceProgramReviewProcess15After.java @@ -3,6 +3,7 @@ package com.ydw.bat.wkflow.listener.policyComplianceProgramReviewProcess; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.ydw.bat.wkflow.business_activiti.service.TaskTodoService; +import com.ydw.bat.wkflow.business_auth.LawsUserInfoService; import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName; import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew; import com.ydw.bat.wkflow.business_main.datas.entity.Datas; @@ -29,6 +30,7 @@ public class PolicyComplianceProgramReviewProcess15After implements TaskListener IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); TaskTodoService taskTodoService = SpringContextUtil.getBean(TaskTodoService.class); IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class); + LawsUserInfoService lawsUserInfoService = SpringContextUtil.getBean(LawsUserInfoService.class); CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class); QueryWrapper queryWrapper = new QueryWrapper<>(); @@ -91,5 +93,12 @@ public class PolicyComplianceProgramReviewProcess15After implements TaskListener busProcessNew.setFinishFlag("0"); busProcessNew.setTaskInfo(delegateTask.getName()); busBean.save(busProcessNew); + + // 抄送完成后修改标准跟踪清单中状态 + // 如果是从标准跟踪清单下发的流程 需要修改主服务表中的流程状态,修改为 已完成 + String checklistId = jsonForm.getString("checklistId"); + if (StringUtils.isNotBlank(checklistId)) { + lawsUserInfoService.processStatusChange(checklistId, 2); + } } } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyComplianceProgramReviewProcess/PolicyComplianceProgramReviewProcess1After.java b/src/main/java/com/ydw/bat/wkflow/listener/policyComplianceProgramReviewProcess/PolicyComplianceProgramReviewProcess1After.java index 5455b731..30302e68 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policyComplianceProgramReviewProcess/PolicyComplianceProgramReviewProcess1After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyComplianceProgramReviewProcess/PolicyComplianceProgramReviewProcess1After.java @@ -2,6 +2,7 @@ package com.ydw.bat.wkflow.listener.policyComplianceProgramReviewProcess; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.ydw.bat.wkflow.business_auth.LawsUserInfoService; import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName; import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew; import com.ydw.bat.wkflow.business_main.datas.entity.Datas; @@ -26,6 +27,7 @@ public class PolicyComplianceProgramReviewProcess1After implements TaskListener IDatasService datasService = SpringContextUtil.getBean(IDatasService.class); IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class); + LawsUserInfoService lawsUserInfoService = SpringContextUtil.getBean(LawsUserInfoService.class); QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId()); @@ -70,6 +72,13 @@ public class PolicyComplianceProgramReviewProcess1After implements TaskListener busProcessNew.setTaskInfo(delegateTask.getName()); busBean.save(busProcessNew); + // 如果是从标准跟踪清单下发的流程 需要修改主服务表中的流程状态,修改为 进行中 + String checklistId = jsonForm.getString("checklistId"); + if (StringUtils.isNotBlank(checklistId)) { + lawsUserInfoService.processStatusChange(checklistId, 1); + } + + if (CollectionUtils.isNotEmpty(nextUserList)) { List addBusProcessNewList = new ArrayList<>(); for (String nextUser : nextUserList) {