From b953b9ee2b6898ca0c241a3e4941d259c5996cae Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Wed, 29 Dec 2021 16:07:15 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=81=E6=A0=87=E5=88=B6=E4=BF=AE=E8=AE=A2?= =?UTF-8?q?=E8=AE=A1=E5=88=92=E7=AE=A1=E6=8E=A7---=E6=9C=80=E6=96=B0?= =?UTF-8?q?=E7=9A=84=20=E7=AB=8B=E9=A1=B9=20=E5=8F=96=E6=B6=88=20=E5=90=88?= =?UTF-8?q?=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 {