标准合规评估流程 项目评估结果后台查询bug~~~~

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

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

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

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

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<Datas> 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());

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.*;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
 
 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<Datas> 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());