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 241ffeca..d6124ed8 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 @@ -2986,6 +2986,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); + } } } @@ -3334,4 +3343,14 @@ public class TodoTaskController extends BaseAction { return processNew; } + + @ApiOperation(value = "根据流程实例ID查询流程编号") + @GetMapping("/getProcessNumByPrcId") + Wrapper getProcessNumByPrcId(@RequestParam("prcId") String prcId) { + String processNum = iBusProcessNameService.getProcessNumByPrcId(prcId); + if (StringUtils.isBlank(processNum)) { + return WrapMapper.error("未找到流程编号"); + } + return WrapMapper.ok(processNum); + } } 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/business_main/datas/service/IBusProcessNameService.java b/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/IBusProcessNameService.java index e599d138..f24d787b 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/IBusProcessNameService.java +++ b/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/IBusProcessNameService.java @@ -26,4 +26,6 @@ public interface IBusProcessNameService extends IService { String delDB(List id); BusProcessName selectById(String id); + + String getProcessNumByPrcId(String prcId); } diff --git a/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/impl/BusProcessNameServiceImpl.java b/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/impl/BusProcessNameServiceImpl.java index 9943b9f3..55a4e34b 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/impl/BusProcessNameServiceImpl.java +++ b/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/impl/BusProcessNameServiceImpl.java @@ -1,5 +1,6 @@ package com.ydw.bat.wkflow.business_main.datas.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.ydw.bat.wkflow.business_activiti.dto.TaskCommonQuery; import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName; import com.ydw.bat.wkflow.business_main.datas.mapper.BusProcessNameMapper; @@ -49,4 +50,15 @@ public class BusProcessNameServiceImpl extends ServiceImpl wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(BusProcessName::getPrcId,prcId); + List busProcessNameList = list(wrapper); + if (busProcessNameList.size()>0){ + return busProcessNameList.get(0).getPrcNum(); + } else { + return null; + } + } } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyComplianceProgramReviewProcess/PolicyComplianceProgramReviewProcess11After.java b/src/main/java/com/ydw/bat/wkflow/listener/policyComplianceProgramReviewProcess/PolicyComplianceProgramReviewProcess11After.java index 0d50758d..2ecd318b 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policyComplianceProgramReviewProcess/PolicyComplianceProgramReviewProcess11After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyComplianceProgramReviewProcess/PolicyComplianceProgramReviewProcess11After.java @@ -17,6 +17,9 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; +/** + * 管理员节点后置处理 + */ public class PolicyComplianceProgramReviewProcess11After implements TaskListener { @Override public void notify(DelegateTask delegateTask) { diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyComplianceProgramReviewProcess/PolicyComplianceProgramReviewProcess12After.java b/src/main/java/com/ydw/bat/wkflow/listener/policyComplianceProgramReviewProcess/PolicyComplianceProgramReviewProcess12After.java index 2ef78d28..bb298150 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policyComplianceProgramReviewProcess/PolicyComplianceProgramReviewProcess12After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyComplianceProgramReviewProcess/PolicyComplianceProgramReviewProcess12After.java @@ -20,6 +20,9 @@ import java.util.Arrays; import java.util.List; import java.util.stream.Collectors; +/** + * 审核后 + */ public class PolicyComplianceProgramReviewProcess12After implements TaskListener { @Override public void notify(DelegateTask delegateTask) { @@ -71,7 +74,7 @@ public class PolicyComplianceProgramReviewProcess12After implements TaskListener } } } else if (StringUtils.equals(approvalFlag, ApprovalFlagEnum.OVERRULE.getValue())) { - String pzr1UserId = jsonForm.getString("pzr1UserId"); + String glyUserId = jsonForm.getString("glyUserId"); BusProcessNew busProcessNewNext = new BusProcessNew(); busProcessNewNext.setMsgType("clause"); busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); @@ -79,10 +82,10 @@ public class PolicyComplianceProgramReviewProcess12After implements TaskListener busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); busProcessNewNext.setFinishFlag("0"); busProcessNewNext.setTaskInfo(delegateTask.getName()); - busProcessNewNext.setUserId(pzr1UserId); + busProcessNewNext.setUserId(glyUserId); busBean.save(busProcessNewNext); - delegateTask.setVariable("pzr1UserId", pzr1UserId); + delegateTask.setVariable("glyUserId", glyUserId); delegateTask.setVariable("shr2UserOverruleCount", 1); } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyComplianceProgramReviewProcess/PolicyComplianceProgramReviewProcess13After.java b/src/main/java/com/ydw/bat/wkflow/listener/policyComplianceProgramReviewProcess/PolicyComplianceProgramReviewProcess13After.java index 03a129a7..cb5bf693 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policyComplianceProgramReviewProcess/PolicyComplianceProgramReviewProcess13After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyComplianceProgramReviewProcess/PolicyComplianceProgramReviewProcess13After.java @@ -18,6 +18,9 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; +/** + * 审定后 + */ public class PolicyComplianceProgramReviewProcess13After implements TaskListener { @Override public void notify(DelegateTask delegateTask) { @@ -55,7 +58,7 @@ public class PolicyComplianceProgramReviewProcess13After implements TaskListener delegateTask.setVariable("pzr2UserId", pzr2UserId); } } else if (StringUtils.equals(approvalFlag, ApprovalFlagEnum.OVERRULE.getValue())) { - String pzr1UserId = jsonForm.getString("pzr1UserId"); + String glyUserId = jsonForm.getString("glyUserId"); BusProcessNew busProcessNewNext = new BusProcessNew(); busProcessNewNext.setMsgType("clause"); busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); @@ -63,10 +66,10 @@ public class PolicyComplianceProgramReviewProcess13After implements TaskListener busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); busProcessNewNext.setFinishFlag("0"); busProcessNewNext.setTaskInfo(delegateTask.getName()); - busProcessNewNext.setUserId(pzr1UserId); + busProcessNewNext.setUserId(glyUserId); busBean.save(busProcessNewNext); - delegateTask.setVariable("pzr1UserId", pzr1UserId); + delegateTask.setVariable("pzr1UserId", glyUserId); delegateTask.setVariable("sdr2UserOverruleCount", 1); } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyComplianceProgramReviewProcess/PolicyComplianceProgramReviewProcess14After.java b/src/main/java/com/ydw/bat/wkflow/listener/policyComplianceProgramReviewProcess/PolicyComplianceProgramReviewProcess14After.java index 43a1a32d..c35c3005 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policyComplianceProgramReviewProcess/PolicyComplianceProgramReviewProcess14After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyComplianceProgramReviewProcess/PolicyComplianceProgramReviewProcess14After.java @@ -18,6 +18,9 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; +/** + * 批准后 + */ public class PolicyComplianceProgramReviewProcess14After implements TaskListener { @Override public void notify(DelegateTask delegateTask) { @@ -54,7 +57,7 @@ public class PolicyComplianceProgramReviewProcess14After implements TaskListener delegateTask.setVariable("csrUserIdList", nextUserList); } } else if (StringUtils.equals(approvalFlag, ApprovalFlagEnum.OVERRULE.getValue())) { - String pzr1UserId = jsonForm.getString("pzr1UserId"); + String glyUserId = jsonForm.getString("glyUserId"); BusProcessNew busProcessNewNext = new BusProcessNew(); busProcessNewNext.setMsgType("clause"); busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); @@ -62,10 +65,10 @@ public class PolicyComplianceProgramReviewProcess14After implements TaskListener busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); busProcessNewNext.setFinishFlag("0"); busProcessNewNext.setTaskInfo(delegateTask.getName()); - busProcessNewNext.setUserId(pzr1UserId); + busProcessNewNext.setUserId(glyUserId); busBean.save(busProcessNewNext); - delegateTask.setVariable("pzr1UserId", pzr1UserId); + delegateTask.setVariable("glyUserId", glyUserId); } // 存储当前节点意见 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) { diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policySolicitOpinionProcess/PolicySolicitOpinionProcess11After.java b/src/main/java/com/ydw/bat/wkflow/listener/policySolicitOpinionProcess/PolicySolicitOpinionProcess11After.java index 4f8e9749..44f7fa15 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policySolicitOpinionProcess/PolicySolicitOpinionProcess11After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policySolicitOpinionProcess/PolicySolicitOpinionProcess11After.java @@ -7,6 +7,7 @@ import com.ydw.bat.wkflow.business_main.datas.entity.Datas; import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNameService; import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService; import com.ydw.bat.wkflow.business_main.datas.service.IDatasService; +import com.ydw.bat.wkflow.business_main.datas.service.IPolicySolicitOpinionEOService; import com.ydw.bat.wkflow.util.SpringContextUtil; import com.ydw.bat.wkflow.util.enums.ApprovalFlagEnum; import org.activiti.engine.delegate.DelegateTask; @@ -23,6 +24,7 @@ public class PolicySolicitOpinionProcess11After implements TaskListener { public void notify(DelegateTask delegateTask) { IDatasService datasService = SpringContextUtil.getBean(IDatasService.class); IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); + IPolicySolicitOpinionEOService policySolicitOpinionEOService = SpringContextUtil.getBean(IPolicySolicitOpinionEOService.class); QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId()); @@ -49,6 +51,11 @@ public class PolicySolicitOpinionProcess11After implements TaskListener { } busBean.saveBatch(addBusProcessNewList); + // 保存管理员填写的征求意见信息 + object.put("currentUserId",delegateTask.getAssignee()); + object.put("prcId",delegateTask.getProcessInstanceId()); + policySolicitOpinionEOService.batchInsert(object); + // 配置多实例 delegateTask.setVariable("shr2UserIdList", nextUserList); delegateTask.setVariable("shr2UserCount", nextUserList.size()); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policySolicitOpinionProcess/PolicySolicitOpinionProcess12After.java b/src/main/java/com/ydw/bat/wkflow/listener/policySolicitOpinionProcess/PolicySolicitOpinionProcess12After.java index 9faa0407..84b47983 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policySolicitOpinionProcess/PolicySolicitOpinionProcess12After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policySolicitOpinionProcess/PolicySolicitOpinionProcess12After.java @@ -81,7 +81,7 @@ public class PolicySolicitOpinionProcess12After implements TaskListener { } } } else if (StringUtils.equals(approvalFlag, ApprovalFlagEnum.OVERRULE.getValue())) { - String pzr1UserId = jsonForm.getString("pzr1UserId"); + String glyUserId = jsonForm.getString("glyUserId"); BusProcessNew busProcessNewNext = new BusProcessNew(); busProcessNewNext.setMsgType("clause"); busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); @@ -89,10 +89,10 @@ public class PolicySolicitOpinionProcess12After implements TaskListener { busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); busProcessNewNext.setFinishFlag("0"); busProcessNewNext.setTaskInfo(delegateTask.getName()); - busProcessNewNext.setUserId(pzr1UserId); + busProcessNewNext.setUserId(glyUserId); busBean.save(busProcessNewNext); - delegateTask.setVariable("pzr1UserId", pzr1UserId); + delegateTask.setVariable("djrUserId", glyUserId); delegateTask.setVariable("hqrUserIdList", new ArrayList()); delegateTask.setVariable("shr2UserOverruleCount", 1); } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policySolicitOpinionProcess/PolicySolicitOpinionProcess13After.java b/src/main/java/com/ydw/bat/wkflow/listener/policySolicitOpinionProcess/PolicySolicitOpinionProcess13After.java index ae6be652..ac33a438 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policySolicitOpinionProcess/PolicySolicitOpinionProcess13After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policySolicitOpinionProcess/PolicySolicitOpinionProcess13After.java @@ -67,7 +67,7 @@ public class PolicySolicitOpinionProcess13After implements TaskListener { } } } else if (StringUtils.equals(approvalFlag, ApprovalFlagEnum.OVERRULE.getValue())) { - String pzr1UserId = jsonForm.getString("pzr1UserId"); + String glyUserId = jsonForm.getString("glyUserId"); BusProcessNew busProcessNewNext = new BusProcessNew(); busProcessNewNext.setMsgType("clause"); busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); @@ -75,10 +75,10 @@ public class PolicySolicitOpinionProcess13After implements TaskListener { busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); busProcessNewNext.setFinishFlag("0"); busProcessNewNext.setTaskInfo(delegateTask.getName()); - busProcessNewNext.setUserId(pzr1UserId); + busProcessNewNext.setUserId(glyUserId); busBean.save(busProcessNewNext); - delegateTask.setVariable("pzr1UserId", pzr1UserId); + delegateTask.setVariable("glyUserId", glyUserId); delegateTask.setVariable("hqrUserOverruleCount", 1); } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policySolicitOpinionProcess/PolicySolicitOpinionProcess14After.java b/src/main/java/com/ydw/bat/wkflow/listener/policySolicitOpinionProcess/PolicySolicitOpinionProcess14After.java index 789af733..954137d4 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policySolicitOpinionProcess/PolicySolicitOpinionProcess14After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policySolicitOpinionProcess/PolicySolicitOpinionProcess14After.java @@ -14,6 +14,9 @@ import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; import org.apache.commons.lang.StringUtils; +/** + * 审定后 + */ public class PolicySolicitOpinionProcess14After implements TaskListener { @Override public void notify(DelegateTask delegateTask) { @@ -51,7 +54,7 @@ public class PolicySolicitOpinionProcess14After implements TaskListener { delegateTask.setVariable("pzr2UserId", pzr2UserId); } } else if (StringUtils.equals(approvalFlag, ApprovalFlagEnum.OVERRULE.getValue())) { - String pzr1UserId = jsonForm.getString("pzr1UserId"); + String glyUserId = jsonForm.getString("glyUserId"); BusProcessNew busProcessNewNext = new BusProcessNew(); busProcessNewNext.setMsgType("clause"); busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); @@ -59,10 +62,10 @@ public class PolicySolicitOpinionProcess14After implements TaskListener { busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); busProcessNewNext.setFinishFlag("0"); busProcessNewNext.setTaskInfo(delegateTask.getName()); - busProcessNewNext.setUserId(pzr1UserId); + busProcessNewNext.setUserId(glyUserId); busBean.save(busProcessNewNext); - delegateTask.setVariable("pzr1UserId", pzr1UserId); + delegateTask.setVariable("glyUserId", glyUserId); delegateTask.setVariable("sdr2UserOverruleCount", 1); } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policySolicitOpinionProcess/PolicySolicitOpinionProcess15After.java b/src/main/java/com/ydw/bat/wkflow/listener/policySolicitOpinionProcess/PolicySolicitOpinionProcess15After.java index 2494f284..1da9b690 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policySolicitOpinionProcess/PolicySolicitOpinionProcess15After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policySolicitOpinionProcess/PolicySolicitOpinionProcess15After.java @@ -18,6 +18,9 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; +/** + * 批准后 + */ public class PolicySolicitOpinionProcess15After implements TaskListener { @Override public void notify(DelegateTask delegateTask) { @@ -53,7 +56,7 @@ public class PolicySolicitOpinionProcess15After implements TaskListener { delegateTask.setVariable("csrUserIdList", nextUserList); } } else if (StringUtils.equals(approvalFlag, ApprovalFlagEnum.OVERRULE.getValue())) { - String pzr1UserId = jsonForm.getString("pzr1UserId"); + String glyUserId = jsonForm.getString("glyUserId"); BusProcessNew busProcessNewNext = new BusProcessNew(); busProcessNewNext.setMsgType("clause"); busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); @@ -61,10 +64,10 @@ public class PolicySolicitOpinionProcess15After implements TaskListener { busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); busProcessNewNext.setFinishFlag("0"); busProcessNewNext.setTaskInfo(delegateTask.getName()); - busProcessNewNext.setUserId(pzr1UserId); + busProcessNewNext.setUserId(glyUserId); busBean.save(busProcessNewNext); - delegateTask.setVariable("pzr1UserId", pzr1UserId); + delegateTask.setVariable("glyUserId", glyUserId); } // 存储当前节点意见 diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policySolicitOpinionProcess/PolicySolicitOpinionProcess1After.java b/src/main/java/com/ydw/bat/wkflow/listener/policySolicitOpinionProcess/PolicySolicitOpinionProcess1After.java index 4b3fb251..e6afbb2e 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policySolicitOpinionProcess/PolicySolicitOpinionProcess1After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policySolicitOpinionProcess/PolicySolicitOpinionProcess1After.java @@ -43,16 +43,16 @@ public class PolicySolicitOpinionProcess1After implements TaskListener { String user = object.getString("prcCreateUser"); String username = object.getString("prcCreateUserName"); Object lawsName = jsonForm.get("lawsName"); - Object lawsNumber = jsonForm.get("lawsNumber"); + Object lawsNo = jsonForm.get("lawsNo"); String lawsInfoName = ""; - if(lawsName != null && lawsNumber != null){ - String name = lawsName.toString()+"-"; - String number = lawsNumber.toString()+"-"; + if(lawsName != null && lawsNo != null){ + String number = "《" + lawsNo +"-"; + String name = lawsName +"》-"; if(StringUtils.isNotBlank(name) && StringUtils.isNotBlank(number)){ - lawsInfoName = number+name; + lawsInfoName = number + name; } } - String prcName = lawsInfoName+"政策征求意见流程"; + String prcName = lawsInfoName + "征求意见"; QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId()); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);