From 508e966fad3b3ada9d10879685123c282198692c Mon Sep 17 00:00:00 2001 From: wxyclub Date: Mon, 1 Jul 2024 11:01:11 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix:=20=E6=94=BF=E7=AD=96=E5=BE=81=E6=B1=82?= =?UTF-8?q?=E6=84=8F=E8=A7=81=E6=B5=81=E7=A8=8BBUG=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PolicySolicitOpinionProcess10After.java | 52 +++++++++++++----- .../PolicySolicitOpinionProcess10Before.java | 2 +- .../PolicySolicitOpinionProcess11After.java | 49 ++++++++++++----- .../PolicySolicitOpinionProcess11Before.java | 2 +- .../PolicySolicitOpinionProcess12After.java | 49 ++++++++++++----- .../PolicySolicitOpinionProcess12Before.java | 2 +- .../PolicySolicitOpinionProcess13After.java | 49 ++++++++++++----- .../PolicySolicitOpinionProcess13Before.java | 2 +- .../PolicySolicitOpinionProcess14After.java | 52 +++++++++++++----- .../PolicySolicitOpinionProcess14Before.java | 2 +- .../PolicySolicitOpinionProcess15After.java | 49 ++++++++++++----- .../PolicySolicitOpinionProcess15Before.java | 2 +- .../PolicySolicitOpinionProcess16After.java | 33 ++++++++---- .../PolicySolicitOpinionProcess16Before.java | 2 +- .../PolicySolicitOpinionProcess1After.java | 9 ++-- .../PolicySolicitOpinionProcess1Before.java | 2 +- .../PolicySolicitOpinionProcess2After.java | 49 ++++++++++++----- .../PolicySolicitOpinionProcess2Before.java | 2 +- .../PolicySolicitOpinionProcess4After.java | 51 ++++++++++++++---- .../PolicySolicitOpinionProcess4Before.java | 2 +- .../PolicySolicitOpinionProcess5After.java | 53 ++++++++++++++----- .../PolicySolicitOpinionProcess5Before.java | 2 +- .../PolicySolicitOpinionProcess7After.java | 49 ++++++++++++----- .../PolicySolicitOpinionProcess7Before.java | 2 +- .../PolicySolicitOpinionProcess8After.java | 52 +++++++++++++----- .../PolicySolicitOpinionProcess8Before.java | 2 +- .../PolicySolicitOpinionProcess9After.java | 52 +++++++++++++----- .../PolicySolicitOpinionProcess9Before.java | 2 +- 28 files changed, 502 insertions(+), 174 deletions(-) diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policySolicitOpinionProcess/PolicySolicitOpinionProcess10After.java b/src/main/java/com/ydw/bat/wkflow/listener/policySolicitOpinionProcess/PolicySolicitOpinionProcess10After.java index 78e10c8d..6760366a 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policySolicitOpinionProcess/PolicySolicitOpinionProcess10After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policySolicitOpinionProcess/PolicySolicitOpinionProcess10After.java @@ -1,6 +1,7 @@ package com.ydw.bat.wkflow.listener.policySolicitOpinionProcess; 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; @@ -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 PolicySolicitOpinionProcess10After implements TaskListener { @Override public void notify(DelegateTask delegateTask) { @@ -25,6 +29,19 @@ public class PolicySolicitOpinionProcess10After implements TaskListener { JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); JSONObject jsonForm = object.getJSONObject("form"); + + Object lawsName = jsonForm.get("lawsName"); + Object lawsNo = jsonForm.get("lawsNo"); + String lawsInfoName = ""; + if(lawsName != null && lawsNo != null){ + String number = "《" + lawsNo +"-"; + String name = lawsName +"》-"; + if(StringUtils.isNotBlank(name) && StringUtils.isNotBlank(number)){ + lawsInfoName = number + name; + } + } + String prcName = lawsInfoName + "征求意见"; + String approvalFlag = jsonForm.getString("approvalFlag"); if (StringUtils.equals(approvalFlag, ApprovalFlagEnum.PASS.getValue())) { // 责任部门 子流程总数 @@ -45,7 +62,8 @@ public class PolicySolicitOpinionProcess10After implements TaskListener { busProcessNewNext.setMesg(object.toJSONString()); busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); busProcessNewNext.setFinishFlag("0"); - busProcessNewNext.setTaskInfo(delegateTask.getName()); + busProcessNewNext.setPrcName(prcName); + busProcessNewNext.setTaskInfo("管理员"); busProcessNewNext.setUserId(glyUserId); busBean.save(busProcessNewNext); } @@ -57,22 +75,32 @@ public class PolicySolicitOpinionProcess10After 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/policySolicitOpinionProcess/PolicySolicitOpinionProcess10Before.java b/src/main/java/com/ydw/bat/wkflow/listener/policySolicitOpinionProcess/PolicySolicitOpinionProcess10Before.java index 73873861..1b100ff8 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policySolicitOpinionProcess/PolicySolicitOpinionProcess10Before.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policySolicitOpinionProcess/PolicySolicitOpinionProcess10Before.java @@ -19,7 +19,7 @@ public class PolicySolicitOpinionProcess10Before 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/policySolicitOpinionProcess/PolicySolicitOpinionProcess11After.java b/src/main/java/com/ydw/bat/wkflow/listener/policySolicitOpinionProcess/PolicySolicitOpinionProcess11After.java index 44f7fa15..3a613cef 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 @@ -1,6 +1,7 @@ package com.ydw.bat.wkflow.listener.policySolicitOpinionProcess; 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,19 @@ public class PolicySolicitOpinionProcess11After implements TaskListener { JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); JSONObject jsonForm = object.getJSONObject("form"); + + Object lawsName = jsonForm.get("lawsName"); + Object lawsNo = jsonForm.get("lawsNo"); + String lawsInfoName = ""; + if(lawsName != null && lawsNo != null){ + String number = "《" + lawsNo +"-"; + String name = lawsName +"》-"; + if(StringUtils.isNotBlank(name) && StringUtils.isNotBlank(number)){ + lawsInfoName = number + name; + } + } + String prcName = lawsInfoName + "征求意见"; + String approvalFlag = jsonForm.getString("approvalFlag"); if (StringUtils.equals(approvalFlag, ApprovalFlagEnum.PASS.getValue())) { String shr2UserIds = jsonForm.getString("shr2UserIds"); @@ -45,7 +59,8 @@ public class PolicySolicitOpinionProcess11After 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); } @@ -70,7 +85,8 @@ public class PolicySolicitOpinionProcess11After 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); @@ -78,16 +94,25 @@ public class PolicySolicitOpinionProcess11After 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/policySolicitOpinionProcess/PolicySolicitOpinionProcess11Before.java b/src/main/java/com/ydw/bat/wkflow/listener/policySolicitOpinionProcess/PolicySolicitOpinionProcess11Before.java index d70becf4..84137849 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policySolicitOpinionProcess/PolicySolicitOpinionProcess11Before.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policySolicitOpinionProcess/PolicySolicitOpinionProcess11Before.java @@ -18,7 +18,7 @@ public class PolicySolicitOpinionProcess11Before 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/policySolicitOpinionProcess/PolicySolicitOpinionProcess12After.java b/src/main/java/com/ydw/bat/wkflow/listener/policySolicitOpinionProcess/PolicySolicitOpinionProcess12After.java index 0f4750e0..4b59ec97 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 @@ -1,6 +1,7 @@ package com.ydw.bat.wkflow.listener.policySolicitOpinionProcess; 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; @@ -35,6 +36,19 @@ public class PolicySolicitOpinionProcess12After implements TaskListener { JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); JSONObject jsonForm = object.getJSONObject("form"); + + Object lawsName = jsonForm.get("lawsName"); + Object lawsNo = jsonForm.get("lawsNo"); + String lawsInfoName = ""; + if(lawsName != null && lawsNo != null){ + String number = "《" + lawsNo +"-"; + String name = lawsName +"》-"; + if(StringUtils.isNotBlank(name) && StringUtils.isNotBlank(number)){ + lawsInfoName = number + name; + } + } + String prcName = lawsInfoName + "征求意见"; + String approvalFlag = jsonForm.getString("approvalFlag"); if (StringUtils.equals(approvalFlag, ApprovalFlagEnum.PASS.getValue())) { int shr2UserPassCount = (int) delegateTask.getVariable("shr2UserPassCount"); @@ -68,7 +82,8 @@ public class PolicySolicitOpinionProcess12After 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); } @@ -88,7 +103,8 @@ public class PolicySolicitOpinionProcess12After 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); @@ -103,16 +119,25 @@ public class PolicySolicitOpinionProcess12After 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/policySolicitOpinionProcess/PolicySolicitOpinionProcess12Before.java b/src/main/java/com/ydw/bat/wkflow/listener/policySolicitOpinionProcess/PolicySolicitOpinionProcess12Before.java index c6edb7bc..6a23a499 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policySolicitOpinionProcess/PolicySolicitOpinionProcess12Before.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policySolicitOpinionProcess/PolicySolicitOpinionProcess12Before.java @@ -18,7 +18,7 @@ public class PolicySolicitOpinionProcess12Before 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/policySolicitOpinionProcess/PolicySolicitOpinionProcess13After.java b/src/main/java/com/ydw/bat/wkflow/listener/policySolicitOpinionProcess/PolicySolicitOpinionProcess13After.java index ac33a438..086ad12b 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 @@ -1,6 +1,7 @@ package com.ydw.bat.wkflow.listener.policySolicitOpinionProcess; 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,19 @@ public class PolicySolicitOpinionProcess13After implements TaskListener { JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); JSONObject jsonForm = object.getJSONObject("form"); + + Object lawsName = jsonForm.get("lawsName"); + Object lawsNo = jsonForm.get("lawsNo"); + String lawsInfoName = ""; + if(lawsName != null && lawsNo != null){ + String number = "《" + lawsNo +"-"; + String name = lawsName +"》-"; + if(StringUtils.isNotBlank(name) && StringUtils.isNotBlank(number)){ + lawsInfoName = number + name; + } + } + String prcName = lawsInfoName + "征求意见"; + String approvalFlag = jsonForm.getString("approvalFlag"); if (StringUtils.equals(approvalFlag, ApprovalFlagEnum.PASS.getValue())) { int hqrUserPassCount = (int) delegateTask.getVariable("hqrUserPassCount"); @@ -53,7 +67,8 @@ public class PolicySolicitOpinionProcess13After 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); } @@ -74,7 +89,8 @@ public class PolicySolicitOpinionProcess13After 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); @@ -83,16 +99,25 @@ public class PolicySolicitOpinionProcess13After 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/policySolicitOpinionProcess/PolicySolicitOpinionProcess13Before.java b/src/main/java/com/ydw/bat/wkflow/listener/policySolicitOpinionProcess/PolicySolicitOpinionProcess13Before.java index 9b9222cd..bff21034 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policySolicitOpinionProcess/PolicySolicitOpinionProcess13Before.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policySolicitOpinionProcess/PolicySolicitOpinionProcess13Before.java @@ -18,7 +18,7 @@ public class PolicySolicitOpinionProcess13Before 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/policySolicitOpinionProcess/PolicySolicitOpinionProcess14After.java b/src/main/java/com/ydw/bat/wkflow/listener/policySolicitOpinionProcess/PolicySolicitOpinionProcess14After.java index 954137d4..1e9ea8fa 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 @@ -1,6 +1,7 @@ package com.ydw.bat.wkflow.listener.policySolicitOpinionProcess; 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; @@ -12,8 +13,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.collections.CollectionUtils; import org.apache.commons.lang.StringUtils; +import java.util.List; + /** * 审定后 */ @@ -30,6 +34,19 @@ public class PolicySolicitOpinionProcess14After implements TaskListener { JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); JSONObject jsonForm = object.getJSONObject("form"); + + Object lawsName = jsonForm.get("lawsName"); + Object lawsNo = jsonForm.get("lawsNo"); + String lawsInfoName = ""; + if(lawsName != null && lawsNo != null){ + String number = "《" + lawsNo +"-"; + String name = lawsName +"》-"; + if(StringUtils.isNotBlank(name) && StringUtils.isNotBlank(number)){ + lawsInfoName = number + name; + } + } + String prcName = lawsInfoName + "征求意见"; + String approvalFlag = jsonForm.getString("approvalFlag"); if (StringUtils.equals(approvalFlag, ApprovalFlagEnum.PASS.getValue())) { int sdr2UserPassCount = (int) delegateTask.getVariable("sdr2UserPassCount"); @@ -48,7 +65,8 @@ public class PolicySolicitOpinionProcess14After implements TaskListener { busProcessNewNext.setMesg(object.toJSONString()); busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); busProcessNewNext.setFinishFlag("0"); - busProcessNewNext.setTaskInfo(delegateTask.getName()); + busProcessNewNext.setTaskInfo("批准"); + busProcessNewNext.setPrcName(prcName); busProcessNewNext.setUserId(pzr2UserId); busBean.save(busProcessNewNext); delegateTask.setVariable("pzr2UserId", pzr2UserId); @@ -61,7 +79,8 @@ public class PolicySolicitOpinionProcess14After 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); @@ -70,16 +89,25 @@ public class PolicySolicitOpinionProcess14After 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/policySolicitOpinionProcess/PolicySolicitOpinionProcess14Before.java b/src/main/java/com/ydw/bat/wkflow/listener/policySolicitOpinionProcess/PolicySolicitOpinionProcess14Before.java index 70aeb1b2..4921813f 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policySolicitOpinionProcess/PolicySolicitOpinionProcess14Before.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policySolicitOpinionProcess/PolicySolicitOpinionProcess14Before.java @@ -18,7 +18,7 @@ public class PolicySolicitOpinionProcess14Before 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/policySolicitOpinionProcess/PolicySolicitOpinionProcess15After.java b/src/main/java/com/ydw/bat/wkflow/listener/policySolicitOpinionProcess/PolicySolicitOpinionProcess15After.java index 1da9b690..3bbcf2c9 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 @@ -1,6 +1,7 @@ package com.ydw.bat.wkflow.listener.policySolicitOpinionProcess; 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; @@ -33,6 +34,19 @@ public class PolicySolicitOpinionProcess15After implements TaskListener { JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); JSONObject jsonForm = object.getJSONObject("form"); + + Object lawsName = jsonForm.get("lawsName"); + Object lawsNo = jsonForm.get("lawsNo"); + String lawsInfoName = ""; + if(lawsName != null && lawsNo != null){ + String number = "《" + lawsNo +"-"; + String name = lawsName +"》-"; + if(StringUtils.isNotBlank(name) && StringUtils.isNotBlank(number)){ + lawsInfoName = number + name; + } + } + String prcName = lawsInfoName + "征求意见"; + String approvalFlag = jsonForm.getString("approvalFlag"); if (StringUtils.equals(approvalFlag, ApprovalFlagEnum.PASS.getValue())) { String csrUserIds = jsonForm.getString("csrUserIds"); @@ -46,7 +60,8 @@ public class PolicySolicitOpinionProcess15After 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); } @@ -63,7 +78,8 @@ public class PolicySolicitOpinionProcess15After 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); @@ -71,16 +87,25 @@ public class PolicySolicitOpinionProcess15After 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/policySolicitOpinionProcess/PolicySolicitOpinionProcess15Before.java b/src/main/java/com/ydw/bat/wkflow/listener/policySolicitOpinionProcess/PolicySolicitOpinionProcess15Before.java index f4cac9be..2a7d25a1 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policySolicitOpinionProcess/PolicySolicitOpinionProcess15Before.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policySolicitOpinionProcess/PolicySolicitOpinionProcess15Before.java @@ -18,7 +18,7 @@ public class PolicySolicitOpinionProcess15Before 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/policySolicitOpinionProcess/PolicySolicitOpinionProcess16After.java b/src/main/java/com/ydw/bat/wkflow/listener/policySolicitOpinionProcess/PolicySolicitOpinionProcess16After.java index 3509f247..de00901e 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policySolicitOpinionProcess/PolicySolicitOpinionProcess16After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policySolicitOpinionProcess/PolicySolicitOpinionProcess16After.java @@ -1,6 +1,7 @@ package com.ydw.bat.wkflow.listener.policySolicitOpinionProcess; 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.BusProcessName; @@ -14,6 +15,7 @@ import com.ydw.bat.wkflow.util.SpringContextUtil; 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.lang3.StringUtils; import java.text.SimpleDateFormat; @@ -73,7 +75,7 @@ public class PolicySolicitOpinionProcess16After implements TaskListener { ); if (!existTaskFlag) { String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); - QueryWrapper bpnQueryWrap = new QueryWrapper(); + QueryWrapper bpnQueryWrap = new QueryWrapper<>(); bpnQueryWrap.eq("PRC_ID", delegateTask.getProcessInstanceId()); BusProcessName bpn = busProcessNameService.getOne(bpnQueryWrap); if (bpn != null) { @@ -83,15 +85,24 @@ public class PolicySolicitOpinionProcess16After 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); } } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policySolicitOpinionProcess/PolicySolicitOpinionProcess16Before.java b/src/main/java/com/ydw/bat/wkflow/listener/policySolicitOpinionProcess/PolicySolicitOpinionProcess16Before.java index 39c68415..83c20a9d 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policySolicitOpinionProcess/PolicySolicitOpinionProcess16Before.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policySolicitOpinionProcess/PolicySolicitOpinionProcess16Before.java @@ -18,7 +18,7 @@ public class PolicySolicitOpinionProcess16Before 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/policySolicitOpinionProcess/PolicySolicitOpinionProcess1After.java b/src/main/java/com/ydw/bat/wkflow/listener/policySolicitOpinionProcess/PolicySolicitOpinionProcess1After.java index e6afbb2e..17b87862 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 @@ -53,7 +53,7 @@ public class PolicySolicitOpinionProcess1After implements TaskListener { } } String prcName = lawsInfoName + "征求意见"; - QueryWrapper queryWrapper2 = new QueryWrapper(); + QueryWrapper queryWrapper2 = new QueryWrapper<>(); queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId()); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); if(one1!=null){ @@ -72,11 +72,11 @@ public class PolicySolicitOpinionProcess1After implements TaskListener { 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); if(CollectionUtils.isNotEmpty(nextUserList)){ @@ -86,9 +86,10 @@ public class PolicySolicitOpinionProcess1After implements TaskListener { busProcessNewNext.setMsgType("clause"); busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); busProcessNewNext.setMesg(object.toJSONString()); - busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); +// busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); + busProcessNewNext.setPrcName(prcName); + busProcessNewNext.setTaskInfo("审核"); busProcessNewNext.setFinishFlag("0"); - busProcessNewNext.setTaskInfo(delegateTask.getName()); busProcessNewNext.setUserId(nextUser); addBusProcessNewList.add(busProcessNewNext); } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policySolicitOpinionProcess/PolicySolicitOpinionProcess1Before.java b/src/main/java/com/ydw/bat/wkflow/listener/policySolicitOpinionProcess/PolicySolicitOpinionProcess1Before.java index 004e40bc..8c0e33fc 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policySolicitOpinionProcess/PolicySolicitOpinionProcess1Before.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policySolicitOpinionProcess/PolicySolicitOpinionProcess1Before.java @@ -17,7 +17,7 @@ public class PolicySolicitOpinionProcess1Before 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/policySolicitOpinionProcess/PolicySolicitOpinionProcess2After.java b/src/main/java/com/ydw/bat/wkflow/listener/policySolicitOpinionProcess/PolicySolicitOpinionProcess2After.java index 2b859f16..c0bcbf03 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policySolicitOpinionProcess/PolicySolicitOpinionProcess2After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policySolicitOpinionProcess/PolicySolicitOpinionProcess2After.java @@ -1,6 +1,7 @@ package com.ydw.bat.wkflow.listener.policySolicitOpinionProcess; 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,18 @@ public class PolicySolicitOpinionProcess2After implements TaskListener { JSONObject jsonForm = object.getJSONObject("form"); + Object lawsName = jsonForm.get("lawsName"); + Object lawsNo = jsonForm.get("lawsNo"); + String lawsInfoName = ""; + if(lawsName != null && lawsNo != null){ + String number = "《" + lawsNo +"-"; + String name = lawsName +"》-"; + if(StringUtils.isNotBlank(name) && StringUtils.isNotBlank(number)){ + lawsInfoName = number + name; + } + } + String prcName = lawsInfoName + "征求意见"; + String approvalFlag = jsonForm.getString("approvalFlag"); if (StringUtils.equals(approvalFlag, ApprovalFlagEnum.PASS.getValue())) { int shr1UserPassCount = (int) delegateTask.getVariable("shr1UserPassCount"); @@ -55,7 +68,8 @@ public class PolicySolicitOpinionProcess2After implements TaskListener { busProcessNewNext.setMesg(object.toJSONString()); busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); busProcessNewNext.setFinishFlag("0"); - busProcessNewNext.setTaskInfo(delegateTask.getName()); + busProcessNewNext.setPrcName(prcName); + busProcessNewNext.setTaskInfo("审定"); busProcessNewNext.setUserId(nextUser); addBusProcessNewList.add(busProcessNewNext); } @@ -74,23 +88,34 @@ public class PolicySolicitOpinionProcess2After implements TaskListener { busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); busProcessNewNext.setMesg(object.toJSONString()); busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); + busProcessNewNext.setPrcName(prcName); + busProcessNewNext.setTaskInfo("起草修改"); busProcessNewNext.setFinishFlag("0"); - busProcessNewNext.setTaskInfo(delegateTask.getName()); 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.setPrcName(prcName); +// busProcessNew.setCommitText(object.getString("commentText")); +// busProcessNew.setFinishFlag("0"); +// busBean.save(busProcessNew); delegateTask.setVariable("approvalFlag",approvalFlag); } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policySolicitOpinionProcess/PolicySolicitOpinionProcess2Before.java b/src/main/java/com/ydw/bat/wkflow/listener/policySolicitOpinionProcess/PolicySolicitOpinionProcess2Before.java index 38eb9b56..f6a16f8d 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policySolicitOpinionProcess/PolicySolicitOpinionProcess2Before.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policySolicitOpinionProcess/PolicySolicitOpinionProcess2Before.java @@ -18,7 +18,7 @@ public class PolicySolicitOpinionProcess2Before 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/policySolicitOpinionProcess/PolicySolicitOpinionProcess4After.java b/src/main/java/com/ydw/bat/wkflow/listener/policySolicitOpinionProcess/PolicySolicitOpinionProcess4After.java index 7d0e63a8..75d774fa 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policySolicitOpinionProcess/PolicySolicitOpinionProcess4After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policySolicitOpinionProcess/PolicySolicitOpinionProcess4After.java @@ -1,6 +1,7 @@ package com.ydw.bat.wkflow.listener.policySolicitOpinionProcess; 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; @@ -12,8 +13,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 PolicySolicitOpinionProcess4After implements TaskListener { @Override public void notify(DelegateTask delegateTask) { @@ -28,6 +32,19 @@ public class PolicySolicitOpinionProcess4After implements TaskListener { JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); JSONObject jsonForm = object.getJSONObject("form"); + + Object lawsName = jsonForm.get("lawsName"); + Object lawsNo = jsonForm.get("lawsNo"); + String lawsInfoName = ""; + if(lawsName != null && lawsNo != null){ + String number = "《" + lawsNo +"-"; + String name = lawsName +"》-"; + if(StringUtils.isNotBlank(name) && StringUtils.isNotBlank(number)){ + lawsInfoName = number + name; + } + } + String prcName = lawsInfoName + "征求意见"; + String approvalFlag = jsonForm.getString("approvalFlag"); if (StringUtils.equals(approvalFlag, ApprovalFlagEnum.PASS.getValue())) { int sdr1UserPassCount = (int) delegateTask.getVariable("sdr1UserPassCount"); @@ -45,8 +62,9 @@ public class PolicySolicitOpinionProcess4After implements TaskListener { busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); busProcessNewNext.setMesg(object.toJSONString()); busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); + busProcessNewNext.setPrcName(prcName); + busProcessNewNext.setTaskInfo("批准"); busProcessNewNext.setFinishFlag("0"); - busProcessNewNext.setTaskInfo(delegateTask.getName()); busProcessNewNext.setUserId(pzr1UserId); busBean.save(busProcessNewNext); @@ -58,6 +76,8 @@ public class PolicySolicitOpinionProcess4After implements TaskListener { busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); busProcessNewNext.setMesg(object.toJSONString()); busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); + busProcessNewNext.setPrcName(prcName); + busProcessNewNext.setTaskInfo("起草修改"); busProcessNewNext.setFinishFlag("0"); busProcessNewNext.setTaskInfo(delegateTask.getName()); busBean.save(busProcessNewNext); @@ -66,16 +86,25 @@ public class PolicySolicitOpinionProcess4After 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.setPrcName(prcName); +// busProcessNew.setCommitText(object.getString("commentText")); +// busProcessNew.setFinishFlag("0"); +// busBean.save(busProcessNew); delegateTask.setVariable("approvalFlag",approvalFlag); } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policySolicitOpinionProcess/PolicySolicitOpinionProcess4Before.java b/src/main/java/com/ydw/bat/wkflow/listener/policySolicitOpinionProcess/PolicySolicitOpinionProcess4Before.java index d237b510..be4f099c 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policySolicitOpinionProcess/PolicySolicitOpinionProcess4Before.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policySolicitOpinionProcess/PolicySolicitOpinionProcess4Before.java @@ -18,7 +18,7 @@ public class PolicySolicitOpinionProcess4Before 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/policySolicitOpinionProcess/PolicySolicitOpinionProcess5After.java b/src/main/java/com/ydw/bat/wkflow/listener/policySolicitOpinionProcess/PolicySolicitOpinionProcess5After.java index 27ed588a..3746fe81 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policySolicitOpinionProcess/PolicySolicitOpinionProcess5After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policySolicitOpinionProcess/PolicySolicitOpinionProcess5After.java @@ -1,6 +1,7 @@ package com.ydw.bat.wkflow.listener.policySolicitOpinionProcess; 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,19 @@ public class PolicySolicitOpinionProcess5After implements TaskListener { JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); JSONObject jsonForm = object.getJSONObject("form"); + + Object lawsName = jsonForm.get("lawsName"); + Object lawsNo = jsonForm.get("lawsNo"); + String lawsInfoName = ""; + if(lawsName != null && lawsNo != null){ + String number = "《" + lawsNo +"-"; + String name = lawsName +"》-"; + if(StringUtils.isNotBlank(name) && StringUtils.isNotBlank(number)){ + lawsInfoName = number + name; + } + } + String prcName = lawsInfoName + "征求意见"; + String approvalFlag = jsonForm.getString("approvalFlag"); if (StringUtils.equals(approvalFlag, ApprovalFlagEnum.PASS.getValue())) { Date responsibleUnitDeadlineDate = jsonForm.getDate("responsibleUnitDeadline"); @@ -44,8 +58,9 @@ public class PolicySolicitOpinionProcess5After implements TaskListener { busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); busProcessNewNext.setMesg(object.toJSONString()); busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); + busProcessNewNext.setPrcName(prcName); + busProcessNewNext.setTaskInfo("管理员"); busProcessNewNext.setFinishFlag("0"); - busProcessNewNext.setTaskInfo(delegateTask.getName()); busProcessNewNext.setUserId(glyUserId); busBean.save(busProcessNewNext); @@ -64,8 +79,9 @@ public class PolicySolicitOpinionProcess5After implements TaskListener { busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); busProcessNewNext.setMesg(object.toJSONString()); busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); + busProcessNewNext.setPrcName(prcName); + busProcessNewNext.setTaskInfo("责任对接人分配任务"); busProcessNewNext.setFinishFlag("0"); - busProcessNewNext.setTaskInfo(delegateTask.getName()); busProcessNewNext.setUserId(nextUser); addBusProcessNewList.add(busProcessNewNext); } @@ -85,22 +101,33 @@ public class PolicySolicitOpinionProcess5After implements TaskListener { busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); busProcessNewNext.setMesg(object.toJSONString()); busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); + busProcessNewNext.setPrcName(prcName); busProcessNewNext.setFinishFlag("0"); - busProcessNewNext.setTaskInfo(delegateTask.getName()); + busProcessNewNext.setTaskInfo("起草修改"); 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.setPrcName(prcName); +// 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/policySolicitOpinionProcess/PolicySolicitOpinionProcess5Before.java b/src/main/java/com/ydw/bat/wkflow/listener/policySolicitOpinionProcess/PolicySolicitOpinionProcess5Before.java index 34dd815e..46f998e5 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policySolicitOpinionProcess/PolicySolicitOpinionProcess5Before.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policySolicitOpinionProcess/PolicySolicitOpinionProcess5Before.java @@ -18,7 +18,7 @@ public class PolicySolicitOpinionProcess5Before 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/policySolicitOpinionProcess/PolicySolicitOpinionProcess7After.java b/src/main/java/com/ydw/bat/wkflow/listener/policySolicitOpinionProcess/PolicySolicitOpinionProcess7After.java index e3f0503e..82da1752 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policySolicitOpinionProcess/PolicySolicitOpinionProcess7After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policySolicitOpinionProcess/PolicySolicitOpinionProcess7After.java @@ -1,6 +1,7 @@ package com.ydw.bat.wkflow.listener.policySolicitOpinionProcess; 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; @@ -33,6 +34,19 @@ public class PolicySolicitOpinionProcess7After implements TaskListener { JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); JSONObject jsonForm = object.getJSONObject("form"); + + Object lawsName = jsonForm.get("lawsName"); + Object lawsNo = jsonForm.get("lawsNo"); + String lawsInfoName = ""; + if(lawsName != null && lawsNo != null){ + String number = "《" + lawsNo +"-"; + String name = lawsName +"》-"; + if(org.apache.commons.lang.StringUtils.isNotBlank(name) && org.apache.commons.lang.StringUtils.isNotBlank(number)){ + lawsInfoName = number + name; + } + } + String prcName = lawsInfoName + "征求意见"; + // 提交方式，如果该字段不为空，则是定时器自动提交 定时器自动提交value:timerAutoSubmit String submitMethod = object.getString("submitMethod"); if (StringUtils.isEmpty(submitMethod)) { @@ -49,8 +63,9 @@ public class PolicySolicitOpinionProcess7After implements TaskListener { busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); busProcessNewNext.setMesg(object.toJSONString()); busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); + busProcessNewNext.setPrcName(prcName); busProcessNewNext.setFinishFlag("0"); - busProcessNewNext.setTaskInfo(delegateTask.getName()); + busProcessNewNext.setTaskInfo("责任人任务处理"); busProcessNewNext.setUserId(nextUser); addBusProcessNewList.add(busProcessNewNext); @@ -89,8 +104,9 @@ public class PolicySolicitOpinionProcess7After implements TaskListener { busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); busProcessNewNext.setMesg(object.toJSONString()); busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); + busProcessNewNext.setPrcName(prcName); busProcessNewNext.setFinishFlag("0"); - busProcessNewNext.setTaskInfo(delegateTask.getName()); + busProcessNewNext.setTaskInfo("管理员"); busProcessNewNext.setUserId(glyUserId); busBean.save(busProcessNewNext); } @@ -99,16 +115,25 @@ public class PolicySolicitOpinionProcess7After 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/policySolicitOpinionProcess/PolicySolicitOpinionProcess7Before.java b/src/main/java/com/ydw/bat/wkflow/listener/policySolicitOpinionProcess/PolicySolicitOpinionProcess7Before.java index 3e4ddf8a..49e8a9c8 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policySolicitOpinionProcess/PolicySolicitOpinionProcess7Before.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policySolicitOpinionProcess/PolicySolicitOpinionProcess7Before.java @@ -19,7 +19,7 @@ public class PolicySolicitOpinionProcess7Before 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/policySolicitOpinionProcess/PolicySolicitOpinionProcess8After.java b/src/main/java/com/ydw/bat/wkflow/listener/policySolicitOpinionProcess/PolicySolicitOpinionProcess8After.java index 964912c0..185653bc 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policySolicitOpinionProcess/PolicySolicitOpinionProcess8After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policySolicitOpinionProcess/PolicySolicitOpinionProcess8After.java @@ -1,6 +1,7 @@ package com.ydw.bat.wkflow.listener.policySolicitOpinionProcess; 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; @@ -12,8 +13,11 @@ import com.ydw.bat.wkflow.business_main.datas.service.IPolicySolicitOpinionEOSer import com.ydw.bat.wkflow.util.SpringContextUtil; import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; +import java.util.List; + public class PolicySolicitOpinionProcess8After implements TaskListener { @Override public void notify(DelegateTask delegateTask) { @@ -28,6 +32,19 @@ public class PolicySolicitOpinionProcess8After implements TaskListener { JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); JSONObject jsonForm = object.getJSONObject("form"); + + Object lawsName = jsonForm.get("lawsName"); + Object lawsNo = jsonForm.get("lawsNo"); + String lawsInfoName = ""; + if(lawsName != null && lawsNo != null){ + String number = "《" + lawsNo +"-"; + String name = lawsName +"》-"; + if(org.apache.commons.lang.StringUtils.isNotBlank(name) && org.apache.commons.lang.StringUtils.isNotBlank(number)){ + lawsInfoName = number + name; + } + } + String prcName = lawsInfoName + "征求意见"; + // 提交方式，如果该字段不为空，则是定时器自动提交 定时器自动提交value:timerAutoSubmit String submitMethod = object.getString("submitMethod"); if (StringUtils.isEmpty(submitMethod)) { @@ -37,8 +54,9 @@ public class PolicySolicitOpinionProcess8After implements TaskListener { busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); busProcessNewNext.setMesg(object.toJSONString()); busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); + busProcessNewNext.setPrcName(prcName); busProcessNewNext.setFinishFlag("0"); - busProcessNewNext.setTaskInfo(delegateTask.getName()); + busProcessNewNext.setTaskInfo("责任对接人汇总"); busProcessNewNext.setUserId((String) delegateTask.getVariable("djrUserId")); busBean.save(busProcessNewNext); @@ -66,7 +84,8 @@ public class PolicySolicitOpinionProcess8After 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); } @@ -74,16 +93,25 @@ public class PolicySolicitOpinionProcess8After 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/policySolicitOpinionProcess/PolicySolicitOpinionProcess8Before.java b/src/main/java/com/ydw/bat/wkflow/listener/policySolicitOpinionProcess/PolicySolicitOpinionProcess8Before.java index a20364be..704c3cd0 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policySolicitOpinionProcess/PolicySolicitOpinionProcess8Before.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policySolicitOpinionProcess/PolicySolicitOpinionProcess8Before.java @@ -18,7 +18,7 @@ public class PolicySolicitOpinionProcess8Before 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/policySolicitOpinionProcess/PolicySolicitOpinionProcess9After.java b/src/main/java/com/ydw/bat/wkflow/listener/policySolicitOpinionProcess/PolicySolicitOpinionProcess9After.java index d1ee1e53..f07710a0 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policySolicitOpinionProcess/PolicySolicitOpinionProcess9After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policySolicitOpinionProcess/PolicySolicitOpinionProcess9After.java @@ -1,6 +1,7 @@ package com.ydw.bat.wkflow.listener.policySolicitOpinionProcess; 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; @@ -11,6 +12,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.collections4.CollectionUtils; import org.apache.commons.lang.StringUtils; import java.util.ArrayList; @@ -31,6 +33,18 @@ public class PolicySolicitOpinionProcess9After implements TaskListener { JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); JSONObject jsonForm = object.getJSONObject("form"); + Object lawsName = jsonForm.get("lawsName"); + Object lawsNo = jsonForm.get("lawsNo"); + String lawsInfoName = ""; + if(lawsName != null && lawsNo != null){ + String number = "《" + lawsNo +"-"; + String name = lawsName +"》-"; + if(StringUtils.isNotBlank(name) && StringUtils.isNotBlank(number)){ + lawsInfoName = number + name; + } + } + String prcName = lawsInfoName + "征求意见"; + String approvalFlag = jsonForm.getString("approvalFlag"); if (StringUtils.equals(approvalFlag, ApprovalFlagEnum.PASS.getValue())) { // 内部审查 0 是，1 否 @@ -45,7 +59,8 @@ public class PolicySolicitOpinionProcess9After 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); @@ -76,7 +91,8 @@ public class PolicySolicitOpinionProcess9After 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,7 +111,8 @@ public class PolicySolicitOpinionProcess9After 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); } @@ -108,16 +125,25 @@ public class PolicySolicitOpinionProcess9After 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/policySolicitOpinionProcess/PolicySolicitOpinionProcess9Before.java b/src/main/java/com/ydw/bat/wkflow/listener/policySolicitOpinionProcess/PolicySolicitOpinionProcess9Before.java index 382fab15..5e297bb5 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policySolicitOpinionProcess/PolicySolicitOpinionProcess9Before.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policySolicitOpinionProcess/PolicySolicitOpinionProcess9Before.java @@ -19,7 +19,7 @@ public class PolicySolicitOpinionProcess9Before 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()); From 092933928433c789e4c2dd19a8b438665bfa6b04 Mon Sep 17 00:00:00 2001 From: wxyclub Date: Mon, 1 Jul 2024 13:34:34 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix:=20=E9=87=8D=E7=82=B9=E8=AE=A4=E8=AF=81?= =?UTF-8?q?=E6=A0=87=E5=87=86/=E6=94=BF=E7=AD=96=E5=90=88=E8=A7=84?= =?UTF-8?q?=E6=80=A7=E9=A1=B9=E7=9B=AE=E5=AE=A1=E6=9F=A5=E6=B5=81=E7=A8=8B?= =?UTF-8?q?BUG=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...ComplianceProgramReviewProcess10After.java | 41 ++++++++++++------ ...omplianceProgramReviewProcess10Before.java | 2 +- ...ComplianceProgramReviewProcess11After.java | 38 +++++++++++------ ...omplianceProgramReviewProcess11Before.java | 2 +- ...ComplianceProgramReviewProcess12After.java | 38 +++++++++++------ ...omplianceProgramReviewProcess12Before.java | 2 +- ...omplianceProgramReviewProcess13Before.java | 2 +- ...yComplianceProgramReviewProcess1After.java | 37 ++++++++++------ ...ComplianceProgramReviewProcess1Before.java | 2 +- ...yComplianceProgramReviewProcess2After.java | 37 ++++++++++------ ...ComplianceProgramReviewProcess2Before.java | 2 +- ...yComplianceProgramReviewProcess4After.java | 40 ++++++++++++------ ...ComplianceProgramReviewProcess4Before.java | 2 +- ...yComplianceProgramReviewProcess5After.java | 40 ++++++++++++------ ...ComplianceProgramReviewProcess5Before.java | 2 +- ...yComplianceProgramReviewProcess7After.java | 38 +++++++++++------ ...ComplianceProgramReviewProcess7Before.java | 2 +- ...yComplianceProgramReviewProcess8After.java | 39 +++++++++++------ ...ComplianceProgramReviewProcess8Before.java | 2 +- ...yComplianceProgramReviewProcess9After.java | 42 +++++++++++++------ ...ComplianceProgramReviewProcess9Before.java | 2 +- 21 files changed, 279 insertions(+), 133 deletions(-) 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()); From 3348d325278c1a8065182df21d1c7594c24c02dc Mon Sep 17 00:00:00 2001 From: wxyclub Date: Mon, 1 Jul 2024 14:20:31 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix:=20=E9=87=8D=E7=82=B9=E8=AE=A4=E8=AF=81?= =?UTF-8?q?=E6=A0=87=E5=87=86/=E6=94=BF=E7=AD=96=E5=90=88=E8=A7=84?= =?UTF-8?q?=E6=80=A7=E9=A1=B9=E7=9B=AE=E5=AE=A1=E6=9F=A5=E6=B5=81=E7=A8=8B?= =?UTF-8?q?BUG=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...ComplianceProgramReviewProcess13After.java | 38 +++++++++++++------ ...ComplianceProgramReviewProcess14After.java | 38 +++++++++++++------ ...omplianceProgramReviewProcess14Before.java | 2 +- ...ComplianceProgramReviewProcess15After.java | 33 ++++++++++------ ...omplianceProgramReviewProcess15Before.java | 2 +- 5 files changed, 76 insertions(+), 37 deletions(-) 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 cb5bf693..f448009d 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 @@ -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; @@ -34,6 +35,8 @@ public class PolicyComplianceProgramReviewProcess13After 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 sdr2UserPassCount = (int) delegateTask.getVariable("sdr2UserPassCount"); @@ -52,7 +55,8 @@ public class PolicyComplianceProgramReviewProcess13After implements TaskListener busProcessNewNext.setMesg(object.toJSONString()); busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); busProcessNewNext.setFinishFlag("0"); - busProcessNewNext.setTaskInfo(delegateTask.getName()); + busProcessNewNext.setTaskInfo("批准"); + busProcessNewNext.setPrcName(prcName); busProcessNewNext.setUserId(pzr2UserId); busBean.save(busProcessNewNext); delegateTask.setVariable("pzr2UserId", pzr2UserId); @@ -65,7 +69,8 @@ public class PolicyComplianceProgramReviewProcess13After 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); @@ -74,16 +79,25 @@ public class PolicyComplianceProgramReviewProcess13After 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/PolicyComplianceProgramReviewProcess14After.java b/src/main/java/com/ydw/bat/wkflow/listener/policyComplianceProgramReviewProcess/PolicyComplianceProgramReviewProcess14After.java index c35c3005..7bc64868 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 @@ -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; @@ -34,6 +35,8 @@ public class PolicyComplianceProgramReviewProcess14After 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 csrUserIds = jsonForm.getString("csrUserIds"); @@ -47,7 +50,8 @@ public class PolicyComplianceProgramReviewProcess14After 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); } @@ -64,7 +68,8 @@ public class PolicyComplianceProgramReviewProcess14After 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); @@ -72,16 +77,25 @@ public class PolicyComplianceProgramReviewProcess14After 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/PolicyComplianceProgramReviewProcess14Before.java b/src/main/java/com/ydw/bat/wkflow/listener/policyComplianceProgramReviewProcess/PolicyComplianceProgramReviewProcess14Before.java index 1f0b6dde..641ccd65 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policyComplianceProgramReviewProcess/PolicyComplianceProgramReviewProcess14Before.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyComplianceProgramReviewProcess/PolicyComplianceProgramReviewProcess14Before.java @@ -18,7 +18,7 @@ public class PolicyComplianceProgramReviewProcess14Before 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/PolicyComplianceProgramReviewProcess15After.java b/src/main/java/com/ydw/bat/wkflow/listener/policyComplianceProgramReviewProcess/PolicyComplianceProgramReviewProcess15After.java index 932b8cfa..696cee96 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 @@ -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_auth.LawsUserInfoService; @@ -15,6 +16,7 @@ import com.ydw.bat.wkflow.util.SpringContextUtil; import com.ydw.bat.wkflow.util.enums.FlowTypeEnum; import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import java.text.SimpleDateFormat; @@ -73,7 +75,7 @@ public class PolicyComplianceProgramReviewProcess15After implements TaskListener ); if (!existTaskFlag) { String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); - QueryWrapper bpnQueryWrap = new QueryWrapper(); + QueryWrapper bpnQueryWrap = new QueryWrapper<>(); bpnQueryWrap.eq("PRC_ID", delegateTask.getProcessInstanceId()); BusProcessName bpn = busProcessNameService.getOne(bpnQueryWrap); if (bpn != null) { @@ -83,16 +85,25 @@ public class PolicyComplianceProgramReviewProcess15After 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); // 抄送完成后修改标准跟踪清单中状态 // 如果是从标准跟踪清单下发的流程 需要修改主服务表中的流程状态，修改为 已完成 diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyComplianceProgramReviewProcess/PolicyComplianceProgramReviewProcess15Before.java b/src/main/java/com/ydw/bat/wkflow/listener/policyComplianceProgramReviewProcess/PolicyComplianceProgramReviewProcess15Before.java index e2912989..269032e7 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policyComplianceProgramReviewProcess/PolicyComplianceProgramReviewProcess15Before.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyComplianceProgramReviewProcess/PolicyComplianceProgramReviewProcess15Before.java @@ -18,7 +18,7 @@ public class PolicyComplianceProgramReviewProcess15Before 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());