From 7571f8057dde7bf9c13857fa8202a78321e93f33 Mon Sep 17 00:00:00 2001 From: "Mr.Z" <709235321@qq.com> Date: Thu, 12 Aug 2021 18:01:01 +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=E7=BB=93=E6=9E=9C=20=E6=A0=87=E5=87=86=E7=BB=B4?= =?UTF-8?q?=E5=BA=A6=20=E5=AD=97=E6=AE=B5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../datas/dto/SarStandardComplianceProductAssess.java | 8 ++++++++ .../ProjectComplianceAssessment/PCAdlApproveAfter.java | 1 + .../projectEvaluationProcess/PEPDepartLeaderAfter.java | 6 ++++-- 3 files changed, 13 insertions(+), 2 deletions(-) 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 6504f27f..12cd7b22 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 @@ -87,6 +87,10 @@ public class SarStandardComplianceProductAssess { @ApiModelProperty(value = "在产产品合规信息") private String productionCompliance; + @ApiModelProperty(value = "在产产品不合规信息") + @TableField("production_non_compliance") + private String productionNonCompliance; + @ApiModelProperty(value = "在产产品不合规应对措施") private String productionCountermeasures; @@ -105,5 +109,9 @@ public class SarStandardComplianceProductAssess { @JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") private Date interpretationTime; + @ApiModelProperty(value = "条款名称") + @TableField("clause_name") + private String clauseName; + } 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 d4d60840..f9ca6b47 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 @@ -158,6 +158,7 @@ public class PCAdlApproveAfter implements TaskListener { sarStandardChild.setResearchNonCompliance(pcAchildren.getNoCompliance()); sarStandardChild.setResearchImplementationTime(pcAdataList.getXcxssrqgj()); sarStandardChild.setProductionImplementationTime(pcAdataList.getZccssrqgj()); + sarStandardChild.setClauseName(pcAchildren.getItemsName()); sarStandardComplianceProductAssesses.add(sarStandardChild); } }); 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 51091632..4f85ef31 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 @@ -107,7 +107,7 @@ public class PEPDepartLeaderAfter implements TaskListener { SarStandardComplianceProductAssess sarStandard=new SarStandardComplianceProductAssess(); sarStandard.setProductName(o.getProjectName()); sarStandard.setProductId(o.getProjectNumber()); - //差一个条款名称 + sarStandard.setClauseName(o.getItemsName()); sarStandard.setProductLineId(o.getProductLine()); sarStandard.setStandName(o.getStandName()); sarStandard.setStandNumber(o.getStandNumber()); @@ -118,7 +118,9 @@ public class PEPDepartLeaderAfter implements TaskListener { //111 sarStandard.setProductionCompletionTime(JSONObject.parseObject(String.valueOf(object1.get("zcCompletionTime")),Date.class)); sarStandard.setProductionCountermeasures(object1.getString("zcCountermeasures")); - sarStandard.setProductionCompliance(object1.getString("zcNoCompliance")); + sarStandard.setProductionNonCompliance(object1.getString("zcNoCompliance")); + sarStandard.setProductionCompliance(object1.getString("zcComplianceReasons")); + sarStandard.setResearchCompliance(object1.getString("complianceReasons")); sarStandard.setResearchCompletionTime(JSONObject.parseObject(String.valueOf(object1.get("completionTime")),Date.class)); sarStandard.setResearchCountermeasures(object1.getString("countermeasures")); sarStandard.setResearchNonCompliance(object1.getString("noCompliance"));