From 3f2a033f79dd02e5defd1228bcfc80f339a98a04 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Tue, 28 Dec 2021 17:06:53 +0800 Subject: [PATCH 01/10] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=BB=B4=E5=BA=A6--?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=AF=84=E4=BC=B0bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PCAComplianceAssessmentBefore.java | 2 +- .../PCAffLiableDistributeAfter.java | 23 ++++++++++++++++++- 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAComplianceAssessmentBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAComplianceAssessmentBefore.java index 84f7e4e0..a1942a7f 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAComplianceAssessmentBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAComplianceAssessmentBefore.java @@ -22,7 +22,7 @@ public class PCAComplianceAssessmentBefore implements TaskListener { QueryWrapper queryWrapper1 = new QueryWrapper(); queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId()); queryWrapper1.eq("USER_ID",delegateTask.getAssignee()); - queryWrapper1.isNull("TASK_ID"); + queryWrapper1.eq("TASK_ID","GO"); List list = busBean.list(queryWrapper1); if(!list.isEmpty()){ BusProcessNew one1 = list.get(0); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAffLiableDistributeAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAffLiableDistributeAfter.java index 3c4d0208..85ad4d3b 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAffLiableDistributeAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAffLiableDistributeAfter.java @@ -21,6 +21,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.apache.poi.util.LocaleID; import org.springframework.beans.BeanUtils; import java.text.SimpleDateFormat; @@ -151,7 +152,12 @@ public class PCAffLiableDistributeAfter implements TaskListener { nextUserList.add(s); } }); - delegateTask.setVariable("workPeoples", nextUserList); + if (null!=delegateTask.getVariable("DisPeo")){ + delegateTask.getVariable("DisPeo",List.class).addAll(nextUserList); + }else { + delegateTask.setVariable("DisPeo",nextUserList); + } + delegateTask.setVariable("workPeoples", delegateTask.getVariable("DisPeo",List.class)); //截止时间 流程描述 创建人 String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); String user = delegateTask.getVariable("prcCreateUser", String.class); @@ -169,6 +175,20 @@ public class PCAffLiableDistributeAfter implements TaskListener { busProcessNameService.saveOrUpdate(one1); } + // 存储当前节点意见1 + if (null!=object.getString("commentText")) { + QueryWrapper queryWrapper3 = new QueryWrapper(); + queryWrapper3.eq("TASK_ID", delegateTask.getId()); + queryWrapper3.eq("USER_ID",delegateTask.getAssignee()); + List list = busBean.list(queryWrapper3); + if(!list.isEmpty()){ + BusProcessNew busProcessNews = list.get(0); + busProcessNews.setTaskId(delegateTask.getId()); + busProcessNews.setCommitText(object.getString("commentText")); + busBean.saveOrUpdate(busProcessNews); + } + } + // 存储当前节点意见 if (nextUserList != null && !nextUserList.isEmpty()) { for (String userId : nextUserList) { @@ -179,6 +199,7 @@ public class PCAffLiableDistributeAfter implements TaskListener { busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); busProcessNewNext.setFinishFlag("0"); busProcessNewNext.setTaskInfo(delegateTask.getName()); + busProcessNewNext.setTaskId("GO"); busProcessNewNext.setUserId(userId); busProcessNewNext.setPrcName(prcName); busBean.save(busProcessNewNext); From 9c9ba499abd883f96ac31660ffa2859906fdb64f Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Tue, 28 Dec 2021 20:03:10 +0800 Subject: [PATCH 02/10] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=AF=84=E4=BC=B0?= =?UTF-8?q?=E9=A9=B3=E5=9B=9E=E6=97=A0=E6=95=B0=E6=8D=AE=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PCAComplianceAssessmentBefore.java | 7 ++++++- .../PCAbafgManagerApproveAfter.java | 6 ++++-- .../PCAffLiableDistributeAfter.java | 2 +- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAComplianceAssessmentBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAComplianceAssessmentBefore.java index a1942a7f..f0186a2a 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAComplianceAssessmentBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAComplianceAssessmentBefore.java @@ -22,7 +22,12 @@ public class PCAComplianceAssessmentBefore implements TaskListener { QueryWrapper queryWrapper1 = new QueryWrapper(); queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId()); queryWrapper1.eq("USER_ID",delegateTask.getAssignee()); - queryWrapper1.eq("TASK_ID","GO"); + if ("GO".equals(delegateTask.getVariable("GOGOGO"))) { + queryWrapper1.eq("TASK_ID", "GO"); + delegateTask.setVariable("GOGOGO","1"); + }else { + queryWrapper1.isNull("TASK_ID"); + } List list = busBean.list(queryWrapper1); if(!list.isEmpty()){ BusProcessNew one1 = list.get(0); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAbafgManagerApproveAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAbafgManagerApproveAfter.java index 37a1c914..d40ec9dd 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAbafgManagerApproveAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAbafgManagerApproveAfter.java @@ -93,7 +93,7 @@ public class PCAbafgManagerApproveAfter implements TaskListener { busBean.saveOrUpdate(busProcessNews); } } - if (Integer.valueOf(delegateTask.getVariable("pass", String.class)) != + if (null==delegateTask.getVariable("pass")||Integer.valueOf(delegateTask.getVariable("pass", String.class)) != delegateTask.getVariable("workPeoples", List.class).size()) { if (nextUserList != null && !nextUserList.isEmpty()) { for (String userId : nextUserList) { @@ -103,7 +103,9 @@ public class PCAbafgManagerApproveAfter implements TaskListener { busProcessNewNext.setMesg(object.toJSONString()); busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); busProcessNewNext.setFinishFlag("0"); - busProcessNewNext.setTaskId("996"); + if (null!=delegateTask.getVariable("pass")) { + busProcessNewNext.setTaskId("996"); + } busProcessNewNext.setTaskInfo(delegateTask.getName()); busProcessNewNext.setUserId(userId); busProcessNewNext.setPrcName(prcName); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAffLiableDistributeAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAffLiableDistributeAfter.java index 85ad4d3b..bd732ce1 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAffLiableDistributeAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAffLiableDistributeAfter.java @@ -188,7 +188,7 @@ public class PCAffLiableDistributeAfter implements TaskListener { busBean.saveOrUpdate(busProcessNews); } } - + delegateTask.setVariable("GOGOGO","GO"); // 存储当前节点意见 if (nextUserList != null && !nextUserList.isEmpty()) { for (String userId : nextUserList) { From 316b7ce8d210169b85bdeb442576c2a478821ab6 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Wed, 29 Dec 2021 10:43:17 +0800 Subject: [PATCH 03/10] =?UTF-8?q?=E8=A7=A3=E8=AF=BB=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E5=85=A5=E5=BA=93=E6=95=B0=E6=8D=AE=E6=B6=88=E5=A4=B1=E9=97=AE?= =?UTF-8?q?=E9=A2=98=20=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../standardRead/DeptApplayAfter.java | 28 ++++++++++--------- .../listener/standardRead/ResolveAfter.java | 6 ++-- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardRead/DeptApplayAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardRead/DeptApplayAfter.java index d7830822..a56670de 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardRead/DeptApplayAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardRead/DeptApplayAfter.java @@ -100,19 +100,21 @@ public class DeptApplayAfter implements TaskListener{ }); JSONArray jsonArray1=JSONArray.parseArray(delegateTask.getVariable("itemListOld",String.class)); - jsonArray1.forEach(obj ->{ - JSONObject object1 = JSONObject.parseObject(obj.toString()); - SarStandItems sarStandItems1=new SarStandItems(); - sarStandItems1.setFileType(delegateTask.getVariable("fileTypeOnly",String.class)); - sarStandItems1.setStandId(object.getString("standId")); - sarStandItems1.setItemsNum(object1.getString("itemsNum")); - sarStandItems1.setItemsName(object1.getString("itemsName")); - sarStandItems1.setResponsibleUnit(object1.getString("responsibleUnitShow")); - sarStandItems1.setDutyEngineer(object1.getString("zxUserIdName")); - sarStandItems1.setTermsConditions(object1.getString("itermsConditions")); - sarStandItems1.setReadContent(object1.getString("technicalRequir")); - sarStandItems.add(sarStandItems1); - }); + if (null!=jsonArray1 && jsonArray1.size()>0) { + jsonArray1.forEach(obj -> { + JSONObject object1 = JSONObject.parseObject(obj.toString()); + SarStandItems sarStandItems1 = new SarStandItems(); + sarStandItems1.setFileType(delegateTask.getVariable("fileTypeOnly", String.class)); + sarStandItems1.setStandId(object.getString("standId")); + sarStandItems1.setItemsNum(object1.getString("itemsNum")); + sarStandItems1.setItemsName(object1.getString("itemsName")); + sarStandItems1.setResponsibleUnit(object1.getString("responsibleUnitShow")); + sarStandItems1.setDutyEngineer(object1.getString("zxUserIdName")); + sarStandItems1.setTermsConditions(object1.getString("itermsConditions")); + sarStandItems1.setReadContent(object1.getString("technicalRequir")); + sarStandItems.add(sarStandItems1); + }); + } //标准状态修改 SarFileSplitInfoEO sarFileSplitInfoEO=new SarFileSplitInfoEO(); sarFileSplitInfoEO.setSplitStatus("4"); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardRead/ResolveAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardRead/ResolveAfter.java index dfcc5f85..2b4cb602 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardRead/ResolveAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardRead/ResolveAfter.java @@ -99,13 +99,11 @@ public class ResolveAfter implements TaskListener{ // busBean.save(busProcessNew); if(nextUserList != null && !nextUserList.isEmpty()){ for(String nextUser : nextUserList){ //2次 -// List listRes = userGroupMap.get(nextUser); -// object.put("itemList", JSON.toJSONString(listRes)); - + List listRes = userGroupMap.get(nextUser); + object.put("itemList", JSON.toJSONString(listRes)); BusProcessNew busProcessNewNext = new BusProcessNew(); busProcessNewNext.setMsgType("clause"); busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); - //busProcessNewNext.setMesg(StringEscapeUtils.unescapeJavaScript(object.toJSONString()));//返转义函数 busProcessNewNext.setMesg(object.toJSONString()); busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); busProcessNewNext.setFinishFlag("0"); From 26f45780b76b8b64bc9465998e437051e485d846 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Wed, 29 Dec 2021 11:30:35 +0800 Subject: [PATCH 04/10] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E8=AF=84=E4=BC=B0=20=E5=88=86=E5=8F=91=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PCAComplianceAssessmentAfter.java | 1 + .../PCAComplianceAssessmentBefore.java | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAComplianceAssessmentAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAComplianceAssessmentAfter.java index 93773ca4..2f87fedf 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAComplianceAssessmentAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAComplianceAssessmentAfter.java @@ -32,6 +32,7 @@ public class PCAComplianceAssessmentAfter implements TaskListener { //流程信息 IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class); + delegateTask.setVariable("GOGOGO","1"); //根据流程id找到流程信息 QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId()); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAComplianceAssessmentBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAComplianceAssessmentBefore.java index f0186a2a..98d58e80 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAComplianceAssessmentBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAComplianceAssessmentBefore.java @@ -24,7 +24,6 @@ public class PCAComplianceAssessmentBefore implements TaskListener { queryWrapper1.eq("USER_ID",delegateTask.getAssignee()); if ("GO".equals(delegateTask.getVariable("GOGOGO"))) { queryWrapper1.eq("TASK_ID", "GO"); - delegateTask.setVariable("GOGOGO","1"); }else { queryWrapper1.isNull("TASK_ID"); } From b953b9ee2b6898ca0c241a3e4941d259c5996cae Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Wed, 29 Dec 2021 16:07:15 +0800 Subject: [PATCH 05/10] =?UTF-8?q?=E4=BC=81=E6=A0=87=E5=88=B6=E4=BF=AE?= =?UTF-8?q?=E8=AE=A2=E8=AE=A1=E5=88=92=E7=AE=A1=E6=8E=A7---=E6=9C=80?= =?UTF-8?q?=E6=96=B0=E7=9A=84=20=E7=AB=8B=E9=A1=B9=20=E5=8F=96=E6=B6=88=20?= =?UTF-8?q?=E5=90=88=E5=B9=B6=20=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../datas/entity/EsRevisePlanDTO.java | 41 ++++++++++++ .../ProcessStep4After.java | 65 +++++++++++++++---- 2 files changed, 95 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/ydw/bat/wkflow/business_main/datas/entity/EsRevisePlanDTO.java b/src/main/java/com/ydw/bat/wkflow/business_main/datas/entity/EsRevisePlanDTO.java index f2eccd01..ee1b7524 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_main/datas/entity/EsRevisePlanDTO.java +++ b/src/main/java/com/ydw/bat/wkflow/business_main/datas/entity/EsRevisePlanDTO.java @@ -1,5 +1,6 @@ package com.ydw.bat.wkflow.business_main.datas.entity; +import com.baomidou.mybatisplus.annotation.TableField; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -68,4 +69,44 @@ public class EsRevisePlanDTO { @ApiModelProperty(value = "起草责任单位") private String unit; + @ApiModelProperty(value = "起草责任单位ID") + private String unitName; + + @ApiModelProperty(value = "引入企业标准json(标准id)") + private String rqbJson; + @ApiModelProperty(value = "引入企业标准json(标准名称)") + private String rqbName; + @ApiModelProperty(value = "引入企业标准json(标准编号)") + private String rqbCode; + @ApiModelProperty(value = "体系结构树（id存储方式是逗号拼接）") + private String tsJson; + @ApiModelProperty(value = "体系结构树（名称逗号拼接展示）") + private String tsJsonName; + @ApiModelProperty(value = "标准范围") + private String area; + @ApiModelProperty(value = "标准范围") + private String areaName; + //企标类别 + private String standType; + + @ApiModelProperty(value = "企标类别") + private String esMatingRelations; + private String esStandRelations; + @ApiModelProperty(value = "是否引用标准") + @TableField("is_relate") + private String isRelate; + + @ApiModelProperty(value = "采用程度") + @TableField("use_level") + private String useLevel; + + private String useLevelName; + + @ApiModelProperty(value = "简述技术指标依据") + @TableField("technologic") + private String technologic; + + @ApiModelProperty(value = "企标类别") + @TableField("buss_sort") + private String bussSort; } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep4After.java b/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep4After.java index 6cd560cd..23a56831 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep4After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep4After.java @@ -16,9 +16,7 @@ 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; +import java.util.*; public class ProcessStep4After implements TaskListener { @@ -47,19 +45,50 @@ public class ProcessStep4After implements TaskListener { if ("0".equals(object.getString("bzfgbzFlag"))){ prcName = "企标制修订计划-流程结束"; delegateTask.setVariable("bzfgbzFlag",0); +// 建立对应字符串 + Map plan_status=new HashMap<>(); + plan_status.put("未开始","0"); + plan_status.put("制定中","1"); + plan_status.put("修订中","2"); + plan_status.put("已取消","3"); + plan_status.put("已完成","4"); + Map revise_status=new HashMap<>(); + revise_status.put("制定","1"); + revise_status.put("修订","2"); + + + //1合并 2延期 3取消 4更名 5立项 if ("1".equals(object.getString("type"))){ - lawsUserInfoService.delPlan(object.getString("esId1")+","+object.getString("esId2")); + EsRevisePlanDTO del1=new EsRevisePlanDTO(); + del1.setId(object.getString("esId1")); + del1.setPlanStatus("3"); + lawsUserInfoService.modPlan(del1); + EsRevisePlanDTO del2=new EsRevisePlanDTO(); + del2.setId(object.getString("esId2")); + del2.setPlanStatus("3"); + lawsUserInfoService.modPlan(del2); EsRevisePlanDTO esRevisePlanDTO=new EsRevisePlanDTO(); esRevisePlanDTO.setEsName(object.getString("esName")); - esRevisePlanDTO.setUnit(object.getString("unitId")); + esRevisePlanDTO.setUnit(object.getString("unit")); esRevisePlanDTO.setDrafter(object.getString("drafter")); esRevisePlanDTO.setResPerson(object.getString("resPerson")); - esRevisePlanDTO.setPlanStatus(object.getString("planStatus")); - esRevisePlanDTO.setReviseStatus(object.getString("reviseStatus")); + esRevisePlanDTO.setPlanStatus(plan_status.get(object.getString("planStatus"))); + esRevisePlanDTO.setReviseStatus(revise_status.get(object.getString("reviseStatus"))); esRevisePlanDTO.setWgLeader(object.getString("wgLeader")); esRevisePlanDTO.setDraftTime(object.getDate("draftTime")); esRevisePlanDTO.setReleaseTime(object.getDate("releaseTime")); + esRevisePlanDTO.setEsMatingRelations(object.getString("esMatingRelations")); + esRevisePlanDTO.setEsStandRelations(object.getString("esStandRelations")); + esRevisePlanDTO.setUseLevel(object.getString("useLevel")); + esRevisePlanDTO.setIsRelate(object.getString("isRelate")); + esRevisePlanDTO.setTsJson(object.getString("tsJson")); + esRevisePlanDTO.setArea(object.getString("area")); + esRevisePlanDTO.setRqbJson(object.getString("rqbJson")); + esRevisePlanDTO.setPlanStatus(object.getString("planStatus")); + esRevisePlanDTO.setReviseStatus(object.getString("reviseStatus")); + esRevisePlanDTO.setTechnologic(object.getString("technologic")); + esRevisePlanDTO.setBussSort(object.getString("bussSort")); lawsUserInfoService.addPlan(esRevisePlanDTO); }else if ("2".equals(object.getString("type"))){ EsRevisePlanDTO esRevisePlanDTO=new EsRevisePlanDTO(); @@ -68,7 +97,10 @@ public class ProcessStep4After implements TaskListener { esRevisePlanDTO.setDraftTime(object.getDate("yqDraftTime")); lawsUserInfoService.modPlan(esRevisePlanDTO); }else if ("3".equals(object.getString("type"))){ - lawsUserInfoService.delPlan(object.getString("esId")); + EsRevisePlanDTO esRevisePlanDTO=new EsRevisePlanDTO(); + esRevisePlanDTO.setId(object.getString("esId")); + esRevisePlanDTO.setPlanStatus("3"); + lawsUserInfoService.modPlan(esRevisePlanDTO); }else if ("4".equals(object.getString("type"))){ EsRevisePlanDTO esRevisePlanDTO=new EsRevisePlanDTO(); esRevisePlanDTO.setEsName(object.getString("renameEs")); @@ -78,14 +110,25 @@ public class ProcessStep4After implements TaskListener { //立项 EsRevisePlanDTO esRevisePlanDTO=new EsRevisePlanDTO(); esRevisePlanDTO.setEsName(object.getString("esName")); - esRevisePlanDTO.setUnit(object.getString("unitId")); + esRevisePlanDTO.setUnit(object.getString("unit")); esRevisePlanDTO.setDrafter(object.getString("drafter")); esRevisePlanDTO.setResPerson(object.getString("resPerson")); - esRevisePlanDTO.setPlanStatus(object.getString("planStatus")); - esRevisePlanDTO.setReviseStatus(object.getString("reviseStatus")); + esRevisePlanDTO.setPlanStatus(plan_status.get(object.getString("planStatus"))); + esRevisePlanDTO.setReviseStatus(revise_status.get(object.getString("reviseStatus"))); esRevisePlanDTO.setWgLeader(object.getString("wgLeader")); esRevisePlanDTO.setDraftTime(object.getDate("draftTime")); esRevisePlanDTO.setReleaseTime(object.getDate("releaseTime")); + esRevisePlanDTO.setEsMatingRelations(object.getString("esMatingRelations")); + esRevisePlanDTO.setEsStandRelations(object.getString("esStandRelations")); + esRevisePlanDTO.setUseLevel(object.getString("useLevel")); + esRevisePlanDTO.setIsRelate(object.getString("isRelate")); + esRevisePlanDTO.setTsJson(object.getString("tsJson")); + esRevisePlanDTO.setArea(object.getString("area")); + esRevisePlanDTO.setRqbJson(object.getString("rqbJson")); + esRevisePlanDTO.setPlanStatus(object.getString("planStatus")); + esRevisePlanDTO.setReviseStatus(object.getString("reviseStatus")); + esRevisePlanDTO.setTechnologic(object.getString("technologic")); + esRevisePlanDTO.setBussSort(object.getString("bussSort")); lawsUserInfoService.addPlan(esRevisePlanDTO); } }else { From 841951b8a582412ff871f3abb0c26af73f676250 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Wed, 29 Dec 2021 17:21:00 +0800 Subject: [PATCH 06/10] =?UTF-8?q?=E8=A7=A3=E8=AF=BB=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E6=9C=AA=E8=B5=B0=E5=AE=8C=E5=87=BA=E7=8E=B0=E5=AE=8C=E6=88=90?= =?UTF-8?q?=E6=97=B6=E9=97=B4bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ydw/bat/wkflow/listener/standardRead/DeptApplayAfter.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardRead/DeptApplayAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardRead/DeptApplayAfter.java index a56670de..2ef78195 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardRead/DeptApplayAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardRead/DeptApplayAfter.java @@ -137,7 +137,9 @@ public class DeptApplayAfter implements TaskListener{ queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId()); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); if(one1!=null){ - one1.setOverTime(OVERTIME); + if (!object.getString("gcApplyFlag").equals("1")) { + one1.setOverTime(OVERTIME); + } one1.setPrcType("9"); one1.setPrcName(prcName); one1.setCreatUser(user); From 1c0985438c98a8366b2985d7e380b4e0256b28ca Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Wed, 29 Dec 2021 17:30:20 +0800 Subject: [PATCH 07/10] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E8=B0=83=E7=A0=94?= =?UTF-8?q?=E7=BB=93=E6=9E=9C=E6=AD=A5=E9=AA=A4=20=E4=BF=9D=E5=AD=98?= =?UTF-8?q?=E5=AE=A1=E6=89=B9=E6=84=8F=E8=A7=81=E5=8E=BB=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../StandardSurvey/UploadResearchResultAfter.java | 14 -------------- 1 file changed, 14 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 373b0c13..4151ec07 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 @@ -80,21 +80,7 @@ public class UploadResearchResultAfter implements TaskListener { busProcessNameService.saveOrUpdate(one1); } - // 存储当前节点意见 - BusProcessNew busProcessNew = new BusProcessNew(); - busProcessNew.setMsgType("clause"); - busProcessNew.setPId(delegateTask.getProcessInstanceId()); - busProcessNew.setMesg(object.toJSONString()); - busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey()); - busProcessNew.setTaskId(delegateTask.getId()); - busProcessNew.setCommitText(object.getString("commentText")); - busProcessNew.setFinishFlag("0"); - busProcessNew.setTaskInfo(delegateTask.getName()); - QueryWrapper updataWapper=new QueryWrapper(); - updataWapper.eq("TASK_ID",delegateTask.getId()); - updataWapper.eq("P_ID",delegateTask.getProcessInstanceId()); - busBean.update(busProcessNew,updataWapper); BusProcessNew busProcessNewNext = new BusProcessNew(); busProcessNewNext.setMsgType("clause"); From a6a87dc3f3b70053cfd97a6013a9e27800aa245c Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Wed, 29 Dec 2021 20:16:50 +0800 Subject: [PATCH 08/10] =?UTF-8?q?=E8=A7=A3=E8=AF=BB=E6=B5=81=E7=A8=8B=20?= =?UTF-8?q?=E5=8F=AF=E8=83=BD=E5=AD=98=E5=9C=A8=E7=9A=84bug=20=E5=B7=B2?= =?UTF-8?q?=E5=86=99=E6=97=A5=E5=BF=97=EF=BC=9A=EF=BC=9A=EF=BC=9A=EF=BC=81?= =?UTF-8?q?=EF=BC=81=EF=BC=81=EF=BC=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wkflow/listener/standardRead/DeptZrAfter.java | 15 +++++++++++++++ .../listener/standardRead/ZrApplayAfter.java | 3 +++ 2 files changed, 18 insertions(+) diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardRead/DeptZrAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardRead/DeptZrAfter.java index 9ae3ff9e..4a9b7a82 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardRead/DeptZrAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardRead/DeptZrAfter.java @@ -97,6 +97,21 @@ public class DeptZrAfter implements TaskListener{ busBean.update(busProcessNew,updataWapper); if(nextUserList != null && !nextUserList.isEmpty()){ for(String nextUser : nextUserList){ //2次 +// if (null==delegateTask.getVariable("maps")){ +// Map stringMap=new HashMap<>(); +// String as= String.valueOf(UUID.randomUUID()); +// stringMap.put(nextUser,as); +// delegateTask.setVariable("maps",stringMap); +// object.put("wkKey",as); +// } +// else if (null!=delegateTask.getVariable("maps",Map.class).get(nextUser)){ +// String as= String.valueOf(UUID.randomUUID()); +// object.put("wkKey",as); +// }else { +// String as= String.valueOf(UUID.randomUUID()); +// object.put("wkKey",as); +// delegateTask.getVariable("maps",Map.class).put(nextUser,as); +// } List listRes = userGroupMap.get(nextUser); object.put("itemList", JSON.toJSONString(listRes)); BusProcessNew busProcessNewNext = new BusProcessNew(); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardRead/ZrApplayAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardRead/ZrApplayAfter.java index c3be1d92..1f070898 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardRead/ZrApplayAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardRead/ZrApplayAfter.java @@ -9,6 +9,7 @@ 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 lombok.extern.slf4j.Slf4j; import org.activiti.engine.ActivitiException; import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; @@ -21,6 +22,7 @@ import java.util.List; /** * 责任人审核发起后 */ +@Slf4j public class ZrApplayAfter implements TaskListener{ @Override public void notify(DelegateTask delegateTask) { @@ -58,6 +60,7 @@ public class ZrApplayAfter implements TaskListener{ }else { prcName=prcName+"-填写解读分析"; delegateTask.setVariable("zrFlag",2); + log.error("戒毒流程当前工作节点驳回人为："+String.valueOf(delegateTask.getVariable("zxUserId"))); JSONObject object1=JSONObject.parseObject(String.valueOf(delegateTask.getVariable("zxUserId"))); nextUserList.add(String.valueOf(object1.getString("id"))); } From 50e1d94dbfa1bbbdcc897aeae55827085704d533 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Wed, 29 Dec 2021 20:25:58 +0800 Subject: [PATCH 09/10] =?UTF-8?q?=E4=BC=81=E6=A0=87=E5=88=B6=E4=BF=AE?= =?UTF-8?q?=E8=AE=A2=E8=AE=A1=E5=88=92=E7=AB=8B=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProcessStep4After.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep4After.java b/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep4After.java index 23a56831..976b67c1 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep4After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep4After.java @@ -85,8 +85,6 @@ public class ProcessStep4After implements TaskListener { esRevisePlanDTO.setTsJson(object.getString("tsJson")); esRevisePlanDTO.setArea(object.getString("area")); esRevisePlanDTO.setRqbJson(object.getString("rqbJson")); - esRevisePlanDTO.setPlanStatus(object.getString("planStatus")); - esRevisePlanDTO.setReviseStatus(object.getString("reviseStatus")); esRevisePlanDTO.setTechnologic(object.getString("technologic")); esRevisePlanDTO.setBussSort(object.getString("bussSort")); lawsUserInfoService.addPlan(esRevisePlanDTO); @@ -125,8 +123,6 @@ public class ProcessStep4After implements TaskListener { esRevisePlanDTO.setTsJson(object.getString("tsJson")); esRevisePlanDTO.setArea(object.getString("area")); esRevisePlanDTO.setRqbJson(object.getString("rqbJson")); - esRevisePlanDTO.setPlanStatus(object.getString("planStatus")); - esRevisePlanDTO.setReviseStatus(object.getString("reviseStatus")); esRevisePlanDTO.setTechnologic(object.getString("technologic")); esRevisePlanDTO.setBussSort(object.getString("bussSort")); lawsUserInfoService.addPlan(esRevisePlanDTO); From 29d5dfdaea70f4a1a3e1c5810de70341ec0e9886 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Thu, 30 Dec 2021 10:59:09 +0800 Subject: [PATCH 10/10] =?UTF-8?q?=E8=A7=A3=E8=AF=BB=E6=B5=81=E7=A8=8Bbug?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../standardRead/DeptApplayAfter.java | 11 +++++++++- .../listener/standardRead/DeptZrAfter.java | 18 ++------------- .../listener/standardRead/ExpainAfter.java | 22 ++++++++++--------- .../listener/standardRead/ResolveAfter.java | 21 +++++++++--------- 4 files changed, 34 insertions(+), 38 deletions(-) diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardRead/DeptApplayAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardRead/DeptApplayAfter.java index 2ef78195..49aef066 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardRead/DeptApplayAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardRead/DeptApplayAfter.java @@ -124,10 +124,19 @@ public class DeptApplayAfter implements TaskListener{ lawsUserInfoService.sarStandItemsSaveBatch(sarStandItems); lawsUserInfoService.SarInterpretationNationalStandardSaveBatch(standards); prcName=prcName+"-流程结束"; + if (null==delegateTask.getVariable("lastCount")){ + delegateTask.setVariable("lastCount",1); + }else { + delegateTask.setVariable("lastCount",delegateTask.getVariable("lastCount",Integer.class)+1); + } } else { delegateTask.setVariable("bzFlag", 2); prcName=prcName+"-填写解读分析"; } + + + + //截止时间 流程描述 创建人 String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); String user = object.getString("applyUserId"); @@ -137,7 +146,7 @@ public class DeptApplayAfter implements TaskListener{ queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId()); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); if(one1!=null){ - if (!object.getString("gcApplyFlag").equals("1")) { + if (delegateTask.getVariable("lastCount",Integer.class)>=delegateTask.getVariable("zxUserList",List.class).size()) { one1.setOverTime(OVERTIME); } one1.setPrcType("9"); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardRead/DeptZrAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardRead/DeptZrAfter.java index 4a9b7a82..d60624c5 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardRead/DeptZrAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardRead/DeptZrAfter.java @@ -50,6 +50,7 @@ public class DeptZrAfter implements TaskListener{ JSONObject jsonObject = new JSONObject(); jsonObject.put("id",str); jsonObject.put("applyUserId",delegateTask.getAssignee()); + jsonObject.put("KEYS",str+delegateTask.getAssignee()); responUserList.add(jsonObject); } delegateTask.setVariable("zxUserList",responUserList); @@ -73,7 +74,6 @@ public class DeptZrAfter implements TaskListener{ queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId()); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); if(one1!=null){ -// one1.setOverTime(OVERTIME); one1.setPrcType("9"); one1.setPrcName(prcName); one1.setCreatUser(user); @@ -97,23 +97,9 @@ public class DeptZrAfter implements TaskListener{ busBean.update(busProcessNew,updataWapper); if(nextUserList != null && !nextUserList.isEmpty()){ for(String nextUser : nextUserList){ //2次 -// if (null==delegateTask.getVariable("maps")){ -// Map stringMap=new HashMap<>(); -// String as= String.valueOf(UUID.randomUUID()); -// stringMap.put(nextUser,as); -// delegateTask.setVariable("maps",stringMap); -// object.put("wkKey",as); -// } -// else if (null!=delegateTask.getVariable("maps",Map.class).get(nextUser)){ -// String as= String.valueOf(UUID.randomUUID()); -// object.put("wkKey",as); -// }else { -// String as= String.valueOf(UUID.randomUUID()); -// object.put("wkKey",as); -// delegateTask.getVariable("maps",Map.class).put(nextUser,as); -// } List listRes = userGroupMap.get(nextUser); object.put("itemList", JSON.toJSONString(listRes)); + object.put("AOLIGEI",nextUser+delegateTask.getAssignee()); BusProcessNew busProcessNewNext = new BusProcessNew(); busProcessNewNext.setMsgType("clause"); busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardRead/ExpainAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardRead/ExpainAfter.java index abc8a166..a45890a6 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardRead/ExpainAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardRead/ExpainAfter.java @@ -81,16 +81,18 @@ public class ExpainAfter implements TaskListener{ if(responUserList != null){ for (Object obj:responUserList) { JSONObject object1 = (JSONObject)obj; - 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.setPrcName(prcName); - busProcessNewNext.setUserId(object1.getString("applyUserId")); - busBean.save(busProcessNewNext); + if (object.getString("AOLIGEI").equals(object1.getString("KEYS"))) { + 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.setPrcName(prcName); + busProcessNewNext.setUserId(object1.getString("applyUserId")); + busBean.save(busProcessNewNext); + } } } } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardRead/ResolveAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardRead/ResolveAfter.java index 2b4cb602..cfa3a896 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardRead/ResolveAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardRead/ResolveAfter.java @@ -79,7 +79,6 @@ public class ResolveAfter implements TaskListener{ queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId()); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); if(one1!=null){ -// one1.setOverTime(OVERTIME); one1.setPrcType("9"); one1.setPrcName(prcName); one1.setCreatUser(user); @@ -87,16 +86,16 @@ public class ResolveAfter implements TaskListener{ busProcessNameService.saveOrUpdate(one1); } // // 存储当前节点意见 -// BusProcessNew busProcessNew = new BusProcessNew(); -// busProcessNew.setMsgType("clause"); -// busProcessNew.setPId(delegateTask.getProcessInstanceId()); -// busProcessNew.setMesg(object.toJSONString()); -// busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey()); -// busProcessNew.setTaskId(delegateTask.getId()); -// busProcessNew.setCommitText(object.getString("commentText")); -// busProcessNew.setFinishFlag("0"); -// busProcessNew.setTaskInfo(delegateTask.getName()); -// busBean.save(busProcessNew); + BusProcessNew busProcessNew = new BusProcessNew(); + busProcessNew.setMsgType("clause"); + busProcessNew.setPId(delegateTask.getProcessInstanceId()); + busProcessNew.setMesg(object.toJSONString()); + busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey()); + busProcessNew.setTaskId(delegateTask.getId()); + busProcessNew.setCommitText(object.getString("commentText")); + busProcessNew.setFinishFlag("0"); + busProcessNew.setTaskInfo(delegateTask.getName()); + busBean.save(busProcessNew); if(nextUserList != null && !nextUserList.isEmpty()){ for(String nextUser : nextUserList){ //2次 List listRes = userGroupMap.get(nextUser);