项目评估入库bug 修复

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

@@ -31,8 +31,8 @@ public class PCAdataList {
     private String kccvppsbm;
     private String kccvppscn;
     private String standName;
-    private String xcxssrqgj;
+    private String xcxssrq;
-    private String zccssrqgj;
+    private String zccssrq;
     private String standEnName;
     private String liablePeople;
     private String liablePeopleId;

src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep5After.java

@@ -35,7 +35,7 @@ public class ProcessStep5After implements TaskListener {
         delegateTask.setVariable("objectJson", object);
         //标准法规部业务经理Id
         List<String> nextUserList = new ArrayList();
-        String prcName = "";
+        String prcName = "企标制修订计划-部门高级经理审批";
        //根据意见选择 企标状态并对企标信息进行修改 bzfgId
         nextUserList.add(delegateTask.getVariable("topmanagerId",String.class));
 

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

@@ -75,9 +75,9 @@ public class PEPDepartLeaderAfter implements TaskListener {
                 sarStandUnqualified.setCloseState(1);
                 sarStandUnqualified.setCreateTime(new Date());
                 sarStandUnqualified.setProductName(o.getProjectName());
-                sarStandUnqualified.setQaEngineer(o.getQualityEngineerName());
+                sarStandUnqualified.setQaEngineer(o.getQualityEngineer());
-                sarStandUnqualified.setAuthEngineer(o.getCertifiedEngineerName());
+                sarStandUnqualified.setAuthEngineer(o.getCertifiedEngineer());
-                sarStandUnqualified.setDutyEngineer(o.getResponsibleEngineer());
+                sarStandUnqualified.setDutyEngineer(o.getImplementerId());
                 sarStandUnqualified.setResponsibleUnit(o.getResponsibleUnit());
                 sarStandUnqualified.setProductType("research");
                 sarStandUnqualified.setReason(object1.getString("noCompliance"));
@@ -99,9 +99,9 @@ public class PEPDepartLeaderAfter implements TaskListener {
                 sarStandUnqualified.setCloseState(1);
                 sarStandUnqualified.setCreateTime(new Date());
                 sarStandUnqualified.setProductName(o.getProjectName());
-                sarStandUnqualified.setQaEngineer(o.getQualityEngineerName());
+                sarStandUnqualified.setQaEngineer(o.getQualityEngineer());
-                sarStandUnqualified.setAuthEngineer(o.getCertifiedEngineerName());
+                sarStandUnqualified.setAuthEngineer(o.getCertifiedEngineer());
-                sarStandUnqualified.setDutyEngineer(o.getResponsibleEngineer());
+                sarStandUnqualified.setDutyEngineer(o.getImplementerId());
                 sarStandUnqualified.setResponsibleUnit(o.getResponsibleUnit());
                 sarStandUnqualified.setReason(object1.getString("zcNoCompliance"));
                 sarStandUnqualified.setProductType("product");

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

@@ -45,14 +45,14 @@ public class PEPffresPersonAfter implements TaskListener {
         delegateTask.setVariable("objectJson", object);
 
         String prcName = "";
-        if ("2".equals(object.getString("fenFlag")) && null == delegateTask.getVariable("PEPCount") && delegateTask.getVariable("workPeoples", List.class).size()==1){
+//        if ("2".equals(object.getString("fenFlag")) && null == delegateTask.getVariable("PEPCount") && delegateTask.getVariable("workPeoples", List.class).size()==1){
             prcName = delegateTask.getVariable("stands",String.class)+"-标准项目合规评估-汇总审批";
-        }
+//        }
-        else if ("2".equals(object.getString("fenFlag")) && String.valueOf(delegateTask.getVariable("PEPCount")).equals(String.valueOf(delegateTask.getVariable("workPeoples", List.class).size())) ) {
+//        else if ("2".equals(object.getString("fenFlag")) && String.valueOf(delegateTask.getVariable("PEPCount")).equals(String.valueOf(delegateTask.getVariable("workPeoples", List.class).size())) ) {
-            prcName = delegateTask.getVariable("stands",String.class)+"-标准项目合规评估-汇总审批";
+//            prcName = delegateTask.getVariable("stands",String.class)+"-标准项目合规评估-汇总审批";
-        } else {
+//        } else {
-            prcName = delegateTask.getVariable("stands",String.class)+"-标准项目合规评估-合规性评估";
+//
-        }
+//        }
 
 
         List<String> nextUserList = new ArrayList();
@@ -114,7 +114,7 @@ public class PEPffresPersonAfter implements TaskListener {
             }
         }
         if (String.valueOf(delegateTask.getVariable("PEPCount")).equals(String.valueOf(delegateTask.getVariable("workPeoples", List.class).size()))) {
-
+            prcName = delegateTask.getVariable("stands",String.class)+"-标准项目合规评估-合规性评估";
             oneStep1(delegateTask, busBean, nextUserList,prcName);
         }
 

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

@@ -52,6 +52,11 @@ public class PEPstartAfter implements TaskListener {
 
         delegateTask.setVariable("certifiedEngineerName",object.getString("certifiedEngineerName"));
         delegateTask.setVariable("qualityEngineerName",object.getString("qualityEngineerName"));
+
+        //认证工程师Id
+        delegateTask.setVariable("certifiedEngineer",object.getString("certifiedEngineer"));
+        //质量工程师Id
+        delegateTask.setVariable("qualityEngineer",object.getString("qualityEngineer"));
         //截止时间 流程描述 创建人
         String user = object.getString("prcCreateUser");
         String username = object.getString("prcCreateUserName");