From bf14cab43370e926c4374cfbb6379c59131f8e74 Mon Sep 17 00:00:00 2001 From: wangzhijiang <1358525938@qq.com> Date: Fri, 26 Apr 2024 10:49:15 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E5=8E=86=E5=8F=B2?= =?UTF-8?q?=E6=8C=89=E5=AD=90=E6=B5=81=E7=A8=8B=E5=BD=92=E5=A0=86=E3=80=81?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=B5=81=E7=A8=8B=E5=8E=86=E5=8F=B2=E6=9D=83?= =?UTF-8?q?=E9=99=90=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BusProcessHistoryController.java | 4 +- .../service/IBusProcessHistoryService.java | 2 +- .../impl/IBusProcessHistoryServiceImpl.java | 68 ++++++++++++++++-- .../StartSurveyAfter.java | 31 ++++++++ .../StandardCommentNewProcess/Step1After.java | 71 ++++++++++++------- .../StandardCommentNewProcess/Step2After.java | 5 ++ .../StandardCommentNewProcess/Step3After.java | 5 ++ .../StandardCommentNewProcess/Step4After.java | 7 ++ .../StandardCommentNewProcess/Step5After.java | 5 ++ .../util/enums/BussLibraryNodeKeyEnum.java | 3 + .../StandardCommentNewProcessNodeKeyEnum.java | 5 +- 11 files changed, 171 insertions(+), 35 deletions(-) diff --git a/src/main/java/com/ydw/bat/wkflow/business_main/datas/controller/BusProcessHistoryController.java b/src/main/java/com/ydw/bat/wkflow/business_main/datas/controller/BusProcessHistoryController.java index ef2dbcd1..0b85021b 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_main/datas/controller/BusProcessHistoryController.java +++ b/src/main/java/com/ydw/bat/wkflow/business_main/datas/controller/BusProcessHistoryController.java @@ -25,11 +25,11 @@ public class BusProcessHistoryController { * @return */ @GetMapping("/queryFlowHistoryList") - public List queryFlowHistoryList(String actiProcInstId,String flowType) { + public List queryFlowHistoryList(String actiProcInstId,String flowType,String userId) { BusProcessHistory busProcessHistory = new BusProcessHistory(); busProcessHistory.setActiProcInstId(actiProcInstId); busProcessHistory.setFlowType(flowType); - return this.busProcessHistoryService.queryFlowHistoryList(busProcessHistory); + return this.busProcessHistoryService.queryFlowHistoryList(busProcessHistory,userId); } /** diff --git a/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/IBusProcessHistoryService.java b/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/IBusProcessHistoryService.java index f2b548fb..e739cef8 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/IBusProcessHistoryService.java +++ b/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/IBusProcessHistoryService.java @@ -10,7 +10,7 @@ import java.util.Map; public interface IBusProcessHistoryService extends IService { - List queryFlowHistoryList(BusProcessHistory busProcessHistory); + List queryFlowHistoryList(BusProcessHistory busProcessHistory,String userId); List queryByList(BusProcessHistory busProcessHistory); diff --git a/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/impl/IBusProcessHistoryServiceImpl.java b/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/impl/IBusProcessHistoryServiceImpl.java index 7b2e0a9c..f747bc3e 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/impl/IBusProcessHistoryServiceImpl.java +++ b/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/impl/IBusProcessHistoryServiceImpl.java @@ -39,13 +39,37 @@ public class IBusProcessHistoryServiceImpl extends ServiceImpl queryFlowHistoryList(BusProcessHistory busProcessHistory) { + public List queryFlowHistoryList(BusProcessHistory busProcessHistory,String userId) { QueryWrapper bphQueryWrap = new QueryWrapper<>(); this.setQueryCondition(busProcessHistory, bphQueryWrap); bphQueryWrap.orderByAsc("order_num","create_time"); - bphQueryWrap.lambda().and( - query -> query.isNull(BusProcessHistory::getTaskId).isNull(BusProcessHistory::getUserId).eq(BusProcessHistory::getIsMany,"1").or().isNotNull(BusProcessHistory::getTaskId) - ); + // 验证当前操作用户，是否只是该流程中子流程中参与的人员(用户参与了外面的节点，也参与了子流程节点，这种情况不属于子流程用户) + // 如果是，查询出非子流程节点所有数据，和他自己参与过的子流程数据，如果不是，查询所有的数据。 + boolean isChildProcess = this.checkUserIsChildProcess(busProcessHistory,userId); + if (isChildProcess) { + // 查询出，当前登录用户，所在的子流程数据id + QueryWrapper childBphQueryWrap = new QueryWrapper<>(); + this.setQueryCondition(busProcessHistory, childBphQueryWrap); + childBphQueryWrap.lambda().eq(BusProcessHistory::getUserId,userId); + List childBpnList = this.list(childBphQueryWrap); + List manyPidList = childBpnList.stream().map(BusProcessHistory::getManyPId) + .distinct().filter(manyPid -> StringUtils.isNotEmpty(manyPid)).collect(Collectors.toList()); + + bphQueryWrap.lambda().and( + query -> query.isNull(BusProcessHistory::getTaskId).isNull(BusProcessHistory::getUserId) + .eq(BusProcessHistory::getIsMany,"1") + .notLike(BusProcessHistory::getTaskKey,StandardCommentNewProcessNodeKeyEnum.SUB_PROCESS.getLable()) + .or().in(BusProcessHistory::getId,manyPidList) + .or().isNotNull(BusProcessHistory::getTaskId) + ); + } else { + bphQueryWrap.lambda().and( + query -> query.isNull(BusProcessHistory::getTaskId) + .isNull(BusProcessHistory::getUserId) + .eq(BusProcessHistory::getIsMany,"1") + .or().isNotNull(BusProcessHistory::getTaskId) + ); + } // bphQueryWrap.isNotNull("task_id"); List bphList = this.list(bphQueryWrap); this.disposeData(bphList,busProcessHistory.getActiProcInstId()); @@ -97,6 +121,38 @@ public class IBusProcessHistoryServiceImpl extends ServiceImpl bphQueryWrap = new QueryWrapper<>(); + this.setQueryCondition(bph, bphQueryWrap); + bphQueryWrap.lambda().eq(BusProcessHistory::getUserId,userId); + List busProcessHistoryList = this.list(bphQueryWrap); + if (CollectionUtils.isNotEmpty(busProcessHistoryList)) { + for (BusProcessHistory busProcessHistory : busProcessHistoryList) { + if (StringUtils.isNotEmpty(busProcessHistory.getManyPId())) { + BusProcessHistory byId = this.getById(busProcessHistory.getManyPId()); + if (StringUtils.contains(byId.getTaskKey(),StandardCommentNewProcessNodeKeyEnum.SUB_PROCESS.getLable())) { + result = true; + continue; + } else { + result = false; + break; + } + } else { + result = false; + break; + } + } + } + return result; + } + @Override public List queryByList(BusProcessHistory busProcessHistory) { QueryWrapper bphQueryWrap = new QueryWrapper<>(); @@ -210,7 +266,9 @@ public class IBusProcessHistoryServiceImpl extends ServiceImpl yjfkUserIdList = Arrays.asList(json.getString("responUserList").split(",")); // 意见反馈 if (CollectionUtils.isNotEmpty(yjfkUserIdList)) { - String yjfkPBphId = (String) delegateTask.getVariable("yjfkPBphId"); - if (StringUtils.isEmpty(yjfkPBphId)) { - BusProcessHistory yjfkPBph = new BusProcessHistory(); - yjfkPBphId = UUID.randomUUID().toString(); - yjfkPBph.setId(yjfkPBphId); - yjfkPBph.setActiProcInstId(delegateTask.getProcessInstanceId()); - yjfkPBph.setTaskKey(StandardCommentNewProcessNodeKeyEnum.STAND_ASK_FOR_OPINION3.getValue()); - yjfkPBph.setFlowType(FlowTypeEnum.BZZQYJLC.getValue()); - yjfkPBph.setOrderNum(StandardCommentNewProcessNodeKeyEnum.STAND_ASK_FOR_OPINION3.getOrderNum()); - yjfkPBph.setIsSub("2"); - yjfkPBph.setIsMany("1"); - bphList.add(yjfkPBph); + String subProcessId = json.getString("subProcessId"); + if (StringUtils.isNotEmpty(subProcessId)) { + for (String yjfkUserId : yjfkUserIdList) { + BusProcessHistory yjfkBph = new BusProcessHistory(); + yjfkBph.setActiProcInstId(delegateTask.getProcessInstanceId()); + yjfkBph.setUserId(yjfkUserId); + yjfkBph.setTaskKey(StandardCommentNewProcessNodeKeyEnum.STAND_ASK_FOR_OPINION3.getValue()); + yjfkBph.setFlowType(FlowTypeEnum.BZZQYJLC.getValue()); + yjfkBph.setOrderNum(StandardCommentNewProcessNodeKeyEnum.STAND_ASK_FOR_OPINION3.getOrderNum()); + yjfkBph.setIsSub("2"); + yjfkBph.setIsMany("1"); + yjfkBph.setManyPId(subProcessId); + yjfkBph.setParentUserId(delegateTask.getAssignee()); + bphList.add(yjfkBph); + } + } else { + String yjfkPBphId = (String) delegateTask.getVariable("yjfkPBphId"); + if (StringUtils.isEmpty(yjfkPBphId)) { + BusProcessHistory yjfkPBph = new BusProcessHistory(); + yjfkPBphId = UUID.randomUUID().toString(); + yjfkPBph.setId(yjfkPBphId); + yjfkPBph.setActiProcInstId(delegateTask.getProcessInstanceId()); + yjfkPBph.setTaskKey(StandardCommentNewProcessNodeKeyEnum.STAND_ASK_FOR_OPINION3.getValue()); + yjfkPBph.setFlowType(FlowTypeEnum.BZZQYJLC.getValue()); + yjfkPBph.setOrderNum(StandardCommentNewProcessNodeKeyEnum.STAND_ASK_FOR_OPINION3.getOrderNum()); + yjfkPBph.setIsSub("2"); + yjfkPBph.setIsMany("1"); + bphList.add(yjfkPBph); + } + + for (String yjfkUserId : yjfkUserIdList) { + BusProcessHistory yjfkBph = new BusProcessHistory(); + yjfkBph.setActiProcInstId(delegateTask.getProcessInstanceId()); + yjfkBph.setUserId(yjfkUserId); + yjfkBph.setTaskKey(StandardCommentNewProcessNodeKeyEnum.STAND_ASK_FOR_OPINION3.getValue()); + yjfkBph.setFlowType(FlowTypeEnum.BZZQYJLC.getValue()); + yjfkBph.setOrderNum(StandardCommentNewProcessNodeKeyEnum.STAND_ASK_FOR_OPINION3.getOrderNum()); + yjfkBph.setIsSub("2"); + yjfkBph.setIsMany("1"); + yjfkBph.setManyPId(yjfkPBphId); + yjfkBph.setParentUserId(delegateTask.getAssignee()); + bphList.add(yjfkBph); + } + + delegateTask.setVariable("yjfkPBphId",yjfkPBphId); } - for (String yjfkUserId : yjfkUserIdList) { - BusProcessHistory yjfkBph = new BusProcessHistory(); - yjfkBph.setActiProcInstId(delegateTask.getProcessInstanceId()); - yjfkBph.setUserId(yjfkUserId); - yjfkBph.setTaskKey(StandardCommentNewProcessNodeKeyEnum.STAND_ASK_FOR_OPINION3.getValue()); - yjfkBph.setFlowType(FlowTypeEnum.BZZQYJLC.getValue()); - yjfkBph.setOrderNum(StandardCommentNewProcessNodeKeyEnum.STAND_ASK_FOR_OPINION3.getOrderNum()); - yjfkBph.setIsSub("2"); - yjfkBph.setIsMany("1"); - yjfkBph.setManyPId(yjfkPBphId); - yjfkBph.setParentUserId(delegateTask.getAssignee()); - bphList.add(yjfkBph); - } - delegateTask.setVariable("yjfkPBphId",yjfkPBphId); } bphService.insertBatch(bphList); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step2After.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step2After.java index 948866ef..aaabecb2 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step2After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step2After.java @@ -19,6 +19,7 @@ import com.ydw.bat.wkflow.util.enums.TaskStatusEnum; import org.activiti.engine.ActivitiException; import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; +import org.apache.commons.lang.StringUtils; import java.text.SimpleDateFormat; import java.util.*; @@ -141,6 +142,7 @@ public class Step2After implements TaskListener { if (count == 0) { List bphList = new ArrayList<>(); + String subProcessId = json.getString("subProcessId"); // 意见汇总审批 BusProcessHistory yjhzspBph = new BusProcessHistory(); yjhzspBph.setActiProcInstId(delegateTask.getProcessInstanceId()); @@ -150,6 +152,9 @@ public class Step2After implements TaskListener { yjhzspBph.setOrderNum(StandardCommentNewProcessNodeKeyEnum.STAND_ASK_FOR_OPINION4.getOrderNum()); yjhzspBph.setIsSub("2"); yjhzspBph.setIsMany("2"); + if (StringUtils.isNotEmpty(subProcessId)) { + yjhzspBph.setManyPId(subProcessId); + } bphList.add(yjhzspBph); bphService.insertBatch(bphList); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step3After.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step3After.java index 80520c6f..7e7147dd 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step3After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step3After.java @@ -17,6 +17,7 @@ import com.ydw.bat.wkflow.util.enums.StandardCommentNewProcessNodeKeyEnum; 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; import java.util.ArrayList; @@ -117,6 +118,10 @@ public class Step3After implements TaskListener { pzBph.setFlowType(FlowTypeEnum.BZZQYJLC.getValue()); pzBph.setIsSub("2"); pzBph.setIsMany("2"); + String subProcessId = json.getString("subProcessId"); + if (StringUtils.isNotEmpty(subProcessId)) { + pzBph.setManyPId(subProcessId); + } int orderNum = bphService.getMaxOrderNum(delegateTask.getProcessInstanceId(),StandardCommentNewProcessNodeKeyEnum.STAND_ASK_FOR_OPINION4.getValue()); pzBph.setOrderNum(orderNum + 1); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step4After.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step4After.java index 0a0ba904..422c3183 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step4After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step4After.java @@ -113,6 +113,7 @@ public class Step4After implements TaskListener { String spFlag = json.getString("spFlag"); List bphList = new ArrayList<>(); + String subProcessId = json.getString("subProcessId"); // 如果是驳回，流程走向意见处理节点，否则流程结束 if (!StringUtils.equals(spFlag,"0")) { String zrUserId = json.getString("SKS"); @@ -126,6 +127,9 @@ public class Step4After implements TaskListener { yjhzspBph.setOrderNum(orderNum + 1); yjhzspBph.setIsSub("2"); yjhzspBph.setIsMany("2"); + if (StringUtils.isNotEmpty(subProcessId)) { + yjhzspBph.setManyPId(subProcessId); + } bphList.add(yjhzspBph); bphService.updateOrderNum(delegateTask.getProcessInstanceId(),orderNum + 1,bphList.size()); @@ -155,6 +159,9 @@ public class Step4After implements TaskListener { glyBph.setOrderNum(orderNum + 1); glyBph.setIsSub("2"); glyBph.setIsMany("2"); + if (StringUtils.isNotEmpty(subProcessId)) { + glyBph.setManyPId(subProcessId); + } glyBph.setParentUserId(delegateTask.getAssignee()); bphList.add(glyBph); bphService.updateOrderNum(delegateTask.getProcessInstanceId(),orderNum + 1,bphList.size()); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step5After.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step5After.java index 5e245d3c..7f79845f 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step5After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step5After.java @@ -141,6 +141,8 @@ public class Step5After implements TaskListener { if (!StringUtils.equals(bzFlag,"0")) { String zrUserId = json.getString("SKS"); List bphList = new ArrayList<>(); + + String subProcessId = json.getString("subProcessId"); // 意见汇总审批 BusProcessHistory yjhzspBph = new BusProcessHistory(); yjhzspBph.setActiProcInstId(delegateTask.getProcessInstanceId()); @@ -151,6 +153,9 @@ public class Step5After implements TaskListener { yjhzspBph.setOrderNum(orderNum + 1); yjhzspBph.setIsSub("2"); yjhzspBph.setIsMany("2"); + if (StringUtils.isNotEmpty(subProcessId)) { + yjhzspBph.setManyPId(subProcessId); + } bphList.add(yjhzspBph); bphService.insertBatch(bphList); bphService.updateOrderNum(delegateTask.getProcessInstanceId(),orderNum + 1,bphList.size()); diff --git a/src/main/java/com/ydw/bat/wkflow/util/enums/BussLibraryNodeKeyEnum.java b/src/main/java/com/ydw/bat/wkflow/util/enums/BussLibraryNodeKeyEnum.java index 98080407..d33eeb4d 100644 --- a/src/main/java/com/ydw/bat/wkflow/util/enums/BussLibraryNodeKeyEnum.java +++ b/src/main/java/com/ydw/bat/wkflow/util/enums/BussLibraryNodeKeyEnum.java @@ -58,6 +58,9 @@ public enum BussLibraryNodeKeyEnum { break; } } + if (StringUtils.isEmpty(result)) { + result = value; + } return result; } diff --git a/src/main/java/com/ydw/bat/wkflow/util/enums/StandardCommentNewProcessNodeKeyEnum.java b/src/main/java/com/ydw/bat/wkflow/util/enums/StandardCommentNewProcessNodeKeyEnum.java index 9c47b64f..f07b2542 100644 --- a/src/main/java/com/ydw/bat/wkflow/util/enums/StandardCommentNewProcessNodeKeyEnum.java +++ b/src/main/java/com/ydw/bat/wkflow/util/enums/StandardCommentNewProcessNodeKeyEnum.java @@ -11,7 +11,7 @@ import java.util.List; */ public enum StandardCommentNewProcessNodeKeyEnum { STAND_ASK_FOR_OPINION1("StandAskForOpinion1","起草",0,true), - // SUB_PROCESS("subProcess","子流程",1), + SUB_PROCESS("subProcess","子流程",1,false), STAND_ASK_FOR_OPINION2("StandAskForOpinion2","任务分发",2,true), STAND_ASK_FOR_OPINION3("StandAskForOpinion3","意见反馈",3,true), STAND_ASK_FOR_OPINION4("StandAskForOpinion4","意见汇总审批",4,true), @@ -53,6 +53,9 @@ public enum StandardCommentNewProcessNodeKeyEnum { break; } } + if (StringUtils.isEmpty(result)) { + result = value; + } return result; } From 090beef0b161979e525916aa491eb2ef19a83da3 Mon Sep 17 00:00:00 2001 From: wxyclub Date: Fri, 26 Apr 2024 14:22:29 +0800 Subject: [PATCH 2/7] =?UTF-8?q?fix:=20=E4=BC=81=E6=A0=87=E5=88=B6=E4=BF=AE?= =?UTF-8?q?=E8=AE=A2-=E6=8A=80=E6=9C=AF=E6=A0=87=E5=87=86=E6=89=B9?= =?UTF-8?q?=E5=87=86=E8=8A=82=E7=82=B9=E6=94=B9=E4=B8=BA=E5=A4=9A=E4=BA=BA?= =?UTF-8?q?=E5=A4=84=E7=90=86=E8=8A=82=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bussLibrary/BLApplicantAfter.java | 38 ++++-- .../bussLibrary/BussLibrary10After.java | 120 +++++++++++++----- .../bussLibrary/BussLibrary11After.java | 73 ++++++++++- 3 files changed, 191 insertions(+), 40 deletions(-) diff --git a/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BLApplicantAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BLApplicantAfter.java index b7d54618..a9351cac 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BLApplicantAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BLApplicantAfter.java @@ -26,6 +26,7 @@ import org.apache.tomcat.util.digester.ArrayStack; import java.text.SimpleDateFormat; import java.util.*; +import java.util.stream.Collectors; /** * 发起企标制修订流程后 @@ -369,15 +370,34 @@ public class BLApplicantAfter implements TaskListener{ // 批准 String zhrUserId = json.getString("zhrUserId"); - BusProcessHistory pzBph = new BusProcessHistory(); - pzBph.setActiProcInstId(delegateTask.getProcessInstanceId()); - pzBph.setUserId(zhrUserId); - pzBph.setTaskKey(BussLibraryNodeKeyEnum.BUSS_LIBRARY11.getValue()); - pzBph.setFlowType(FlowTypeEnum.QBZXD_JSBZ.getValue()); - pzBph.setOrderNum(BussLibraryNodeKeyEnum.BUSS_LIBRARY11.getOrderNum()); - pzBph.setIsSub("2"); - pzBph.setIsMany("2"); - bphList.add(pzBph); + List zhrUserIdList = Arrays.stream(zhrUserId.split(",")).filter(StringUtils::isNotBlank).collect(Collectors.toList()); + if (CollectionUtils.isNotEmpty(qcUserIdList)) { + // 批准节点父节点信息 + BusProcessHistory pzPBph = new BusProcessHistory(); + String pzPBphId = UUID.randomUUID().toString(); + pzPBph.setId(pzPBphId); + pzPBph.setActiProcInstId(delegateTask.getProcessInstanceId()); + pzPBph.setTaskKey(BussLibraryNodeKeyEnum.BUSS_LIBRARY11.getValue()); + pzPBph.setFlowType(FlowTypeEnum.QBZXD_JSBZ.getValue()); + pzPBph.setOrderNum(BussLibraryNodeKeyEnum.BUSS_LIBRARY11.getOrderNum()); + pzPBph.setIsSub("2"); + pzPBph.setIsMany("1"); + bphList.add(pzPBph); + + for (String eachZhrUserId : zhrUserIdList) { + // 批准子节点信息 + BusProcessHistory pzBph = new BusProcessHistory(); + pzBph.setActiProcInstId(delegateTask.getProcessInstanceId()); + pzBph.setUserId(eachZhrUserId); + pzBph.setTaskKey(BussLibraryNodeKeyEnum.BUSS_LIBRARY11.getValue()); + pzBph.setFlowType(FlowTypeEnum.QBZXD_JSBZ.getValue()); + pzBph.setOrderNum(BussLibraryNodeKeyEnum.BUSS_LIBRARY11.getOrderNum()); + pzBph.setIsSub("2"); + pzBph.setIsMany("1"); + pzBph.setManyPId(pzPBphId); + bphList.add(pzBph); + } + } // 培训 String pxUserId = json.getString("pxUserId"); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary10After.java b/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary10After.java index de4b3219..7e1f91a5 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary10After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary10After.java @@ -1,7 +1,6 @@ package com.ydw.bat.wkflow.listener.bussLibrary; 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.BusProcessHistory; import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName; @@ -15,13 +14,18 @@ import com.ydw.bat.wkflow.util.SpringContextUtil; import com.ydw.bat.wkflow.util.enums.BussLibraryNodeKeyEnum; import com.ydw.bat.wkflow.util.enums.FlowTypeEnum; import org.activiti.engine.ActivitiException; +import org.activiti.engine.RepositoryService; import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; +import org.activiti.engine.repository.ProcessDefinition; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang.StringUtils; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; +import java.util.UUID; +import java.util.stream.Collectors; /** * 专委会副主任/起草单位中心主任审定后 @@ -29,6 +33,11 @@ import java.util.List; public class BussLibrary10After implements TaskListener{ @Override public void notify(DelegateTask delegateTask) { + RepositoryService repositoryService = SpringContextUtil.getBean(RepositoryService.class); + // 获取当前流程的流程定义 + ProcessDefinition processDefinition = repositoryService.createProcessDefinitionQuery() + .processDefinitionId(delegateTask.getProcessDefinitionId()) + .singleResult(); IDatasService datasService = SpringContextUtil.getBean(IDatasService.class); IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class); @@ -70,10 +79,16 @@ public class BussLibrary10After implements TaskListener{ if(StringUtils.isNotBlank(approvalOpinion)){ if ("0".equalsIgnoreCase(approvalOpinion)) { - if(StringUtils.isNotBlank(object.getString("zhrUserId"))){ - - delegateTask.setVariable("zhrUserId",object.getString("zhrUserId")); - nextUserList.add(object.getString("zhrUserId")); + String zhrUserId = object.getString("zhrUserId"); + if(StringUtils.isNotBlank(zhrUserId)){ + List zhrUserIdList = Arrays.stream(zhrUserId.split(",")).filter(StringUtils::isNotBlank).collect(Collectors.toList()); + // 对旧数据做兼容，如果流程定义版本低于13则是旧数据，批准节点是单人处理，之后的版本是多人处理 + if (processDefinition.getVersion() <= 13) { + delegateTask.setVariable("zhrUserId",zhrUserIdList.get(0)); + } else { + delegateTask.setVariable("zhrUserId",zhrUserIdList); + } + nextUserList.addAll(zhrUserIdList); // BussUtils.approvalFunc2(delegateTask, object, prcName, nextUserList); BussUtils.approvalFunc3(delegateTask, object, prcName, nextUserList); @@ -104,43 +119,90 @@ public class BussLibrary10After implements TaskListener{ }else { throw new ActivitiException("1#2 提交OR驳回参数不存在"); } - this.addBusProcessHistory(object,delegateTask); + this.addBusProcessHistory(object,delegateTask, processDefinition); } private String verifyObj(String str){ return (str == null || str.equals("")) ? "" : str; } - public void addBusProcessHistory(JSONObject json,DelegateTask delegateTask) { + public void addBusProcessHistory(JSONObject json,DelegateTask delegateTask, ProcessDefinition processDefinition) { IBusProcessHistoryService bphService = SpringContextUtil.getBean(IBusProcessHistoryService.class); Integer fzrFlag = (Integer) delegateTask.getVariable("fzrFlag"); if (fzrFlag == 0) { String zhrUserId = json.getString("zhrUserId"); - // 如果存在 批准 节点的数据，taskId为空。 不用添加，否则需要添加。 - QueryWrapper bphQueryWrap = new QueryWrapper<>(); - bphQueryWrap.lambda().eq(BusProcessHistory::getActiProcInstId, delegateTask.getProcessInstanceId()); - bphQueryWrap.lambda().eq(BusProcessHistory::getUserId, zhrUserId); - bphQueryWrap.lambda().eq(BusProcessHistory::getTaskKey, BussLibraryNodeKeyEnum.BUSS_LIBRARY11.getValue()); - bphQueryWrap.lambda().isNull(BusProcessHistory::getTaskId); + List zhrUserIdList = Arrays.stream(zhrUserId.split(",")).filter(StringUtils::isNotBlank).collect(Collectors.toList()); + // 对旧数据做兼容，如果流程定义版本低于13则是旧数据，批准节点是单人处理，之后的版本是多人处理 + if (processDefinition.getVersion() <= 13) { + // 如果存在 批准 节点的数据，taskId为空。 不用添加，否则需要添加。 + QueryWrapper bphQueryWrap = new QueryWrapper<>(); + bphQueryWrap.lambda().eq(BusProcessHistory::getActiProcInstId, delegateTask.getProcessInstanceId()); + bphQueryWrap.lambda().eq(BusProcessHistory::getUserId, zhrUserId); + bphQueryWrap.lambda().eq(BusProcessHistory::getTaskKey, BussLibraryNodeKeyEnum.BUSS_LIBRARY11.getValue()); + bphQueryWrap.lambda().isNull(BusProcessHistory::getTaskId); - List busProcessHistoryList = bphService.list(bphQueryWrap); - if (CollectionUtils.isEmpty(busProcessHistoryList)) { - List bphList = new ArrayList<>(); - // 批准 - BusProcessHistory pzBph = new BusProcessHistory(); - pzBph.setActiProcInstId(delegateTask.getProcessInstanceId()); - pzBph.setUserId(zhrUserId); - pzBph.setTaskKey(BussLibraryNodeKeyEnum.BUSS_LIBRARY11.getValue()); - pzBph.setFlowType(FlowTypeEnum.QBZXD_JSBZ.getValue()); - pzBph.setIsSub("2"); - pzBph.setIsMany("2"); - int orderNum = bphService.getMaxOrderNum(delegateTask.getProcessInstanceId(), BussLibraryNodeKeyEnum.BUSS_LIBRARY10.getValue()); - pzBph.setOrderNum(orderNum + 1); - bphList.add(pzBph); + List busProcessHistoryList = bphService.list(bphQueryWrap); + if (CollectionUtils.isEmpty(busProcessHistoryList)) { + List bphList = new ArrayList<>(); + // 批准 + BusProcessHistory pzBph = new BusProcessHistory(); + pzBph.setActiProcInstId(delegateTask.getProcessInstanceId()); + pzBph.setUserId(zhrUserId); + pzBph.setTaskKey(BussLibraryNodeKeyEnum.BUSS_LIBRARY11.getValue()); + pzBph.setFlowType(FlowTypeEnum.QBZXD_JSBZ.getValue()); + pzBph.setIsSub("2"); + pzBph.setIsMany("2"); + int orderNum = bphService.getMaxOrderNum(delegateTask.getProcessInstanceId(), BussLibraryNodeKeyEnum.BUSS_LIBRARY10.getValue()); + pzBph.setOrderNum(orderNum + 1); + bphList.add(pzBph); - bphService.insertBatch(bphList); - bphService.updateOrderNum(delegateTask.getProcessInstanceId(), orderNum + 1, bphList.size()); + bphService.insertBatch(bphList); + bphService.updateOrderNum(delegateTask.getProcessInstanceId(), orderNum + 1, bphList.size()); + } + } else { + if (CollectionUtils.isNotEmpty(zhrUserIdList)) { + List bphList = new ArrayList<>(); + int orderNum = bphService.getMaxOrderNum(delegateTask.getProcessInstanceId(),BussLibraryNodeKeyEnum.BUSS_LIBRARY10.getValue()); + String pzPBphId = UUID.randomUUID().toString(); + for (String userId : zhrUserIdList) { + QueryWrapper bphQueryWrap = new QueryWrapper<>(); + bphQueryWrap.lambda().eq(BusProcessHistory::getActiProcInstId,delegateTask.getProcessInstanceId()); + bphQueryWrap.lambda().eq(BusProcessHistory::getUserId,userId); + bphQueryWrap.lambda().eq(BusProcessHistory::getTaskKey, BussLibraryNodeKeyEnum.BUSS_LIBRARY11.getValue()); + bphQueryWrap.lambda().isNull(BusProcessHistory::getTaskId); + List busProcessHistoryList = bphService.list(bphQueryWrap); + if (CollectionUtils.isEmpty(busProcessHistoryList)) { + BusProcessHistory pzBph = new BusProcessHistory(); + pzBph.setActiProcInstId(delegateTask.getProcessInstanceId()); + pzBph.setUserId(userId); + pzBph.setTaskKey(BussLibraryNodeKeyEnum.BUSS_LIBRARY11.getValue()); + pzBph.setFlowType(FlowTypeEnum.QBZXD_JSBZ.getValue()); + pzBph.setOrderNum(BussLibraryNodeKeyEnum.BUSS_LIBRARY11.getOrderNum()); + pzBph.setIsSub("2"); + pzBph.setIsMany("1"); + pzBph.setManyPId(pzPBphId); + pzBph.setOrderNum(orderNum + 1); + bphList.add(pzBph); + } + } + + if (CollectionUtils.isNotEmpty(bphList)) { + BusProcessHistory pzPBph = new BusProcessHistory(); + pzPBph.setId(pzPBphId); + pzPBph.setActiProcInstId(delegateTask.getProcessInstanceId()); + pzPBph.setTaskKey(BussLibraryNodeKeyEnum.BUSS_LIBRARY11.getValue()); + pzPBph.setFlowType(FlowTypeEnum.QBZXD_JSBZ.getValue()); + pzPBph.setOrderNum(BussLibraryNodeKeyEnum.BUSS_LIBRARY11.getOrderNum()); + pzPBph.setIsSub("2"); + pzPBph.setIsMany("1"); + pzPBph.setOrderNum(orderNum + 1); + bphList.add(pzPBph); + + bphService.insertBatch(bphList); + bphService.updateOrderNum(delegateTask.getProcessInstanceId(),orderNum + 1,bphList.size()); + } + } } } else if (fzrFlag == 1) { String cxdUserId = (String) delegateTask.getVariable("cxdUserId"); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary11After.java b/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary11After.java index ed3eeb4d..1545b144 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary11After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary11After.java @@ -11,17 +11,22 @@ import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessHistoryService; import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNameService; import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService; import com.ydw.bat.wkflow.business_main.datas.service.IDatasService; +import com.ydw.bat.wkflow.business_oa.webService.service.WebServiceOAService; import com.ydw.bat.wkflow.util.SpringContextUtil; import com.ydw.bat.wkflow.util.enums.BussLibraryNodeKeyEnum; import com.ydw.bat.wkflow.util.enums.FlowTypeEnum; import org.activiti.engine.ActivitiException; +import org.activiti.engine.HistoryService; import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; +import org.activiti.engine.history.HistoricTaskInstance; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang.StringUtils; import java.util.ArrayList; import java.util.List; +import java.util.Objects; +import java.util.stream.Collectors; /** * 专委会主任/总院院长或主管副院长批准后 @@ -32,6 +37,7 @@ public class BussLibrary11After implements TaskListener{ IDatasService datasService = SpringContextUtil.getBean(IDatasService.class); IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class); + WebServiceOAService webServiceOAService = SpringContextUtil.getBean(WebServiceOAService.class); QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId()); @@ -75,13 +81,76 @@ public class BussLibrary11After implements TaskListener{ delegateTask.setVariable("pxUserId",object.getString("pxUserId")); nextUserList.add(object.getString("pxUserId")); -// BussUtils.approvalFunc2(delegateTask, object, prcName, nextUserList); - BussUtils.approvalFunc3(delegateTask, object, prcName, nextUserList); + // 存储当前节点意见 + LambdaQueryWrapper queryWrapper1 = new LambdaQueryWrapper<>(); + queryWrapper1.eq(BusProcessNew::getTaskId,delegateTask.getId()); + List list = busBean.list(queryWrapper1); + if (list.isEmpty()) { + throw new ActivitiException("流程实例不存在"); + } + // 当前节点 + BusProcessNew busProcessNew = list.get(0); + busProcessNew.setCommitText(object.getString("commentText")); + busProcessNew.setTaskId(delegateTask.getId()); + busProcessNew.setTaskInfo(delegateTask.getName()); + busBean.saveOrUpdate(busProcessNew); + + // 下一个节点 + try { + Integer nrOfCompletedInstances = delegateTask.getVariable("nrOfCompletedInstances", Integer.class); + if (nrOfCompletedInstances == 0) { + for (String nextUser : nextUserList) { + BusProcessNew busProcessNewNext = new BusProcessNew(); + busProcessNewNext.setMsgType("clause"); + busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); + busProcessNewNext.setMesg(object.toJSONString()); + busProcessNewNext.setFinishFlag("0"); + busProcessNewNext.setUserId(nextUser); + busProcessNewNext.setPrcName(prcName); + busBean.save(busProcessNewNext); + } + } + } catch (NullPointerException e) { + // 对旧数据做兼容，旧流程是单人处理节点没有 nrOfCompletedInstances + for (String nextUser : nextUserList) { + BusProcessNew busProcessNewNext = new BusProcessNew(); + busProcessNewNext.setMsgType("clause"); + busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); + busProcessNewNext.setMesg(object.toJSONString()); + busProcessNewNext.setFinishFlag("0"); + busProcessNewNext.setUserId(nextUser); + busProcessNewNext.setPrcName(prcName); + busBean.save(busProcessNewNext); + } + } + delegateTask.setVariable("zrFlag", 0); }else { throw new ActivitiException("1#2主起草人用户参数不存在,请配置相关用户"); } } else { + HistoryService historyService = SpringContextUtil.getBean(HistoryService.class); + + // 改为多人处理节点后需要驳回需要删除未完成人员的待办OA + List historicTaskInstanceList = historyService.createHistoricTaskInstanceQuery() + .processInstanceId(delegateTask.getProcessInstanceId()) + .taskDefinitionKey(delegateTask.getTaskDefinitionKey()) + .unfinished() + .list(); + List unFinishedTaskIdList = historicTaskInstanceList.stream() + .map(HistoricTaskInstance::getId) + .filter(taskId -> !Objects.equals(taskId, delegateTask.getId())) + .collect(Collectors.toList()); + if (CollectionUtils.isNotEmpty(unFinishedTaskIdList)) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(BusProcessNew::getPId, delegateTask.getProcessInstanceId()); + wrapper.in(BusProcessNew::getTaskId, unFinishedTaskIdList); + List busProcessNewList = busBean.list(wrapper); + for (BusProcessNew busProcessNew : busProcessNewList) { + webServiceOAService.deleteOAByMandatory(busProcessNew.getId(), busProcessNew.getUserId()); + } + } + if(StringUtils.isNotBlank(object.getString("xdUserId"))) { // 驳回节点数据 BusProcessNew busProcessNew = new BusProcessNew(); From 3608c1e5e2353c1eb66b3142e2895a4628ac59c8 Mon Sep 17 00:00:00 2001 From: wxyclub Date: Sun, 28 Apr 2024 11:26:36 +0800 Subject: [PATCH 3/7] =?UTF-8?q?fix:=20=E5=A4=96=E9=83=A8=E7=BD=B2=E5=90=8D?= =?UTF-8?q?=E6=8E=A8=E8=8D=90=E5=AE=A1=E6=89=B9=E6=B5=81=E7=A8=8B=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../RecommendedApproval/RAAuditAfter.java | 5 ++-- .../RAModifyInformationAfter.java | 24 +++++++++++++------ .../RecommendedApproval/RASignAfter.java | 7 +++--- .../RAValidationAfter.java | 9 +++---- 4 files changed, 29 insertions(+), 16 deletions(-) diff --git a/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAAuditAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAAuditAfter.java index d8e2812a..ce1b9604 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAAuditAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAAuditAfter.java @@ -31,6 +31,7 @@ public class RAAuditAfter implements TaskListener { Datas datas = datasService.getOne(queryWrapper); JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); + JSONObject roleForm = object.getJSONObject("roleForm"); delegateTask.setVariable("objectJson", object); List nextUserList = new ArrayList(); @@ -46,8 +47,8 @@ public class RAAuditAfter implements TaskListener { } //截止时间 流程描述 创建人 - String user = object.getString("prcCreateUser"); - String username = object.getString("prcCreateUserName"); + String user = roleForm.getString("prcCreateUser"); + String username = roleForm.getString("prcCreateUserName"); delegateTask.setVariable("prcCreateUser", user); delegateTask.setVariable("prcCreateUserName", username); String prcName=""; diff --git a/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAModifyInformationAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAModifyInformationAfter.java index 11ff39b7..eaad9faf 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAModifyInformationAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAModifyInformationAfter.java @@ -12,6 +12,7 @@ import com.ydw.bat.wkflow.util.SpringContextUtil; import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; public class RAModifyInformationAfter implements TaskListener { @@ -31,19 +32,27 @@ public class RAModifyInformationAfter implements TaskListener { JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); delegateTask.setVariable("objectJson", object); - List nextUserList = new ArrayList(); - - nextUserList.addAll(delegateTask.getVariable("leadershiplist",List.class)); - + List nextUserList = new ArrayList<>(); //截止时间 流程描述 创建人 - String user = object.getString("prcCreateUser"); - String username = object.getString("prcCreateUserName"); + JSONObject roleForm = object.getJSONObject("roleForm"); + String user = roleForm.getString("prcCreateUser"); + String username = roleForm.getString("prcCreateUserName"); + String dockUser = roleForm.getString("dockUser"); + List dockUserList = Arrays.asList(dockUser.split(",")); delegateTask.setVariable("prcCreateUser", user); delegateTask.setVariable("prcCreateUserName", username); + // 赋值 + delegateTask.setVariable("leadershiplist", dockUserList); + delegateTask.setVariable("statuteminister1", roleForm.getString("ministerUser")); + delegateTask.setVariable("director1", roleForm.getString("directorUser")); + delegateTask.setVariable("dean1", roleForm.getString("president")); + delegateTask.setVariable("statuteengineer3", roleForm.getString("passUser")); + nextUserList.addAll(dockUserList); + String prcName = "外部署名推荐批准-署名领导会签"; - QueryWrapper queryWrapper2 = new QueryWrapper(); + QueryWrapper queryWrapper2 = new QueryWrapper<>(); queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); @@ -52,6 +61,7 @@ public class RAModifyInformationAfter implements TaskListener { // one1.setPrcName(prcName); one1.setCreatUser(user); one1.setCreatUserName(username); + one1.setMes(datas.getFormValsJson()); busProcessNameService.saveOrUpdate(one1); } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RASignAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RASignAfter.java index f4b1179e..55b08960 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RASignAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RASignAfter.java @@ -31,6 +31,7 @@ public class RASignAfter implements TaskListener { Datas datas = datasService.getOne(queryWrapper); JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); + JSONObject roleForm = object.getJSONObject("roleForm"); delegateTask.setVariable("objectJson", object); List nextUserList = new ArrayList(); @@ -46,8 +47,8 @@ public class RASignAfter implements TaskListener { } //截止时间 流程描述 创建人 - String user = object.getString("prcCreateUser"); - String username = object.getString("prcCreateUserName"); + String user = roleForm.getString("prcCreateUser"); + String username = roleForm.getString("prcCreateUserName"); delegateTask.setVariable("prcCreateUser", user); delegateTask.setVariable("prcCreateUserName", username); String prcName=""; @@ -58,7 +59,7 @@ public class RASignAfter implements TaskListener { } - QueryWrapper queryWrapper2 = new QueryWrapper(); + QueryWrapper queryWrapper2 = new QueryWrapper<>(); queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAValidationAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAValidationAfter.java index 15647d60..ffced68a 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAValidationAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAValidationAfter.java @@ -32,9 +32,10 @@ public class RAValidationAfter implements TaskListener { Datas datas = datasService.getOne(queryWrapper); JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); + JSONObject roleForm = object.getJSONObject("roleForm"); delegateTask.setVariable("objectJson", object); - List nextUserList = new ArrayList(); + List nextUserList = new ArrayList<>(); if(object.getString("signFlag").equals("1")) { delegateTask.setVariable("zrFlag", 1); @@ -47,8 +48,8 @@ public class RAValidationAfter implements TaskListener { } //截止时间 流程描述 创建人 - String user = object.getString("prcCreateUser"); - String username = object.getString("prcCreateUserName"); + String user = roleForm.getString("prcCreateUser"); + String username = roleForm.getString("prcCreateUserName"); delegateTask.setVariable("prcCreateUser", user); delegateTask.setVariable("prcCreateUserName", username); @@ -59,7 +60,7 @@ public class RAValidationAfter implements TaskListener { prcName = "外部署名推荐批准-修改信息"; } - QueryWrapper queryWrapper2 = new QueryWrapper(); + QueryWrapper queryWrapper2 = new QueryWrapper<>(); queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); From c205381d52d71e56fb343b886e2079521d25e4e4 Mon Sep 17 00:00:00 2001 From: wxyclub Date: Sun, 28 Apr 2024 15:33:48 +0800 Subject: [PATCH 4/7] =?UTF-8?q?fix:=20=E5=8A=A0=E5=85=A5=E6=A0=87=E5=87=86?= =?UTF-8?q?=E5=8C=96=E5=8D=8F=E4=BC=9A=E4=BF=A1=E6=81=AF=E5=A4=87=E6=A1=88?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=E6=B5=81=E7=A8=8B=E5=9B=9E=E6=89=A7=E4=B8=8D?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../JoinStandardFiling/JSFApproveBefore.java | 1 + .../JoinStandardFiling/JSFAuditBefore.java | 1 + .../JSFFillinformationBefore.java | 1 + .../JoinStandardFiling/JSFstartAfter.java | 25 ++++++++++--------- 4 files changed, 16 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/ydw/bat/wkflow/listener/JoinStandardFiling/JSFApproveBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/JoinStandardFiling/JSFApproveBefore.java index d06ce9e4..700c78d1 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/JoinStandardFiling/JSFApproveBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/JoinStandardFiling/JSFApproveBefore.java @@ -21,6 +21,7 @@ public class JSFApproveBefore implements TaskListener { List list = busBean.list(queryWrapper1); if(!list.isEmpty()){ BusProcessNew one1 = list.get(0); + one1.setTaskInfo(delegateTask.getName()); one1.setTaskId(delegateTask.getId()); busBean.saveOrUpdate(one1); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/JoinStandardFiling/JSFAuditBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/JoinStandardFiling/JSFAuditBefore.java index 5611e898..005709da 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/JoinStandardFiling/JSFAuditBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/JoinStandardFiling/JSFAuditBefore.java @@ -21,6 +21,7 @@ public class JSFAuditBefore implements TaskListener { List list = busBean.list(queryWrapper1); if(!list.isEmpty()){ BusProcessNew one1 = list.get(0); + one1.setTaskInfo(delegateTask.getName()); one1.setTaskId(delegateTask.getId()); busBean.saveOrUpdate(one1); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/JoinStandardFiling/JSFFillinformationBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/JoinStandardFiling/JSFFillinformationBefore.java index 7bf8580a..7872c6f8 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/JoinStandardFiling/JSFFillinformationBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/JoinStandardFiling/JSFFillinformationBefore.java @@ -22,6 +22,7 @@ public class JSFFillinformationBefore implements TaskListener { if(!list.isEmpty()){ BusProcessNew one1 = list.get(0); one1.setTaskId(delegateTask.getId()); + one1.setTaskInfo(delegateTask.getName()); busBean.saveOrUpdate(one1); CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/JoinStandardFiling/JSFstartAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/JoinStandardFiling/JSFstartAfter.java index ad0cbeb8..28084201 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/JoinStandardFiling/JSFstartAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/JoinStandardFiling/JSFstartAfter.java @@ -66,20 +66,21 @@ public class JSFstartAfter implements TaskListener { one1.setCreatUserName(username); busProcessNameService.saveOrUpdate(one1); } - if (null != object.getString("commentText")) { - BusProcessNew busProcessNews = new BusProcessNew(); - busProcessNews.setMsgType("clause"); - busProcessNews.setPId(delegateTask.getProcessInstanceId()); - busProcessNews.setMesg(object.toJSONString()); - busProcessNews.setTaskInfo(delegateTask.getTaskDefinitionKey()); - busProcessNews.setFinishFlag("0"); - busProcessNews.setTaskInfo(delegateTask.getName()); - busProcessNews.setTaskId(delegateTask.getId()); - busProcessNews.setUserId("start"); - busProcessNews.setPrcName(prcName); + BusProcessNew busProcessNews = new BusProcessNew(); + busProcessNews.setMsgType("clause"); + busProcessNews.setPId(delegateTask.getProcessInstanceId()); + busProcessNews.setMesg(object.toJSONString()); + busProcessNews.setTaskInfo(delegateTask.getTaskDefinitionKey()); + busProcessNews.setFinishFlag("0"); + busProcessNews.setTaskInfo(delegateTask.getName()); + busProcessNews.setTaskId(delegateTask.getId()); + busProcessNews.setUserId("start"); + busProcessNews.setPrcName(prcName); + if (object.containsKey("commentText")) { + busProcessNews.setCommitFlag("1"); busProcessNews.setCommitText(object.getString("commentText")); - busBean.save(busProcessNews); } + busBean.save(busProcessNews); if (nextUserList != null && !nextUserList.isEmpty()) { for (String nextUser : nextUserList) { From 66ab2fd86f0b6f6c22f7ee9b31221635480211b5 Mon Sep 17 00:00:00 2001 From: wxyclub Date: Sun, 28 Apr 2024 16:56:04 +0800 Subject: [PATCH 5/7] =?UTF-8?q?fix:=20=E6=B5=81=E7=A8=8B=E5=9B=9E=E6=89=A7?= =?UTF-8?q?=E4=B8=8D=E6=98=BE=E7=A4=BA=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../JoinStandardFiling/JSFstartAfter.java | 3 +- .../PRFApproveBefore.java | 1 + .../PRFEngineerreviewBefore.java | 1 + .../PRFFillinformationBefore.java | 1 + .../PRFReviewdockBefore.java | 1 + .../PRFUnderengineerBefore.java | 1 + .../PRFstartAfter.java | 30 ++++++++++--------- .../RecommendedApproval/RAstartAfter.java | 28 +++++++++-------- .../ChargeVerifyBefore.java | 1 + .../DirectorChooseBefore.java | 1 + .../EngineerReviseBefore.java | 1 + .../EngineerReviseDoneBefore.java | 1 + .../LeaderVerifyBefore.java | 1 + .../StandardMeetProcess/ManageSignBefore.java | 1 + .../PresidentVerifyBefore.java | 1 + .../WriteMaterialAfter.java | 9 +++--- .../WriteMaterialBefore.java | 1 + .../WriteMemberInfoBefore.java | 1 + 18 files changed, 53 insertions(+), 31 deletions(-) diff --git a/src/main/java/com/ydw/bat/wkflow/listener/JoinStandardFiling/JSFstartAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/JoinStandardFiling/JSFstartAfter.java index 28084201..43b14ac7 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/JoinStandardFiling/JSFstartAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/JoinStandardFiling/JSFstartAfter.java @@ -11,6 +11,7 @@ import com.ydw.bat.wkflow.business_main.datas.service.IDatasService; import com.ydw.bat.wkflow.util.SpringContextUtil; import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; +import org.apache.commons.lang.StringUtils; import java.util.ArrayList; import java.util.Arrays; @@ -76,7 +77,7 @@ public class JSFstartAfter implements TaskListener { busProcessNews.setTaskId(delegateTask.getId()); busProcessNews.setUserId("start"); busProcessNews.setPrcName(prcName); - if (object.containsKey("commentText")) { + if (object.containsKey("commentText") && StringUtils.isNotBlank(object.getString("commentText"))) { busProcessNews.setCommitFlag("1"); busProcessNews.setCommitText(object.getString("commentText")); } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFApproveBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFApproveBefore.java index decdcb09..ec371dc7 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFApproveBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFApproveBefore.java @@ -21,6 +21,7 @@ public class PRFApproveBefore implements TaskListener { List list = busBean.list(queryWrapper1); if(!list.isEmpty()){ BusProcessNew one1 = list.get(0); + one1.setTaskInfo(delegateTask.getName()); one1.setTaskId(delegateTask.getId()); busBean.saveOrUpdate(one1); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFEngineerreviewBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFEngineerreviewBefore.java index 34b4f18d..5f16eac8 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFEngineerreviewBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFEngineerreviewBefore.java @@ -21,6 +21,7 @@ public class PRFEngineerreviewBefore implements TaskListener { List list = busBean.list(queryWrapper1); if(!list.isEmpty()){ BusProcessNew one1 = list.get(0); + one1.setTaskInfo(delegateTask.getName()); one1.setTaskId(delegateTask.getId()); busBean.saveOrUpdate(one1); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFFillinformationBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFFillinformationBefore.java index ad34f0ff..54b4a300 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFFillinformationBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFFillinformationBefore.java @@ -21,6 +21,7 @@ public class PRFFillinformationBefore implements TaskListener { List list = busBean.list(queryWrapper1); if(!list.isEmpty()){ BusProcessNew one1 = list.get(0); + one1.setTaskInfo(delegateTask.getName()); one1.setTaskId(delegateTask.getId()); busBean.saveOrUpdate(one1); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFReviewdockBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFReviewdockBefore.java index 24f116c8..bc18d6f2 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFReviewdockBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFReviewdockBefore.java @@ -21,6 +21,7 @@ public class PRFReviewdockBefore implements TaskListener { List list = busBean.list(queryWrapper1); if(!list.isEmpty()){ BusProcessNew one1 = list.get(0); + one1.setTaskInfo(delegateTask.getName()); one1.setTaskId(delegateTask.getId()); busBean.saveOrUpdate(one1); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFUnderengineerBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFUnderengineerBefore.java index 3f9e7fed..1a72bec4 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFUnderengineerBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFUnderengineerBefore.java @@ -21,6 +21,7 @@ public class PRFUnderengineerBefore implements TaskListener { List list = busBean.list(queryWrapper1); if(!list.isEmpty()){ BusProcessNew one1 = list.get(0); + one1.setTaskInfo(delegateTask.getName()); one1.setTaskId(delegateTask.getId()); busBean.saveOrUpdate(one1); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFstartAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFstartAfter.java index 693250c1..8cb61520 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFstartAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFstartAfter.java @@ -11,6 +11,7 @@ import com.ydw.bat.wkflow.business_main.datas.service.IDatasService; import com.ydw.bat.wkflow.util.SpringContextUtil; import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; +import org.apache.commons.lang.StringUtils; import java.util.ArrayList; import java.util.Arrays; @@ -33,7 +34,7 @@ public class PRFstartAfter implements TaskListener { JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); delegateTask.setVariable("objectJson", object); - List nextUserList = new ArrayList(); + List nextUserList = new ArrayList<>(); String ids=object.getString("dockUser"); if(ids.contains(",")){ nextUserList=new ArrayList<>(Arrays.asList(ids.split(","))); @@ -55,7 +56,7 @@ public class PRFstartAfter implements TaskListener { delegateTask.setVariable("prcCreateUserName", username); String prcName = "参与外部标准制修订备案-备案任务下发"; - QueryWrapper queryWrapper2 = new QueryWrapper(); + QueryWrapper queryWrapper2 = new QueryWrapper<>(); queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); @@ -67,20 +68,21 @@ public class PRFstartAfter implements TaskListener { busProcessNameService.saveOrUpdate(one1); } - if (null != object.getString("commentText")) { - BusProcessNew busProcessNews = new BusProcessNew(); - busProcessNews.setMsgType("clause"); - busProcessNews.setPId(delegateTask.getProcessInstanceId()); - busProcessNews.setMesg(object.toJSONString()); - busProcessNews.setTaskInfo(delegateTask.getTaskDefinitionKey()); - busProcessNews.setFinishFlag("0"); - busProcessNews.setTaskInfo(delegateTask.getName()); - busProcessNews.setTaskId(delegateTask.getId()); - busProcessNews.setUserId("start"); - busProcessNews.setPrcName(prcName); + BusProcessNew busProcessNews = new BusProcessNew(); + busProcessNews.setMsgType("clause"); + busProcessNews.setPId(delegateTask.getProcessInstanceId()); + busProcessNews.setMesg(object.toJSONString()); + busProcessNews.setTaskInfo(delegateTask.getTaskDefinitionKey()); + busProcessNews.setFinishFlag("0"); + busProcessNews.setTaskInfo(delegateTask.getName()); + busProcessNews.setTaskId(delegateTask.getId()); + busProcessNews.setUserId("start"); + busProcessNews.setPrcName(prcName); + if (object.containsKey("commentText") && StringUtils.isNotBlank(object.getString("commentText"))) { + busProcessNews.setCommitFlag("1"); busProcessNews.setCommitText(object.getString("commentText")); - busBean.save(busProcessNews); } + busBean.save(busProcessNews); if (nextUserList != null && !nextUserList.isEmpty()) { for (String nextUser : nextUserList) { diff --git a/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAstartAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAstartAfter.java index eb955ceb..a9c26c4a 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAstartAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAstartAfter.java @@ -11,6 +11,8 @@ import com.ydw.bat.wkflow.business_main.datas.service.IDatasService; import com.ydw.bat.wkflow.util.SpringContextUtil; import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; +import org.apache.commons.lang.StringUtils; + import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -69,20 +71,22 @@ public class RAstartAfter implements TaskListener { busProcessNameService.saveOrUpdate(one1); } - if (null != object.getString("commentText")) { - BusProcessNew busProcessNews = new BusProcessNew(); - busProcessNews.setMsgType("clause"); - busProcessNews.setPId(delegateTask.getProcessInstanceId()); - busProcessNews.setMesg(object.toJSONString()); - busProcessNews.setTaskInfo(delegateTask.getTaskDefinitionKey()); - busProcessNews.setFinishFlag("0"); - busProcessNews.setTaskInfo(delegateTask.getName()); - busProcessNews.setTaskId(delegateTask.getId()); - busProcessNews.setUserId("start"); - busProcessNews.setPrcName(prcName); + BusProcessNew busProcessNews = new BusProcessNew(); + busProcessNews.setMsgType("clause"); + busProcessNews.setPId(delegateTask.getProcessInstanceId()); + busProcessNews.setMesg(object.toJSONString()); + busProcessNews.setTaskInfo(delegateTask.getTaskDefinitionKey()); + busProcessNews.setFinishFlag("0"); + busProcessNews.setTaskInfo(delegateTask.getName()); + busProcessNews.setTaskId(delegateTask.getId()); + busProcessNews.setUserId("start"); + busProcessNews.setPrcName(prcName); + if (object.containsKey("commentText") && StringUtils.isNotBlank(object.getString("commentText"))) { + busProcessNews.setCommitFlag("1"); busProcessNews.setCommitText(object.getString("commentText")); - busBean.save(busProcessNews); } + busBean.save(busProcessNews); + if (nextUserList != null && !nextUserList.isEmpty()) { for (String nextUser : nextUserList) { diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/ChargeVerifyBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/ChargeVerifyBefore.java index 64dcf54e..933c7bb5 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/ChargeVerifyBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/ChargeVerifyBefore.java @@ -24,6 +24,7 @@ public class ChargeVerifyBefore implements TaskListener { List list = busBean.list(queryWrapper1); if(!list.isEmpty()){ BusProcessNew one1 = list.get(0); + one1.setTaskInfo(delegateTask.getName()); one1.setTaskId(delegateTask.getId()); busBean.saveOrUpdate(one1); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/DirectorChooseBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/DirectorChooseBefore.java index 6378a207..391c8fe2 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/DirectorChooseBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/DirectorChooseBefore.java @@ -23,6 +23,7 @@ public class DirectorChooseBefore implements TaskListener { List list = busBean.list(queryWrapper1); if(!list.isEmpty()){ BusProcessNew one1 = list.get(0); + one1.setTaskInfo(delegateTask.getName()); one1.setTaskId(delegateTask.getId()); busBean.saveOrUpdate(one1); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/EngineerReviseBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/EngineerReviseBefore.java index 12728e69..e6dedc16 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/EngineerReviseBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/EngineerReviseBefore.java @@ -23,6 +23,7 @@ public class EngineerReviseBefore implements TaskListener { List list = busBean.list(queryWrapper1); if(!list.isEmpty()){ BusProcessNew one1 = list.get(0); + one1.setTaskInfo(delegateTask.getName()); one1.setTaskId(delegateTask.getId()); busBean.saveOrUpdate(one1); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/EngineerReviseDoneBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/EngineerReviseDoneBefore.java index 417fd319..d35c94f1 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/EngineerReviseDoneBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/EngineerReviseDoneBefore.java @@ -23,6 +23,7 @@ public class EngineerReviseDoneBefore implements TaskListener { List list = busBean.list(queryWrapper1); if(!list.isEmpty()){ BusProcessNew one1 = list.get(0); + one1.setTaskInfo(delegateTask.getName()); one1.setTaskId(delegateTask.getId()); busBean.saveOrUpdate(one1); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/LeaderVerifyBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/LeaderVerifyBefore.java index 68af5ca9..407b606f 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/LeaderVerifyBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/LeaderVerifyBefore.java @@ -23,6 +23,7 @@ public class LeaderVerifyBefore implements TaskListener { List list = busBean.list(queryWrapper1); if(!list.isEmpty()){ BusProcessNew one1 = list.get(0); + one1.setTaskInfo(delegateTask.getName()); one1.setTaskId(delegateTask.getId()); busBean.saveOrUpdate(one1); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/ManageSignBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/ManageSignBefore.java index e3e4ca4d..7730251e 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/ManageSignBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/ManageSignBefore.java @@ -23,6 +23,7 @@ public class ManageSignBefore implements TaskListener { List list = busBean.list(queryWrapper1); if(!list.isEmpty()){ BusProcessNew one1 = list.get(0); + one1.setTaskInfo(delegateTask.getName()); one1.setTaskId(delegateTask.getId()); busBean.saveOrUpdate(one1); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/PresidentVerifyBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/PresidentVerifyBefore.java index bbb8a082..ceaf3f47 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/PresidentVerifyBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/PresidentVerifyBefore.java @@ -23,6 +23,7 @@ public class PresidentVerifyBefore implements TaskListener { List list = busBean.list(queryWrapper1); if(!list.isEmpty()){ BusProcessNew one1 = list.get(0); + one1.setTaskInfo(delegateTask.getName()); one1.setTaskId(delegateTask.getId()); busBean.saveOrUpdate(one1); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/WriteMaterialAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/WriteMaterialAfter.java index bab0ec60..47dbbaba 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/WriteMaterialAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/WriteMaterialAfter.java @@ -61,7 +61,7 @@ public class WriteMaterialAfter implements TaskListener { String standName = object.getString("listName"); delegateTask.setVariable("listName", standName); - QueryWrapper queryWrapper2 = new QueryWrapper(); + QueryWrapper queryWrapper2 = new QueryWrapper<>(); queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); if (one1 != null) { @@ -71,7 +71,6 @@ public class WriteMaterialAfter implements TaskListener { one1.setCreatUserName(username); busProcessNameService.saveOrUpdate(one1); } - if (null != object.getString("commentText")) { BusProcessNew busProcessNews = new BusProcessNew(); busProcessNews.setMsgType("clause"); busProcessNews.setPId(delegateTask.getProcessInstanceId()); @@ -82,9 +81,11 @@ public class WriteMaterialAfter implements TaskListener { busProcessNews.setTaskId(delegateTask.getId()); busProcessNews.setUserId("start"); busProcessNews.setPrcName(prcName); - busProcessNews.setCommitText(object.getString("commentText")); + if (object.containsKey("commentText") && StringUtils.isNotBlank(object.getString("commentText"))) { + busProcessNews.setCommitFlag("1"); + busProcessNews.setCommitText(object.getString("commentText")); + } busBean.save(busProcessNews); - } JSONObject object1 = object.getJSONObject("ch_pageData"); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/WriteMaterialBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/WriteMaterialBefore.java index 91e65bf8..643d1074 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/WriteMaterialBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/WriteMaterialBefore.java @@ -24,6 +24,7 @@ public class WriteMaterialBefore implements TaskListener { List list = busBean.list(queryWrapper1); if(!list.isEmpty()){ BusProcessNew one1 = list.get(0); + one1.setTaskInfo(delegateTask.getName()); one1.setTaskId(delegateTask.getId()); busBean.saveOrUpdate(one1); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/WriteMemberInfoBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/WriteMemberInfoBefore.java index 845055e3..df02e8c6 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/WriteMemberInfoBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/WriteMemberInfoBefore.java @@ -23,6 +23,7 @@ public class WriteMemberInfoBefore implements TaskListener { List list = busBean.list(queryWrapper1); if(!list.isEmpty()){ BusProcessNew one1 = list.get(0); + one1.setTaskInfo(delegateTask.getName()); one1.setTaskId(delegateTask.getId()); busBean.saveOrUpdate(one1); From 942c19c271b41fe297a67a78b4e25aceb7ace9e8 Mon Sep 17 00:00:00 2001 From: wxyclub Date: Sun, 28 Apr 2024 17:25:26 +0800 Subject: [PATCH 6/7] =?UTF-8?q?fix:=20=E6=A0=87=E5=87=86=E5=8C=96=E5=8D=8F?= =?UTF-8?q?=E4=BC=9A=E5=85=A5=E4=BC=9A=E6=B5=81=E7=A8=8B=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E5=9B=9E=E6=89=A7=E4=B8=8D=E6=98=BE=E7=A4=BA=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ChargeVerifyBefore.java | 1 + .../DirectorChooseBefore.java | 1 + .../EngineerReviseBefore.java | 1 + .../EngineerReviseDoneBefore.java | 1 + .../LeaderVerifyBefore.java | 1 + .../ManageSignBefore.java | 1 + .../PresidentVerifyBefore.java | 1 + .../WriteMaterialAfter.java | 25 ++++++++++--------- .../WriteMemberInfoBefore.java | 1 + 9 files changed, 21 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/ChargeVerifyBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/ChargeVerifyBefore.java index 475e88cc..342bb473 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/ChargeVerifyBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/ChargeVerifyBefore.java @@ -23,6 +23,7 @@ public class ChargeVerifyBefore implements TaskListener { List list = busBean.list(queryWrapper1); if(!list.isEmpty()){ BusProcessNew one1 = list.get(0); + one1.setTaskInfo(delegateTask.getName()); one1.setTaskId(delegateTask.getId()); busBean.saveOrUpdate(one1); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/DirectorChooseBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/DirectorChooseBefore.java index 34411513..f0d0cdac 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/DirectorChooseBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/DirectorChooseBefore.java @@ -24,6 +24,7 @@ public class DirectorChooseBefore implements TaskListener { List list = busBean.list(queryWrapper1); if(!list.isEmpty()){ BusProcessNew one1 = list.get(0); + one1.setTaskInfo(delegateTask.getName()); one1.setTaskId(delegateTask.getId()); busBean.saveOrUpdate(one1); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseBefore.java index cdbe19ed..c60753e7 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseBefore.java @@ -24,6 +24,7 @@ public class EngineerReviseBefore implements TaskListener { List list = busBean.list(queryWrapper1); if(!list.isEmpty()){ BusProcessNew one1 = list.get(0); + one1.setTaskInfo(delegateTask.getName()); one1.setTaskId(delegateTask.getId()); busBean.saveOrUpdate(one1); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseDoneBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseDoneBefore.java index ffed6d8c..ba61ab2b 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseDoneBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseDoneBefore.java @@ -24,6 +24,7 @@ public class EngineerReviseDoneBefore implements TaskListener { List list = busBean.list(queryWrapper1); if(!list.isEmpty()){ BusProcessNew one1 = list.get(0); + one1.setTaskInfo(delegateTask.getName()); one1.setTaskId(delegateTask.getId()); busBean.saveOrUpdate(one1); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/LeaderVerifyBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/LeaderVerifyBefore.java index 22058ddd..161aa8b2 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/LeaderVerifyBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/LeaderVerifyBefore.java @@ -26,6 +26,7 @@ public class LeaderVerifyBefore implements TaskListener { List list = busBean.list(queryWrapper1); if(!list.isEmpty()){ BusProcessNew one1 = list.get(0); + one1.setTaskInfo(delegateTask.getName()); one1.setTaskId(delegateTask.getId()); busBean.saveOrUpdate(one1); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/ManageSignBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/ManageSignBefore.java index 8659bb5c..3cf69697 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/ManageSignBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/ManageSignBefore.java @@ -24,6 +24,7 @@ public class ManageSignBefore implements TaskListener { List list = busBean.list(queryWrapper1); if(!list.isEmpty()){ BusProcessNew one1 = list.get(0); + one1.setTaskInfo(delegateTask.getName()); one1.setTaskId(delegateTask.getId()); busBean.saveOrUpdate(one1); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/PresidentVerifyBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/PresidentVerifyBefore.java index 0324f75a..c40cfe12 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/PresidentVerifyBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/PresidentVerifyBefore.java @@ -24,6 +24,7 @@ public class PresidentVerifyBefore implements TaskListener { List list = busBean.list(queryWrapper1); if(!list.isEmpty()){ BusProcessNew one1 = list.get(0); + one1.setTaskInfo(delegateTask.getName()); one1.setTaskId(delegateTask.getId()); busBean.saveOrUpdate(one1); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMaterialAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMaterialAfter.java index 1ac74d8a..d1e17c6e 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMaterialAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMaterialAfter.java @@ -77,20 +77,21 @@ public class WriteMaterialAfter implements TaskListener { busProcessNameService.saveOrUpdate(one1); } - if (null != object.getString("commentText")) { - BusProcessNew busProcessNews = new BusProcessNew(); - busProcessNews.setMsgType("clause"); - busProcessNews.setPId(delegateTask.getProcessInstanceId()); - busProcessNews.setMesg(object.toJSONString()); - busProcessNews.setTaskInfo(delegateTask.getTaskDefinitionKey()); - busProcessNews.setFinishFlag("0"); - busProcessNews.setTaskInfo(delegateTask.getName()); - busProcessNews.setTaskId(delegateTask.getId()); - busProcessNews.setUserId("start"); - busProcessNews.setPrcName(prcName); + BusProcessNew busProcessNews = new BusProcessNew(); + busProcessNews.setMsgType("clause"); + busProcessNews.setPId(delegateTask.getProcessInstanceId()); + busProcessNews.setMesg(object.toJSONString()); + busProcessNews.setTaskInfo(delegateTask.getTaskDefinitionKey()); + busProcessNews.setFinishFlag("0"); + busProcessNews.setTaskInfo(delegateTask.getName()); + busProcessNews.setTaskId(delegateTask.getId()); + busProcessNews.setUserId("start"); + busProcessNews.setPrcName(prcName); + if (object.containsKey("commentText") && StringUtils.isNotBlank(object.getString("commentText"))) { + busProcessNews.setCommitFlag("1"); busProcessNews.setCommitText(object.getString("commentText")); - busBean.save(busProcessNews); } + busBean.save(busProcessNews); JSONObject object1 = object.getJSONObject("rh_pageData"); WgWorkGroupShowDTO wgWorkGroupShowDTO = new WgWorkGroupShowDTO(); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMemberInfoBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMemberInfoBefore.java index 844af9b0..63b19d66 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMemberInfoBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMemberInfoBefore.java @@ -24,6 +24,7 @@ public class WriteMemberInfoBefore implements TaskListener { List list = busBean.list(queryWrapper1); if(!list.isEmpty()){ BusProcessNew one1 = list.get(0); + one1.setTaskInfo(delegateTask.getName()); one1.setTaskId(delegateTask.getId()); busBean.saveOrUpdate(one1); From c2456486e4a9d607e03352bb177614fa6649cb4f Mon Sep 17 00:00:00 2001 From: wxyclub Date: Sun, 28 Apr 2024 17:28:04 +0800 Subject: [PATCH 7/7] =?UTF-8?q?fix:=20=E5=A4=96=E9=83=A8=E7=BD=B2=E5=90=8D?= =?UTF-8?q?=E6=8E=A8=E8=8D=90=E6=89=B9=E5=87=86=E6=B5=81=E7=A8=8B=E5=9B=9E?= =?UTF-8?q?=E6=89=A7=E4=B8=8D=E6=98=BE=E7=A4=BA=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bat/wkflow/listener/RecommendedApproval/RAApproveBefore.java | 1 + .../bat/wkflow/listener/RecommendedApproval/RAAuditBefore.java | 1 + .../listener/RecommendedApproval/RAModifyInformationBefore.java | 1 + .../bat/wkflow/listener/RecommendedApproval/RASignBefore.java | 1 + .../wkflow/listener/RecommendedApproval/RAValidationBefore.java | 1 + 5 files changed, 5 insertions(+) diff --git a/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAApproveBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAApproveBefore.java index 7d69c72f..be990385 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAApproveBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAApproveBefore.java @@ -21,6 +21,7 @@ public class RAApproveBefore implements TaskListener{ List list = busBean.list(queryWrapper1); if(!list.isEmpty()){ BusProcessNew one1 = list.get(0); + one1.setTaskInfo(delegateTask.getName()); one1.setTaskId(delegateTask.getId()); busBean.saveOrUpdate(one1); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAAuditBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAAuditBefore.java index 045d2707..5241de57 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAAuditBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAAuditBefore.java @@ -21,6 +21,7 @@ public class RAAuditBefore implements TaskListener{ List list = busBean.list(queryWrapper1); if(!list.isEmpty()){ BusProcessNew one1 = list.get(0); + one1.setTaskInfo(delegateTask.getName()); one1.setTaskId(delegateTask.getId()); busBean.saveOrUpdate(one1); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAModifyInformationBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAModifyInformationBefore.java index 74ec459e..8338c2bf 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAModifyInformationBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAModifyInformationBefore.java @@ -21,6 +21,7 @@ public class RAModifyInformationBefore implements TaskListener{ List list = busBean.list(queryWrapper1); if(!list.isEmpty()){ BusProcessNew one1 = list.get(0); + one1.setTaskInfo(delegateTask.getName()); one1.setTaskId(delegateTask.getId()); busBean.saveOrUpdate(one1); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RASignBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RASignBefore.java index 6daf73b4..56bb5804 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RASignBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RASignBefore.java @@ -21,6 +21,7 @@ public class RASignBefore implements TaskListener{ List list = busBean.list(queryWrapper1); if(!list.isEmpty()){ BusProcessNew one1 = list.get(0); + one1.setTaskInfo(delegateTask.getName()); one1.setTaskId(delegateTask.getId()); busBean.saveOrUpdate(one1); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAValidationBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAValidationBefore.java index 45a75c36..31c527f2 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAValidationBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAValidationBefore.java @@ -21,6 +21,7 @@ public class RAValidationBefore implements TaskListener{ List list = busBean.list(queryWrapper1); if(!list.isEmpty()){ BusProcessNew one1 = list.get(0); + one1.setTaskInfo(delegateTask.getName()); one1.setTaskId(delegateTask.getId()); busBean.saveOrUpdate(one1);