From 0c9d30c1f60a93f52a8139cf79c17f2b91a50677 Mon Sep 17 00:00:00 2001 From: "Mr.Z" <709235321@qq.com> Date: Wed, 8 Sep 2021 16:53:25 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=90=88=E8=A7=84?= =?UTF-8?q?=E8=AF=84=E4=BC=B0=E6=B5=81=E7=A8=8B-=E9=A1=B9=E7=9B=AE=20?= =?UTF-8?q?=E5=85=A5=E5=88=B0=E6=A0=87=E5=87=86=E5=90=88=E8=A7=84=E8=AF=84?= =?UTF-8?q?=E4=BC=B0=E7=BB=93=E6=9E=9C=20=E9=87=8C=E9=9D=A2=20=E4=BA=A7?= =?UTF-8?q?=E5=93=81=E7=BA=BF=E3=80=81=E9=A1=B9=E7=9B=AE=E7=BC=96=E5=8F=B7?= =?UTF-8?q?=E3=80=81=E9=A1=B9=E7=9B=AE=E5=90=8D=E7=A7=B0=E6=B2=A1=E4=BC=A0?= =?UTF-8?q?=E5=80=BC~~~?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PCAdlApproveAfter.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAdlApproveAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAdlApproveAfter.java index 3671b8ba..9e7d6f6b 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAdlApproveAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAdlApproveAfter.java @@ -101,9 +101,9 @@ public class PCAdlApproveAfter implements TaskListener { SarStandardComplianceProductAssess sarStandard = new SarStandardComplianceProductAssess(); sarStandard.setStandId(pcAdataList.getStandId()); sarStandard.setStandName(pcAdataList.getStandName()); - sarStandard.setProductLineId(pcAdataList.getProductLineId()); - sarStandard.setProductId(pcAdataList.getProductId()); - sarStandard.setProductName(pcAdataList.getProductName()); + sarStandard.setProductLineId(res.getProductLine()); + sarStandard.setProductId(res.getProjectNumber()); + sarStandard.setProductName(res.getProjectName()); sarStandard.setStandNumber(pcAdataList.getStandSort()+" "+pcAdataList.getStandNumber()+"-"+pcAdataList.getStandYear()); sarStandard.setStandType(pcAdataList.getStandType()); sarStandard.setType(pcAdataList.getTypeId()); @@ -177,9 +177,9 @@ public class PCAdlApproveAfter implements TaskListener { sarStandardChild.setStandName(pcAdataList.getStandName()); sarStandardChild.setStandNumber(pcAdataList.getStandSort()+" "+pcAdataList.getStandNumber()+"-"+pcAdataList.getStandYear()); sarStandardChild.setType(pcAchildren.getTypeId()); - sarStandardChild.setProductLineId(pcAdataList.getProductLineId()); - sarStandardChild.setProductId(pcAdataList.getProductId()); - sarStandardChild.setProductName(pcAdataList.getProductName()); + sarStandardChild.setProductLineId(res.getProductLine()); + sarStandardChild.setProductId(res.getProjectNumber()); + sarStandardChild.setProductName(res.getProjectName()); sarStandardChild.setProductionCompletionTime(pcAchildren.getZcCompletionTime()); sarStandardChild.setProductionCountermeasures(pcAchildren.getZcCountermeasures()); sarStandardChild.setProductionCompliance(pcAchildren.getZcComplianceReasons()); From 7693aa7007a00336f0bc13a115eda7b7066cdaf6 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Thu, 9 Sep 2021 16:11:54 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E6=A8=99=E6=BA=96=E5=BE=81=E6=B1=82?= =?UTF-8?q?=E6=84=8F=E8=A7=81=E6=B5=81=E7=A8=8B=E5=8A=A0=E9=99=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ydw/bat/wkflow/business_slrs/dao/SarPublicIdea.java | 4 ++++ .../listener/StandardCommentProcess/StartSurveyAfter.java | 2 ++ 2 files changed, 6 insertions(+) diff --git a/src/main/java/com/ydw/bat/wkflow/business_slrs/dao/SarPublicIdea.java b/src/main/java/com/ydw/bat/wkflow/business_slrs/dao/SarPublicIdea.java index 1552a475..dea2f9c5 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_slrs/dao/SarPublicIdea.java +++ b/src/main/java/com/ydw/bat/wkflow/business_slrs/dao/SarPublicIdea.java @@ -30,5 +30,9 @@ public class SarPublicIdea{ private String uniques; + private String files; + + private String filesName; + } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/StartSurveyAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/StartSurveyAfter.java index ff92560d..a49021f0 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/StartSurveyAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/StartSurveyAfter.java @@ -144,6 +144,8 @@ public class StartSurveyAfter implements TaskListener { .standType(object.getString("standType")) .standId(object.getString("standId")) .uniques(uniques) + .files(object.getString("filesId")) + .filesName(object.getString("filesName")) .build(); ResponseMessage result = lawsUserInfoService.addSarPublicIdea(sarPublicIdea); if(!result.isOk()){ From 518fa5bc61aa125ed845ae22361dc47dacea6c8b Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Tue, 14 Sep 2021 16:36:40 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=A1=AE=E8=AE=A4?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=20=E6=96=B0=E8=8A=82=E7=82=B9=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bzApproveAfter.java | 90 +++++++++++++++++++ .../bzApproveBefore.java | 27 ++++++ .../confirmAfter.java | 23 ++--- .../itemlistvalidationprocessStartAfter.java | 2 + 4 files changed, 131 insertions(+), 11 deletions(-) create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/itemlistvalidationprocess/bzApproveAfter.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/itemlistvalidationprocess/bzApproveBefore.java diff --git a/src/main/java/com/ydw/bat/wkflow/listener/itemlistvalidationprocess/bzApproveAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/itemlistvalidationprocess/bzApproveAfter.java new file mode 100644 index 00000000..79dc48ad --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/itemlistvalidationprocess/bzApproveAfter.java @@ -0,0 +1,90 @@ +package com.ydw.bat.wkflow.listener.itemlistvalidationprocess; + +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.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.business_slrs.dao.StandProjectRelationDto; +import com.ydw.bat.wkflow.util.SpringContextUtil; +import org.activiti.engine.delegate.DelegateTask; +import org.activiti.engine.delegate.TaskListener; + +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +public class bzApproveAfter implements TaskListener { + @Override + public void notify(DelegateTask delegateTask) { + IDatasService datasService = SpringContextUtil.getBean(IDatasService.class); + IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); + IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class); + LawsUserInfoService lawsUserInfoService=SpringContextUtil.getBean(LawsUserInfoService.class); + + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId()); + Datas datas = datasService.getOne(queryWrapper); + + JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); + delegateTask.setVariable("objectJson",object); + + List nextUserList = new ArrayList(); + if ("0".equals(object.getString("passFlag"))) { + delegateTask.setVariable("passFlag","0"); + List standProjectRelationDtos = new ArrayList<>(); + JSONArray jsonArray = JSONArray.parseArray(object.getString("dataList")); + for (Object os : jsonArray) { + JSONObject jsonObject = JSONObject.parseObject(os.toString()); + StandProjectRelationDto standProjectRelationDto = new StandProjectRelationDto(); + standProjectRelationDto.setProjectId(object.getString("projectId")); + standProjectRelationDto.setStandId(jsonObject.getString("id")); + standProjectRelationDtos.add(standProjectRelationDto); + } + lawsUserInfoService.batchInsert(standProjectRelationDtos); + }else { + delegateTask.setVariable("passFlag","1"); + nextUserList.add(delegateTask.getVariable("confirmId",String.class)); + } + //截止时间 流程描述 创建人 + String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); + String user = delegateTask.getVariable("startId",String.class); + String username = delegateTask.getVariable("startName",String.class); + String prcName = "项目清单确认流程"; + QueryWrapper queryWrapper2 = new QueryWrapper(); + queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId()); + BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); + if(one1!=null){ + if ("0".equals(object.getString("passFlag"))) { + one1.setOverTime(OVERTIME); + } + one1.setPrcType("10"); + one1.setPrcName(prcName); + one1.setCreatUser(user); + one1.setCreatUserName(username); + busProcessNameService.saveOrUpdate(one1); + } + + + if(!nextUserList.isEmpty()){ + for(String nextUser : nextUserList){ + BusProcessNew busProcessNewNext = new BusProcessNew(); + busProcessNewNext.setMsgType("clause"); + busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); + busProcessNewNext.setMesg(object.toJSONString()); + busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); + busProcessNewNext.setFinishFlag("0"); + busProcessNewNext.setTaskInfo(delegateTask.getName()); + busProcessNewNext.setUserId(nextUser); + busProcessNewNext.setPrcName(prcName); + busBean.save(busProcessNewNext); + } + } + } +} diff --git a/src/main/java/com/ydw/bat/wkflow/listener/itemlistvalidationprocess/bzApproveBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/itemlistvalidationprocess/bzApproveBefore.java new file mode 100644 index 00000000..77c6f799 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/itemlistvalidationprocess/bzApproveBefore.java @@ -0,0 +1,27 @@ +package com.ydw.bat.wkflow.listener.itemlistvalidationprocess; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew; +import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService; +import com.ydw.bat.wkflow.util.SpringContextUtil; +import org.activiti.engine.delegate.DelegateTask; +import org.activiti.engine.delegate.TaskListener; + +import java.util.List; + +public class bzApproveBefore implements TaskListener { + @Override + public void notify(DelegateTask delegateTask) { + IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); + QueryWrapper queryWrapper1 = new QueryWrapper(); + queryWrapper1.isNull("TASK_ID"); + queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId()); + List list = busBean.list(queryWrapper1); + if(!list.isEmpty()){ + BusProcessNew one1 = list.get(0); + one1.setTaskId(delegateTask.getId()); + one1.setTaskInfo(delegateTask.getName()); + busBean.saveOrUpdate(one1); + } + } +} diff --git a/src/main/java/com/ydw/bat/wkflow/listener/itemlistvalidationprocess/confirmAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/itemlistvalidationprocess/confirmAfter.java index 85842f12..24684cd3 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/itemlistvalidationprocess/confirmAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/itemlistvalidationprocess/confirmAfter.java @@ -34,18 +34,19 @@ public class confirmAfter implements TaskListener { JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); delegateTask.setVariable("objectJson",object); - List nextUserList = new ArrayList(); + delegateTask.setVariable("approveId",object.getString("approveId")); + nextUserList.add(object.getString("approveId")); List standProjectRelationDtos = new ArrayList<>(); - JSONArray jsonArray=JSONArray.parseArray(object.getString("dataList")); - for (Object os:jsonArray) { - JSONObject jsonObject=JSONObject.parseObject(os.toString()); - StandProjectRelationDto standProjectRelationDto=new StandProjectRelationDto(); - standProjectRelationDto.setProjectId(object.getString("projectId")); - standProjectRelationDto.setStandId(jsonObject.getString("id")); - standProjectRelationDtos.add(standProjectRelationDto); - } - lawsUserInfoService.batchInsert(standProjectRelationDtos); +// JSONArray jsonArray=JSONArray.parseArray(object.getString("dataList")); +// for (Object os:jsonArray) { +// JSONObject jsonObject=JSONObject.parseObject(os.toString()); +// StandProjectRelationDto standProjectRelationDto=new StandProjectRelationDto(); +// standProjectRelationDto.setProjectId(object.getString("projectId")); +// standProjectRelationDto.setStandId(jsonObject.getString("id")); +// standProjectRelationDtos.add(standProjectRelationDto); +// } +// lawsUserInfoService.batchInsert(standProjectRelationDtos); //截止时间 流程描述 创建人 String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); String user = delegateTask.getVariable("startId",String.class); @@ -55,7 +56,7 @@ public class confirmAfter implements TaskListener { queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId()); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); if(one1!=null){ - one1.setOverTime(OVERTIME); +// one1.setOverTime(OVERTIME); one1.setPrcType("10"); one1.setPrcName(prcName); one1.setCreatUser(user); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/itemlistvalidationprocess/itemlistvalidationprocessStartAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/itemlistvalidationprocess/itemlistvalidationprocessStartAfter.java index c260d73f..e2da5788 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/itemlistvalidationprocess/itemlistvalidationprocessStartAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/itemlistvalidationprocess/itemlistvalidationprocessStartAfter.java @@ -35,6 +35,8 @@ public class itemlistvalidationprocessStartAfter implements TaskListener { nextUserList.add(object.getString("confirmId")); delegateTask.setVariable("confirmId",object.getString("confirmId")); + delegateTask.setVariable("dl",object.getString("approveId")); + //截止时间 流程描述 创建人 String user = object.getString("startUser"); String username = object.getString("startUserName"); From 9ac1fe17ad57a95fc04e796812af03ea7d6e1b6c Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Wed, 15 Sep 2021 11:26:36 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E5=BE=81=E6=B1=82=E6=84=8F=E8=A7=81?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=20=E5=88=86=E5=8F=91=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E4=B8=A2=E5=A4=B1=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SelectResponsibleUserAfter.java | 49 +++++++++++-------- 1 file changed, 28 insertions(+), 21 deletions(-) diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/SelectResponsibleUserAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/SelectResponsibleUserAfter.java index 5b4b8925..6314ef74 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/SelectResponsibleUserAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/SelectResponsibleUserAfter.java @@ -91,7 +91,6 @@ public class SelectResponsibleUserAfter implements TaskListener { queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId()); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); if(one1!=null){ -// one1.setOverTime(OVERTIME); one1.setPrcType("3"); one1.setPrcName(prcName); one1.setCreatUser(user); @@ -115,37 +114,45 @@ public class SelectResponsibleUserAfter implements TaskListener { updataWapper.eq("P_ID",delegateTask.getProcessInstanceId()); busBean.update(busProcessNew,updataWapper); + if (null==delegateTask.getVariable("zs")) { + delegateTask.setVariable("zs", strings); + }else { + delegateTask.getVariable("zs",List.class).addAll(strings); + delegateTask.setVariable("zs",delegateTask.getVariable("zs") ); + } if(selectResponCompletedCount>=dockUserList.size()){ -// Collection values = userListJson; -// Collection> respon=new ArrayList<>(); -// for (Object value : values) { -// respon.add(((JSONObject)value).getInnerMap()); -// } - delegateTask.setVariable("zqazqazqaUserList",strings); + delegateTask.setVariable("zqazqazqaUserList", delegateTask.getVariable("zs",List.class)); delegateTask.setVariable("datas",map); if(nextUserList != null && !nextUserList.isEmpty()){ List busProcessNews=new ArrayList<>(); - for(String zqa : strings){ - BusProcessNew busProcessNewNext = new BusProcessNew(); - busProcessNewNext.setMsgType("clause"); - busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); -// object.put("dockUser",(String)zqa.get("dockUser")); - object.put("dockUser",map.get(zqa).getString("dockUser")); - busProcessNewNext.setMesg(object.toJSONString()); - busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); - busProcessNewNext.setFinishFlag("0"); - busProcessNewNext.setTaskInfo(delegateTask.getName()); - busProcessNewNext.setUserId(map.get(zqa).getString("id")); - busProcessNewNext.setPrcName(prcName); - busProcessNews.add(busProcessNewNext); - } + saveBusPress(delegateTask, object, strings, map, prcName, busProcessNews); busBean.saveBatch(busProcessNews); } + }else { + List busProcessNews=new ArrayList<>(); + saveBusPress(delegateTask, object, strings, map, prcName, busProcessNews); + busBean.saveBatch(busProcessNews); + } + } + + private void saveBusPress(DelegateTask delegateTask, JSONObject object, List strings, Map map, String prcName, List busProcessNews) { + for (String zqa : strings) { + BusProcessNew busProcessNewNext = new BusProcessNew(); + busProcessNewNext.setMsgType("clause"); + busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); + object.put("dockUser", map.get(zqa).getString("dockUser")); + busProcessNewNext.setMesg(object.toJSONString()); + busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); + busProcessNewNext.setFinishFlag("0"); + busProcessNewNext.setTaskInfo(delegateTask.getName()); + busProcessNewNext.setUserId(map.get(zqa).getString("id")); + busProcessNewNext.setPrcName(prcName); + busProcessNews.add(busProcessNewNext); } } } From 5ddd70262cd267367bc947c8315cb4c4f98013ac Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Wed, 15 Sep 2021 17:46:19 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E5=BE=81=E6=B1=82=E6=84=8F=E8=A7=81?= =?UTF-8?q?=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ydw/bat/wkflow/business_main/datas/dto/Step3DTO.java | 1 + .../listener/StandardCommentProcess/DirectorSignAfter.java | 2 +- .../listener/StandardCommentProcess/DockingApprovalAfter.java | 2 +- .../StandardCommentProcess/MinisterAndDockerSignAfter.java | 2 +- .../listener/StandardCommentProcess/PresidentSignAfter.java | 2 +- .../listener/StandardCommentProcess/ResponUserSignAfter.java | 2 +- .../StandardCommentProcess/SelectResponsibleUserAfter.java | 2 +- .../listener/StandardCommentProcess/StartSurveyAfter.java | 1 + .../listener/StandardCommentProcess/SummarySurveyAfter.java | 2 +- .../StandardCommentProcess/UploadResearchResultAfter.java | 2 +- 10 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/ydw/bat/wkflow/business_main/datas/dto/Step3DTO.java b/src/main/java/com/ydw/bat/wkflow/business_main/datas/dto/Step3DTO.java index a6349cb7..08f03c41 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_main/datas/dto/Step3DTO.java +++ b/src/main/java/com/ydw/bat/wkflow/business_main/datas/dto/Step3DTO.java @@ -12,6 +12,7 @@ import lombok.Data; @Data public class Step3DTO { + private String id; private String uname; private String itemNum; private String itemsName; diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/DirectorSignAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/DirectorSignAfter.java index eaeee777..e62334ba 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/DirectorSignAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/DirectorSignAfter.java @@ -44,7 +44,7 @@ public class DirectorSignAfter implements TaskListener { String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); String user = object.getString("startUser"); String username = object.getString("startUserName"); - String standName = object.getString("cid"); + String standName = delegateTask.getVariable("cid",String.class); String prcName = standName+"标准-标准征求意见流程"; QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/DockingApprovalAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/DockingApprovalAfter.java index 905843fc..080b05e4 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/DockingApprovalAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/DockingApprovalAfter.java @@ -42,7 +42,7 @@ public class DockingApprovalAfter implements TaskListener { String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); String user = object.getString("startUser"); String username = object.getString("startUserName"); - String standName = object.getString("cid"); + String standName = delegateTask.getVariable("cid",String.class); String prcName = standName+"标准-标准征求意见流程"; QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/MinisterAndDockerSignAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/MinisterAndDockerSignAfter.java index f1bfacbd..153a7dd2 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/MinisterAndDockerSignAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/MinisterAndDockerSignAfter.java @@ -33,7 +33,7 @@ public class MinisterAndDockerSignAfter implements TaskListener { List nextUserList = new ArrayList(); - String standName = object.getString("cid"); + String standName = delegateTask.getVariable("cid",String.class); String prcName = standName+"标准-标准征求意见流程"; if(delegateTask.getVariable("actionFlag",Integer.class)==0){ diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/PresidentSignAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/PresidentSignAfter.java index 15087ed8..8407f22f 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/PresidentSignAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/PresidentSignAfter.java @@ -43,7 +43,7 @@ public class PresidentSignAfter implements TaskListener { String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); String user = object.getString("startUser"); String username = object.getString("startUserName"); - String standName = object.getString("cid"); + String standName = delegateTask.getVariable("cid",String.class); String prcName = standName+"标准-标准征求意见流程"; QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/ResponUserSignAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/ResponUserSignAfter.java index 4b76003f..08e49446 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/ResponUserSignAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/ResponUserSignAfter.java @@ -50,7 +50,7 @@ public class ResponUserSignAfter implements TaskListener { String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); String user = object.getString("startUser"); String username = object.getString("startUserName"); - String standName = object.getString("cid"); + String standName = delegateTask.getVariable("cid",String.class); String prcName = standName+"标准-标准征求意见流程"; QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId()); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/SelectResponsibleUserAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/SelectResponsibleUserAfter.java index 6314ef74..0cfe3893 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/SelectResponsibleUserAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/SelectResponsibleUserAfter.java @@ -85,7 +85,7 @@ public class SelectResponsibleUserAfter implements TaskListener { String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); String user = object.getString("startUser"); String username = object.getString("startUserName"); - String standName = object.getString("cid"); + String standName = delegateTask.getVariable("cid",String.class); String prcName = standName+"标准-标准征求意见流程"; QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId()); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/StartSurveyAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/StartSurveyAfter.java index a49021f0..05dac21d 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/StartSurveyAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/StartSurveyAfter.java @@ -70,6 +70,7 @@ public class StartSurveyAfter implements TaskListener { String user = object.getString("startUser"); String username = object.getString("startUserName"); String standName = object.getString("cid"); + delegateTask.setVariable("cid",standName); String prcName = standName+"-标准征求意见流程"; QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId()); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/SummarySurveyAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/SummarySurveyAfter.java index 8d158e22..759ce5ac 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/SummarySurveyAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/SummarySurveyAfter.java @@ -48,7 +48,7 @@ public class SummarySurveyAfter implements TaskListener { String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); String user = object.getString("startUser"); String username = object.getString("startUserName"); - String standName = object.getString("cid"); + String standName = delegateTask.getVariable("cid",String.class); String prcName = standName+"标准-标准征求意见流程"; QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId()); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/UploadResearchResultAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/UploadResearchResultAfter.java index 20e3cca2..219a0bc0 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/UploadResearchResultAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/UploadResearchResultAfter.java @@ -67,7 +67,7 @@ public class UploadResearchResultAfter implements TaskListener { String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); String user = object.getString("startUser"); String username = object.getString("startUserName"); - String standName = object.getString("cid"); + String standName = delegateTask.getVariable("cid",String.class); String prcName = standName+"标准-标准征求意见流程"; QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId()); From d408dfd55d30dada67b88bd0894b75129ef4de76 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Thu, 16 Sep 2021 15:01:41 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E5=BE=81=E6=B1=82=E6=84=8F=E8=A7=81?= =?UTF-8?q?=EF=BC=81=EF=BC=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../listener/StandardSurvey/UploadResearchResultAfter.java | 2 +- .../wkflow/listener/projectEvaluationProcess/PEPSumAfter.java | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/UploadResearchResultAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/UploadResearchResultAfter.java index 324e5959..d7222aa2 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/UploadResearchResultAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/UploadResearchResultAfter.java @@ -46,7 +46,7 @@ public class UploadResearchResultAfter implements TaskListener { object.put("responUser",obj.getString("id")); object.put("responUserName",obj.getString("name")); - + obj.put("dyhz",object.getString("dyhz")); obj.put("fileId",object.getString("fileId")); obj.put("fileName",object.getString("fileName")); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationProcess/PEPSumAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationProcess/PEPSumAfter.java index 0b96e5cd..4fd3900d 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationProcess/PEPSumAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationProcess/PEPSumAfter.java @@ -62,7 +62,6 @@ public class PEPSumAfter implements TaskListener { queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); if (one1 != null) { -// one1.setOverTime(OVERTIME); one1.setPrcType("5"); one1.setPrcName(prcName); one1.setCreatUser(user); From 83812a26683231830dd9ea56db48e4fddbc78b7f Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Thu, 16 Sep 2021 15:05:06 +0800 Subject: [PATCH 7/7] feat: There is no way the --- .../business_activiti/task/TaskController.java | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/main/java/com/ydw/bat/wkflow/business_activiti/task/TaskController.java b/src/main/java/com/ydw/bat/wkflow/business_activiti/task/TaskController.java index 6a0bae20..1736f065 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_activiti/task/TaskController.java +++ b/src/main/java/com/ydw/bat/wkflow/business_activiti/task/TaskController.java @@ -45,6 +45,19 @@ public class TaskController { @Autowired private IBusProcessEntrustService iBusProcessEntrustService; + @ApiOperation(value = "流程实例明细验证是否完成") + @GetMapping("/get_verify_by_instance") + public long get_verify_by_instance(String taskId,String pId) { + Map map = new TreeMap<>(); + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.eq("TASK_ID",taskId); + queryWrapper.eq("P_ID",pId); + queryWrapper.eq("COMMIT_FLAG","0"); + long count = iBusProcessNewService.count(queryWrapper); + return count; + + } + @ApiOperation(value = "流程实例明细列表") @ApiImplicitParam(name = "prcNum", value = "流程实例id") @GetMapping("/get_list_by_instance")