From 3bf7b413851138848a7822f43a25ece6d21b6391 Mon Sep 17 00:00:00 2001 From: "Mr.Z" <709235321@qq.com> Date: Mon, 16 Aug 2021 15:03:29 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E5=87=86=E5=90=88=E8=A7=84=E8=AF=84?= =?UTF-8?q?=E4=BC=B0=E6=B5=81=E7=A8=8B=20=E9=A1=B9=E7=9B=AE=E8=AF=84?= =?UTF-8?q?=E4=BC=B0=E7=BB=93=E6=9E=9C=E5=90=8E=E5=8F=B0=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?bug~~~~?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../business_main/datas/dto/PCA/PCAchildren.java | 1 + .../business_main/datas/dto/PCA/PCAdataList.java | 2 ++ .../datas/dto/SarStandardComplianceProductAssess.java | 4 ++++ .../bat/wkflow/business_main/datas/dto/Step3DTO.java | 1 + .../PCAdlApproveAfter.java | 11 +++++++++++ .../PEPDepartLeaderAfter.java | 9 +++++---- 6 files changed, 24 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/ydw/bat/wkflow/business_main/datas/dto/PCA/PCAchildren.java b/src/main/java/com/ydw/bat/wkflow/business_main/datas/dto/PCA/PCAchildren.java index 0a66d9a7..fe670e8a 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_main/datas/dto/PCA/PCAchildren.java +++ b/src/main/java/com/ydw/bat/wkflow/business_main/datas/dto/PCA/PCAchildren.java @@ -30,4 +30,5 @@ public class PCAchildren { private Date zcCompletionTime; private Date completionTime; private String zcComplianceReasons; + private String typeId; } \ No newline at end of file diff --git a/src/main/java/com/ydw/bat/wkflow/business_main/datas/dto/PCA/PCAdataList.java b/src/main/java/com/ydw/bat/wkflow/business_main/datas/dto/PCA/PCAdataList.java index be5f9ff1..1685e38c 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_main/datas/dto/PCA/PCAdataList.java +++ b/src/main/java/com/ydw/bat/wkflow/business_main/datas/dto/PCA/PCAdataList.java @@ -48,4 +48,6 @@ public class PCAdataList { private String itemNum; private String itemsName; + private String typeId; + } \ No newline at end of file diff --git a/src/main/java/com/ydw/bat/wkflow/business_main/datas/dto/SarStandardComplianceProductAssess.java b/src/main/java/com/ydw/bat/wkflow/business_main/datas/dto/SarStandardComplianceProductAssess.java index 12cd7b22..2b2c9488 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_main/datas/dto/SarStandardComplianceProductAssess.java +++ b/src/main/java/com/ydw/bat/wkflow/business_main/datas/dto/SarStandardComplianceProductAssess.java @@ -113,5 +113,9 @@ public class SarStandardComplianceProductAssess { @TableField("clause_name") private String clauseName; + @ApiModelProperty(value = "流程UUID") + @TableField("type") + private String type; + } 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 355ac3fa..5ddb05c5 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 @@ -35,5 +35,6 @@ public class Step3DTO { private String responsibleEngineer; private String standId; private String standardInfo; + private String typeId; } \ No newline at end of file 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 a76add78..d6ab2956 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 @@ -23,6 +23,7 @@ import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Date; import java.util.List; +import java.util.UUID; public class PCAdlApproveAfter implements TaskListener { @@ -37,6 +38,9 @@ public class PCAdlApproveAfter implements TaskListener { LawsUserInfoService lawsUserInfoService = SpringContextUtil.getBean(LawsUserInfoService.class); + //流程分类UUID + UUID uuid = UUID.randomUUID(); + //根据流程id找到流程信息 QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId()); @@ -88,11 +92,16 @@ public class PCAdlApproveAfter implements TaskListener { //合估评规 结果！ + pcAdataList.setTypeId(String.valueOf(uuid)); SarStandardComplianceProductAssess sarStandard = new SarStandardComplianceProductAssess(); sarStandard.setStandId(pcAdataList.getStandId()); sarStandard.setStandName(pcAdataList.getStandName()); sarStandard.setStandNumber(pcAdataList.getStandSort()+" "+pcAdataList.getStandNumber()+"-"+pcAdataList.getStandYear()); sarStandard.setStandType(pcAdataList.getStandType()); + sarStandard.setType(pcAdataList.getTypeId()); + System.out.println(uuid); + System.out.println(pcAdataList.getTypeId()); + System.out.println(sarStandard.getType()); //111 sarStandard.setProductionCompletionTime(pcAdataList.getZcCompletionTime()); sarStandard.setProductionCountermeasures(pcAdataList.getZcCountermeasures()); @@ -152,11 +161,13 @@ public class PCAdlApproveAfter implements TaskListener { standUnqualifieds.add(sarStandUnqualified); } //合估评规 结果！ + pcAchildren.setTypeId(String.valueOf(uuid)); SarStandardComplianceProductAssess sarStandardChild = new SarStandardComplianceProductAssess(); sarStandardChild.setStandId(pcAdataList.getStandId()); sarStandardChild.setStandType(pcAdataList.getStandType()); sarStandardChild.setStandName(pcAdataList.getStandName()); sarStandardChild.setStandNumber(pcAdataList.getStandSort()+" "+pcAdataList.getStandNumber()+"-"+pcAdataList.getStandYear()); + sarStandardChild.setType(pcAchildren.getTypeId()); sarStandardChild.setProductionCompletionTime(pcAchildren.getZcCompletionTime()); sarStandardChild.setProductionCountermeasures(pcAchildren.getZcCountermeasures()); sarStandardChild.setProductionCompliance(pcAchildren.getZcComplianceReasons()); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationProcess/PEPDepartLeaderAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationProcess/PEPDepartLeaderAfter.java index 4f85ef31..c00b5ffd 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationProcess/PEPDepartLeaderAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationProcess/PEPDepartLeaderAfter.java @@ -22,10 +22,7 @@ import org.apache.commons.lang.StringUtils; import java.text.DateFormat; import java.text.ParseException; import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Date; -import java.util.List; +import java.util.*; public class PEPDepartLeaderAfter implements TaskListener { @@ -41,6 +38,8 @@ public class PEPDepartLeaderAfter implements TaskListener { LawsUserInfoService lawsUserInfoService = SpringContextUtil.getBean(LawsUserInfoService.class); + //流程分类UUID + UUID uuid = UUID.randomUUID(); //根据流程id找到流程信息 QueryWrapper queryWrapper = new QueryWrapper<>(); @@ -104,6 +103,7 @@ public class PEPDepartLeaderAfter implements TaskListener { sarStandUnqualifieds.add(sarStandUnqualified); } //合估评规 结果！ + o.setTypeId(String.valueOf(uuid)); SarStandardComplianceProductAssess sarStandard=new SarStandardComplianceProductAssess(); sarStandard.setProductName(o.getProjectName()); sarStandard.setProductId(o.getProjectNumber()); @@ -112,6 +112,7 @@ public class PEPDepartLeaderAfter implements TaskListener { sarStandard.setStandName(o.getStandName()); sarStandard.setStandNumber(o.getStandNumber()); sarStandard.setStandardItem(o.getItemNum()); + sarStandard.setType(o.getTypeId()); sarStandard.setStandId(delegateTask.getVariable("standsId",String.class)); sarStandard.setStandType(delegateTask.getVariable("standType",String.class)); sarStandard.setInterpretationTime(delegateTask.getCreateTime());