项目评估流程 流程内部bug修复

src/main/java/com/ydw/bat/wkflow/listener/xmhgpgXM/Step2Before.java

@@ -27,7 +27,7 @@ public class Step2Before implements TaskListener {
 
             CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class);
             // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
-            one1.setLink("xmpg2Step11?prcType=6");
+            one1.setLink("xmpgStep2?prcType=6");
             one1.setTaskInfo(delegateTask.getName());
             oaService.sendTodoMq(one1);
         }

src/main/java/com/ydw/bat/wkflow/listener/xmhgpgXM/Step3Before.java

@@ -27,7 +27,7 @@ public class Step3Before implements TaskListener {
 
             CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class);
             // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
-            one1.setLink("xmpg2Step11?prcType=6");
+            one1.setLink("xmpgStep3?prcType=6");
             one1.setTaskInfo(delegateTask.getName());
             oaService.sendTodoMq(one1);
         }

src/main/java/com/ydw/bat/wkflow/listener/xmhgpgXM/Step4After.java

@@ -97,7 +97,7 @@ public class Step4After implements TaskListener {
                         BusProcessNew busProcessNewNext = new BusProcessNew();
                         busProcessNewNext.setMsgType("clause");
                         busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
-                        busProcessNewNext.setMesg(object.toJSONString());
+                        busProcessNewNext.setMesg(delegateTask.getVariable("resJSON",JSONObject.class).toJSONString());
                         busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey());
                         busProcessNewNext.setFinishFlag("0");
                         busProcessNewNext.setTaskInfo(delegateTask.getName());

src/main/java/com/ydw/bat/wkflow/listener/xmhgpgXM/Step4Before.java

@@ -27,7 +27,7 @@ public class Step4Before implements TaskListener {
 
             CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class);
             // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
-            one1.setLink("xmpg2Step11?prcType=6");
+            one1.setLink("xmpgStep4?prcType=6");
             one1.setTaskInfo(delegateTask.getName());
             oaService.sendTodoMq(one1);
         }

src/main/java/com/ydw/bat/wkflow/listener/xmhgpgXM/Step5After.java

@@ -20,10 +20,7 @@ import org.activiti.engine.delegate.DelegateTask;
 import org.activiti.engine.delegate.TaskListener;
 
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
+import java.util.*;
-import java.util.Date;
-import java.util.List;
-import java.util.UUID;
 
 public class Step5After implements TaskListener {
 
@@ -54,12 +51,25 @@ public class Step5After implements TaskListener {
         List<String> nextUserList = new ArrayList<>();
         //后续节点所需要的数据
         JSONArray jsonArray = object.getJSONArray("dataList");
+        Map<String,String> map=new HashMap<>();
+        JSONArray array=object.getJSONArray("children");
+        for (Object o:array){
+            if (null!=o){
+                JSONObject jsonObject=JSON.parseObject(o.toString());
+                map.put(jsonObject.getString("id"),jsonObject.getString("key"));
+            }
+        }
+
         for (Object o : jsonArray) {
             JSONObject jsonObject = JSON.parseObject(o.toString());
             if (null != jsonObject.getString("noCompliance")) {
                 SarStandUnqualified sarStandUnqualified = new SarStandUnqualified();
                 //少一个standId 不合格原因 在研在产！
-                sarStandUnqualified.setStandId(jsonObject.getString("standId"));
+                if (null!=map.get(jsonObject.getString("standId"))){
+                    sarStandUnqualified.setStandId(map.get(jsonObject.getString("standId")));
+                }else {
+                    sarStandUnqualified.setStandId(jsonObject.getString("standId"));
+                }
                 sarStandUnqualified.setStandSerialNumber(jsonObject.getString("standSort") + " " + jsonObject.getString("standNumber") + "-" + jsonObject.getString("standYear"));
                 if (null != jsonObject.getString("standName") && !"".equals(jsonObject.getString("standName"))) {
                     sarStandUnqualified.setStandName(jsonObject.getString("standName"));
@@ -74,20 +84,24 @@ public class Step5After implements TaskListener {
                 sarStandUnqualified.setReason(jsonObject.getString("noCompliance"));
                 sarStandUnqualified.setPlanCloseTime(jsonObject.getDate("completionTime"));
                 sarStandUnqualified.setProductLine(object.getString("productLine"));
-                sarStandUnqualified.setProductId(object.getString("projectId"));
+                sarStandUnqualified.setProductId(object.getString("projectNumber"));
                 standUnqualifieds.add(sarStandUnqualified);
             }
             if (null!=jsonObject.getString("remarks") || null!=jsonObject.getString("complianceReasons") || null!= jsonObject.getString("noCompliance")) {
                 //合估评规 结果！
                 SarStandardComplianceProductAssess sarStandard = new SarStandardComplianceProductAssess();
-                sarStandard.setStandId(jsonObject.getString("standId"));
+                if (null!=map.get(jsonObject.getString("standId"))){
+                    sarStandard.setStandId(map.get(jsonObject.getString("standId")));
+                }else {
+                    sarStandard.setStandId(jsonObject.getString("standId"));
+                }
                 if (null != jsonObject.getString("standName") && !"".equals(jsonObject.getString("standName"))) {
                     sarStandard.setStandName(jsonObject.getString("standName"));
                 } else {
                     sarStandard.setStandName(jsonObject.getString("standEnName"));
                 }
                 sarStandard.setProductLineId(object.getString("productLine"));
-                sarStandard.setProductId(object.getString("projectId"));
+                sarStandard.setProductId(object.getString("projectNumber"));
                 sarStandard.setProductName(object.getString("projectName"));
                 sarStandard.setStandNumber(jsonObject.getString("standSort") + " " + jsonObject.getString("standNumber") + "-" + jsonObject.getString("standYear"));
                 sarStandard.setStandType(jsonObject.getString("standType"));
@@ -112,6 +126,7 @@ public class Step5After implements TaskListener {
 
 
         //截止时间 流程描述 创建人
+        String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
         String user = delegateTask.getVariable("prcCreateUser", String.class);
         String username = delegateTask.getVariable("prcCreateUserName", String.class);
         String prcName = delegateTask.getVariable("stId", String.class) + "-项目合规评估流程-标准法规部部长审核";
@@ -119,6 +134,7 @@ public class Step5After implements TaskListener {
         queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
         BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
         if (one1 != null) {
+            one1.setOverTime(OVERTIME);
             one1.setPrcType("6");
             one1.setCreatUser(user);
             one1.setCreatUserName(username);

src/main/java/com/ydw/bat/wkflow/listener/xmhgpgXM/Step5Before.java

@@ -27,7 +27,7 @@ public class Step5Before implements TaskListener {
 
             CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class);
             // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
-            one1.setLink("xmpg2Step11?prcType=6");
+            one1.setLink("xmpgStep5?prcType=6");
             one1.setTaskInfo(delegateTask.getName());
             oaService.sendTodoMq(one1);
         }