From b953b9ee2b6898ca0c241a3e4941d259c5996cae Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Wed, 29 Dec 2021 16:07:15 +0800 Subject: [PATCH 1/5] =?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 2/5] =?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 3/5] =?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 4/5] =?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 5/5] =?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);