From 17197f2c38072604d453df4bde9f94d781a7aeec Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Wed, 27 Oct 2021 09:21:10 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E6=A0=87=E5=87=86=E5=90=88=E8=A7=84?= =?UTF-8?q?=E8=AF=84=E4=BC=B0=E6=B5=81=E7=A8=8B=EF=BC=81=EF=BC=81=EF=BC=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../business_auth/LawsUserInfoService.java | 2 +- .../controller/BusProcessNewController.java | 8 ++++ .../datas/mapper/BusProcessNewMapper.java | 2 + .../datas/service/IBusProcessNewService.java | 2 + .../impl/BusProcessNewServiceImpl.java | 5 +++ .../RecommendedApproval/RAApproveAfter.java | 39 ++++++++----------- .../RecommendedApproval/RAAuditAfter.java | 9 ----- .../RAModifyInformationAfter.java | 11 ------ .../RecommendedApproval/RASignAfter.java | 9 ----- .../RAValidationAfter.java | 9 ----- .../RecommendedApproval/RAstartAfter.java | 14 +------ .../PRGEStartAfter.java | 2 +- src/main/resources/application.yml | 2 +- .../mapper/datas/BusProcessNewMapper.xml | 11 ++++++ 14 files changed, 48 insertions(+), 77 deletions(-) diff --git a/src/main/java/com/ydw/bat/wkflow/business_auth/LawsUserInfoService.java b/src/main/java/com/ydw/bat/wkflow/business_auth/LawsUserInfoService.java index 4223c428..07a67b75 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_auth/LawsUserInfoService.java +++ b/src/main/java/com/ydw/bat/wkflow/business_auth/LawsUserInfoService.java @@ -18,7 +18,7 @@ import java.util.Map; import java.util.Set; @Component -@FeignClient(value = "FotonLAWSSystemLeo",path="/api",url="") +@FeignClient(value = "FotonLAWSSystem",path="/api",url="") @RequestMapping("/") public interface LawsUserInfoService { diff --git a/src/main/java/com/ydw/bat/wkflow/business_main/datas/controller/BusProcessNewController.java b/src/main/java/com/ydw/bat/wkflow/business_main/datas/controller/BusProcessNewController.java index 44064b20..e589fd93 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_main/datas/controller/BusProcessNewController.java +++ b/src/main/java/com/ydw/bat/wkflow/business_main/datas/controller/BusProcessNewController.java @@ -47,5 +47,13 @@ public class BusProcessNewController extends BaseAction { return findtodotask; } + @ApiOperation(value = "每天十点需要启动 政策课题后续流程") + @GetMapping("/everyDayTenOlock") + public List everyDayTenOlock() { + List findtodotask = iBusProcessNewService.everyDayTenOlock(); + return findtodotask; + } + + } diff --git a/src/main/java/com/ydw/bat/wkflow/business_main/datas/mapper/BusProcessNewMapper.java b/src/main/java/com/ydw/bat/wkflow/business_main/datas/mapper/BusProcessNewMapper.java index 986f222f..250e500a 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_main/datas/mapper/BusProcessNewMapper.java +++ b/src/main/java/com/ydw/bat/wkflow/business_main/datas/mapper/BusProcessNewMapper.java @@ -28,4 +28,6 @@ public interface BusProcessNewMapper extends BaseMapper { List findLastworkPeople(@Param("key")String key,@Param("pId")String pId); + List everyDayTenOlock(); + } diff --git a/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/IBusProcessNewService.java b/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/IBusProcessNewService.java index a078b9c2..c699cf84 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/IBusProcessNewService.java +++ b/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/IBusProcessNewService.java @@ -32,4 +32,6 @@ public interface IBusProcessNewService extends IService { //子流程 获取 阶段数据 专用 BY yzh List findLastworkPeople(@Param("key")String key, @Param("pId")String pId); + List everyDayTenOlock(); + } diff --git a/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/impl/BusProcessNewServiceImpl.java b/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/impl/BusProcessNewServiceImpl.java index 448756e1..85e6da57 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/impl/BusProcessNewServiceImpl.java +++ b/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/impl/BusProcessNewServiceImpl.java @@ -73,4 +73,9 @@ public class BusProcessNewServiceImpl extends ServiceImpl findLastworkPeople(String key, String pId) { return baseMapper.findLastworkPeople(key,pId); } + + @Override + public List everyDayTenOlock() { + return baseMapper.everyDayTenOlock(); + } } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAApproveAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAApproveAfter.java index e3a7a1c1..ba7910f6 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAApproveAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAApproveAfter.java @@ -2,29 +2,22 @@ package com.ydw.bat.wkflow.listener.RecommendedApproval; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; - import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; - import com.ydw.bat.wkflow.business_auth.LawsUserInfoService; - import com.ydw.bat.wkflow.business_main.datas.dto.DetailedUpDto; - import com.ydw.bat.wkflow.business_main.datas.dto.SarLawsDetailedList; - import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName; - import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew; - import com.ydw.bat.wkflow.business_main.datas.entity.Datas; - 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.util.SpringContextUtil; - 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.ArrayList; - import java.util.Arrays; - import java.util.Date; - import java.util.List; - import java.util.regex.Matcher; - import java.util.regex.Pattern; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.ydw.bat.wkflow.business_auth.LawsUserInfoService; +import com.ydw.bat.wkflow.business_main.datas.dto.DetailedUpDto; +import com.ydw.bat.wkflow.business_main.datas.dto.SarLawsDetailedList; +import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName; +import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew; +import com.ydw.bat.wkflow.business_main.datas.entity.Datas; +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.util.SpringContextUtil; +import org.activiti.engine.ActivitiException; +import org.activiti.engine.delegate.DelegateTask; +import org.activiti.engine.delegate.TaskListener; +import java.text.SimpleDateFormat; +import java.util.Date; public class RAApproveAfter implements TaskListener { @Override 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 75578a70..24ddab89 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 @@ -2,9 +2,6 @@ package com.ydw.bat.wkflow.listener.RecommendedApproval; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.ydw.bat.wkflow.business_auth.LawsUserInfoService; -import com.ydw.bat.wkflow.business_main.datas.dto.DetailedUpDto; -import com.ydw.bat.wkflow.business_main.datas.dto.SarLawsDetailedList; import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName; import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew; import com.ydw.bat.wkflow.business_main.datas.entity.Datas; @@ -12,18 +9,12 @@ 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.util.SpringContextUtil; -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.ArrayList; import java.util.Arrays; -import java.util.Date; import java.util.List; -import java.util.regex.Matcher; -import java.util.regex.Pattern; public class RAAuditAfter implements TaskListener { @Override 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 72420410..2d79823b 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 @@ -2,9 +2,6 @@ package com.ydw.bat.wkflow.listener.RecommendedApproval; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.ydw.bat.wkflow.business_auth.LawsUserInfoService; -import com.ydw.bat.wkflow.business_main.datas.dto.DetailedUpDto; -import com.ydw.bat.wkflow.business_main.datas.dto.SarLawsDetailedList; import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName; import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew; import com.ydw.bat.wkflow.business_main.datas.entity.Datas; @@ -12,18 +9,10 @@ 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.util.SpringContextUtil; -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.ArrayList; -import java.util.Arrays; -import java.util.Date; import java.util.List; -import java.util.regex.Matcher; -import java.util.regex.Pattern; public class RAModifyInformationAfter implements TaskListener { @Override 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 f725c571..6c2403c9 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 @@ -2,9 +2,6 @@ package com.ydw.bat.wkflow.listener.RecommendedApproval; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.ydw.bat.wkflow.business_auth.LawsUserInfoService; -import com.ydw.bat.wkflow.business_main.datas.dto.DetailedUpDto; -import com.ydw.bat.wkflow.business_main.datas.dto.SarLawsDetailedList; import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName; import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew; import com.ydw.bat.wkflow.business_main.datas.entity.Datas; @@ -12,18 +9,12 @@ 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.util.SpringContextUtil; -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.ArrayList; import java.util.Arrays; -import java.util.Date; import java.util.List; -import java.util.regex.Matcher; -import java.util.regex.Pattern; public class RASignAfter implements TaskListener { @Override 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 afa5b5e5..122e8e0a 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 @@ -1,11 +1,7 @@ package com.ydw.bat.wkflow.listener.RecommendedApproval; -import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.ydw.bat.wkflow.business_auth.LawsUserInfoService; -import com.ydw.bat.wkflow.business_main.datas.dto.DetailedUpDto; -import com.ydw.bat.wkflow.business_main.datas.dto.SarLawsDetailedList; import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName; import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew; import com.ydw.bat.wkflow.business_main.datas.entity.Datas; @@ -13,18 +9,13 @@ 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.util.SpringContextUtil; -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.ArrayList; import java.util.Arrays; -import java.util.Date; import java.util.List; -import java.util.regex.Matcher; -import java.util.regex.Pattern; public class RAValidationAfter implements TaskListener { @Override 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 ad69ddd7..56d0bb54 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 @@ -2,9 +2,6 @@ package com.ydw.bat.wkflow.listener.RecommendedApproval; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.ydw.bat.wkflow.business_auth.LawsUserInfoService; -import com.ydw.bat.wkflow.business_main.datas.dto.DetailedUpDto; -import com.ydw.bat.wkflow.business_main.datas.dto.SarLawsDetailedList; import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName; import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew; import com.ydw.bat.wkflow.business_main.datas.entity.Datas; @@ -12,19 +9,11 @@ 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.util.SpringContextUtil; -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.ArrayList; -import java.util.Arrays; -import java.util.Date; import java.util.List; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - +//外部署名推荐批准 public class RAstartAfter implements TaskListener { @Override public void notify(DelegateTask delegateTask) { @@ -56,7 +45,6 @@ public class RAstartAfter implements TaskListener { String username = object.getString("prcCreateUserName"); delegateTask.setVariable("prcCreateUser", user); delegateTask.setVariable("prcCreateUserName", username); -// delegateTask.setVariable("stId",object.getString("projectNumber")); String prcName = delegateTask.getVariable("listName", String.class) + "-外部署名推荐批准-署名领导会签"; QueryWrapper queryWrapper2 = new QueryWrapper(); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PRGEStartAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PRGEStartAfter.java index b4fbeece..15766599 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PRGEStartAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PRGEStartAfter.java @@ -22,7 +22,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Date; import java.util.List; - +//政策课题组入会 public class PRGEStartAfter implements TaskListener { @Override public void notify(DelegateTask delegateTask) { diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 59aa9518..e0d2bdf9 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -18,7 +18,7 @@ eureka: defaultZone: http://62.234.136.153:8761/eureka/ spring: application: - name: bat-wkflow-leo + name: bat-wkflow http: encoding: charset: UTF-8 diff --git a/src/main/resources/mapper/datas/BusProcessNewMapper.xml b/src/main/resources/mapper/datas/BusProcessNewMapper.xml index 7bb28260..a49542f8 100644 --- a/src/main/resources/mapper/datas/BusProcessNewMapper.xml +++ b/src/main/resources/mapper/datas/BusProcessNewMapper.xml @@ -33,4 +33,15 @@ LEFT JOIN act_hi_taskinst aht ON bpn.TASK_ID = aht.ID_ WHERE bpn.P_ID = #{pId} and aht.TASK_DEF_KEY_ = #{key} + + + From dd52ea79a91194d39bef8ea37425c9496740d16b Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Fri, 29 Oct 2021 14:06:49 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E6=94=BF=E7=AD=96=E8=AF=BE=E9=A2=98?= =?UTF-8?q?=E7=BB=84=E5=85=A5=E4=BC=9A=20&=20=E5=8F=82=E4=BC=9A=20&=20?= =?UTF-8?q?=E4=BC=9A=E5=90=8E=20=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../task/TodoTaskController.java | 13 +++++++-- .../ApprovalAfter.java | 19 ++++++------- .../ApprovalBefore.java | 2 +- .../InputInformationAfter.java | 27 +------------------ .../InputInformationBefore.java | 2 +- .../PRGAMStartAfter.java | 17 +++++++----- .../RevisionInformationAfter.java | 18 ------------- .../RevisionInformationBefore.java | 2 +- .../MinisterApprovalAfter.java | 25 ----------------- .../MinisterApprovalBefore.java | 2 +- .../PRGAMStartAfter.java | 18 ------------- .../PresidentApprovalAfter.java | 20 +++++--------- .../PresidentApprovalBefore.java | 2 +- .../RevisionInformationAfter.java | 25 ----------------- .../RevisionInformationBefore.java | 2 +- .../PGREPresidentApprovalBefore.java | 2 +- .../PRGEInspectorApprovalBefore.java | 2 +- .../PRGEMinisterConfirmBefore.java | 2 +- .../PRGEStartAfter.java | 3 +-- .../RevisionInformationBefore.java | 2 +- .../mapper/datas/BusProcessNewMapper.xml | 21 ++++++++------- 21 files changed, 60 insertions(+), 166 deletions(-) diff --git a/src/main/java/com/ydw/bat/wkflow/business_activiti/task/TodoTaskController.java b/src/main/java/com/ydw/bat/wkflow/business_activiti/task/TodoTaskController.java index 58b51664..c7e9e76f 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_activiti/task/TodoTaskController.java +++ b/src/main/java/com/ydw/bat/wkflow/business_activiti/task/TodoTaskController.java @@ -1964,7 +1964,12 @@ public class TodoTaskController extends BaseAction { queryWrapper1.eq("P_ID",busProcessName.getPrcId()); queryWrapper1.eq("TASK_ID",task.getId()); BusProcessNew busProcessNew=iBusProcessNewService.getOne(queryWrapper1); - busProcessName.setPrcName(busProcessNew.getPrcName()); + if (null!=busProcessNew.getPrcName()){ + busProcessName.setPrcName(busProcessNew.getPrcName()); + }else { + busProcessNew.setPrcName(""); + } + } } if (assignee != null && !assignee.equals("")) { @@ -2080,7 +2085,11 @@ public class TodoTaskController extends BaseAction { queryWrapper1.eq("P_ID",busProcessName.getPrcId()); queryWrapper1.eq("TASK_ID",task.getId()); BusProcessNew busProcessNew=iBusProcessNewService.getOne(queryWrapper1); - busProcessName.setPrcName(busProcessNew.getPrcName()); + if (null!=busProcessNew.getPrcName()){ + busProcessName.setPrcName(busProcessNew.getPrcName()); + }else { + busProcessNew.setPrcName(""); + } } } if (assignee != null && !assignee.equals("")) { diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/ApprovalAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/ApprovalAfter.java index f914b11f..eae189eb 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/ApprovalAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/ApprovalAfter.java @@ -14,7 +14,9 @@ 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.ArrayList; +import java.util.Date; import java.util.List; public class ApprovalAfter implements TaskListener { @@ -26,7 +28,6 @@ public class ApprovalAfter implements TaskListener { //流程信息 IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class); - LawsUserInfoService lawsUserInfoService = SpringContextUtil.getBean(LawsUserInfoService.class); //根据流程id找到流程信息 QueryWrapper queryWrapper = new QueryWrapper<>(); @@ -36,7 +37,7 @@ public class ApprovalAfter implements TaskListener { JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); delegateTask.setVariable("objectJson",object); //截止时间 流程描述 创建人 -// String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); + String user = delegateTask.getVariable("createUser", String.class); String username = delegateTask.getVariable("createUserName", String.class); String prcName=""; @@ -56,17 +57,14 @@ public class ApprovalAfter implements TaskListener { } -// if(object.getString("signFlag").equals("1")) { -// prcName = standName + "-标准法规清单申请-会签"; -// }else { -// prcName = standName + "-标准法规清单申请-经理审批"; -// } - - + String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId()); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); if(one1!=null){ + if("1".equals(object.getString("shyFlag"))){ + one1.setOverTime(OVERTIME); + } one1.setPrcType("19"); one1.setPrcName(prcName); one1.setCreatUser(user); @@ -74,7 +72,6 @@ public class ApprovalAfter implements TaskListener { busProcessNameService.saveOrUpdate(one1); } // 存储当前节点意见 - // 存储当前节点意见 if (null!=object.getString("commentText")) { QueryWrapper queryWrapper3 = new QueryWrapper(); queryWrapper3.eq("TASK_ID", delegateTask.getId()); @@ -106,7 +103,7 @@ public class ApprovalAfter implements TaskListener { busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); busProcessNewNext.setMesg(object.toJSONString()); busProcessNewNext.setFinishFlag("0"); - busProcessNewNext.setTaskInfo("业务经理审批"); + busProcessNewNext.setTaskInfo("政策课题组会后流程-结束"); busProcessNewNext.setUserId(object.getString("jlUserId")); busProcessNewNext.setPrcName(prcName); busBean.save(busProcessNewNext); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/ApprovalBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/ApprovalBefore.java index d706b8eb..5c0d829f 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/ApprovalBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/ApprovalBefore.java @@ -26,7 +26,7 @@ public class ApprovalBefore implements TaskListener { CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class); // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型 - one1.setLink("policyResearchGroupEnrollment2?prcType=19"); + one1.setLink("zchhStep3?prcType=19"); one1.setTaskInfo(delegateTask.getName()); oaService.sendTodoMq(one1); } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/InputInformationAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/InputInformationAfter.java index de6b391e..b43429a2 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/InputInformationAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/InputInformationAfter.java @@ -26,7 +26,6 @@ public class InputInformationAfter implements TaskListener { //流程信息 IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class); - LawsUserInfoService lawsUserInfoService = SpringContextUtil.getBean(LawsUserInfoService.class); //根据流程id找到流程信息 QueryWrapper queryWrapper = new QueryWrapper<>(); @@ -43,22 +42,9 @@ public class InputInformationAfter implements TaskListener { } //截止时间 流程描述 创建人 -// String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); -// String user = object.getString("prcCreateUser"); -// delegateTask.setVariable("createUser",user); -// String username = object.getString("prcCreateUserName"); -// delegateTask.setVariable("createUserName",username); -// String standName = object.getString("listName"); -// delegateTask.setVariable("listName",standName); String user = delegateTask.getVariable("createUser", String.class); String username = delegateTask.getVariable("createUserName", String.class); - String prcName=""; - prcName = "政策课题组会后流程-审核员批准"; -// if(object.getString("signFlag").equals("1")) { -// prcName = standName + "-标准法规清单申请-会签"; -// }else { -// prcName = standName + "-标准法规清单申请-经理审批"; -// } + String prcName = "政策课题组会后流程-审核员批准"; QueryWrapper queryWrapper2 = new QueryWrapper(); @@ -72,7 +58,6 @@ public class InputInformationAfter implements TaskListener { busProcessNameService.saveOrUpdate(one1); } // 存储当前节点意见 - // 存储当前节点意见 if (null!=object.getString("commentText")) { QueryWrapper queryWrapper3 = new QueryWrapper(); queryWrapper3.eq("TASK_ID", delegateTask.getId()); @@ -98,16 +83,6 @@ public class InputInformationAfter implements TaskListener { busProcessNewNext.setPrcName(prcName); busBean.save(busProcessNewNext); } - }else { - BusProcessNew busProcessNewNext = new BusProcessNew(); - busProcessNewNext.setMsgType("clause"); - busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); - busProcessNewNext.setMesg(object.toJSONString()); - busProcessNewNext.setFinishFlag("0"); - busProcessNewNext.setTaskInfo("业务经理审批"); - busProcessNewNext.setUserId(object.getString("jlUserId")); - busProcessNewNext.setPrcName(prcName); - busBean.save(busProcessNewNext); } } } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/InputInformationBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/InputInformationBefore.java index b81e8f66..d9124374 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/InputInformationBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/InputInformationBefore.java @@ -26,7 +26,7 @@ public class InputInformationBefore implements TaskListener { CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class); // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型 - one1.setLink("policyResearchGroupEnrollment2?prcType=19"); + one1.setLink("zchhStep2?prcType=19"); one1.setTaskInfo(delegateTask.getName()); oaService.sendTodoMq(one1); } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/PRGAMStartAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/PRGAMStartAfter.java index f1c7a6a7..a8446f37 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/PRGAMStartAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/PRGAMStartAfter.java @@ -35,15 +35,20 @@ public class PRGAMStartAfter implements TaskListener { JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); delegateTask.setVariable("objectJson",object); - List nextUserList = new ArrayList(); - if(StringUtils.isNotBlank(object.getString("applicantId"))){ - delegateTask.setVariable("inputInformation", object.getString("applicantId")); - nextUserList.add(object.getString("applicantId")); - } + //auto 判断流程是否是自动发起的 + if ("1".equals(object.getString("auto"))){ + delegateTask.setVariable("inputInformation", object.getString("revisionId")); + nextUserList.add(object.getString("revisionId")); + } + else { + if (StringUtils.isNotBlank(object.getString("applicantId"))) { + delegateTask.setVariable("inputInformation", object.getString("applicantId")); + nextUserList.add(object.getString("applicantId")); + } + } //截止时间 流程描述 创建人 -// String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); String user = object.getString("revisionId"); delegateTask.setVariable("createUser",user); String username = object.getString("revisionIdName"); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/RevisionInformationAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/RevisionInformationAfter.java index 4a0bbcd3..1ee02716 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/RevisionInformationAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/RevisionInformationAfter.java @@ -26,7 +26,6 @@ public class RevisionInformationAfter implements TaskListener { //流程信息 IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class); - LawsUserInfoService lawsUserInfoService = SpringContextUtil.getBean(LawsUserInfoService.class); //根据流程id找到流程信息 QueryWrapper queryWrapper = new QueryWrapper<>(); @@ -43,15 +42,9 @@ public class RevisionInformationAfter implements TaskListener { } //截止时间 流程描述 创建人 -// String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); String user = delegateTask.getVariable("createUser",String.class); String username = delegateTask.getVariable("createUserName",String.class); String prcName="政策课题组会后流程-审核员审核"; -// if(object.getString("signFlag").equals("1")) { -// prcName = standName + "-标准法规清单申请-会签"; -// }else { -// prcName = standName + "-标准法规清单申请-经理审批"; -// } QueryWrapper queryWrapper2 = new QueryWrapper(); @@ -65,7 +58,6 @@ public class RevisionInformationAfter implements TaskListener { busProcessNameService.saveOrUpdate(one1); } // 存储当前节点意见 - // 存储当前节点意见 if (null!=object.getString("commentText")) { QueryWrapper queryWrapper3 = new QueryWrapper(); queryWrapper3.eq("TASK_ID", delegateTask.getId()); @@ -91,16 +83,6 @@ public class RevisionInformationAfter implements TaskListener { busProcessNewNext.setPrcName(prcName); busBean.save(busProcessNewNext); } - }else { - BusProcessNew busProcessNewNext = new BusProcessNew(); - busProcessNewNext.setMsgType("clause"); - busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); - busProcessNewNext.setMesg(object.toJSONString()); - busProcessNewNext.setFinishFlag("0"); - busProcessNewNext.setTaskInfo("业务经理审批"); - busProcessNewNext.setUserId(object.getString("jlUserId")); - busProcessNewNext.setPrcName(prcName); - busBean.save(busProcessNewNext); } } } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/RevisionInformationBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/RevisionInformationBefore.java index 47d49dc4..6979c05c 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/RevisionInformationBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/RevisionInformationBefore.java @@ -26,7 +26,7 @@ public class RevisionInformationBefore implements TaskListener { CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class); // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型 - one1.setLink("policyResearchGroupEnrollment2?prcType=19"); + one1.setLink("zchhStep1?prcType=19"); one1.setTaskInfo(delegateTask.getName()); oaService.sendTodoMq(one1); } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/MinisterApprovalAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/MinisterApprovalAfter.java index 82f2599a..c69608ef 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/MinisterApprovalAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/MinisterApprovalAfter.java @@ -26,8 +26,6 @@ public class MinisterApprovalAfter implements TaskListener { //流程信息 IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class); - LawsUserInfoService lawsUserInfoService = SpringContextUtil.getBean(LawsUserInfoService.class); - //根据流程id找到流程信息 QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId()); @@ -36,11 +34,6 @@ public class MinisterApprovalAfter implements TaskListener { JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); delegateTask.setVariable("objectJson",object); //截止时间 流程描述 创建人 -// String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); -// String user = object.getString("prcCreateUser"); -// delegateTask.setVariable("createUser",user); -// String username = object.getString("prcCreateUserName"); -// delegateTask.setVariable("createUserName",username); String user = delegateTask.getVariable("createUser",String.class); String username = delegateTask.getVariable("createUserName",String.class); String prcName=""; @@ -67,13 +60,6 @@ public class MinisterApprovalAfter implements TaskListener { } -// if(object.getString("signFlag").equals("1")) { -// prcName = standName + "-标准法规清单申请-会签"; -// }else { -// prcName = standName + "-标准法规清单申请-经理审批"; -// } - - QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId()); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); @@ -85,7 +71,6 @@ public class MinisterApprovalAfter implements TaskListener { busProcessNameService.saveOrUpdate(one1); } // 存储当前节点意见 - // 存储当前节点意见 if (null!=object.getString("commentText")) { QueryWrapper queryWrapper3 = new QueryWrapper(); queryWrapper3.eq("TASK_ID", delegateTask.getId()); @@ -111,16 +96,6 @@ public class MinisterApprovalAfter implements TaskListener { busProcessNewNext.setPrcName(prcName); busBean.save(busProcessNewNext); } - }else { - BusProcessNew busProcessNewNext = new BusProcessNew(); - busProcessNewNext.setMsgType("clause"); - busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); - busProcessNewNext.setMesg(object.toJSONString()); - busProcessNewNext.setFinishFlag("0"); - busProcessNewNext.setTaskInfo("业务经理审批"); - busProcessNewNext.setUserId(object.getString("jlUserId")); - busProcessNewNext.setPrcName(prcName); - busBean.save(busProcessNewNext); } } } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/MinisterApprovalBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/MinisterApprovalBefore.java index 5ca46dbe..7a1500fc 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/MinisterApprovalBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/MinisterApprovalBefore.java @@ -26,7 +26,7 @@ public class MinisterApprovalBefore implements TaskListener { CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class); // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型 - one1.setLink("policyResearchGroupEnrollment2?prcType=18"); + one1.setLink("zcchStep3?prcType=18"); one1.setTaskInfo(delegateTask.getName()); oaService.sendTodoMq(one1); } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/PRGAMStartAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/PRGAMStartAfter.java index a96ecdf3..627d58d3 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/PRGAMStartAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/PRGAMStartAfter.java @@ -26,8 +26,6 @@ public class PRGAMStartAfter implements TaskListener { //流程信息 IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class); - LawsUserInfoService lawsUserInfoService = SpringContextUtil.getBean(LawsUserInfoService.class); - //根据流程id找到流程信息 QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId()); @@ -50,11 +48,6 @@ public class PRGAMStartAfter implements TaskListener { delegateTask.setVariable("createUserName",username); String prcName = ""; prcName= "政策课题组参会流程-法规认证部副部长审核"; -// if(object.getString("signFlag").equals("1")) { -// prcName = standName + "-标准法规清单申请-会签"; -// }else { -// prcName = standName + "标准法规清单申请-经理审批"; -// } QueryWrapper queryWrapper2 = new QueryWrapper(); @@ -68,7 +61,6 @@ public class PRGAMStartAfter implements TaskListener { busProcessNameService.saveOrUpdate(one1); } // 存储当前节点意见 - // 存储当前节点意见 if (null!=object.getString("commentText")) { QueryWrapper queryWrapper3 = new QueryWrapper(); queryWrapper3.eq("TASK_ID", delegateTask.getId()); @@ -94,16 +86,6 @@ public class PRGAMStartAfter implements TaskListener { busProcessNewNext.setPrcName(prcName); busBean.save(busProcessNewNext); } - }else { - BusProcessNew busProcessNewNext = new BusProcessNew(); - busProcessNewNext.setMsgType("clause"); - busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); - busProcessNewNext.setMesg(object.toJSONString()); - busProcessNewNext.setFinishFlag("0"); - busProcessNewNext.setTaskInfo("业务经理审批"); - busProcessNewNext.setUserId(object.getString("jlUserId")); - busProcessNewNext.setPrcName(prcName); - busBean.save(busProcessNewNext); } } } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/PresidentApprovalAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/PresidentApprovalAfter.java index 75960693..b5010546 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/PresidentApprovalAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/PresidentApprovalAfter.java @@ -14,7 +14,9 @@ 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.ArrayList; +import java.util.Date; import java.util.List; public class PresidentApprovalAfter implements TaskListener { @@ -26,8 +28,6 @@ public class PresidentApprovalAfter implements TaskListener { //流程信息 IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class); - LawsUserInfoService lawsUserInfoService = SpringContextUtil.getBean(LawsUserInfoService.class); - //根据流程id找到流程信息 QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId()); @@ -37,15 +37,11 @@ public class PresidentApprovalAfter implements TaskListener { delegateTask.setVariable("objectJson",object); //截止时间 流程描述 创建人 -// String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); -// String user = object.getString("prcCreateUser"); -// delegateTask.setVariable("createUser",user); String user = delegateTask.getVariable("createUser",String.class); String username = delegateTask.getVariable("createUserName",String.class); String prcName=""; List nextUserList = new ArrayList(); - if("1".equals(object.getString("gsfz"))){ delegateTask.setVariable("gsfz", "1"); prcName = "政策课题组参会流程"; @@ -59,14 +55,14 @@ public class PresidentApprovalAfter implements TaskListener { } - - - - + String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId()); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); if(one1!=null){ + if("1".equals(object.getString("gsfz"))){ + one1.setOverTime(OVERTIME); + } one1.setPrcType("18"); one1.setPrcName(prcName); one1.setCreatUser(user); @@ -74,7 +70,6 @@ public class PresidentApprovalAfter implements TaskListener { busProcessNameService.saveOrUpdate(one1); } // 存储当前节点意见 - // 存储当前节点意见 if (null!=object.getString("commentText")) { QueryWrapper queryWrapper3 = new QueryWrapper(); queryWrapper3.eq("TASK_ID", delegateTask.getId()); @@ -106,8 +101,7 @@ public class PresidentApprovalAfter implements TaskListener { busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); busProcessNewNext.setMesg(object.toJSONString()); busProcessNewNext.setFinishFlag("0"); - busProcessNewNext.setTaskInfo("业务经理审批"); - busProcessNewNext.setUserId(object.getString("jlUserId")); + busProcessNewNext.setTaskInfo("政策课题组参会流程-流程结束"); busProcessNewNext.setPrcName(prcName); busBean.save(busProcessNewNext); } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/PresidentApprovalBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/PresidentApprovalBefore.java index 1e194949..e138d2a0 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/PresidentApprovalBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/PresidentApprovalBefore.java @@ -26,7 +26,7 @@ public class PresidentApprovalBefore implements TaskListener { CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class); // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型 - one1.setLink("policyResearchGroupEnrollment2?prcType=18"); + one1.setLink("zcchStep2?prcType=18"); one1.setTaskInfo(delegateTask.getName()); oaService.sendTodoMq(one1); } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/RevisionInformationAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/RevisionInformationAfter.java index 5ae077f5..e4f0d526 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/RevisionInformationAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/RevisionInformationAfter.java @@ -36,13 +36,6 @@ public class RevisionInformationAfter implements TaskListener { JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); delegateTask.setVariable("objectJson",object); //截止时间 流程描述 创建人 -// String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); -// String user = object.getString("prcCreateUser"); -// delegateTask.setVariable("createUser",user); -// String username = object.getString("prcCreateUserName"); -// delegateTask.setVariable("createUserName",username); -// String standName = object.getString("listName"); -// delegateTask.setVariable("listName",standName); String user = delegateTask.getVariable("createUser",String.class); String username = delegateTask.getVariable("createUserName",String.class); String prcName=""; @@ -55,13 +48,6 @@ public class RevisionInformationAfter implements TaskListener { } -// if(object.getString("signFlag").equals("1")) { -// prcName = standName + "-标准法规清单申请-会签"; -// }else { -// prcName = standName + "-标准法规清单申请-经理审批"; -// } - - QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId()); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); @@ -73,7 +59,6 @@ public class RevisionInformationAfter implements TaskListener { busProcessNameService.saveOrUpdate(one1); } // 存储当前节点意见 - // 存储当前节点意见 if(nextUserList != null && !nextUserList.isEmpty()){ for(String nextUser : nextUserList){ @@ -88,16 +73,6 @@ public class RevisionInformationAfter implements TaskListener { busProcessNewNext.setPrcName(prcName); busBean.save(busProcessNewNext); } - }else { - BusProcessNew busProcessNewNext = new BusProcessNew(); - busProcessNewNext.setMsgType("clause"); - busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); - busProcessNewNext.setMesg(object.toJSONString()); - busProcessNewNext.setFinishFlag("0"); - busProcessNewNext.setTaskInfo("业务经理审批"); - busProcessNewNext.setUserId(object.getString("jlUserId")); - busProcessNewNext.setPrcName(prcName); - busBean.save(busProcessNewNext); } } } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/RevisionInformationBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/RevisionInformationBefore.java index 31f60396..98440476 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/RevisionInformationBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/RevisionInformationBefore.java @@ -26,7 +26,7 @@ public class RevisionInformationBefore implements TaskListener { CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class); // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型 - one1.setLink("policyResearchGroupEnrollment2?prcType=18"); + one1.setLink("zcchStep1-1?prcType=18"); one1.setTaskInfo(delegateTask.getName()); oaService.sendTodoMq(one1); } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PGREPresidentApprovalBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PGREPresidentApprovalBefore.java index 3c56c0cb..ec16dc22 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PGREPresidentApprovalBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PGREPresidentApprovalBefore.java @@ -26,7 +26,7 @@ public class PGREPresidentApprovalBefore implements TaskListener { CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class); // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型 - one1.setLink("bzqdfbStep3?prcType=17"); + one1.setLink("zcrhStep4?prcType=17"); one1.setTaskInfo(delegateTask.getName()); oaService.sendTodoMq(one1); } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PRGEInspectorApprovalBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PRGEInspectorApprovalBefore.java index 204823aa..9842c401 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PRGEInspectorApprovalBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PRGEInspectorApprovalBefore.java @@ -26,7 +26,7 @@ public class PRGEInspectorApprovalBefore implements TaskListener { CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class); // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型 - one1.setLink("policyResearchGroupEnrollment3?prcType=17"); + one1.setLink("zcrhStep3?prcType=17"); one1.setTaskInfo(delegateTask.getName()); oaService.sendTodoMq(one1); } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PRGEMinisterConfirmBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PRGEMinisterConfirmBefore.java index 4d19b060..ed466925 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PRGEMinisterConfirmBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PRGEMinisterConfirmBefore.java @@ -30,7 +30,7 @@ public class PRGEMinisterConfirmBefore implements TaskListener { CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class); // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型 - one1.setLink("policyResearchGroupEnrollment2?prcType=17"); + one1.setLink("zcrhStep2?prcType=17"); one1.setTaskInfo(delegateTask.getName()); oaService.sendTodoMq(one1); } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PRGEStartAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PRGEStartAfter.java index 86afc073..79885261 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PRGEStartAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PRGEStartAfter.java @@ -52,13 +52,12 @@ public class PRGEStartAfter implements TaskListener { //截止时间 流程描述 创建人 -// String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); String user = object.getString("revisionId"); delegateTask.setVariable("createUser",user); String username = object.getString("revisionIdName"); delegateTask.setVariable("createUserName",username); String prcName=""; - prcName = "标准化活动入会流程-法规认证部副部长审核"; + prcName = "政策课题组入会流程-法规认证部副部长审核"; QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/RevisionInformationBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/RevisionInformationBefore.java index 5b8fb276..8a9afaca 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/RevisionInformationBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/RevisionInformationBefore.java @@ -26,7 +26,7 @@ public class RevisionInformationBefore implements TaskListener { CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class); // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型 - one1.setLink("bzqdfbStep3?prcType=17"); + one1.setLink("zcrhStep1-1?prcType=17"); one1.setTaskInfo(delegateTask.getName()); oaService.sendTodoMq(one1); } diff --git a/src/main/resources/mapper/datas/BusProcessNewMapper.xml b/src/main/resources/mapper/datas/BusProcessNewMapper.xml index a49542f8..56294e89 100644 --- a/src/main/resources/mapper/datas/BusProcessNewMapper.xml +++ b/src/main/resources/mapper/datas/BusProcessNewMapper.xml @@ -4,24 +4,24 @@ SELECT - * - FROM - bus_process_new - WHERE - MESG -> '$.endTime' LIKE CONCAT( - '%',CONCAT(date_sub(DATE_FORMAT(NOW(), '%Y-%m-%d'),interval 1 day),'%')) + * + FROM + bus_process_new + WHERE + MESG -> '$.time2' LIKE CONCAT( + '%', + CONCAT( date_sub( DATE_FORMAT( NOW(), '%Y-%m-%d' ), INTERVAL 1 DAY), '%')) and TASK_INFO = '政策课题组参会流程-流程结束' From 99c31d89b0bff265e1181897a341ff42e88060ad Mon Sep 17 00:00:00 2001 From: Kevin Date: Fri, 29 Oct 2021 14:23:11 +0800 Subject: [PATCH 3/5] taskFinishV1.3 --- .../ChargeVerifyAfter.java | 29 ++++++++++++--- .../EngineerReviseAfter.java | 11 +----- .../EngineerReviseDoneAfter.java | 7 +--- .../LeaderVerifyAfter.java | 11 +++--- .../StandardMeetProcess/ManageSignAfter.java | 16 ++++---- .../PresidentVerifyAfter.java | 16 ++++---- .../WriteMemberInfoAfter.java | 9 ++--- .../ChargeVerifyAfter.java | 37 +++++++++++++++---- .../EngineerReviseAfter.java | 8 ++-- .../EngineerReviseDoneAfter.java | 1 + .../LeaderVerifyAfter.java | 11 +++--- .../ManageSignAfter.java | 19 ++++------ .../PresidentVerifyAfter.java | 17 ++++----- .../WriteMemberInfoAfter.java | 9 +---- 14 files changed, 105 insertions(+), 96 deletions(-) diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/ChargeVerifyAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/ChargeVerifyAfter.java index ff78244b..cbc1e186 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/ChargeVerifyAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/ChargeVerifyAfter.java @@ -42,10 +42,13 @@ public class ChargeVerifyAfter implements TaskListener { delegateTask.setVariable("objectJson",object); List nextUserList = new ArrayList(); + JSONObject sum = new JSONObject(); + if(null == delegateTask.getVariable("membersSumJSON")){ + delegateTask.setVariable("membersSumJSON",sum); + } Integer count = 0; - if(null == delegateTask.getVariable("chargePassCount")){ delegateTask.setVariable("chargePassCount",count); } @@ -72,6 +75,22 @@ public class ChargeVerifyAfter implements TaskListener { if(rat == 0){ if("1".equals(object.getString("passFlag"))){//通过 + JSONArray os = object.getJSONObject("rh_pageData").getJSONArray("myPartRole"); + + sum = delegateTask.getVariable("membersSumJSON",JSONObject.class); + if(sum.isEmpty()){ + sum = object; + delegateTask.setVariable("membersSumJSON",sum); + }else { + JSONObject o1 = sum.getJSONObject("rh_pageData"); + JSONObject o = os.getJSONObject(0); + JSONArray os1 = sum.getJSONObject("rh_pageData").getJSONArray("myPartRole"); + os1.add(o); + o1.put("myPartRole",os1); + sum.put("rh_pageData",o1); + delegateTask.setVariable("membersSumJSON",sum); + } + idList.add(object.getString("member")); delegateTask.setVariable("chargeIdList",idList); @@ -85,8 +104,8 @@ public class ChargeVerifyAfter implements TaskListener { if(delegateTask.getVariable("memberCount", Integer.class).equals(delegateTask.getVariable("chargePassCount", Integer.class))){ if(StringUtils.isNotBlank(object.getString("engineerSum"))) { nextUserList.add(object.getString("engineerSum")); - delegateTask.setVariable("engineerSum", nextUserList); - }//下一节点 + delegateTask.setVariable("engineerSum", object.getString("engineerSum")); + } } }else{ delegateTask.setVariable("pass2",0);//排他通道 @@ -141,8 +160,8 @@ prcName = standName + "-标准化活动参会流程-"; BusProcessNew busProcessNewNext = new BusProcessNew(); busProcessNewNext.setMsgType("clause"); busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); - busProcessNewNext.setMesg(objects.toJSONString()); -// busProcessNewNext.setMesg(object.toJSONString()); + JSONObject hand = delegateTask.getVariable("membersSumJSON",JSONObject.class); + busProcessNewNext.setMesg(hand.toJSONString()); busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); busProcessNewNext.setFinishFlag("0"); busProcessNewNext.setTaskInfo(delegateTask.getName()); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/EngineerReviseAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/EngineerReviseAfter.java index f92f0fc3..03eb7f94 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/EngineerReviseAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/EngineerReviseAfter.java @@ -2,7 +2,6 @@ package com.ydw.bat.wkflow.listener.StandardMeetProcess; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.ydw.bat.wkflow.business_auth.LawsUserInfoService; import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName; import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew; import com.ydw.bat.wkflow.business_main.datas.entity.Datas; @@ -12,7 +11,6 @@ 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.List; @@ -29,8 +27,6 @@ public class EngineerReviseAfter implements TaskListener { //流程信息 IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class); - LawsUserInfoService lawsUserInfoService = SpringContextUtil.getBean(LawsUserInfoService.class); - //根据流程id找到流程信息 QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId()); @@ -38,13 +34,10 @@ public class EngineerReviseAfter implements TaskListener { JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); delegateTask.setVariable("objectJson",object); - List nextUserList = new ArrayList(); - if (StringUtils.isNotBlank(object.getString("leader"))) { - nextUserList.add(object.getString("leader")); - delegateTask.setVariable("leader", nextUserList); - } + nextUserList.add(object.getString("leader")); + delegateTask.setVariable("leader", object.getString("leader")); //截止时间 流程描述 创建人 String user = object.getString("prcCreateUser"); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/EngineerReviseDoneAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/EngineerReviseDoneAfter.java index 98b03e9d..cfda8128 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/EngineerReviseDoneAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/EngineerReviseDoneAfter.java @@ -29,17 +29,13 @@ public class EngineerReviseDoneAfter implements TaskListener { IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); //流程信息 IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class); - LawsUserInfoService lawsUserInfoService = SpringContextUtil.getBean(LawsUserInfoService.class); - //根据流程id找到流程信息 QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId()); Datas datas = datasService.getOne(queryWrapper); - JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); delegateTask.setVariable("objectJson",object); - List nextUserList = new ArrayList(); @@ -47,8 +43,6 @@ public class EngineerReviseDoneAfter implements TaskListener { - - //截止时间 流程描述 创建人 String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); String user = object.getString("prcCreateUser"); @@ -67,6 +61,7 @@ public class EngineerReviseDoneAfter implements TaskListener { if (one1 != null) { one1.setPrcType("21"); one1.setPrcName(prcName); + one1.setOverTime(OVERTIME); one1.setCreatUser(user); one1.setCreatUserName(username); busProcessNameService.saveOrUpdate(one1); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/LeaderVerifyAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/LeaderVerifyAfter.java index 4d747b85..d749ab91 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/LeaderVerifyAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/LeaderVerifyAfter.java @@ -58,12 +58,11 @@ public class LeaderVerifyAfter implements TaskListener { } }else{ delegateTask.setVariable("pass3",0); - - //若有通过参数重新指定代理人，则更换代理人，否则使用之前节点设定的原有代理人 - if(StringUtils.isNotBlank(object.getString("engineerSum"))) { - nextUserList.add(object.getString("engineerSum")); - delegateTask.setVariable("engineerSum", nextUserList); - } + nextUserList.add(delegateTask.getVariable("engineerSum",String.class)); +// if(StringUtils.isNotBlank(object.getString("engineerSum"))) { +// nextUserList.add(object.getString("engineerSum")); +// delegateTask.setVariable("engineerSum", nextUserList); +// } } // 存储当前节点意见 if (null != object.getString("commentText")) { diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/ManageSignAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/ManageSignAfter.java index 7111ccaa..1cd0bdce 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/ManageSignAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/ManageSignAfter.java @@ -70,21 +70,19 @@ public class ManageSignAfter implements TaskListener { count++; delegateTask.setVariable("managePassCount",count); if(delegateTask.getVariable("manageDepartmentCount", Integer.class).equals(delegateTask.getVariable("managePassCount", Integer.class))){ - if(StringUtils.isNotBlank(object.getString("president"))) { - nextUserList.add(object.getString("president")); - delegateTask.setVariable("president", nextUserList); - } + nextUserList.add(object.getString("president")); + delegateTask.setVariable("president", object.getString("president")); delegateTask.setVariable("pass4",1); } }else{ delegateTask.setVariable("pass4",0); - delegateTask.removeVariable("manageIdList"); - if(StringUtils.isNotBlank(object.getString("engineerSum"))) { - nextUserList.add(object.getString("engineerSum")); - delegateTask.setVariable("engineerSum", nextUserList); - } +// if(StringUtils.isNotBlank(object.getString("engineerSum"))) { +// nextUserList.add(object.getString("engineerSum")); +// delegateTask.setVariable("engineerSum", nextUserList); +// } + nextUserList.add(delegateTask.getVariable("engineerSum",String.class)); } }else{ throw new ActivitiException("此对象已经审批过了"); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/PresidentVerifyAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/PresidentVerifyAfter.java index 040a9152..3dae16f7 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/PresidentVerifyAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/PresidentVerifyAfter.java @@ -44,17 +44,15 @@ public class PresidentVerifyAfter implements TaskListener { // 入会申请信息重新封装 if("1".equals(object.getString("passFlag"))) {//通过 delegateTask.setVariable("pass5",1); - if(StringUtils.isNotBlank(object.getString("engineerSumDone"))) { - nextUserList.add(object.getString("engineerSumDone")); - delegateTask.setVariable("engineerSumDone", nextUserList); - } - + nextUserList.add(object.getString("engineerSumDone")); + delegateTask.setVariable("engineerSumDone", object.getString("engineerSumDone")); }else{ delegateTask.setVariable("pass5",0); - if(StringUtils.isNotBlank(object.getString("engineerSum"))) { - nextUserList.add(object.getString("engineerSum")); - delegateTask.setVariable("engineerSum", nextUserList); - } +// if(StringUtils.isNotBlank(object.getString("engineerSum"))) { +// nextUserList.add(object.getString("engineerSum")); +// delegateTask.setVariable("engineerSum", nextUserList); +// } + nextUserList.add(delegateTask.getVariable("engineerSum",String.class)); } // 存储当前节点意见 if (null != object.getString("commentText")) { diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/WriteMemberInfoAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/WriteMemberInfoAfter.java index 5210a0e0..01c4e7f9 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/WriteMemberInfoAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/WriteMemberInfoAfter.java @@ -43,12 +43,9 @@ public class WriteMemberInfoAfter implements TaskListener { List nextUserList = new ArrayList(); - // - if(StringUtils.isNotBlank(object.getString("charge"))) { - nextUserList.add(object.getString("charge")); - delegateTask.setVariable("charge", nextUserList); - System.out.println(delegateTask.getVariable("charge")); - } + + nextUserList.add(object.getString("charge")); + delegateTask.setVariable("charge", object.getString("charge")); //截止时间 流程描述 创建人 diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/ChargeVerifyAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/ChargeVerifyAfter.java index 39efddf1..d6a2ec4a 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/ChargeVerifyAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/ChargeVerifyAfter.java @@ -1,5 +1,6 @@ package com.ydw.bat.wkflow.listener.standardApplyMeetProcess; +import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -14,6 +15,7 @@ import com.ydw.bat.wkflow.util.SpringContextUtil; import org.activiti.engine.ActivitiException; import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; +import org.activiti.engine.impl.json.JsonObjectConverter; import org.apache.commons.lang.StringUtils; import java.util.ArrayList; @@ -31,7 +33,6 @@ public class ChargeVerifyAfter implements TaskListener { //流程信息 IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class); - LawsUserInfoService lawsUserInfoService = SpringContextUtil.getBean(LawsUserInfoService.class); //根据流程id找到流程信息 QueryWrapper queryWrapper = new QueryWrapper<>(); @@ -43,9 +44,13 @@ public class ChargeVerifyAfter implements TaskListener { List nextUserList = new ArrayList(); + JSONObject sum = new JSONObject(); + if(null == delegateTask.getVariable("membersSumJSON")){ + delegateTask.setVariable("membersSumJSON",sum); + } + Integer count = 0; - if(null == delegateTask.getVariable("chargePassCount")){ delegateTask.setVariable("chargePassCount",count); } @@ -72,21 +77,37 @@ public class ChargeVerifyAfter implements TaskListener { if(rat == 0){ if("1".equals(object.getString("passFlag"))){//通过 + JSONArray os = object.getJSONObject("rh_pageData").getJSONArray("myPartRole"); + + sum = delegateTask.getVariable("membersSumJSON",JSONObject.class); + if(sum.isEmpty()){ + sum = object; + delegateTask.setVariable("membersSumJSON",sum); + }else { + JSONObject o1 = sum.getJSONObject("rh_pageData"); + JSONObject o = os.getJSONObject(0); + JSONArray os1 = sum.getJSONObject("rh_pageData").getJSONArray("myPartRole"); + os1.add(o); + o1.put("myPartRole",os1); + sum.put("rh_pageData",o1); + delegateTask.setVariable("membersSumJSON",sum); + } + idList.add(object.getString("member")); delegateTask.setVariable("chargeIdList",idList); - delegateTask.setVariable("pass2",1);//排他通道 + count = delegateTask.getVariable("chargePassCount",Integer.class); delegateTask.setVariable("chargePassCount",count + 1); objects = delegateTask.getVariable("chargePassList",JSONArray.class); objects.add(object); + delegateTask.setVariable("pass2",1);//排他通道 delegateTask.setVariable("chargePassList",objects); - System.out.println(delegateTask.getVariable("chargePassList")); if(delegateTask.getVariable("memberCount", Integer.class).equals(delegateTask.getVariable("chargePassCount", Integer.class))){ if(StringUtils.isNotBlank(object.getString("engineerSum"))) { nextUserList.add(object.getString("engineerSum")); - delegateTask.setVariable("engineerSum", nextUserList); - }//下一节点 + delegateTask.setVariable("engineerSum", object.getString("engineerSum")); + } } }else{ delegateTask.setVariable("pass2",0);//排他通道 @@ -141,8 +162,8 @@ prcName = standName + "-标准化活动入会流程-"; BusProcessNew busProcessNewNext = new BusProcessNew(); busProcessNewNext.setMsgType("clause"); busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); - busProcessNewNext.setMesg(objects.toJSONString()); -// busProcessNewNext.setMesg(object.toJSONString()); + JSONObject hand = delegateTask.getVariable("membersSumJSON",JSONObject.class); + busProcessNewNext.setMesg(hand.toJSONString()); busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); busProcessNewNext.setFinishFlag("0"); busProcessNewNext.setTaskInfo(delegateTask.getName()); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseAfter.java index 25572801..b7150d8a 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseAfter.java @@ -41,10 +41,10 @@ public class EngineerReviseAfter implements TaskListener { List nextUserList = new ArrayList(); - if (StringUtils.isNotBlank(object.getString("leader"))) { - nextUserList.add(object.getString("leader")); - delegateTask.setVariable("leader", nextUserList); - } + nextUserList.add(object.getString("leader")); + delegateTask.setVariable("leader", object.getString("leader")); + + //截止时间 流程描述 创建人 String user = object.getString("prcCreateUser"); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseDoneAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseDoneAfter.java index 26d0728d..f6649dad 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseDoneAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseDoneAfter.java @@ -67,6 +67,7 @@ public class EngineerReviseDoneAfter implements TaskListener { one1.setPrcType("20"); one1.setPrcName(prcName); one1.setCreatUser(user); + one1.setOverTime(OVERTIME); one1.setCreatUserName(username); busProcessNameService.saveOrUpdate(one1); } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/LeaderVerifyAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/LeaderVerifyAfter.java index 6aa2397a..84e1d731 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/LeaderVerifyAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/LeaderVerifyAfter.java @@ -30,8 +30,6 @@ public class LeaderVerifyAfter implements TaskListener { //流程信息 IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class); - LawsUserInfoService lawsUserInfoService = SpringContextUtil.getBean(LawsUserInfoService.class); - //根据流程id找到流程信息 QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId()); @@ -58,10 +56,11 @@ public class LeaderVerifyAfter implements TaskListener { } }else{ delegateTask.setVariable("pass3",0); - if(StringUtils.isNotBlank(object.getString("engineerSum"))) { - nextUserList.add(object.getString("engineerSum")); - delegateTask.setVariable("engineerSum", nextUserList); - } +// if(StringUtils.isNotBlank(object.getString("engineerSum"))) { +// nextUserList.add(object.getString("engineerSum")); +// delegateTask.setVariable("engineerSum", nextUserList); +// } + nextUserList.add(delegateTask.getVariable("engineerSum",String.class)); } // 存储当前节点意见 if (null != object.getString("commentText")) { diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/ManageSignAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/ManageSignAfter.java index 2197858c..e6a9c5bb 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/ManageSignAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/ManageSignAfter.java @@ -62,31 +62,26 @@ public class ManageSignAfter implements TaskListener { } idList.add(object.getString("manageDepartment")); delegateTask.setVariable("manageIdList",idList); - - if(rat == 0){ if("1".equals(object.getString("passFlag"))) {//通过 - count = delegateTask.getVariable("managePassCount",Integer.class); count++; delegateTask.setVariable("managePassCount",count); if(delegateTask.getVariable("manageDepartmentCount", Integer.class).equals(delegateTask.getVariable("managePassCount", Integer.class))){ - if(StringUtils.isNotBlank(object.getString("president"))) { - nextUserList.add(object.getString("president")); - delegateTask.setVariable("president", nextUserList); - } + nextUserList.add(object.getString("president")); + delegateTask.setVariable("president", object.getString("president")); delegateTask.setVariable("pass4",1); } }else{ delegateTask.setVariable("pass4",0); delegateTask.removeVariable("manageIdList"); - - if(StringUtils.isNotBlank(object.getString("engineerSum"))) { - nextUserList.add(object.getString("engineerSum")); - delegateTask.setVariable("engineerSum", nextUserList); - } +// if(StringUtils.isNotBlank(object.getString("engineerSum"))) { +// nextUserList.add(object.getString("engineerSum")); +// delegateTask.setVariable("engineerSum", nextUserList); +// } + nextUserList.add(delegateTask.getVariable("engineerSum",String.class)); } }else{ throw new ActivitiException("此对象已经审批过了"); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/PresidentVerifyAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/PresidentVerifyAfter.java index 811aeb38..4e677255 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/PresidentVerifyAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/PresidentVerifyAfter.java @@ -44,17 +44,16 @@ public class PresidentVerifyAfter implements TaskListener { // 入会申请信息重新封装 if("1".equals(object.getString("passFlag"))) {//通过 delegateTask.setVariable("pass5",1); - if(StringUtils.isNotBlank(object.getString("engineerSumDone"))) { - nextUserList.add(object.getString("engineerSumDone")); - delegateTask.setVariable("engineerSumDone", nextUserList); - } - + nextUserList.add(object.getString("engineerSumDone")); + delegateTask.setVariable("engineerSumDone", object.getString("engineerSumDone")); }else{ delegateTask.setVariable("pass5",0); - if(StringUtils.isNotBlank(object.getString("engineerSum"))) { - nextUserList.add(object.getString("engineerSum")); - delegateTask.setVariable("engineerSum", nextUserList); - } +// if(StringUtils.isNotBlank(object.getString("engineerSum"))) { +// nextUserList.add(object.getString("engineerSum")); +// delegateTask.setVariable("engineerSum", nextUserList); +// } + nextUserList.add(delegateTask.getVariable("engineerSum",String.class)); + } // 存储当前节点意见 if (null != object.getString("commentText")) { diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMemberInfoAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMemberInfoAfter.java index 52de2fc8..97ce5683 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMemberInfoAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMemberInfoAfter.java @@ -43,13 +43,8 @@ public class WriteMemberInfoAfter implements TaskListener { List nextUserList = new ArrayList(); - // - if(StringUtils.isNotBlank(object.getString("charge"))) { - nextUserList.add(object.getString("charge")); - delegateTask.setVariable("charge", nextUserList); - System.out.println(delegateTask.getVariable("charge")); - } - + nextUserList.add(object.getString("charge")); + delegateTask.setVariable("charge",object.getString("charge")); //截止时间 流程描述 创建人 String user = object.getString("prcCreateUser"); From ca3a26591be95cd8782c538be813e1e709089041 Mon Sep 17 00:00:00 2001 From: Kevin Date: Sat, 30 Oct 2021 18:46:01 +0800 Subject: [PATCH 4/5] =?UTF-8?q?taskFinish-=E6=B5=81=E7=A8=8B=E7=95=85?= =?UTF-8?q?=E9=80=9A=5FprcName=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AutoStartAfter.java | 4 +- .../DirectorVerifyAfter.java | 4 +- .../MemberUploadInfoAfter.java | 4 +- .../ChargeVerifyAfter.java | 19 +++--- .../DirectorChooseAfter.java | 4 +- .../EngineerReviseAfter.java | 4 +- .../EngineerReviseDoneAfter.java | 13 +++- .../LeaderVerifyAfter.java | 4 +- .../StandardMeetProcess/ManageSignAfter.java | 20 ++----- .../PresidentVerifyAfter.java | 4 +- .../WriteMaterialAfter.java | 4 +- .../WriteMemberInfoAfter.java | 4 +- .../ChargeVerifyAfter.java | 55 +++++------------ .../ChargeVerifyBefore.java | 2 +- .../DirectorChooseAfter.java | 39 +++--------- .../DirectorChooseBefore.java | 2 +- .../EngineerReviseAfter.java | 5 +- .../EngineerReviseBefore.java | 2 +- .../EngineerReviseDoneAfter.java | 22 ++++--- .../EngineerReviseDoneBefore.java | 4 +- .../LeaderVerifyAfter.java | 13 ++-- .../LeaderVerifyBefore.java | 4 +- .../ManageSignAfter.java | 59 ++++++------------- .../ManageSignBefore.java | 4 +- .../PresidentVerifyAfter.java | 16 ++--- .../PresidentVerifyBefore.java | 4 +- .../WriteMaterialAfter.java | 6 +- .../WriteMaterialBefore.java | 18 ------ .../WriteMemberInfoAfter.java | 5 +- .../WriteMemberInfoBefore.java | 2 +- 30 files changed, 118 insertions(+), 232 deletions(-) diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/AutoStartAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/AutoStartAfter.java index cd4735f4..7f52958a 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/AutoStartAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/AutoStartAfter.java @@ -55,9 +55,7 @@ public class AutoStartAfter implements TaskListener { delegateTask.setVariable("createUserName", username); String standName = object.getString("listName"); delegateTask.setVariable("listName", standName); - String prcName = ""; - - prcName = standName + "-标准化活动会后流程-"; + String prcName ="标准化活动会后流程"; QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/DirectorVerifyAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/DirectorVerifyAfter.java index cbe96e50..d18970e4 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/DirectorVerifyAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/DirectorVerifyAfter.java @@ -77,9 +77,7 @@ public class DirectorVerifyAfter implements TaskListener { delegateTask.setVariable("createUserName", username); String standName = object.getString("listName"); delegateTask.setVariable("listName", standName); - String prcName = ""; - - prcName = standName + "-标准化活动会后流程-"; + String prcName ="标准化活动会后流程"; QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/MemberUploadInfoAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/MemberUploadInfoAfter.java index bd5ba54e..a545acfe 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/MemberUploadInfoAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/MemberUploadInfoAfter.java @@ -56,9 +56,7 @@ public class MemberUploadInfoAfter implements TaskListener { delegateTask.setVariable("createUserName", username); String standName = object.getString("listName"); delegateTask.setVariable("listName", standName); - String prcName = ""; - - prcName = standName + "-标准化活动会后流程-"; + String prcName ="标准化活动会后流程"; QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/ChargeVerifyAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/ChargeVerifyAfter.java index cbc1e186..9d926704 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/ChargeVerifyAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/ChargeVerifyAfter.java @@ -76,7 +76,6 @@ public class ChargeVerifyAfter implements TaskListener { if("1".equals(object.getString("passFlag"))){//通过 JSONArray os = object.getJSONObject("rh_pageData").getJSONArray("myPartRole"); - sum = delegateTask.getVariable("membersSumJSON",JSONObject.class); if(sum.isEmpty()){ sum = object; @@ -109,10 +108,7 @@ public class ChargeVerifyAfter implements TaskListener { } }else{ delegateTask.setVariable("pass2",0);//排他通道 - if(StringUtils.isNotBlank(object.getString("member"))) { - nextUserList.add(object.getString("member")); - delegateTask.setVariable("member", nextUserList); - }//驳回重写 + nextUserList.add(object.getString("member")); } }else{ throw new ActivitiException("审批过了"); @@ -140,9 +136,7 @@ public class ChargeVerifyAfter implements TaskListener { delegateTask.setVariable("createUserName", username); String standName = object.getString("listName"); delegateTask.setVariable("listName", standName); - String prcName = ""; - -prcName = standName + "-标准化活动参会流程-"; + String prcName ="标准化活动参会流程"; QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); @@ -160,8 +154,12 @@ prcName = standName + "-标准化活动参会流程-"; BusProcessNew busProcessNewNext = new BusProcessNew(); busProcessNewNext.setMsgType("clause"); busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); - JSONObject hand = delegateTask.getVariable("membersSumJSON",JSONObject.class); - busProcessNewNext.setMesg(hand.toJSONString()); + if(delegateTask.getVariable("pass2",Integer.class).equals(0)){ + busProcessNewNext.setMesg(object.toJSONString()); + }else{ + JSONObject hand = delegateTask.getVariable("membersSumJSON",JSONObject.class); + busProcessNewNext.setMesg(hand.toJSONString()); + } busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); busProcessNewNext.setFinishFlag("0"); busProcessNewNext.setTaskInfo(delegateTask.getName()); @@ -170,5 +168,6 @@ prcName = standName + "-标准化活动参会流程-"; busBean.save(busProcessNewNext); } } + } } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/DirectorChooseAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/DirectorChooseAfter.java index a05e2a4a..c5358f64 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/DirectorChooseAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/DirectorChooseAfter.java @@ -106,9 +106,7 @@ public class DirectorChooseAfter implements TaskListener { delegateTask.setVariable("createUserName", username); String standName = object.getString("listName"); delegateTask.setVariable("listName", standName); - String prcName = ""; - - prcName = standName + "-标准化活动参会流程-"; + String prcName ="标准化活动参会流程"; QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/EngineerReviseAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/EngineerReviseAfter.java index 03eb7f94..495dd672 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/EngineerReviseAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/EngineerReviseAfter.java @@ -46,9 +46,7 @@ public class EngineerReviseAfter implements TaskListener { delegateTask.setVariable("createUserName", username); String standName = object.getString("listName"); delegateTask.setVariable("listName", standName); - String prcName = ""; - - prcName = standName + "-标准化活动参会流程-"; + String prcName ="标准化活动参会流程"; QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/EngineerReviseDoneAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/EngineerReviseDoneAfter.java index cfda8128..5604b11a 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/EngineerReviseDoneAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/EngineerReviseDoneAfter.java @@ -42,7 +42,6 @@ public class EngineerReviseDoneAfter implements TaskListener { //TODO 流程结束，汇总 - //截止时间 流程描述 创建人 String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); String user = object.getString("prcCreateUser"); @@ -53,7 +52,7 @@ public class EngineerReviseDoneAfter implements TaskListener { delegateTask.setVariable("listName", standName); String prcName = ""; - prcName = standName + "-标准化活动参会流程-"; + prcName = "标准化活动参会流程"; QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); @@ -80,6 +79,16 @@ public class EngineerReviseDoneAfter implements TaskListener { busProcessNewNext.setPrcName(prcName); busBean.save(busProcessNewNext); } + }else { + BusProcessNew busProcessNewNext = new BusProcessNew(); + busProcessNewNext.setMsgType("clause"); + busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); + busProcessNewNext.setMesg(object.toJSONString()); + busProcessNewNext.setFinishFlag("0"); + busProcessNewNext.setTaskInfo(delegateTask.getName()); + prcName = "标准化活动参会流程" + "会议结束"; + busProcessNewNext.setPrcName(prcName); + busBean.save(busProcessNewNext); } } } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/LeaderVerifyAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/LeaderVerifyAfter.java index d749ab91..2097410b 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/LeaderVerifyAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/LeaderVerifyAfter.java @@ -86,9 +86,7 @@ public class LeaderVerifyAfter implements TaskListener { delegateTask.setVariable("createUserName", username); String standName = object.getString("listName"); delegateTask.setVariable("listName", standName); - String prcName = ""; - - prcName = standName + "-标准化活动参会流程-"; + String prcName ="标准化活动参会流程"; QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/ManageSignAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/ManageSignAfter.java index 1cd0bdce..283bfcf6 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/ManageSignAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/ManageSignAfter.java @@ -29,18 +29,16 @@ public class ManageSignAfter implements TaskListener { IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); //流程信息 IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class); - - LawsUserInfoService lawsUserInfoService = SpringContextUtil.getBean(LawsUserInfoService.class); - //根据流程id找到流程信息 QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId()); Datas datas = datasService.getOne(queryWrapper); - JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); delegateTask.setVariable("objectJson",object); - List nextUserList = new ArrayList(); + + + Integer count = 0; if(null == delegateTask.getVariable("managePassCount")){ delegateTask.setVariable("managePassCount",count); @@ -65,7 +63,6 @@ public class ManageSignAfter implements TaskListener { delegateTask.setVariable("manageIdList",idList); if(rat == 0){ if("1".equals(object.getString("passFlag"))) {//通过 - count = delegateTask.getVariable("managePassCount",Integer.class); count++; delegateTask.setVariable("managePassCount",count); @@ -77,11 +74,6 @@ public class ManageSignAfter implements TaskListener { }else{ delegateTask.setVariable("pass4",0); - delegateTask.removeVariable("manageIdList"); -// if(StringUtils.isNotBlank(object.getString("engineerSum"))) { -// nextUserList.add(object.getString("engineerSum")); -// delegateTask.setVariable("engineerSum", nextUserList); -// } nextUserList.add(delegateTask.getVariable("engineerSum",String.class)); } }else{ @@ -100,6 +92,8 @@ public class ManageSignAfter implements TaskListener { busBean.saveOrUpdate(busProcessNews); } } + + //截止时间 流程描述 创建人 String user = object.getString("prcCreateUser"); delegateTask.setVariable("createUser", user); @@ -107,9 +101,7 @@ public class ManageSignAfter implements TaskListener { delegateTask.setVariable("createUserName", username); String standName = object.getString("listName"); delegateTask.setVariable("listName", standName); - String prcName = ""; - - prcName = standName + "-标准化活动参会流程-"; + String prcName ="标准化活动参会流程"; QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/PresidentVerifyAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/PresidentVerifyAfter.java index 3dae16f7..046658d3 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/PresidentVerifyAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/PresidentVerifyAfter.java @@ -75,9 +75,7 @@ public class PresidentVerifyAfter implements TaskListener { delegateTask.setVariable("createUserName", username); String standName = object.getString("listName"); delegateTask.setVariable("listName", standName); - String prcName = ""; - - prcName = standName + "-标准化活动参会流程-"; + String prcName ="标准化活动参会流程"; QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); 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 501b8f0b..d8e99853 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 @@ -60,9 +60,7 @@ public class WriteMaterialAfter implements TaskListener { delegateTask.setVariable("createUserName", username); String standName = object.getString("listName"); delegateTask.setVariable("listName", standName); - String prcName = ""; - - prcName = standName + "-标准化活动参会流程-"; + String prcName ="标准化活动参会流程"; QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/WriteMemberInfoAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/WriteMemberInfoAfter.java index 01c4e7f9..42b37ff1 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/WriteMemberInfoAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/WriteMemberInfoAfter.java @@ -55,9 +55,7 @@ public class WriteMemberInfoAfter implements TaskListener { delegateTask.setVariable("createUserName", username); String standName = object.getString("listName"); delegateTask.setVariable("listName", standName); - String prcName = ""; - - prcName = standName + "-标准化活动参会流程-"; + String prcName ="标准化活动参会流程"; QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/ChargeVerifyAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/ChargeVerifyAfter.java index d6a2ec4a..d22e6ae1 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/ChargeVerifyAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/ChargeVerifyAfter.java @@ -42,7 +42,7 @@ public class ChargeVerifyAfter implements TaskListener { JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); delegateTask.setVariable("objectJson",object); List nextUserList = new ArrayList(); - + String prcName = "标准化活动入会流程-"; JSONObject sum = new JSONObject(); if(null == delegateTask.getVariable("membersSumJSON")){ @@ -54,31 +54,12 @@ public class ChargeVerifyAfter implements TaskListener { if(null == delegateTask.getVariable("chargePassCount")){ delegateTask.setVariable("chargePassCount",count); } - JSONArray objects = new JSONArray(); - if(null == delegateTask.getVariable("chargePassList")) { - delegateTask.setVariable("chargePassList", objects); - } - // 审批 - //防止重复审批同一对象 - List idList = new ArrayList<>(); - if(null == delegateTask.getVariable("chargeIdList")){ - delegateTask.setVariable("chargeIdList", idList); - } - int rat = 0; - idList = delegateTask.getVariable("chargeIdList",List.class); - if(!idList.isEmpty()){ - for(String a : idList){ - if(a.equals(object.getString("member"))){ - rat = 1; - break; - } - } - } - if(rat == 0){ + + + if("1".equals(object.getString("passFlag"))){//通过 JSONArray os = object.getJSONObject("rh_pageData").getJSONArray("myPartRole"); - sum = delegateTask.getVariable("membersSumJSON",JSONObject.class); if(sum.isEmpty()){ sum = object; @@ -93,32 +74,24 @@ public class ChargeVerifyAfter implements TaskListener { delegateTask.setVariable("membersSumJSON",sum); } - idList.add(object.getString("member")); - delegateTask.setVariable("chargeIdList",idList); - count = delegateTask.getVariable("chargePassCount",Integer.class); delegateTask.setVariable("chargePassCount",count + 1); - objects = delegateTask.getVariable("chargePassList",JSONArray.class); - objects.add(object); delegateTask.setVariable("pass2",1);//排他通道 - delegateTask.setVariable("chargePassList",objects); + if(delegateTask.getVariable("memberCount", Integer.class).equals(delegateTask.getVariable("chargePassCount", Integer.class))){ + prcName = prcName + "标准法规工程师汇总修订"; if(StringUtils.isNotBlank(object.getString("engineerSum"))) { nextUserList.add(object.getString("engineerSum")); delegateTask.setVariable("engineerSum", object.getString("engineerSum")); } } }else{ + prcName = prcName + "入会代表填写入会信息表"; delegateTask.setVariable("pass2",0);//排他通道 - if(StringUtils.isNotBlank(object.getString("member"))) { - nextUserList.add(object.getString("member")); - delegateTask.setVariable("member", nextUserList); - }//驳回重写 + nextUserList.add(object.getString("member")); } - }else{ - throw new ActivitiException("审批过了"); - } + // 存储当前节点意见 if (null != object.getString("commentText")) { QueryWrapper queryWrapper3 = new QueryWrapper(); @@ -142,9 +115,7 @@ public class ChargeVerifyAfter implements TaskListener { delegateTask.setVariable("createUserName", username); String standName = object.getString("listName"); delegateTask.setVariable("listName", standName); - String prcName = ""; -prcName = standName + "-标准化活动入会流程-"; QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); @@ -162,8 +133,12 @@ prcName = standName + "-标准化活动入会流程-"; BusProcessNew busProcessNewNext = new BusProcessNew(); busProcessNewNext.setMsgType("clause"); busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); - JSONObject hand = delegateTask.getVariable("membersSumJSON",JSONObject.class); - busProcessNewNext.setMesg(hand.toJSONString()); + if(delegateTask.getVariable("pass2",Integer.class).equals(0)){ + busProcessNewNext.setMesg(object.toJSONString()); + }else{ + JSONObject hand = delegateTask.getVariable("membersSumJSON",JSONObject.class); + busProcessNewNext.setMesg(hand.toJSONString()); + } busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); busProcessNewNext.setFinishFlag("0"); busProcessNewNext.setTaskInfo(delegateTask.getName()); 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 0d99b15d..475e88cc 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 @@ -14,7 +14,7 @@ public class ChargeVerifyBefore implements TaskListener { @Override public void notify(DelegateTask delegateTask) { - String link = "bzqdfbStep2?prcType=20"; + String link = "bzrhStep4?prcType=20"; IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); QueryWrapper queryWrapper1 = new QueryWrapper(); queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId()); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/DirectorChooseAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/DirectorChooseAfter.java index ce55aeaf..25ce0f64 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/DirectorChooseAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/DirectorChooseAfter.java @@ -28,9 +28,6 @@ public class DirectorChooseAfter implements TaskListener { IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); //流程信息 IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class); - - LawsUserInfoService lawsUserInfoService = SpringContextUtil.getBean(LawsUserInfoService.class); - //根据流程id找到流程信息 QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId()); @@ -40,33 +37,17 @@ public class DirectorChooseAfter implements TaskListener { delegateTask.setVariable("objectJson",object); List nextUserList = new ArrayList(); - System.out.println("后置搭建完成"); + String prcName = "标准化活动入会流程-"; + //如果 他是通过 passFlag==1 List passMemberList = new ArrayList<>(); if(null == delegateTask.getVariable("memberList")){ delegateTask.setVariable("memberList", passMemberList); } - //防止重复审批同一对象 - List idList = new ArrayList<>(); - if(null == delegateTask.getVariable("memberIdList")){ - delegateTask.setVariable("memberIdList", idList); - } - int rat = 0; - idList = delegateTask.getVariable("memberIdList",List.class); - if(!idList.isEmpty()){ - for(String a : idList){ - if(a.equals(object.getString("memberId"))){ - rat = 1; - break; - } - } - } - idList.add(object.getString("memberId")); - delegateTask.setVariable("memberIdList",idList); - if(rat == 0){ - if("1".equals(object.getString("passFlag"))) { + if("1".equals(object.getString("passFlag"))) { + prcName = prcName + "入会代表填写入会信息表"; nextUserList.add(object.getString("memberId")); if (null!=delegateTask.getVariable("memberList")) { List middle=delegateTask.getVariable("memberList",List.class); @@ -76,12 +57,12 @@ public class DirectorChooseAfter implements TaskListener { delegateTask.setVariable("memberList",nextUserList); } delegateTask.setVariable("memberCount",delegateTask.getVariable("memberList",List.class).size()); - }else{ - //TODO 如果所有人未通过，则结束流程 } - }else{ - throw new ActivitiException("此对象已经审批过了"); - } + + if(delegateTask.getVariable("memberCount",Integer.class).equals(0)){ + throw new ActivitiException("所有人不涉及入会，流程终止"); + } + // 存储当前节点意见 @@ -104,9 +85,7 @@ public class DirectorChooseAfter implements TaskListener { delegateTask.setVariable("createUserName", username); String standName = object.getString("listName"); delegateTask.setVariable("listName", standName); - String prcName = ""; - prcName = standName + "-标准化活动入会流程-"; QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); 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 3c7d007b..34411513 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 @@ -14,7 +14,7 @@ public class DirectorChooseBefore implements TaskListener { @Override public void notify(DelegateTask delegateTask) { - String link = "bzqdfbStep2?prcType=20"; + String link = "bzrhStep2?prcType=20"; IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); QueryWrapper queryWrapper1 = new QueryWrapper(); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseAfter.java index b7150d8a..3d3f46cd 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseAfter.java @@ -40,7 +40,8 @@ public class EngineerReviseAfter implements TaskListener { delegateTask.setVariable("objectJson",object); List nextUserList = new ArrayList(); - + String prcName = "标准化活动入会流程-"; + prcName = prcName + "标准法规部主管领导审核"; nextUserList.add(object.getString("leader")); delegateTask.setVariable("leader", object.getString("leader")); @@ -53,9 +54,7 @@ public class EngineerReviseAfter implements TaskListener { delegateTask.setVariable("createUserName", username); String standName = object.getString("listName"); delegateTask.setVariable("listName", standName); - String prcName = ""; - prcName = standName + "-标准化活动入会流程-"; QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); 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 49c75d79..cdbe19ed 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 @@ -14,7 +14,7 @@ public class EngineerReviseBefore implements TaskListener { @Override public void notify(DelegateTask delegateTask) { - String link = "bzqdfbStep2?prcType=20"; + String link = "bzrhStep5?prcType=20"; IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); QueryWrapper queryWrapper1 = new QueryWrapper(); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseDoneAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseDoneAfter.java index f6649dad..5b301984 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseDoneAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseDoneAfter.java @@ -30,21 +30,18 @@ public class EngineerReviseDoneAfter implements TaskListener { //流程信息 IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class); - LawsUserInfoService lawsUserInfoService = SpringContextUtil.getBean(LawsUserInfoService.class); - //根据流程id找到流程信息 QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId()); Datas datas = datasService.getOne(queryWrapper); - JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); delegateTask.setVariable("objectJson",object); - List nextUserList = new ArrayList(); + String prcName = "标准化活动入会流程-"; +// prcName = "标准化活动入会流程" + "会议结束"; + prcName = prcName + "流程结束"; - - - //TODO 流程结束，汇总 + //TODO 流程结束，入库 @@ -56,9 +53,7 @@ public class EngineerReviseDoneAfter implements TaskListener { delegateTask.setVariable("createUserName", username); String standName = object.getString("listName"); delegateTask.setVariable("listName", standName); - String prcName = ""; - prcName = standName + "-标准化活动入会流程-"; QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); @@ -85,6 +80,15 @@ public class EngineerReviseDoneAfter implements TaskListener { busProcessNewNext.setPrcName(prcName); busBean.save(busProcessNewNext); } + }else { + BusProcessNew busProcessNewNext = new BusProcessNew(); + busProcessNewNext.setMsgType("clause"); + busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); + busProcessNewNext.setMesg(object.toJSONString()); + busProcessNewNext.setFinishFlag("0"); + busProcessNewNext.setTaskInfo(delegateTask.getName()); + busProcessNewNext.setPrcName(prcName); + busBean.save(busProcessNewNext); } } } 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 33316a1c..ffed6d8c 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 @@ -14,8 +14,8 @@ public class EngineerReviseDoneBefore implements TaskListener { @Override public void notify(DelegateTask delegateTask) { - String link = "bzqdfbStep2?prcType=20"; - + String link = "bzrhStep6?prcType=20"; +//taskInfo=标准法规工程师汇总修订完毕 IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); QueryWrapper queryWrapper1 = new QueryWrapper(); queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId()); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/LeaderVerifyAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/LeaderVerifyAfter.java index 84e1d731..2bf6ffe5 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/LeaderVerifyAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/LeaderVerifyAfter.java @@ -34,11 +34,11 @@ public class LeaderVerifyAfter implements TaskListener { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId()); Datas datas = datasService.getOne(queryWrapper); - JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); delegateTask.setVariable("objectJson",object); - List nextUserList = new ArrayList(); + String prcName = "标准化活动入会流程-"; + if("1".equals(object.getString("passFlag"))) {//通过 delegateTask.setVariable("pass3",1); @@ -50,16 +50,13 @@ public class LeaderVerifyAfter implements TaskListener { nextUserList.add(object.getString("manageDepartmentList")); } // 配置多实例 + prcName = prcName + "费用管理部门会签"; delegateTask.setVariable("manageDepartmentList", nextUserList); delegateTask.setVariable("manageDepartmentCount",nextUserList.size()); - } }else{ + prcName = prcName + "标准法规工程师汇总修订"; delegateTask.setVariable("pass3",0); -// if(StringUtils.isNotBlank(object.getString("engineerSum"))) { -// nextUserList.add(object.getString("engineerSum")); -// delegateTask.setVariable("engineerSum", nextUserList); -// } nextUserList.add(delegateTask.getVariable("engineerSum",String.class)); } // 存储当前节点意见 @@ -84,9 +81,7 @@ public class LeaderVerifyAfter implements TaskListener { delegateTask.setVariable("createUserName", username); String standName = object.getString("listName"); delegateTask.setVariable("listName", standName); - String prcName = ""; - prcName = standName + "-标准化活动入会流程-"; QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); 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 9c7a538f..22058ddd 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 @@ -14,7 +14,9 @@ public class LeaderVerifyBefore implements TaskListener { @Override public void notify(DelegateTask delegateTask) { - String link = "bzqdfbStep2?prcType=20"; + String link = "bzrhStep6?prcType=20"; +// taskInfo=标准法规部主管领导审核 + IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); QueryWrapper queryWrapper1 = new QueryWrapper(); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/ManageSignAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/ManageSignAfter.java index e6a9c5bb..a48e545a 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/ManageSignAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/ManageSignAfter.java @@ -30,62 +30,39 @@ public class ManageSignAfter implements TaskListener { //流程信息 IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class); - LawsUserInfoService lawsUserInfoService = SpringContextUtil.getBean(LawsUserInfoService.class); - //根据流程id找到流程信息 QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId()); Datas datas = datasService.getOne(queryWrapper); - JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); delegateTask.setVariable("objectJson",object); + + List nextUserList = new ArrayList(); + String prcName = "标准化活动入会流程-"; Integer count = 0; if(null == delegateTask.getVariable("managePassCount")){ delegateTask.setVariable("managePassCount",count); } - //防止重复审批同一对象 - List idList = new ArrayList<>(); - if(null == delegateTask.getVariable("manageIdList")){ - delegateTask.setVariable("manageIdList", idList); - } - int rat = 0; - idList = delegateTask.getVariable("manageIdList",List.class); - if(!idList.isEmpty()){ - for(String a : idList){ - if(a.equals(object.getString("manageDepartment"))){ - rat = 1; - break; - } - } - } - idList.add(object.getString("manageDepartment")); - delegateTask.setVariable("manageIdList",idList); - if(rat == 0){ - if("1".equals(object.getString("passFlag"))) {//通过 - count = delegateTask.getVariable("managePassCount",Integer.class); - count++; - delegateTask.setVariable("managePassCount",count); - if(delegateTask.getVariable("manageDepartmentCount", Integer.class).equals(delegateTask.getVariable("managePassCount", Integer.class))){ - nextUserList.add(object.getString("president")); - delegateTask.setVariable("president", object.getString("president")); - delegateTask.setVariable("pass4",1); - } - - }else{ - delegateTask.setVariable("pass4",0); - delegateTask.removeVariable("manageIdList"); -// if(StringUtils.isNotBlank(object.getString("engineerSum"))) { -// nextUserList.add(object.getString("engineerSum")); -// delegateTask.setVariable("engineerSum", nextUserList); -// } - nextUserList.add(delegateTask.getVariable("engineerSum",String.class)); + if("1".equals(object.getString("passFlag"))) {//通过 + count = delegateTask.getVariable("managePassCount",Integer.class); + count++; + delegateTask.setVariable("managePassCount",count); + if(delegateTask.getVariable("manageDepartmentCount", Integer.class).equals(delegateTask.getVariable("managePassCount", Integer.class))){ + prcName = prcName + "技术委员会常务副主任/总院院长审定"; + nextUserList.add(object.getString("president")); + delegateTask.setVariable("president", object.getString("president")); + delegateTask.setVariable("managePassCount",0); + delegateTask.setVariable("pass4",1); } }else{ - throw new ActivitiException("此对象已经审批过了"); + prcName = prcName + "标准法规工程师汇总修订"; + delegateTask.setVariable("pass4",0); + nextUserList.add(delegateTask.getVariable("engineerSum",String.class)); } + // 存储当前节点意见 if (null != object.getString("commentText")) { QueryWrapper queryWrapper3 = new QueryWrapper(); @@ -106,9 +83,7 @@ public class ManageSignAfter implements TaskListener { delegateTask.setVariable("createUserName", username); String standName = object.getString("listName"); delegateTask.setVariable("listName", standName); - String prcName = ""; - prcName = standName + "-标准化活动入会流程-"; QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); 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 cb2b82f2..8659bb5c 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 @@ -14,8 +14,8 @@ public class ManageSignBefore implements TaskListener { @Override public void notify(DelegateTask delegateTask) { - String link = "bzqdfbStep2?prcType=20"; - + String link = "bzrhStep6?prcType=20"; +//taskInfo=费用管理部门会签 IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); QueryWrapper queryWrapper1 = new QueryWrapper(); queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId()); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/PresidentVerifyAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/PresidentVerifyAfter.java index 4e677255..30257399 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/PresidentVerifyAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/PresidentVerifyAfter.java @@ -28,34 +28,28 @@ public class PresidentVerifyAfter implements TaskListener { IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); //流程信息 IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class); - LawsUserInfoService lawsUserInfoService = SpringContextUtil.getBean(LawsUserInfoService.class); //根据流程id找到流程信息 QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId()); Datas datas = datasService.getOne(queryWrapper); - JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); delegateTask.setVariable("objectJson",object); List nextUserList = new ArrayList(); - - // 入会申请信息重新封装 + String prcName = "标准化活动入会流程-"; if("1".equals(object.getString("passFlag"))) {//通过 + prcName = prcName + "标准法规工程师汇总修订完毕"; delegateTask.setVariable("pass5",1); nextUserList.add(object.getString("engineerSumDone")); delegateTask.setVariable("engineerSumDone", object.getString("engineerSumDone")); }else{ + prcName = prcName + "标准法规工程师汇总修订"; delegateTask.setVariable("pass5",0); -// if(StringUtils.isNotBlank(object.getString("engineerSum"))) { -// nextUserList.add(object.getString("engineerSum")); -// delegateTask.setVariable("engineerSum", nextUserList); -// } nextUserList.add(delegateTask.getVariable("engineerSum",String.class)); - } - // 存储当前节点意见 + //存储当前节点意见 if (null != object.getString("commentText")) { QueryWrapper queryWrapper3 = new QueryWrapper(); queryWrapper3.eq("TASK_ID", delegateTask.getId()); @@ -76,9 +70,7 @@ public class PresidentVerifyAfter implements TaskListener { delegateTask.setVariable("createUserName", username); String standName = object.getString("listName"); delegateTask.setVariable("listName", standName); - String prcName = ""; - prcName = standName + "-标准化活动入会流程-"; QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); 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 4154637d..0324f75a 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 @@ -14,8 +14,8 @@ public class PresidentVerifyBefore implements TaskListener { @Override public void notify(DelegateTask delegateTask) { - String link = "bzqdfbStep2?prcType=20"; - + String link = "bzrhStep6?prcType=20"; +//taskInfo=技术委员会常务副主任 IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); QueryWrapper queryWrapper1 = new QueryWrapper(); queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId()); 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 cbea2bde..dac7d739 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 @@ -42,6 +42,8 @@ public class WriteMaterialAfter implements TaskListener { List nextUserList = new ArrayList(); + String prcName = "标准化活动入会流程-"; + // 入会申请信息重新封装 if(StringUtils.isNotBlank(object.getString("directorList"))) { @@ -52,6 +54,7 @@ public class WriteMaterialAfter implements TaskListener { } // 配置多实例 delegateTask.setVariable("directorList", nextUserList); + prcName = prcName + "技术委员会分委会主任/入会代表所在中心主任提名入会代表"; } //截止时间 流程描述 创建人 String user = object.getString("prcCreateUser"); @@ -60,9 +63,7 @@ public class WriteMaterialAfter implements TaskListener { delegateTask.setVariable("createUserName", username); String standName = object.getString("listName"); delegateTask.setVariable("listName", standName); - String prcName = ""; - prcName = standName + "-标准化活动入会流程-"; QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); @@ -91,6 +92,7 @@ public class WriteMaterialAfter implements TaskListener { System.out.println("处理人:" + nextUser); System.out.println("流程名:" + prcName); System.out.println("节点信息:" + delegateTask.getName()); + System.out.println("节点信息2:" + delegateTask.getTaskDefinitionKey()); } } } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMaterialBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMaterialBefore.java index 243ce174..c56f7d72 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMaterialBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMaterialBefore.java @@ -15,23 +15,5 @@ public class WriteMaterialBefore implements TaskListener { @Override public void notify(DelegateTask delegateTask) { - String link = "bzqdfbStep2?prcType=20"; - IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); - QueryWrapper queryWrapper1 = new QueryWrapper(); - queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId()); - queryWrapper1.eq("USER_ID",delegateTask.getAssignee()); - queryWrapper1.isNull("TASK_ID"); - List list = busBean.list(queryWrapper1); - if(!list.isEmpty()){ - BusProcessNew one1 = list.get(0); - one1.setTaskId(delegateTask.getId()); - busBean.saveOrUpdate(one1); - - CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class); - // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型 - one1.setLink(link); - one1.setTaskInfo(delegateTask.getName()); - oaService.sendTodoMq(one1); - } }} diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMemberInfoAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMemberInfoAfter.java index 97ce5683..aa337e28 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMemberInfoAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMemberInfoAfter.java @@ -42,7 +42,8 @@ public class WriteMemberInfoAfter implements TaskListener { List nextUserList = new ArrayList(); - + String prcName = "标准化活动入会流程-"; + prcName = prcName + "入会人员所在部门负责人审核"; nextUserList.add(object.getString("charge")); delegateTask.setVariable("charge",object.getString("charge")); @@ -53,9 +54,7 @@ public class WriteMemberInfoAfter implements TaskListener { delegateTask.setVariable("createUserName", username); String standName = object.getString("listName"); delegateTask.setVariable("listName", standName); - String prcName = ""; - prcName = standName + "-标准化活动入会流程-"; QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); 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 1e119e94..844af9b0 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 @@ -14,7 +14,7 @@ public class WriteMemberInfoBefore implements TaskListener { @Override public void notify(DelegateTask delegateTask) { - String link = "bzqdfbStep2?prcType=20"; + String link = "bzrhStep3?prcType=20"; IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); QueryWrapper queryWrapper1 = new QueryWrapper(); From 895f27c3009f6d9d6f3430f1bdef91c4235d7bbe Mon Sep 17 00:00:00 2001 From: Kevin Date: Sat, 30 Oct 2021 19:48:34 +0800 Subject: [PATCH 5/5] =?UTF-8?q?zcr:=E5=8F=82=E4=BC=9A=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E6=95=B4=E6=94=B9=20+=20=E5=85=A5=E4=BC=9A=E4=BC=98=E5=8C=96?= =?UTF-8?q?=20+=20prcName=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AutoStartBefore.java | 2 +- .../DirectorVerifyBefore.java | 2 +- .../MemberUploadInfoBefore.java | 2 +- .../ChargeVerifyAfter.java | 93 ++++++------------- .../ChargeVerifyBefore.java | 2 +- .../DirectorChooseAfter.java | 58 ++++-------- .../DirectorChooseBefore.java | 2 +- .../EngineerReviseAfter.java | 5 +- .../EngineerReviseBefore.java | 2 +- .../EngineerReviseDoneAfter.java | 6 +- .../EngineerReviseDoneBefore.java | 2 +- .../LeaderVerifyAfter.java | 14 +-- .../LeaderVerifyBefore.java | 2 +- .../StandardMeetProcess/ManageSignAfter.java | 50 +++------- .../StandardMeetProcess/ManageSignBefore.java | 2 +- .../PresidentVerifyAfter.java | 14 +-- .../PresidentVerifyBefore.java | 2 +- .../WriteMaterialAfter.java | 5 +- .../WriteMaterialBefore.java | 2 +- .../WriteMemberInfoAfter.java | 11 +-- .../WriteMemberInfoBefore.java | 2 +- .../ChargeVerifyAfter.java | 67 ++++++------- .../DirectorChooseAfter.java | 40 ++++---- .../EngineerReviseAfter.java | 6 +- .../EngineerReviseDoneAfter.java | 2 +- .../LeaderVerifyAfter.java | 4 +- .../ManageSignAfter.java | 5 +- .../PresidentVerifyAfter.java | 4 +- .../WriteMemberInfoAfter.java | 5 - 29 files changed, 144 insertions(+), 269 deletions(-) diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/AutoStartBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/AutoStartBefore.java index 2584f77b..500581c4 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/AutoStartBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/AutoStartBefore.java @@ -14,7 +14,7 @@ public class AutoStartBefore implements TaskListener { @Override public void notify(DelegateTask delegateTask) { - String link = "bzqdfbStep2?prcType=22"; + String link = "bzhhStep?prcType=22"; IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); QueryWrapper queryWrapper1 = new QueryWrapper(); queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId()); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/DirectorVerifyBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/DirectorVerifyBefore.java index f70ca5ab..36da681e 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/DirectorVerifyBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/DirectorVerifyBefore.java @@ -14,7 +14,7 @@ public class DirectorVerifyBefore implements TaskListener { @Override public void notify(DelegateTask delegateTask) { - String link = "bzqdfbStep2?prcType=22"; + String link = "bzhhStep?prcType=22"; IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); QueryWrapper queryWrapper1 = new QueryWrapper(); queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId()); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/MemberUploadInfoBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/MemberUploadInfoBefore.java index f883cb31..c9647980 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/MemberUploadInfoBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/MemberUploadInfoBefore.java @@ -14,7 +14,7 @@ public class MemberUploadInfoBefore implements TaskListener { @Override public void notify(DelegateTask delegateTask) { - String link = "bzqdfbStep2?prcType=22"; + String link = "bzhhStep?prcType=22"; IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); QueryWrapper queryWrapper1 = new QueryWrapper(); queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId()); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/ChargeVerifyAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/ChargeVerifyAfter.java index 9d926704..32299470 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/ChargeVerifyAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/ChargeVerifyAfter.java @@ -30,89 +30,57 @@ public class ChargeVerifyAfter implements TaskListener { IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); //流程信息 IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class); - LawsUserInfoService lawsUserInfoService = SpringContextUtil.getBean(LawsUserInfoService.class); - //根据流程id找到流程信息 QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId()); Datas datas = datasService.getOne(queryWrapper); - JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); delegateTask.setVariable("objectJson",object); List nextUserList = new ArrayList(); + String prcName = "标准化活动参会流程-"; JSONObject sum = new JSONObject(); if(null == delegateTask.getVariable("membersSumJSON")){ delegateTask.setVariable("membersSumJSON",sum); } - - Integer count = 0; if(null == delegateTask.getVariable("chargePassCount")){ delegateTask.setVariable("chargePassCount",count); } - JSONArray objects = new JSONArray(); - if(null == delegateTask.getVariable("chargePassList")) { - delegateTask.setVariable("chargePassList", objects); - } - // 审批 - //防止重复审批同一对象 - List idList = new ArrayList<>(); - if(null == delegateTask.getVariable("chargeIdList")){ - delegateTask.setVariable("chargeIdList", idList); - } - int rat = 0; - idList = delegateTask.getVariable("chargeIdList",List.class); - if(!idList.isEmpty()){ - for(String a : idList){ - if(a.equals(object.getString("member"))){ - rat = 1; - break; - } + + if("1".equals(object.getString("passFlag"))){//通过 + JSONArray os = object.getJSONObject("rh_pageData").getJSONArray("myPartRole"); + sum = delegateTask.getVariable("membersSumJSON",JSONObject.class); + if(sum.isEmpty()){ + sum = object; + delegateTask.setVariable("membersSumJSON",sum); + }else { + JSONObject o1 = sum.getJSONObject("rh_pageData"); + JSONObject o = os.getJSONObject(0); + JSONArray os1 = sum.getJSONObject("rh_pageData").getJSONArray("myPartRole"); + os1.add(o); + o1.put("myPartRole",os1); + sum.put("rh_pageData",o1); + delegateTask.setVariable("membersSumJSON",sum); } - } - if(rat == 0){ - if("1".equals(object.getString("passFlag"))){//通过 - - JSONArray os = object.getJSONObject("rh_pageData").getJSONArray("myPartRole"); - sum = delegateTask.getVariable("membersSumJSON",JSONObject.class); - if(sum.isEmpty()){ - sum = object; - delegateTask.setVariable("membersSumJSON",sum); - }else { - JSONObject o1 = sum.getJSONObject("rh_pageData"); - JSONObject o = os.getJSONObject(0); - JSONArray os1 = sum.getJSONObject("rh_pageData").getJSONArray("myPartRole"); - os1.add(o); - o1.put("myPartRole",os1); - sum.put("rh_pageData",o1); - delegateTask.setVariable("membersSumJSON",sum); + count = delegateTask.getVariable("chargePassCount",Integer.class); + delegateTask.setVariable("chargePassCount",count + 1); + delegateTask.setVariable("pass2",1);//排他通道 + System.out.println(delegateTask.getVariable("chargePassList")); + if(delegateTask.getVariable("memberCount", Integer.class).equals(delegateTask.getVariable("chargePassCount", Integer.class))){ + prcName = prcName + "标准法规工程师修订"; + if(StringUtils.isNotBlank(object.getString("engineerSum"))) { + nextUserList.add(object.getString("engineerSum")); + delegateTask.setVariable("engineerSum", object.getString("engineerSum")); } - - idList.add(object.getString("member")); - delegateTask.setVariable("chargeIdList",idList); - - delegateTask.setVariable("pass2",1);//排他通道 - count = delegateTask.getVariable("chargePassCount",Integer.class); - delegateTask.setVariable("chargePassCount",count + 1); - objects = delegateTask.getVariable("chargePassList",JSONArray.class); - objects.add(object); - delegateTask.setVariable("chargePassList",objects); - System.out.println(delegateTask.getVariable("chargePassList")); - if(delegateTask.getVariable("memberCount", Integer.class).equals(delegateTask.getVariable("chargePassCount", Integer.class))){ - if(StringUtils.isNotBlank(object.getString("engineerSum"))) { - nextUserList.add(object.getString("engineerSum")); - delegateTask.setVariable("engineerSum", object.getString("engineerSum")); - } - } - }else{ - delegateTask.setVariable("pass2",0);//排他通道 - nextUserList.add(object.getString("member")); } }else{ - throw new ActivitiException("审批过了"); + prcName = prcName + "参会代表填写参会信息表"; + delegateTask.setVariable("pass2",0);//排他通道 + nextUserList.add(object.getString("member")); } + // 存储当前节点意见 if (null != object.getString("commentText")) { QueryWrapper queryWrapper3 = new QueryWrapper(); @@ -127,8 +95,6 @@ public class ChargeVerifyAfter implements TaskListener { } } - - //截止时间 流程描述 创建人 String user = object.getString("prcCreateUser"); delegateTask.setVariable("createUser", user); @@ -136,7 +102,6 @@ public class ChargeVerifyAfter implements TaskListener { delegateTask.setVariable("createUserName", username); String standName = object.getString("listName"); delegateTask.setVariable("listName", standName); - String prcName ="标准化活动参会流程"; QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); 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 45c4e771..00df1e02 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 @@ -14,7 +14,7 @@ public class ChargeVerifyBefore implements TaskListener { @Override public void notify(DelegateTask delegateTask) { - String link = "bzqdfbStep2?prcType=21"; + String link = "bzchStep?prcType=21"; IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); QueryWrapper queryWrapper1 = new QueryWrapper(); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/DirectorChooseAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/DirectorChooseAfter.java index c5358f64..d82b3d03 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/DirectorChooseAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/DirectorChooseAfter.java @@ -30,59 +30,42 @@ public class DirectorChooseAfter implements TaskListener { //流程信息 IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class); - LawsUserInfoService lawsUserInfoService = SpringContextUtil.getBean(LawsUserInfoService.class); - //根据流程id找到流程信息 QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId()); Datas datas = datasService.getOne(queryWrapper); - JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); delegateTask.setVariable("objectJson",object); - List nextUserList = new ArrayList(); - System.out.println("后置搭建完成"); + //如果 他是通过 passFlag==1 List passMemberList = new ArrayList<>(); if(null == delegateTask.getVariable("memberList")){ delegateTask.setVariable("memberList", passMemberList); } + String prcName = "标准化活动参会流程-"; - //防止重复审批同一对象 - List idList = new ArrayList<>(); - if(null == delegateTask.getVariable("memberIdList")){ - delegateTask.setVariable("memberIdList", idList); + //全员不通过，检测条件 directorCount + //TODO 1全员不通过,2会后需要多实例吗? + Integer allCount = delegateTask.getVariable("directorList",List.class).size();; + Integer count = 0; + if(null == delegateTask.getVariable("directorCount")){ + delegateTask.setVariable("directorCount", count); } - int rat = 0; - idList = delegateTask.getVariable("memberIdList",List.class); - if(!idList.isEmpty()){ - for(String a : idList){ - if(a.equals(object.getString("memberId"))){ - rat = 1; - break; - } - } - } - idList.add(object.getString("memberId")); - delegateTask.setVariable("memberIdList",idList); + count = delegateTask.getVariable("directorCount",Integer.class); + delegateTask.setVariable("directorCount",count+1); - if(rat == 0){ - if("1".equals(object.getString("passFlag"))) { - - nextUserList.add(object.getString("memberId")); - if (null!=delegateTask.getVariable("memberList")) { - List middle=delegateTask.getVariable("memberList",List.class); - middle.addAll(nextUserList); - delegateTask.setVariable("memberList",middle); - }else { - delegateTask.setVariable("memberList",nextUserList); - } - delegateTask.setVariable("memberCount",delegateTask.getVariable("memberList",List.class).size()); - }else{ - //TODO 如果所有人未通过，则结束流程 + if("1".equals(object.getString("passFlag"))) { + prcName = prcName + "参会代表填写参会信息表"; + nextUserList.add(object.getString("memberId")); + if (null!=delegateTask.getVariable("memberList")) { + List middle=delegateTask.getVariable("memberList",List.class); + middle.addAll(nextUserList); + delegateTask.setVariable("memberList",middle); + }else { + delegateTask.setVariable("memberList",nextUserList); } - }else{ - throw new ActivitiException("此对象已经审批过了"); + delegateTask.setVariable("memberCount",delegateTask.getVariable("memberList",List.class).size()); } @@ -106,7 +89,6 @@ public class DirectorChooseAfter implements TaskListener { delegateTask.setVariable("createUserName", username); String standName = object.getString("listName"); delegateTask.setVariable("listName", standName); - String prcName ="标准化活动参会流程"; QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); 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 ccad914f..edf1b148 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 @@ -14,7 +14,7 @@ public class DirectorChooseBefore implements TaskListener { @Override public void notify(DelegateTask delegateTask) { - String link = "bzqdfbStep2?prcType=21"; + String link = "bzchStep?prcType=21"; IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); QueryWrapper queryWrapper1 = new QueryWrapper(); queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId()); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/EngineerReviseAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/EngineerReviseAfter.java index 495dd672..b596c261 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/EngineerReviseAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/EngineerReviseAfter.java @@ -26,16 +26,16 @@ public class EngineerReviseAfter implements TaskListener { IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); //流程信息 IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class); - //根据流程id找到流程信息 QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId()); Datas datas = datasService.getOne(queryWrapper); - JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); delegateTask.setVariable("objectJson",object); List nextUserList = new ArrayList(); + String prcName = "标准化活动参会流程-"; + prcName = prcName + "技术管理中心主任审批"; nextUserList.add(object.getString("leader")); delegateTask.setVariable("leader", object.getString("leader")); @@ -46,7 +46,6 @@ public class EngineerReviseAfter implements TaskListener { delegateTask.setVariable("createUserName", username); String standName = object.getString("listName"); delegateTask.setVariable("listName", standName); - String prcName ="标准化活动参会流程"; QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); 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 a1403a34..e203b821 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 @@ -14,7 +14,7 @@ public class EngineerReviseBefore implements TaskListener { @Override public void notify(DelegateTask delegateTask) { - String link = "bzqdfbStep2?prcType=21"; + String link = "bzchStep?prcType=21"; IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); QueryWrapper queryWrapper1 = new QueryWrapper(); queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId()); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/EngineerReviseDoneAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/EngineerReviseDoneAfter.java index 5604b11a..2ac661bb 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/EngineerReviseDoneAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/EngineerReviseDoneAfter.java @@ -38,7 +38,9 @@ public class EngineerReviseDoneAfter implements TaskListener { delegateTask.setVariable("objectJson",object); List nextUserList = new ArrayList(); - + String prcName = "标准化活动参会流程-"; +// prcName = "标准化活动参会流程-" + "会议结束"; + prcName = prcName + "流程结束"; //TODO 流程结束，汇总 @@ -50,7 +52,6 @@ public class EngineerReviseDoneAfter implements TaskListener { delegateTask.setVariable("createUserName", username); String standName = object.getString("listName"); delegateTask.setVariable("listName", standName); - String prcName = ""; prcName = "标准化活动参会流程"; @@ -86,7 +87,6 @@ public class EngineerReviseDoneAfter implements TaskListener { busProcessNewNext.setMesg(object.toJSONString()); busProcessNewNext.setFinishFlag("0"); busProcessNewNext.setTaskInfo(delegateTask.getName()); - prcName = "标准化活动参会流程" + "会议结束"; busProcessNewNext.setPrcName(prcName); busBean.save(busProcessNewNext); } 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 f054da16..6485c216 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 @@ -14,7 +14,7 @@ public class EngineerReviseDoneBefore implements TaskListener { @Override public void notify(DelegateTask delegateTask) { - String link = "bzqdfbStep2?prcType=21"; + String link = "bzchStep?prcType=21"; IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); QueryWrapper queryWrapper1 = new QueryWrapper(); queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId()); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/LeaderVerifyAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/LeaderVerifyAfter.java index 2097410b..88374852 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/LeaderVerifyAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/LeaderVerifyAfter.java @@ -29,19 +29,15 @@ public class LeaderVerifyAfter implements TaskListener { IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); //流程信息 IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class); - - LawsUserInfoService lawsUserInfoService = SpringContextUtil.getBean(LawsUserInfoService.class); - //根据流程id找到流程信息 QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId()); Datas datas = datasService.getOne(queryWrapper); - JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); delegateTask.setVariable("objectJson",object); - List nextUserList = new ArrayList(); + String prcName = "标准化活动参会流程-"; if("1".equals(object.getString("passFlag"))) {//通过 delegateTask.setVariable("pass3",1); if(StringUtils.isNotBlank(object.getString("manageDepartmentList"))) { @@ -54,15 +50,12 @@ public class LeaderVerifyAfter implements TaskListener { // 配置多实例 delegateTask.setVariable("manageDepartmentList", nextUserList); delegateTask.setVariable("manageDepartmentCount",nextUserList.size()); - + prcName = prcName + "费用管理部门会签"; } }else{ delegateTask.setVariable("pass3",0); nextUserList.add(delegateTask.getVariable("engineerSum",String.class)); -// if(StringUtils.isNotBlank(object.getString("engineerSum"))) { -// nextUserList.add(object.getString("engineerSum")); -// delegateTask.setVariable("engineerSum", nextUserList); -// } + prcName = prcName + "标准法规工程师修订"; } // 存储当前节点意见 if (null != object.getString("commentText")) { @@ -86,7 +79,6 @@ public class LeaderVerifyAfter implements TaskListener { delegateTask.setVariable("createUserName", username); String standName = object.getString("listName"); delegateTask.setVariable("listName", standName); - String prcName ="标准化活动参会流程"; QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); 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 d3f917f6..c7856218 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 @@ -14,7 +14,7 @@ public class LeaderVerifyBefore implements TaskListener { @Override public void notify(DelegateTask delegateTask) { - String link = "bzqdfbStep2?prcType=21"; + String link = "bzchStep?prcType=21"; IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); QueryWrapper queryWrapper1 = new QueryWrapper(); queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId()); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/ManageSignAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/ManageSignAfter.java index 283bfcf6..23cb4f60 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/ManageSignAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/ManageSignAfter.java @@ -37,47 +37,26 @@ public class ManageSignAfter implements TaskListener { delegateTask.setVariable("objectJson",object); List nextUserList = new ArrayList(); - - + String prcName = "标准化活动参会流程-"; Integer count = 0; if(null == delegateTask.getVariable("managePassCount")){ delegateTask.setVariable("managePassCount",count); } - - //防止重复审批同一对象 - List idList = new ArrayList<>(); - if(null == delegateTask.getVariable("manageIdList")){ - delegateTask.setVariable("manageIdList", idList); - } - int rat = 0; - idList = delegateTask.getVariable("manageIdList",List.class); - if(!idList.isEmpty()){ - for(String a : idList){ - if(a.equals(object.getString("manageDepartment"))){ - rat = 1; - break; - } - } - } - idList.add(object.getString("manageDepartment")); - delegateTask.setVariable("manageIdList",idList); - if(rat == 0){ - if("1".equals(object.getString("passFlag"))) {//通过 - count = delegateTask.getVariable("managePassCount",Integer.class); - count++; - delegateTask.setVariable("managePassCount",count); - if(delegateTask.getVariable("manageDepartmentCount", Integer.class).equals(delegateTask.getVariable("managePassCount", Integer.class))){ - nextUserList.add(object.getString("president")); - delegateTask.setVariable("president", object.getString("president")); - delegateTask.setVariable("pass4",1); - } - - }else{ - delegateTask.setVariable("pass4",0); - nextUserList.add(delegateTask.getVariable("engineerSum",String.class)); + if("1".equals(object.getString("passFlag"))) {//通过 + count = delegateTask.getVariable("managePassCount",Integer.class); + count++; + delegateTask.setVariable("managePassCount",count); + if(delegateTask.getVariable("manageDepartmentCount", Integer.class).equals(delegateTask.getVariable("managePassCount", Integer.class))){ + prcName = prcName + "技术委员会常务副主任/总院院长审定"; + nextUserList.add(object.getString("president")); + delegateTask.setVariable("managePassCount",0); + delegateTask.setVariable("president", object.getString("president")); + delegateTask.setVariable("pass4",1); } }else{ - throw new ActivitiException("此对象已经审批过了"); + prcName = prcName + "标准法规工程师修订"; + delegateTask.setVariable("pass4",0); + nextUserList.add(delegateTask.getVariable("engineerSum",String.class)); } // 存储当前节点意见 if (null != object.getString("commentText")) { @@ -101,7 +80,6 @@ public class ManageSignAfter implements TaskListener { delegateTask.setVariable("createUserName", username); String standName = object.getString("listName"); delegateTask.setVariable("listName", standName); - String prcName ="标准化活动参会流程"; QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); 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 c33e641a..6c7e3488 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 @@ -14,7 +14,7 @@ public class ManageSignBefore implements TaskListener { @Override public void notify(DelegateTask delegateTask) { - String link = "bzqdfbStep2?prcType=21"; + String link = "bzchStep?prcType=21"; IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); QueryWrapper queryWrapper1 = new QueryWrapper(); queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId()); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/PresidentVerifyAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/PresidentVerifyAfter.java index 046658d3..fa53a424 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/PresidentVerifyAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/PresidentVerifyAfter.java @@ -28,30 +28,23 @@ public class PresidentVerifyAfter implements TaskListener { IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); //流程信息 IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class); - - LawsUserInfoService lawsUserInfoService = SpringContextUtil.getBean(LawsUserInfoService.class); - //根据流程id找到流程信息 QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId()); Datas datas = datasService.getOne(queryWrapper); - JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); delegateTask.setVariable("objectJson",object); - List nextUserList = new ArrayList(); - // 入会申请信息重新封装 + String prcName = "标准化活动参会流程-"; if("1".equals(object.getString("passFlag"))) {//通过 + prcName = prcName + "标准法规工程师修订完毕"; delegateTask.setVariable("pass5",1); nextUserList.add(object.getString("engineerSumDone")); delegateTask.setVariable("engineerSumDone", object.getString("engineerSumDone")); }else{ + prcName = prcName + "标准法规工程师修订"; delegateTask.setVariable("pass5",0); -// if(StringUtils.isNotBlank(object.getString("engineerSum"))) { -// nextUserList.add(object.getString("engineerSum")); -// delegateTask.setVariable("engineerSum", nextUserList); -// } nextUserList.add(delegateTask.getVariable("engineerSum",String.class)); } // 存储当前节点意见 @@ -75,7 +68,6 @@ public class PresidentVerifyAfter implements TaskListener { delegateTask.setVariable("createUserName", username); String standName = object.getString("listName"); delegateTask.setVariable("listName", standName); - String prcName ="标准化活动参会流程"; QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); 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 8bad174b..ca637a9d 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 @@ -14,7 +14,7 @@ public class PresidentVerifyBefore implements TaskListener { @Override public void notify(DelegateTask delegateTask) { - String link = "bzqdfbStep2?prcType=21"; + String link = "bzchStep?prcType=21"; IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); QueryWrapper queryWrapper1 = new QueryWrapper(); queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId()); 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 d8e99853..7c2ea60a 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 @@ -41,7 +41,7 @@ public class WriteMaterialAfter implements TaskListener { delegateTask.setVariable("objectJson",object); List nextUserList = new ArrayList(); - + String prcName = "标准化活动参会流程-"; // 入会申请信息重新封装 if(StringUtils.isNotBlank(object.getString("directorList"))) { @@ -52,6 +52,7 @@ public class WriteMaterialAfter implements TaskListener { } // 配置多实例 delegateTask.setVariable("directorList", nextUserList); + prcName = prcName + "分委会主任/部门中心主任提名入会代表"; } //截止时间 流程描述 创建人 String user = object.getString("prcCreateUser"); @@ -60,7 +61,7 @@ public class WriteMaterialAfter implements TaskListener { delegateTask.setVariable("createUserName", username); String standName = object.getString("listName"); delegateTask.setVariable("listName", standName); - String prcName ="标准化活动参会流程"; + QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); 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 54d2f747..91e65bf8 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 @@ -15,7 +15,7 @@ public class WriteMaterialBefore implements TaskListener { @Override public void notify(DelegateTask delegateTask) { - String link = "bzqdfbStep2?prcType=21"; + String link = "bzchStep?prcType=21"; IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); QueryWrapper queryWrapper1 = new QueryWrapper(); queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId()); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/WriteMemberInfoAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/WriteMemberInfoAfter.java index 42b37ff1..c29ae72b 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/WriteMemberInfoAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/WriteMemberInfoAfter.java @@ -29,25 +29,19 @@ public class WriteMemberInfoAfter implements TaskListener { IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); //流程信息 IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class); - - LawsUserInfoService lawsUserInfoService = SpringContextUtil.getBean(LawsUserInfoService.class); - //根据流程id找到流程信息 QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId()); Datas datas = datasService.getOne(queryWrapper); - JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); delegateTask.setVariable("objectJson",object); - List nextUserList = new ArrayList(); - - + String prcName = "标准化活动参会流程-"; + prcName = prcName + "参会人员所在部门中心主任审核"; nextUserList.add(object.getString("charge")); delegateTask.setVariable("charge", object.getString("charge")); - //截止时间 流程描述 创建人 String user = object.getString("prcCreateUser"); delegateTask.setVariable("createUser", user); @@ -55,7 +49,6 @@ public class WriteMemberInfoAfter implements TaskListener { delegateTask.setVariable("createUserName", username); String standName = object.getString("listName"); delegateTask.setVariable("listName", standName); - String prcName ="标准化活动参会流程"; QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); 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 3c0d550d..33c732b8 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 @@ -14,7 +14,7 @@ public class WriteMemberInfoBefore implements TaskListener { @Override public void notify(DelegateTask delegateTask) { - String link = "bzqdfbStep2?prcType=21"; + String link = "bzchStep?prcType=21"; IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); QueryWrapper queryWrapper1 = new QueryWrapper(); queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId()); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/ChargeVerifyAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/ChargeVerifyAfter.java index d22e6ae1..713b8569 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/ChargeVerifyAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/ChargeVerifyAfter.java @@ -32,65 +32,53 @@ public class ChargeVerifyAfter implements TaskListener { IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); //流程信息 IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class); - - //根据流程id找到流程信息 QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId()); Datas datas = datasService.getOne(queryWrapper); - JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); delegateTask.setVariable("objectJson",object); List nextUserList = new ArrayList(); - String prcName = "标准化活动入会流程-"; + String prcName = "标准化活动入会流程-"; JSONObject sum = new JSONObject(); if(null == delegateTask.getVariable("membersSumJSON")){ delegateTask.setVariable("membersSumJSON",sum); } - - Integer count = 0; if(null == delegateTask.getVariable("chargePassCount")){ delegateTask.setVariable("chargePassCount",count); } - - - - if("1".equals(object.getString("passFlag"))){//通过 - - JSONArray os = object.getJSONObject("rh_pageData").getJSONArray("myPartRole"); - sum = delegateTask.getVariable("membersSumJSON",JSONObject.class); - if(sum.isEmpty()){ - sum = object; - delegateTask.setVariable("membersSumJSON",sum); - }else { - JSONObject o1 = sum.getJSONObject("rh_pageData"); - JSONObject o = os.getJSONObject(0); - JSONArray os1 = sum.getJSONObject("rh_pageData").getJSONArray("myPartRole"); - os1.add(o); - o1.put("myPartRole",os1); - sum.put("rh_pageData",o1); - delegateTask.setVariable("membersSumJSON",sum); + if("1".equals(object.getString("passFlag"))){//通过 + JSONArray os = object.getJSONObject("rh_pageData").getJSONArray("myPartRole"); + sum = delegateTask.getVariable("membersSumJSON",JSONObject.class); + if(sum.isEmpty()){ + sum = object; + delegateTask.setVariable("membersSumJSON",sum); + }else { + JSONObject o1 = sum.getJSONObject("rh_pageData"); + JSONObject o = os.getJSONObject(0); + JSONArray os1 = sum.getJSONObject("rh_pageData").getJSONArray("myPartRole"); + os1.add(o); + o1.put("myPartRole",os1); + sum.put("rh_pageData",o1); + delegateTask.setVariable("membersSumJSON",sum); + } + count = delegateTask.getVariable("chargePassCount",Integer.class); + delegateTask.setVariable("chargePassCount",count + 1); + delegateTask.setVariable("pass2",1);//排他通道 + if(delegateTask.getVariable("memberCount", Integer.class).equals(delegateTask.getVariable("chargePassCount", Integer.class))){ + prcName = prcName + "标准法规工程师汇总修订"; + if(StringUtils.isNotBlank(object.getString("engineerSum"))) { + nextUserList.add(object.getString("engineerSum")); + delegateTask.setVariable("engineerSum", object.getString("engineerSum")); } - - - count = delegateTask.getVariable("chargePassCount",Integer.class); - delegateTask.setVariable("chargePassCount",count + 1); - delegateTask.setVariable("pass2",1);//排他通道 - - if(delegateTask.getVariable("memberCount", Integer.class).equals(delegateTask.getVariable("chargePassCount", Integer.class))){ - prcName = prcName + "标准法规工程师汇总修订"; - if(StringUtils.isNotBlank(object.getString("engineerSum"))) { - nextUserList.add(object.getString("engineerSum")); - delegateTask.setVariable("engineerSum", object.getString("engineerSum")); - } - } - }else{ + } + }else{ prcName = prcName + "入会代表填写入会信息表"; delegateTask.setVariable("pass2",0);//排他通道 nextUserList.add(object.getString("member")); - } + } // 存储当前节点意见 if (null != object.getString("commentText")) { @@ -107,7 +95,6 @@ public class ChargeVerifyAfter implements TaskListener { } - //截止时间 流程描述 创建人 String user = object.getString("prcCreateUser"); delegateTask.setVariable("createUser", user); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/DirectorChooseAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/DirectorChooseAfter.java index 25ce0f64..b2c3df50 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/DirectorChooseAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/DirectorChooseAfter.java @@ -32,37 +32,39 @@ public class DirectorChooseAfter implements TaskListener { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId()); Datas datas = datasService.getOne(queryWrapper); - JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); delegateTask.setVariable("objectJson",object); - List nextUserList = new ArrayList(); - String prcName = "标准化活动入会流程-"; + + String prcName = "标准化活动入会流程-"; //如果 他是通过 passFlag==1 List passMemberList = new ArrayList<>(); if(null == delegateTask.getVariable("memberList")){ delegateTask.setVariable("memberList", passMemberList); } + //全员不通过，检测条件 directorCount + Integer allCount = delegateTask.getVariable("directorList",List.class).size();; + Integer count = 0; + if(null == delegateTask.getVariable("directorCount")){ + delegateTask.setVariable("directorCount", count); + } + count = delegateTask.getVariable("directorCount",Integer.class); + delegateTask.setVariable("directorCount",count+1); - if("1".equals(object.getString("passFlag"))) { - prcName = prcName + "入会代表填写入会信息表"; - nextUserList.add(object.getString("memberId")); - if (null!=delegateTask.getVariable("memberList")) { - List middle=delegateTask.getVariable("memberList",List.class); - middle.addAll(nextUserList); - delegateTask.setVariable("memberList",middle); - }else { - delegateTask.setVariable("memberList",nextUserList); - } - delegateTask.setVariable("memberCount",delegateTask.getVariable("memberList",List.class).size()); + if("1".equals(object.getString("passFlag"))) { + prcName = prcName + "入会代表填写入会信息表"; + nextUserList.add(object.getString("memberId")); + if (null!=delegateTask.getVariable("memberList")) { + List middle=delegateTask.getVariable("memberList",List.class); + middle.addAll(nextUserList); + delegateTask.setVariable("memberList",middle); + }else { + delegateTask.setVariable("memberList",nextUserList); } - - if(delegateTask.getVariable("memberCount",Integer.class).equals(0)){ - throw new ActivitiException("所有人不涉及入会，流程终止"); - } - + delegateTask.setVariable("memberCount",delegateTask.getVariable("memberList",List.class).size()); + } // 存储当前节点意见 diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseAfter.java index 3d3f46cd..b28a90cc 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseAfter.java @@ -28,18 +28,14 @@ public class EngineerReviseAfter implements TaskListener { IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); //流程信息 IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class); - - LawsUserInfoService lawsUserInfoService = SpringContextUtil.getBean(LawsUserInfoService.class); - //根据流程id找到流程信息 QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId()); Datas datas = datasService.getOne(queryWrapper); - JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); delegateTask.setVariable("objectJson",object); - List nextUserList = new ArrayList(); + String prcName = "标准化活动入会流程-"; prcName = prcName + "标准法规部主管领导审核"; nextUserList.add(object.getString("leader")); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseDoneAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseDoneAfter.java index 5b301984..7e027b4d 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseDoneAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseDoneAfter.java @@ -38,7 +38,7 @@ public class EngineerReviseDoneAfter implements TaskListener { delegateTask.setVariable("objectJson",object); List nextUserList = new ArrayList(); String prcName = "标准化活动入会流程-"; -// prcName = "标准化活动入会流程" + "会议结束"; +// prcName = "标准化活动入会流程-" + "会议结束"; prcName = prcName + "流程结束"; //TODO 流程结束，入库 diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/LeaderVerifyAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/LeaderVerifyAfter.java index 2bf6ffe5..a3ca73a5 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/LeaderVerifyAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/LeaderVerifyAfter.java @@ -29,7 +29,6 @@ public class LeaderVerifyAfter implements TaskListener { IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); //流程信息 IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class); - //根据流程id找到流程信息 QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId()); @@ -37,9 +36,8 @@ public class LeaderVerifyAfter implements TaskListener { JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); delegateTask.setVariable("objectJson",object); List nextUserList = new ArrayList(); + String prcName = "标准化活动入会流程-"; - - if("1".equals(object.getString("passFlag"))) {//通过 delegateTask.setVariable("pass3",1); if(StringUtils.isNotBlank(object.getString("manageDepartmentList"))) { diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/ManageSignAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/ManageSignAfter.java index a48e545a..d8e53aad 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/ManageSignAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/ManageSignAfter.java @@ -36,16 +36,13 @@ public class ManageSignAfter implements TaskListener { Datas datas = datasService.getOne(queryWrapper); JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); delegateTask.setVariable("objectJson",object); - - - List nextUserList = new ArrayList(); + String prcName = "标准化活动入会流程-"; Integer count = 0; if(null == delegateTask.getVariable("managePassCount")){ delegateTask.setVariable("managePassCount",count); } - if("1".equals(object.getString("passFlag"))) {//通过 count = delegateTask.getVariable("managePassCount",Integer.class); count++; diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/PresidentVerifyAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/PresidentVerifyAfter.java index 30257399..5b551e2c 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/PresidentVerifyAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/PresidentVerifyAfter.java @@ -28,16 +28,14 @@ public class PresidentVerifyAfter implements TaskListener { IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); //流程信息 IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class); - LawsUserInfoService lawsUserInfoService = SpringContextUtil.getBean(LawsUserInfoService.class); - //根据流程id找到流程信息 QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId()); Datas datas = datasService.getOne(queryWrapper); JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); delegateTask.setVariable("objectJson",object); - List nextUserList = new ArrayList(); + String prcName = "标准化活动入会流程-"; if("1".equals(object.getString("passFlag"))) {//通过 prcName = prcName + "标准法规工程师汇总修订完毕"; diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMemberInfoAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMemberInfoAfter.java index aa337e28..85d15ddd 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMemberInfoAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMemberInfoAfter.java @@ -29,17 +29,12 @@ public class WriteMemberInfoAfter implements TaskListener { IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); //流程信息 IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class); - - LawsUserInfoService lawsUserInfoService = SpringContextUtil.getBean(LawsUserInfoService.class); - //根据流程id找到流程信息 QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId()); Datas datas = datasService.getOne(queryWrapper); - JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); delegateTask.setVariable("objectJson",object); - List nextUserList = new ArrayList(); String prcName = "标准化活动入会流程-";