解决项目合规评估流程-标准 入到未符合项整改库中，标准号、认证工程师，质量工程师没回显~~~

src/main/java/com/ydw/bat/wkflow/business_main/datas/dto/PCA/PCAtotal.java

@@ -26,6 +26,7 @@ public class PCAtotal {
     private List<PCAbreakdownList> breakdownList;
     private String prcCreateUser;
     private String projectNumber;
+    private String projectLine;
     private String startUserName;
     private String serviceManager;
     private String statuteMinister;

src/main/java/com/ydw/bat/wkflow/business_main/datas/dto/SarStandUnqualified.java

@@ -31,6 +31,10 @@ public class SarStandUnqualified  {
     @ApiModelProperty(value = "标准ID")
     private String standId;
 
+    @ApiModelProperty(value = "标准号")
+    @TableField("STAND_SERIAL_NUMBER")
+    private String standSerialNumber;
+
     @ApiModelProperty(value = "标准名称")
     private String standName;
 
@@ -41,6 +45,7 @@ public class SarStandUnqualified  {
     private String itemsName;
 
     @ApiModelProperty(value = "产品线")
+    @TableField("PRODUCT_LINE")
     private String productLine;
 
     @ApiModelProperty(value = "责任部门")
@@ -78,12 +83,15 @@ public class SarStandUnqualified  {
     private String reason;
 
     @ApiModelProperty(value = "质量工程师")
+    @TableField("QA_ENGINEER")
     private String qaEngineer;
 
     @ApiModelProperty(value = "认证工程师")
+    @TableField("AUTH_ENGINEER")
     private String authEngineer;
 
     @ApiModelProperty(value = "责任工程师")
+    @TableField("DUTY_ENGINEER")
     private String dutyEngineer;
 
     @ApiModelProperty(value = "产品类型（research为在研产品，product为在产产品）")

src/main/java/com/ydw/bat/wkflow/business_main/datas/dto/Step3DTO.java

@@ -25,14 +25,17 @@ public class Step3DTO {
     private String projectManager;
     private String qualityEngineer;
     private String qualityEngineerName;
+    private String qaEngineer;
     private String distributePerson;
     private String certifiedEngineer;
     private String certifiedEngineerName;
+    private String authEngineer;
     private String distributePersonId;
     private String zCCSSRQ;
     private String xCXSSRQ;
     private String responsibleUnit;
     private String responsibleEngineer;
+    private String dutyEngineer;
     private String standId;
     private String standardInfo;
     private String typeId;

src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationProcess/PEPDepartLeaderAfter.java

@@ -63,6 +63,7 @@ public class PEPDepartLeaderAfter implements TaskListener {
                 SarStandUnqualified sarStandUnqualified = new SarStandUnqualified();
                 //少一个standId 不合格原因 在研在产！
                 sarStandUnqualified.setStandId(delegateTask.getVariable("standId",String.class));
+                sarStandUnqualified.setStandSerialNumber(o.getStandNumber());
                 sarStandUnqualified.setStandName(o.getStandName());
                 sarStandUnqualified.setItemsNum(o.getItemNum());
                 sarStandUnqualified.setCreateById(delegateTask.getVariable("prcCreateUser", String.class));
@@ -71,9 +72,9 @@ public class PEPDepartLeaderAfter implements TaskListener {
                 sarStandUnqualified.setCloseState(1);
                 sarStandUnqualified.setCreateTime(new Date());
                 sarStandUnqualified.setProductName(o.getProjectName());
-                sarStandUnqualified.setQaEngineer(o.getQualityEngineer());
+                sarStandUnqualified.setQaEngineer(o.getQualityEngineerName());
-                sarStandUnqualified.setAuthEngineer(o.getCertifiedEngineer());
+                sarStandUnqualified.setAuthEngineer(o.getCertifiedEngineerName());
-                sarStandUnqualified.setDutyEngineer(o.getDistributePersonId());
+                sarStandUnqualified.setDutyEngineer(o.getResponsibleEngineer());
                 sarStandUnqualified.setResponsibleUnit(o.getResponsibleUnit());
                 sarStandUnqualified.setProductType("research");
                 sarStandUnqualified.setReason(object1.getString("noCompliance"));
@@ -85,6 +86,7 @@ public class PEPDepartLeaderAfter implements TaskListener {
                 SarStandUnqualified sarStandUnqualified = new SarStandUnqualified();
                 //少一个standId 不合格原因 在研在产！
                 sarStandUnqualified.setStandId(delegateTask.getVariable("standId",String.class));
+                sarStandUnqualified.setStandSerialNumber(o.getStandNumber());
                 sarStandUnqualified.setStandName(o.getStandName());
                 sarStandUnqualified.setItemsNum(o.getItemNum());
                 sarStandUnqualified.setCreateById(delegateTask.getVariable("prcCreateUser", String.class));
@@ -93,9 +95,9 @@ public class PEPDepartLeaderAfter implements TaskListener {
                 sarStandUnqualified.setCloseState(1);
                 sarStandUnqualified.setCreateTime(new Date());
                 sarStandUnqualified.setProductName(o.getProjectName());
-                sarStandUnqualified.setQaEngineer(o.getQualityEngineer());
+                sarStandUnqualified.setQaEngineer(o.getQualityEngineerName());
-                sarStandUnqualified.setAuthEngineer(o.getCertifiedEngineer());
+                sarStandUnqualified.setAuthEngineer(o.getCertifiedEngineerName());
-                sarStandUnqualified.setDutyEngineer(o.getDistributePersonId());
+                sarStandUnqualified.setDutyEngineer(o.getResponsibleEngineer());
                 sarStandUnqualified.setResponsibleUnit(o.getResponsibleUnit());
                 sarStandUnqualified.setReason(object1.getString("zcNoCompliance"));
                 sarStandUnqualified.setProductType("product");