diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyComplianceProgramReviewProcess/PolicyComplianceProgramReviewProcess10After.java b/src/main/java/com/ydw/bat/wkflow/listener/policyComplianceProgramReviewProcess/PolicyComplianceProgramReviewProcess10After.java index 220c04c0..7fd1b1da 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policyComplianceProgramReviewProcess/PolicyComplianceProgramReviewProcess10After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyComplianceProgramReviewProcess/PolicyComplianceProgramReviewProcess10After.java @@ -1,6 +1,7 @@ package com.ydw.bat.wkflow.listener.policyComplianceProgramReviewProcess; import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew; import com.ydw.bat.wkflow.business_main.datas.entity.Datas; @@ -10,8 +11,11 @@ import com.ydw.bat.wkflow.util.SpringContextUtil; import com.ydw.bat.wkflow.util.enums.ApprovalFlagEnum; import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang.StringUtils; +import java.util.List; + public class PolicyComplianceProgramReviewProcess10After implements TaskListener { @Override public void notify(DelegateTask delegateTask) { @@ -24,6 +28,8 @@ public class PolicyComplianceProgramReviewProcess10After implements TaskListener JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); JSONObject jsonForm = object.getJSONObject("form"); + String prcName = "重点认证标准/政策合规性项目审查流程"; + String approvalFlag = jsonForm.getString("approvalFlag"); if (StringUtils.equals(approvalFlag, ApprovalFlagEnum.PASS.getValue())) { // 责任部门 子流程总数 @@ -44,7 +50,8 @@ public class PolicyComplianceProgramReviewProcess10After implements TaskListener busProcessNewNext.setMesg(object.toJSONString()); busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); busProcessNewNext.setFinishFlag("0"); - busProcessNewNext.setTaskInfo(delegateTask.getName()); + busProcessNewNext.setTaskInfo("管理员"); + busProcessNewNext.setPrcName(prcName); busProcessNewNext.setUserId(glyUserId); busBean.save(busProcessNewNext); } @@ -56,22 +63,32 @@ public class PolicyComplianceProgramReviewProcess10After implements TaskListener busProcessNewNext.setMesg(object.toJSONString()); busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); busProcessNewNext.setFinishFlag("0"); - busProcessNewNext.setTaskInfo(delegateTask.getName()); + busProcessNewNext.setTaskInfo("责任对接人汇总"); + busProcessNewNext.setPrcName(prcName); busProcessNewNext.setUserId(djrUserId); busBean.save(busProcessNewNext); } // 存储当前节点意见 - BusProcessNew busProcessNew = new BusProcessNew(); - busProcessNew.setMsgType("clause"); - busProcessNew.setPId(delegateTask.getProcessInstanceId()); - busProcessNew.setMesg(object.toJSONString()); - busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey()); - busProcessNew.setTaskId(delegateTask.getId()); - busProcessNew.setCommitText(object.getString("commentText")); - busProcessNew.setFinishFlag("0"); - busProcessNew.setTaskInfo(delegateTask.getName()); - busBean.save(busProcessNew); + LambdaQueryWrapper queryWrapper1 = new LambdaQueryWrapper<>(); + queryWrapper1.eq(BusProcessNew::getTaskId,delegateTask.getId()); + List list = busBean.list(queryWrapper1); + if (CollectionUtils.isNotEmpty(list)) { + BusProcessNew busProcessNew = list.get(0); + busProcessNew.setTaskId(delegateTask.getId()); + busProcessNew.setCommitText(object.getString("commentText")); + busBean.saveOrUpdate(busProcessNew); + } +// BusProcessNew busProcessNew = new BusProcessNew(); +// busProcessNew.setMsgType("clause"); +// busProcessNew.setPId(delegateTask.getProcessInstanceId()); +// busProcessNew.setMesg(object.toJSONString()); +// busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey()); +// busProcessNew.setTaskId(delegateTask.getId()); +// busProcessNew.setCommitText(object.getString("commentText")); +// busProcessNew.setFinishFlag("0"); +// busProcessNew.setTaskInfo(delegateTask.getName()); +// busBean.save(busProcessNew); delegateTask.setVariable("approvalFlag",approvalFlag); } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyComplianceProgramReviewProcess/PolicyComplianceProgramReviewProcess10Before.java b/src/main/java/com/ydw/bat/wkflow/listener/policyComplianceProgramReviewProcess/PolicyComplianceProgramReviewProcess10Before.java index cb2c9dd7..5ac910e0 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policyComplianceProgramReviewProcess/PolicyComplianceProgramReviewProcess10Before.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyComplianceProgramReviewProcess/PolicyComplianceProgramReviewProcess10Before.java @@ -19,7 +19,7 @@ public class PolicyComplianceProgramReviewProcess10Before implements TaskListene CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class); - QueryWrapper queryWrapper = new QueryWrapper(); + QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.isNull("TASK_ID"); queryWrapper.eq("P_ID",delegateTask.getProcessInstanceId()); queryWrapper.eq("USER_ID",delegateTask.getAssignee()); 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 2ecd318b..bec28c1d 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 @@ -1,6 +1,7 @@ package com.ydw.bat.wkflow.listener.policyComplianceProgramReviewProcess; import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew; import com.ydw.bat.wkflow.business_main.datas.entity.Datas; @@ -32,6 +33,8 @@ public class PolicyComplianceProgramReviewProcess11After implements TaskListener JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); JSONObject jsonForm = object.getJSONObject("form"); + String prcName = "重点认证标准/政策合规性项目审查流程"; + String approvalFlag = jsonForm.getString("approvalFlag"); if (StringUtils.equals(approvalFlag, ApprovalFlagEnum.PASS.getValue())) { String shr2UserIds = jsonForm.getString("shr2UserIds"); @@ -45,7 +48,8 @@ public class PolicyComplianceProgramReviewProcess11After implements TaskListener busProcessNewNext.setMesg(object.toJSONString()); busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); busProcessNewNext.setFinishFlag("0"); - busProcessNewNext.setTaskInfo(delegateTask.getName()); + busProcessNewNext.setTaskInfo("审核"); + busProcessNewNext.setPrcName(prcName); busProcessNewNext.setUserId(nextUser); addBusProcessNewList.add(busProcessNewNext); } @@ -65,7 +69,8 @@ public class PolicyComplianceProgramReviewProcess11After implements TaskListener busProcessNewNext.setMesg(object.toJSONString()); busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); busProcessNewNext.setFinishFlag("0"); - busProcessNewNext.setTaskInfo(delegateTask.getName()); + busProcessNewNext.setTaskInfo("批准"); + busProcessNewNext.setPrcName(prcName); busProcessNewNext.setUserId(pzr1UserId); busBean.save(busProcessNewNext); @@ -73,16 +78,25 @@ public class PolicyComplianceProgramReviewProcess11After implements TaskListener } // 存储当前节点意见 - BusProcessNew busProcessNew = new BusProcessNew(); - busProcessNew.setMsgType("clause"); - busProcessNew.setPId(delegateTask.getProcessInstanceId()); - busProcessNew.setMesg(object.toJSONString()); - busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey()); - busProcessNew.setTaskId(delegateTask.getId()); - busProcessNew.setCommitText(object.getString("commentText")); - busProcessNew.setFinishFlag("0"); - busProcessNew.setTaskInfo(delegateTask.getName()); - busBean.save(busProcessNew); + LambdaQueryWrapper queryWrapper1 = new LambdaQueryWrapper<>(); + queryWrapper1.eq(BusProcessNew::getTaskId,delegateTask.getId()); + List list = busBean.list(queryWrapper1); + if (CollectionUtils.isNotEmpty(list)) { + BusProcessNew busProcessNew = list.get(0); + busProcessNew.setTaskId(delegateTask.getId()); + busProcessNew.setCommitText(object.getString("commentText")); + busBean.saveOrUpdate(busProcessNew); + } +// BusProcessNew busProcessNew = new BusProcessNew(); +// busProcessNew.setMsgType("clause"); +// busProcessNew.setPId(delegateTask.getProcessInstanceId()); +// busProcessNew.setMesg(object.toJSONString()); +// busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey()); +// busProcessNew.setTaskId(delegateTask.getId()); +// busProcessNew.setCommitText(object.getString("commentText")); +// busProcessNew.setFinishFlag("0"); +// busProcessNew.setTaskInfo(delegateTask.getName()); +// busBean.save(busProcessNew); delegateTask.setVariable("approvalFlag", approvalFlag); } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyComplianceProgramReviewProcess/PolicyComplianceProgramReviewProcess11Before.java b/src/main/java/com/ydw/bat/wkflow/listener/policyComplianceProgramReviewProcess/PolicyComplianceProgramReviewProcess11Before.java index 2740391a..b6cad58c 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policyComplianceProgramReviewProcess/PolicyComplianceProgramReviewProcess11Before.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyComplianceProgramReviewProcess/PolicyComplianceProgramReviewProcess11Before.java @@ -18,7 +18,7 @@ public class PolicyComplianceProgramReviewProcess11Before implements TaskListene IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class); - QueryWrapper queryWrapper = new QueryWrapper(); + QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.isNull("TASK_ID"); queryWrapper.eq("P_ID",delegateTask.getProcessInstanceId()); queryWrapper.eq("USER_ID",delegateTask.getAssignee()); 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 bb298150..a8b8cdda 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 @@ -1,6 +1,7 @@ package com.ydw.bat.wkflow.listener.policyComplianceProgramReviewProcess; import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.ydw.bat.wkflow.business_activiti.service.TaskTodoService; import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew; @@ -37,6 +38,8 @@ public class PolicyComplianceProgramReviewProcess12After implements TaskListener JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); JSONObject jsonForm = object.getJSONObject("form"); + String prcName = "重点认证标准/政策合规性项目审查流程"; + String approvalFlag = jsonForm.getString("approvalFlag"); if (StringUtils.equals(approvalFlag, ApprovalFlagEnum.PASS.getValue())) { int shr2UserPassCount = (int) delegateTask.getVariable("shr2UserPassCount"); @@ -61,7 +64,8 @@ public class PolicyComplianceProgramReviewProcess12After implements TaskListener busProcessNewNext.setMesg(object.toJSONString()); busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); busProcessNewNext.setFinishFlag("0"); - busProcessNewNext.setTaskInfo(delegateTask.getName()); + busProcessNewNext.setTaskInfo("审定"); + busProcessNewNext.setPrcName(prcName); busProcessNewNext.setUserId(nextUser); addBusProcessNewList.add(busProcessNewNext); } @@ -81,7 +85,8 @@ public class PolicyComplianceProgramReviewProcess12After implements TaskListener busProcessNewNext.setMesg(object.toJSONString()); busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); busProcessNewNext.setFinishFlag("0"); - busProcessNewNext.setTaskInfo(delegateTask.getName()); + busProcessNewNext.setTaskInfo("管理员"); + busProcessNewNext.setPrcName(prcName); busProcessNewNext.setUserId(glyUserId); busBean.save(busProcessNewNext); @@ -95,16 +100,25 @@ public class PolicyComplianceProgramReviewProcess12After implements TaskListener // policySolicitOpinionEOService.batchInsert(object); // 存储当前节点意见 - BusProcessNew busProcessNew = new BusProcessNew(); - busProcessNew.setMsgType("clause"); - busProcessNew.setPId(delegateTask.getProcessInstanceId()); - busProcessNew.setMesg(object.toJSONString()); - busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey()); - busProcessNew.setTaskId(delegateTask.getId()); - busProcessNew.setCommitText(object.getString("commentText")); - busProcessNew.setFinishFlag("0"); - busProcessNew.setTaskInfo(delegateTask.getName()); - busBean.save(busProcessNew); + LambdaQueryWrapper queryWrapper1 = new LambdaQueryWrapper<>(); + queryWrapper1.eq(BusProcessNew::getTaskId,delegateTask.getId()); + List list = busBean.list(queryWrapper1); + if (CollectionUtils.isNotEmpty(list)) { + BusProcessNew busProcessNew = list.get(0); + busProcessNew.setTaskId(delegateTask.getId()); + busProcessNew.setCommitText(object.getString("commentText")); + busBean.saveOrUpdate(busProcessNew); + } +// BusProcessNew busProcessNew = new BusProcessNew(); +// busProcessNew.setMsgType("clause"); +// busProcessNew.setPId(delegateTask.getProcessInstanceId()); +// busProcessNew.setMesg(object.toJSONString()); +// busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey()); +// busProcessNew.setTaskId(delegateTask.getId()); +// busProcessNew.setCommitText(object.getString("commentText")); +// busProcessNew.setFinishFlag("0"); +// busProcessNew.setTaskInfo(delegateTask.getName()); +// busBean.save(busProcessNew); delegateTask.setVariable("approvalFlag", approvalFlag); } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyComplianceProgramReviewProcess/PolicyComplianceProgramReviewProcess12Before.java b/src/main/java/com/ydw/bat/wkflow/listener/policyComplianceProgramReviewProcess/PolicyComplianceProgramReviewProcess12Before.java index 8664fbdd..5edab792 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policyComplianceProgramReviewProcess/PolicyComplianceProgramReviewProcess12Before.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyComplianceProgramReviewProcess/PolicyComplianceProgramReviewProcess12Before.java @@ -18,7 +18,7 @@ public class PolicyComplianceProgramReviewProcess12Before implements TaskListene IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class); - QueryWrapper queryWrapper = new QueryWrapper(); + QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.isNull("TASK_ID"); queryWrapper.eq("P_ID",delegateTask.getProcessInstanceId()); queryWrapper.eq("USER_ID",delegateTask.getAssignee()); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyComplianceProgramReviewProcess/PolicyComplianceProgramReviewProcess13Before.java b/src/main/java/com/ydw/bat/wkflow/listener/policyComplianceProgramReviewProcess/PolicyComplianceProgramReviewProcess13Before.java index 7130649e..76c5bf87 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policyComplianceProgramReviewProcess/PolicyComplianceProgramReviewProcess13Before.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyComplianceProgramReviewProcess/PolicyComplianceProgramReviewProcess13Before.java @@ -18,7 +18,7 @@ public class PolicyComplianceProgramReviewProcess13Before implements TaskListene IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class); - QueryWrapper queryWrapper = new QueryWrapper(); + QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.isNull("TASK_ID"); queryWrapper.eq("P_ID",delegateTask.getProcessInstanceId()); queryWrapper.eq("USER_ID",delegateTask.getAssignee()); 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 30302e68..1247f731 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 @@ -1,6 +1,7 @@ package com.ydw.bat.wkflow.listener.policyComplianceProgramReviewProcess; import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; 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; @@ -46,7 +47,7 @@ public class PolicyComplianceProgramReviewProcess1After implements TaskListener String username = object.getString("prcCreateUserName"); String prcName = "重点认证标准/政策合规性项目审查流程"; - QueryWrapper bpnQueryWrap = new QueryWrapper(); + QueryWrapper bpnQueryWrap = new QueryWrapper<>(); bpnQueryWrap.eq("PRC_ID", delegateTask.getProcessInstanceId()); BusProcessName bpn = busProcessNameService.getOne(bpnQueryWrap); if (bpn != null) { @@ -61,16 +62,27 @@ public class PolicyComplianceProgramReviewProcess1After implements TaskListener } // 存储当前节点意见 - BusProcessNew busProcessNew = new BusProcessNew(); - busProcessNew.setMsgType("clause"); - busProcessNew.setPId(delegateTask.getProcessInstanceId()); - busProcessNew.setMesg(object.toJSONString()); - busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey()); - busProcessNew.setTaskId(delegateTask.getId()); - busProcessNew.setCommitText(object.getString("commentText")); - busProcessNew.setFinishFlag("0"); - busProcessNew.setTaskInfo(delegateTask.getName()); - busBean.save(busProcessNew); + LambdaQueryWrapper queryWrapper1 = new LambdaQueryWrapper<>(); + queryWrapper1.eq(BusProcessNew::getTaskId,delegateTask.getId()); + List list = busBean.list(queryWrapper1); + if (CollectionUtils.isNotEmpty(list)) { + BusProcessNew busProcessNew = list.get(0); + busProcessNew.setTaskId(delegateTask.getId()); + busProcessNew.setCommitText(object.getString("commentText")); + busBean.saveOrUpdate(busProcessNew); + } else { + BusProcessNew busProcessNew = new BusProcessNew(); + busProcessNew.setMsgType("clause"); + busProcessNew.setPId(delegateTask.getProcessInstanceId()); + busProcessNew.setMesg(object.toJSONString()); + busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey()); + busProcessNew.setTaskId(delegateTask.getId()); + busProcessNew.setCommitText(object.getString("commentText")); + busProcessNew.setFinishFlag("0"); + busProcessNew.setTaskInfo(delegateTask.getName()); + busProcessNew.setPrcName(prcName); + busBean.save(busProcessNew); + } // 如果是从标准跟踪清单下发的流程 需要修改主服务表中的流程状态，修改为 进行中 String checklistId = jsonForm.getString("checklistId"); @@ -88,7 +100,8 @@ public class PolicyComplianceProgramReviewProcess1After implements TaskListener busProcessNewNext.setMesg(object.toJSONString()); busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); busProcessNewNext.setFinishFlag("0"); - busProcessNewNext.setTaskInfo(delegateTask.getName()); + busProcessNewNext.setTaskInfo("审核"); + busProcessNewNext.setPrcName(prcName); busProcessNewNext.setUserId(nextUser); addBusProcessNewList.add(busProcessNewNext); } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyComplianceProgramReviewProcess/PolicyComplianceProgramReviewProcess1Before.java b/src/main/java/com/ydw/bat/wkflow/listener/policyComplianceProgramReviewProcess/PolicyComplianceProgramReviewProcess1Before.java index 331192b0..1bb976f3 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policyComplianceProgramReviewProcess/PolicyComplianceProgramReviewProcess1Before.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyComplianceProgramReviewProcess/PolicyComplianceProgramReviewProcess1Before.java @@ -17,7 +17,7 @@ public class PolicyComplianceProgramReviewProcess1Before implements TaskListener IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class); - QueryWrapper queryWrapper1 = new QueryWrapper(); + QueryWrapper queryWrapper1 = new QueryWrapper<>(); queryWrapper1.isNull("TASK_ID"); queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId()); List list = busBean.list(queryWrapper1); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyComplianceProgramReviewProcess/PolicyComplianceProgramReviewProcess2After.java b/src/main/java/com/ydw/bat/wkflow/listener/policyComplianceProgramReviewProcess/PolicyComplianceProgramReviewProcess2After.java index 82f28ad0..94d96730 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policyComplianceProgramReviewProcess/PolicyComplianceProgramReviewProcess2After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyComplianceProgramReviewProcess/PolicyComplianceProgramReviewProcess2After.java @@ -1,6 +1,7 @@ package com.ydw.bat.wkflow.listener.policyComplianceProgramReviewProcess; import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.ydw.bat.wkflow.business_activiti.service.TaskTodoService; import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew; @@ -32,6 +33,7 @@ public class PolicyComplianceProgramReviewProcess2After implements TaskListener JSONObject jsonForm = object.getJSONObject("form"); + String prcName = "重点认证标准/政策合规性项目审查流程"; String approvalFlag = jsonForm.getString("approvalFlag"); if (StringUtils.equals(approvalFlag, ApprovalFlagEnum.PASS.getValue())) { int shr1UserPassCount = (int) delegateTask.getVariable("shr1UserPassCount"); @@ -55,7 +57,8 @@ public class PolicyComplianceProgramReviewProcess2After implements TaskListener busProcessNewNext.setMesg(object.toJSONString()); busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); busProcessNewNext.setFinishFlag("0"); - busProcessNewNext.setTaskInfo(delegateTask.getName()); + busProcessNewNext.setTaskInfo("审定"); + busProcessNewNext.setPrcName(prcName); busProcessNewNext.setUserId(nextUser); addBusProcessNewList.add(busProcessNewNext); } @@ -75,22 +78,32 @@ public class PolicyComplianceProgramReviewProcess2After implements TaskListener busProcessNewNext.setMesg(object.toJSONString()); busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); busProcessNewNext.setFinishFlag("0"); - busProcessNewNext.setTaskInfo(delegateTask.getName()); + busProcessNewNext.setTaskInfo("起草修改"); + busProcessNewNext.setPrcName(prcName); busBean.save(busProcessNewNext); delegateTask.setVariable("shr1UserOverruleCount", 1); } // 存储当前节点意见 - BusProcessNew busProcessNew = new BusProcessNew(); - busProcessNew.setMsgType("clause"); - busProcessNew.setPId(delegateTask.getProcessInstanceId()); - busProcessNew.setMesg(object.toJSONString()); - busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey()); - busProcessNew.setTaskId(delegateTask.getId()); - busProcessNew.setCommitText(object.getString("commentText")); - busProcessNew.setFinishFlag("0"); - busProcessNew.setTaskInfo(delegateTask.getName()); - busBean.save(busProcessNew); + LambdaQueryWrapper queryWrapper1 = new LambdaQueryWrapper<>(); + queryWrapper1.eq(BusProcessNew::getTaskId,delegateTask.getId()); + List list = busBean.list(queryWrapper1); + if (CollectionUtils.isNotEmpty(list)) { + BusProcessNew busProcessNew = list.get(0); + busProcessNew.setTaskId(delegateTask.getId()); + busProcessNew.setCommitText(object.getString("commentText")); + busBean.saveOrUpdate(busProcessNew); + } +// BusProcessNew busProcessNew = new BusProcessNew(); +// busProcessNew.setMsgType("clause"); +// busProcessNew.setPId(delegateTask.getProcessInstanceId()); +// busProcessNew.setMesg(object.toJSONString()); +// busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey()); +// busProcessNew.setTaskId(delegateTask.getId()); +// busProcessNew.setCommitText(object.getString("commentText")); +// busProcessNew.setFinishFlag("0"); +// busProcessNew.setTaskInfo(delegateTask.getName()); +// busBean.save(busProcessNew); delegateTask.setVariable("approvalFlag",approvalFlag); } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyComplianceProgramReviewProcess/PolicyComplianceProgramReviewProcess2Before.java b/src/main/java/com/ydw/bat/wkflow/listener/policyComplianceProgramReviewProcess/PolicyComplianceProgramReviewProcess2Before.java index ad1ea188..a3f42cd3 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policyComplianceProgramReviewProcess/PolicyComplianceProgramReviewProcess2Before.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyComplianceProgramReviewProcess/PolicyComplianceProgramReviewProcess2Before.java @@ -18,7 +18,7 @@ public class PolicyComplianceProgramReviewProcess2Before implements TaskListener IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class); - QueryWrapper queryWrapper = new QueryWrapper(); + QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.isNull("TASK_ID"); queryWrapper.eq("P_ID",delegateTask.getProcessInstanceId()); queryWrapper.eq("USER_ID",delegateTask.getAssignee()); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyComplianceProgramReviewProcess/PolicyComplianceProgramReviewProcess4After.java b/src/main/java/com/ydw/bat/wkflow/listener/policyComplianceProgramReviewProcess/PolicyComplianceProgramReviewProcess4After.java index 410664a1..4766de93 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policyComplianceProgramReviewProcess/PolicyComplianceProgramReviewProcess4After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyComplianceProgramReviewProcess/PolicyComplianceProgramReviewProcess4After.java @@ -1,6 +1,7 @@ package com.ydw.bat.wkflow.listener.policyComplianceProgramReviewProcess; import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.ydw.bat.wkflow.business_activiti.service.TaskTodoService; import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew; @@ -11,8 +12,11 @@ import com.ydw.bat.wkflow.util.SpringContextUtil; import com.ydw.bat.wkflow.util.enums.ApprovalFlagEnum; import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang.StringUtils; +import java.util.List; + public class PolicyComplianceProgramReviewProcess4After implements TaskListener { @Override public void notify(DelegateTask delegateTask) { @@ -27,6 +31,7 @@ public class PolicyComplianceProgramReviewProcess4After implements TaskListener JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); JSONObject jsonForm = object.getJSONObject("form"); + String prcName = "重点认证标准/政策合规性项目审查流程"; String approvalFlag = jsonForm.getString("approvalFlag"); if (StringUtils.equals(approvalFlag, ApprovalFlagEnum.PASS.getValue())) { int sdr1UserPassCount = (int) delegateTask.getVariable("sdr1UserPassCount"); @@ -45,7 +50,8 @@ public class PolicyComplianceProgramReviewProcess4After implements TaskListener busProcessNewNext.setMesg(object.toJSONString()); busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); busProcessNewNext.setFinishFlag("0"); - busProcessNewNext.setTaskInfo(delegateTask.getName()); + busProcessNewNext.setTaskInfo("批准"); + busProcessNewNext.setPrcName(prcName); busProcessNewNext.setUserId(pzr1UserId); busBean.save(busProcessNewNext); @@ -58,23 +64,33 @@ public class PolicyComplianceProgramReviewProcess4After implements TaskListener busProcessNewNext.setMesg(object.toJSONString()); busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); busProcessNewNext.setFinishFlag("0"); - busProcessNewNext.setTaskInfo(delegateTask.getName()); + busProcessNewNext.setTaskInfo("起草修改"); + busProcessNewNext.setPrcName(prcName); busBean.save(busProcessNewNext); delegateTask.setVariable("sdr1UserOverruleCount", 1); } // 存储当前节点意见 - BusProcessNew busProcessNew = new BusProcessNew(); - busProcessNew.setMsgType("clause"); - busProcessNew.setPId(delegateTask.getProcessInstanceId()); - busProcessNew.setMesg(object.toJSONString()); - busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey()); - busProcessNew.setTaskId(delegateTask.getId()); - busProcessNew.setCommitText(object.getString("commentText")); - busProcessNew.setFinishFlag("0"); - busProcessNew.setTaskInfo(delegateTask.getName()); - busBean.save(busProcessNew); + LambdaQueryWrapper queryWrapper1 = new LambdaQueryWrapper<>(); + queryWrapper1.eq(BusProcessNew::getTaskId,delegateTask.getId()); + List list = busBean.list(queryWrapper1); + if (CollectionUtils.isNotEmpty(list)) { + BusProcessNew busProcessNew = list.get(0); + busProcessNew.setTaskId(delegateTask.getId()); + busProcessNew.setCommitText(object.getString("commentText")); + busBean.saveOrUpdate(busProcessNew); + } +// BusProcessNew busProcessNew = new BusProcessNew(); +// busProcessNew.setMsgType("clause"); +// busProcessNew.setPId(delegateTask.getProcessInstanceId()); +// busProcessNew.setMesg(object.toJSONString()); +// busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey()); +// busProcessNew.setTaskId(delegateTask.getId()); +// busProcessNew.setCommitText(object.getString("commentText")); +// busProcessNew.setFinishFlag("0"); +// busProcessNew.setTaskInfo(delegateTask.getName()); +// busBean.save(busProcessNew); delegateTask.setVariable("approvalFlag",approvalFlag); } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyComplianceProgramReviewProcess/PolicyComplianceProgramReviewProcess4Before.java b/src/main/java/com/ydw/bat/wkflow/listener/policyComplianceProgramReviewProcess/PolicyComplianceProgramReviewProcess4Before.java index 08fb8762..49234710 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policyComplianceProgramReviewProcess/PolicyComplianceProgramReviewProcess4Before.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyComplianceProgramReviewProcess/PolicyComplianceProgramReviewProcess4Before.java @@ -18,7 +18,7 @@ public class PolicyComplianceProgramReviewProcess4Before implements TaskListener IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class); - QueryWrapper queryWrapper = new QueryWrapper(); + QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.isNull("TASK_ID"); queryWrapper.eq("P_ID",delegateTask.getProcessInstanceId()); queryWrapper.eq("USER_ID",delegateTask.getAssignee()); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyComplianceProgramReviewProcess/PolicyComplianceProgramReviewProcess5After.java b/src/main/java/com/ydw/bat/wkflow/listener/policyComplianceProgramReviewProcess/PolicyComplianceProgramReviewProcess5After.java index d6a96ff7..7cbbe493 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policyComplianceProgramReviewProcess/PolicyComplianceProgramReviewProcess5After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyComplianceProgramReviewProcess/PolicyComplianceProgramReviewProcess5After.java @@ -1,6 +1,7 @@ package com.ydw.bat.wkflow.listener.policyComplianceProgramReviewProcess; import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew; import com.ydw.bat.wkflow.business_main.datas.entity.Datas; @@ -30,6 +31,7 @@ public class PolicyComplianceProgramReviewProcess5After implements TaskListener JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); JSONObject jsonForm = object.getJSONObject("form"); + String prcName = "重点认证标准/政策合规性项目审查流程"; String approvalFlag = jsonForm.getString("approvalFlag"); if (StringUtils.equals(approvalFlag, ApprovalFlagEnum.PASS.getValue())) { Date approvalUnitDeadline = jsonForm.getDate("approvalUnitDeadline"); @@ -45,7 +47,8 @@ public class PolicyComplianceProgramReviewProcess5After implements TaskListener busProcessNewNext.setMesg(object.toJSONString()); busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); busProcessNewNext.setFinishFlag("0"); - busProcessNewNext.setTaskInfo(delegateTask.getName()); + busProcessNewNext.setTaskInfo("管理员"); + busProcessNewNext.setPrcName(prcName); busProcessNewNext.setUserId(glyUserId); busBean.save(busProcessNewNext); @@ -65,7 +68,8 @@ public class PolicyComplianceProgramReviewProcess5After implements TaskListener busProcessNewNext.setMesg(object.toJSONString()); busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); busProcessNewNext.setFinishFlag("0"); - busProcessNewNext.setTaskInfo(delegateTask.getName()); + busProcessNewNext.setTaskInfo("责任对接人分配任务"); + busProcessNewNext.setPrcName(prcName); busProcessNewNext.setUserId(nextUser); addBusProcessNewList.add(busProcessNewNext); } @@ -86,21 +90,31 @@ public class PolicyComplianceProgramReviewProcess5After implements TaskListener busProcessNewNext.setMesg(object.toJSONString()); busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); busProcessNewNext.setFinishFlag("0"); - busProcessNewNext.setTaskInfo(delegateTask.getName()); + busProcessNewNext.setTaskInfo("起草修改"); + busProcessNewNext.setPrcName(prcName); busBean.save(busProcessNewNext); } // 存储当前节点意见 - BusProcessNew busProcessNew = new BusProcessNew(); - busProcessNew.setMsgType("clause"); - busProcessNew.setPId(delegateTask.getProcessInstanceId()); - busProcessNew.setMesg(object.toJSONString()); - busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey()); - busProcessNew.setTaskId(delegateTask.getId()); - busProcessNew.setCommitText(object.getString("commentText")); - busProcessNew.setFinishFlag("0"); - busProcessNew.setTaskInfo(delegateTask.getName()); - busBean.save(busProcessNew); + LambdaQueryWrapper queryWrapper1 = new LambdaQueryWrapper<>(); + queryWrapper1.eq(BusProcessNew::getTaskId,delegateTask.getId()); + List list = busBean.list(queryWrapper1); + if (CollectionUtils.isNotEmpty(list)) { + BusProcessNew busProcessNew = list.get(0); + busProcessNew.setTaskId(delegateTask.getId()); + busProcessNew.setCommitText(object.getString("commentText")); + busBean.saveOrUpdate(busProcessNew); + } +// BusProcessNew busProcessNew = new BusProcessNew(); +// busProcessNew.setMsgType("clause"); +// busProcessNew.setPId(delegateTask.getProcessInstanceId()); +// busProcessNew.setMesg(object.toJSONString()); +// busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey()); +// busProcessNew.setTaskId(delegateTask.getId()); +// busProcessNew.setCommitText(object.getString("commentText")); +// busProcessNew.setFinishFlag("0"); +// busProcessNew.setTaskInfo(delegateTask.getName()); +// busBean.save(busProcessNew); delegateTask.setVariable("approvalFlag",approvalFlag); } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyComplianceProgramReviewProcess/PolicyComplianceProgramReviewProcess5Before.java b/src/main/java/com/ydw/bat/wkflow/listener/policyComplianceProgramReviewProcess/PolicyComplianceProgramReviewProcess5Before.java index f57c71a3..8871974f 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policyComplianceProgramReviewProcess/PolicyComplianceProgramReviewProcess5Before.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyComplianceProgramReviewProcess/PolicyComplianceProgramReviewProcess5Before.java @@ -18,7 +18,7 @@ public class PolicyComplianceProgramReviewProcess5Before implements TaskListener IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class); - QueryWrapper queryWrapper = new QueryWrapper(); + QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.isNull("TASK_ID"); queryWrapper.eq("P_ID",delegateTask.getProcessInstanceId()); queryWrapper.eq("USER_ID",delegateTask.getAssignee()); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyComplianceProgramReviewProcess/PolicyComplianceProgramReviewProcess7After.java b/src/main/java/com/ydw/bat/wkflow/listener/policyComplianceProgramReviewProcess/PolicyComplianceProgramReviewProcess7After.java index 3b445680..461979b4 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policyComplianceProgramReviewProcess/PolicyComplianceProgramReviewProcess7After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyComplianceProgramReviewProcess/PolicyComplianceProgramReviewProcess7After.java @@ -2,6 +2,7 @@ package com.ydw.bat.wkflow.listener.policyComplianceProgramReviewProcess; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew; import com.ydw.bat.wkflow.business_main.datas.entity.Datas; @@ -34,6 +35,8 @@ public class PolicyComplianceProgramReviewProcess7After implements TaskListener JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); JSONObject jsonForm = object.getJSONObject("form"); + String prcName = "重点认证标准/政策合规性项目审查流程"; + // 提交方式，如果该字段不为空，则是定时器自动提交 定时器自动提交value:timerAutoSubmit String submitMethod = object.getString("submitMethod"); if (StringUtils.isEmpty(submitMethod)) { @@ -72,7 +75,8 @@ public class PolicyComplianceProgramReviewProcess7After implements TaskListener busProcessNewNext.setMesg(object.toJSONString()); busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); busProcessNewNext.setFinishFlag("0"); - busProcessNewNext.setTaskInfo(delegateTask.getName()); + busProcessNewNext.setTaskInfo("责任人任务处理"); + busProcessNewNext.setPrcName(prcName); busProcessNewNext.setUserId(nextUser); addBusProcessNewList.add(busProcessNewNext); @@ -112,7 +116,8 @@ public class PolicyComplianceProgramReviewProcess7After implements TaskListener busProcessNewNext.setMesg(object.toJSONString()); busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); busProcessNewNext.setFinishFlag("0"); - busProcessNewNext.setTaskInfo(delegateTask.getName()); + busProcessNewNext.setTaskInfo("管理员"); + busProcessNewNext.setPrcName(prcName); busProcessNewNext.setUserId(glyUserId); busBean.save(busProcessNewNext); } @@ -121,16 +126,25 @@ public class PolicyComplianceProgramReviewProcess7After implements TaskListener } // 存储当前节点意见 - BusProcessNew busProcessNew = new BusProcessNew(); - busProcessNew.setMsgType("clause"); - busProcessNew.setPId(delegateTask.getProcessInstanceId()); - busProcessNew.setMesg(object.toJSONString()); - busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey()); - busProcessNew.setTaskId(delegateTask.getId()); - busProcessNew.setCommitText(object.getString("commentText")); - busProcessNew.setFinishFlag("0"); - busProcessNew.setTaskInfo(delegateTask.getName()); - busBean.save(busProcessNew); + LambdaQueryWrapper queryWrapper1 = new LambdaQueryWrapper<>(); + queryWrapper1.eq(BusProcessNew::getTaskId,delegateTask.getId()); + List list = busBean.list(queryWrapper1); + if (CollectionUtils.isNotEmpty(list)) { + BusProcessNew busProcessNew = list.get(0); + busProcessNew.setTaskId(delegateTask.getId()); + busProcessNew.setCommitText(object.getString("commentText")); + busBean.saveOrUpdate(busProcessNew); + } +// BusProcessNew busProcessNew = new BusProcessNew(); +// busProcessNew.setMsgType("clause"); +// busProcessNew.setPId(delegateTask.getProcessInstanceId()); +// busProcessNew.setMesg(object.toJSONString()); +// busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey()); +// busProcessNew.setTaskId(delegateTask.getId()); +// busProcessNew.setCommitText(object.getString("commentText")); +// busProcessNew.setFinishFlag("0"); +// busProcessNew.setTaskInfo(delegateTask.getName()); +// busBean.save(busProcessNew); delegateTask.setVariable("submitMethod",submitMethod); } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyComplianceProgramReviewProcess/PolicyComplianceProgramReviewProcess7Before.java b/src/main/java/com/ydw/bat/wkflow/listener/policyComplianceProgramReviewProcess/PolicyComplianceProgramReviewProcess7Before.java index e855e39c..6f2fe8a7 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policyComplianceProgramReviewProcess/PolicyComplianceProgramReviewProcess7Before.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyComplianceProgramReviewProcess/PolicyComplianceProgramReviewProcess7Before.java @@ -19,7 +19,7 @@ public class PolicyComplianceProgramReviewProcess7Before implements TaskListener CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class); - QueryWrapper queryWrapper = new QueryWrapper(); + QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.isNull("TASK_ID"); queryWrapper.eq("P_ID",delegateTask.getProcessInstanceId()); queryWrapper.eq("USER_ID",delegateTask.getAssignee()); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyComplianceProgramReviewProcess/PolicyComplianceProgramReviewProcess8After.java b/src/main/java/com/ydw/bat/wkflow/listener/policyComplianceProgramReviewProcess/PolicyComplianceProgramReviewProcess8After.java index 19fa8ae0..53a20c0b 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policyComplianceProgramReviewProcess/PolicyComplianceProgramReviewProcess8After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyComplianceProgramReviewProcess/PolicyComplianceProgramReviewProcess8After.java @@ -2,6 +2,7 @@ package com.ydw.bat.wkflow.listener.policyComplianceProgramReviewProcess; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.ydw.bat.wkflow.business_activiti.service.TaskTodoService; import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew; @@ -11,6 +12,7 @@ import com.ydw.bat.wkflow.business_main.datas.service.*; import com.ydw.bat.wkflow.util.SpringContextUtil; import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; +import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; import java.util.ArrayList; @@ -31,6 +33,8 @@ public class PolicyComplianceProgramReviewProcess8After implements TaskListener JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); JSONObject jsonForm = object.getJSONObject("form"); + String prcName = "重点认证标准/政策合规性项目审查流程"; + // 提交方式，如果该字段不为空，则是定时器自动提交 定时器自动提交value:timerAutoSubmit String submitMethod = object.getString("submitMethod"); if (StringUtils.isEmpty(submitMethod)) { @@ -41,7 +45,8 @@ public class PolicyComplianceProgramReviewProcess8After implements TaskListener busProcessNewNext.setMesg(object.toJSONString()); busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); busProcessNewNext.setFinishFlag("0"); - busProcessNewNext.setTaskInfo(delegateTask.getName()); + busProcessNewNext.setTaskInfo("责任对接人汇总"); + busProcessNewNext.setPrcName(prcName); busProcessNewNext.setUserId((String) delegateTask.getVariable("djrUserId")); busBean.save(busProcessNewNext); @@ -84,7 +89,8 @@ public class PolicyComplianceProgramReviewProcess8After implements TaskListener busProcessNewNext.setMesg(object.toJSONString()); busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); busProcessNewNext.setFinishFlag("0"); - busProcessNewNext.setTaskInfo(delegateTask.getName()); + busProcessNewNext.setTaskInfo("管理员"); + busProcessNewNext.setPrcName(prcName); busProcessNewNext.setUserId(glyUserId); busBean.save(busProcessNewNext); } @@ -92,16 +98,25 @@ public class PolicyComplianceProgramReviewProcess8After implements TaskListener } // 存储当前节点意见 - BusProcessNew busProcessNew = new BusProcessNew(); - busProcessNew.setMsgType("clause"); - busProcessNew.setPId(delegateTask.getProcessInstanceId()); - busProcessNew.setMesg(object.toJSONString()); - busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey()); - busProcessNew.setTaskId(delegateTask.getId()); - busProcessNew.setCommitText(object.getString("commentText")); - busProcessNew.setFinishFlag("0"); - busProcessNew.setTaskInfo(delegateTask.getName()); - busBean.save(busProcessNew); + LambdaQueryWrapper queryWrapper1 = new LambdaQueryWrapper<>(); + queryWrapper1.eq(BusProcessNew::getTaskId,delegateTask.getId()); + List list = busBean.list(queryWrapper1); + if (CollectionUtils.isNotEmpty(list)) { + BusProcessNew busProcessNew = list.get(0); + busProcessNew.setTaskId(delegateTask.getId()); + busProcessNew.setCommitText(object.getString("commentText")); + busBean.saveOrUpdate(busProcessNew); + } +// BusProcessNew busProcessNew = new BusProcessNew(); +// busProcessNew.setMsgType("clause"); +// busProcessNew.setPId(delegateTask.getProcessInstanceId()); +// busProcessNew.setMesg(object.toJSONString()); +// busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey()); +// busProcessNew.setTaskId(delegateTask.getId()); +// busProcessNew.setCommitText(object.getString("commentText")); +// busProcessNew.setFinishFlag("0"); +// busProcessNew.setTaskInfo(delegateTask.getName()); +// busBean.save(busProcessNew); delegateTask.setVariable("submitMethod",submitMethod); } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyComplianceProgramReviewProcess/PolicyComplianceProgramReviewProcess8Before.java b/src/main/java/com/ydw/bat/wkflow/listener/policyComplianceProgramReviewProcess/PolicyComplianceProgramReviewProcess8Before.java index 50fadcb1..0789a3d8 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policyComplianceProgramReviewProcess/PolicyComplianceProgramReviewProcess8Before.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyComplianceProgramReviewProcess/PolicyComplianceProgramReviewProcess8Before.java @@ -18,7 +18,7 @@ public class PolicyComplianceProgramReviewProcess8Before implements TaskListener IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class); - QueryWrapper queryWrapper = new QueryWrapper(); + QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.isNull("TASK_ID"); queryWrapper.eq("P_ID",delegateTask.getProcessInstanceId()); queryWrapper.eq("USER_ID",delegateTask.getAssignee()); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyComplianceProgramReviewProcess/PolicyComplianceProgramReviewProcess9After.java b/src/main/java/com/ydw/bat/wkflow/listener/policyComplianceProgramReviewProcess/PolicyComplianceProgramReviewProcess9After.java index 8a07a344..b692445f 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policyComplianceProgramReviewProcess/PolicyComplianceProgramReviewProcess9After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyComplianceProgramReviewProcess/PolicyComplianceProgramReviewProcess9After.java @@ -2,6 +2,7 @@ package com.ydw.bat.wkflow.listener.policyComplianceProgramReviewProcess; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew; import com.ydw.bat.wkflow.business_main.datas.entity.Datas; @@ -13,6 +14,7 @@ import com.ydw.bat.wkflow.util.enums.ApprovalFlagEnum; import com.ydw.bat.wkflow.util.enums.FlowTypeEnum; import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; +import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang.StringUtils; import java.util.ArrayList; @@ -33,6 +35,8 @@ public class PolicyComplianceProgramReviewProcess9After implements TaskListener JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); JSONObject jsonForm = object.getJSONObject("form"); + String prcName = "重点认证标准/政策合规性项目审查流程"; + String approvalFlag = jsonForm.getString("approvalFlag"); // 提交方式，如果该字段不为空，则是定时器自动提交 定时器自动提交value:timerAutoSubmit @@ -48,7 +52,8 @@ public class PolicyComplianceProgramReviewProcess9After implements TaskListener busProcessNewNext.setMesg(object.toJSONString()); busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); busProcessNewNext.setFinishFlag("0"); - busProcessNewNext.setTaskInfo(delegateTask.getName()); + busProcessNewNext.setTaskInfo("责任单位审批"); + busProcessNewNext.setPrcName(prcName); busProcessNewNext.setUserId(zrdwUserId); busBean.save(busProcessNewNext); @@ -74,7 +79,8 @@ public class PolicyComplianceProgramReviewProcess9After implements TaskListener busProcessNewNext.setMesg(object.toJSONString()); busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); busProcessNewNext.setFinishFlag("0"); - busProcessNewNext.setTaskInfo(delegateTask.getName()); + busProcessNewNext.setTaskInfo("责任人任务处理"); + busProcessNewNext.setPrcName(prcName); busProcessNewNext.setUserId(nextUser); addBusProcessNewList.add(busProcessNewNext); } @@ -98,7 +104,8 @@ public class PolicyComplianceProgramReviewProcess9After implements TaskListener busProcessNewNext.setMesg(object.toJSONString()); busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); busProcessNewNext.setFinishFlag("0"); - busProcessNewNext.setTaskInfo(delegateTask.getName()); + busProcessNewNext.setTaskInfo("管理员"); + busProcessNewNext.setPrcName(prcName); busProcessNewNext.setUserId(glyUserId); busBean.save(busProcessNewNext); } @@ -123,16 +130,25 @@ public class PolicyComplianceProgramReviewProcess9After implements TaskListener } // 存储当前节点意见 - BusProcessNew busProcessNew = new BusProcessNew(); - busProcessNew.setMsgType("clause"); - busProcessNew.setPId(delegateTask.getProcessInstanceId()); - busProcessNew.setMesg(object.toJSONString()); - busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey()); - busProcessNew.setTaskId(delegateTask.getId()); - busProcessNew.setCommitText(object.getString("commentText")); - busProcessNew.setFinishFlag("0"); - busProcessNew.setTaskInfo(delegateTask.getName()); - busBean.save(busProcessNew); + LambdaQueryWrapper queryWrapper1 = new LambdaQueryWrapper<>(); + queryWrapper1.eq(BusProcessNew::getTaskId,delegateTask.getId()); + List list = busBean.list(queryWrapper1); + if (CollectionUtils.isNotEmpty(list)) { + BusProcessNew busProcessNew = list.get(0); + busProcessNew.setTaskId(delegateTask.getId()); + busProcessNew.setCommitText(object.getString("commentText")); + busBean.saveOrUpdate(busProcessNew); + } +// BusProcessNew busProcessNew = new BusProcessNew(); +// busProcessNew.setMsgType("clause"); +// busProcessNew.setPId(delegateTask.getProcessInstanceId()); +// busProcessNew.setMesg(object.toJSONString()); +// busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey()); +// busProcessNew.setTaskId(delegateTask.getId()); +// busProcessNew.setCommitText(object.getString("commentText")); +// busProcessNew.setFinishFlag("0"); +// busProcessNew.setTaskInfo(delegateTask.getName()); +// busBean.save(busProcessNew); delegateTask.setVariable("approvalFlag", approvalFlag); delegateTask.setVariable("submitMethod", submitMethod); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyComplianceProgramReviewProcess/PolicyComplianceProgramReviewProcess9Before.java b/src/main/java/com/ydw/bat/wkflow/listener/policyComplianceProgramReviewProcess/PolicyComplianceProgramReviewProcess9Before.java index dc85adb4..db644315 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policyComplianceProgramReviewProcess/PolicyComplianceProgramReviewProcess9Before.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyComplianceProgramReviewProcess/PolicyComplianceProgramReviewProcess9Before.java @@ -19,7 +19,7 @@ public class PolicyComplianceProgramReviewProcess9Before implements TaskListener CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class); - QueryWrapper queryWrapper = new QueryWrapper(); + QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.isNull("TASK_ID"); queryWrapper.eq("P_ID",delegateTask.getProcessInstanceId()); queryWrapper.eq("USER_ID",delegateTask.getAssignee());