Merge remote-tracking branch 'origin/develop' into develop

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;
+
 
 }

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);
                 }
             });

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"));