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

src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAComplianceAssessmentAfter.java

@@ -74,7 +74,7 @@ public class PCAComplianceAssessmentAfter 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)+"-项目合规评估流程-审批";
+        String prcName = delegateTask.getVariable("prcName", String.class);
         QueryWrapper queryWrapper2 = new QueryWrapper();
         queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
         BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);

src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAbafgManagerApproveAfter.java

@@ -64,9 +64,9 @@ public class PCAbafgManagerApproveAfter implements TaskListener {
         String username = delegateTask.getVariable("prcCreateUserName", String.class);
         String prcName="";
         if ("1".equals(object.getString("bzFlag"))) {
-            prcName = delegateTask.getVariable("stId", String.class) + "-项目合规评估流程-汇总审批";
+            prcName = delegateTask.getVariable("prcName", String.class);
         }else {
-            prcName = delegateTask.getVariable("stId", String.class) + "-项目合规评估流程-责任人填写评估反馈";
+            prcName = delegateTask.getVariable("prcName", String.class);
         }
         QueryWrapper queryWrapper2 = new QueryWrapper();
         queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());

src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAbzManagerApproveAfter.java

@@ -55,9 +55,9 @@ public class PCAbzManagerApproveAfter implements TaskListener {
         String username = delegateTask.getVariable("prcCreateUserName", String.class);
         String prcName="";
         if ("1".equals(object.getString("BZFlag"))) {
-             prcName= delegateTask.getVariable("stId", String.class) + "-合规评估流程-工程经理转办";
+             prcName= delegateTask.getVariable("prcName", String.class);
         }else {
-            prcName= delegateTask.getVariable("stId", String.class) + "-合规评估流程-流程结束";
+            prcName= delegateTask.getVariable("prcName", String.class);
         }
         QueryWrapper queryWrapper2 = new QueryWrapper();
         queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());

src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAdlApproveAfter.java

@@ -216,9 +216,9 @@ public class PCAdlApproveAfter implements TaskListener {
         String username = delegateTask.getVariable("prcCreateUserName",String.class);
         String prcName="";
         if ("1".equals(object.get("dlFlag"))) {
-            prcName = delegateTask.getVariable("stId", String.class) + "-项目合规评估流程-流程结束";
+            prcName = delegateTask.getVariable("prcName", String.class);
         }else {
-            prcName = delegateTask.getVariable("stId", String.class) + "-项目合规评估流程-标准法规工程师汇总审核";
+            prcName = delegateTask.getVariable("prcName", String.class);
         }
         QueryWrapper queryWrapper2 = new QueryWrapper();
         queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());

src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAffLiableApproveAfter.java

@@ -54,9 +54,9 @@ public class PCAffLiableApproveAfter implements TaskListener {
         String username = delegateTask.getVariable("prcCreateUserName",String.class);
         String prcName="";
         if ("1".equals(object.getString("ffFlag"))){
-             prcName = delegateTask.getVariable("stId", String.class) + "-项目合规评估流程-架构经理审批";
+             prcName = delegateTask.getVariable("prcName", String.class);
         }else {
-             prcName = delegateTask.getVariable("stId", String.class) + "-项目合规评估流程-责任人填写评估反馈";
+             prcName = delegateTask.getVariable("prcName", String.class);
         }
         QueryWrapper queryWrapper2 = new QueryWrapper();
         queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());

src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAffLiableDistributeAfter.java

@@ -162,7 +162,7 @@ public class PCAffLiableDistributeAfter 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) + "-项目合规评估流程-合规性评估";
+        String prcName = delegateTask.getVariable("prcName", String.class);
         QueryWrapper queryWrapper2 = new QueryWrapper();
         queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
         BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);

src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAgcManagerApproveAfter.java

@@ -55,9 +55,9 @@ public class PCAgcManagerApproveAfter implements TaskListener {
         String username = delegateTask.getVariable("prcCreateUserName",String.class);
         String prcName="";
         if ("1".equals(object.getString("gcFlag"))) {
-            prcName = delegateTask.getVariable("stId", String.class) + "-项目合规评估流程-标准法规部经理审批";
+            prcName = delegateTask.getVariable("prcName", String.class);
         }else {
-            prcName = delegateTask.getVariable("stId", String.class) + "-项目合规评估流程-责任人填写评估反馈";
+            prcName = delegateTask.getVariable("prcName", String.class);
         }
         QueryWrapper queryWrapper2 = new QueryWrapper();
         queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());

src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAgcManagerDeliverAfter.java

@@ -49,7 +49,7 @@ public class PCAgcManagerDeliverAfter 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)+"-合规评估流程-架构经理任务分发";
+        String prcName = delegateTask.getVariable("prcName", String.class);
         QueryWrapper queryWrapper2 = new QueryWrapper();
         queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
         BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);

src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAjgManagerApproveAfter.java

@@ -55,9 +55,9 @@ public class PCAjgManagerApproveAfter implements TaskListener {
         String username = delegateTask.getVariable("prcCreateUserName",String.class);
         String prcName="";
         if ("1".equals(object.getString("jgFlag"))) {
-            prcName = delegateTask.getVariable("stId", String.class) + "-项目合规评估流程-工程经理审批";
+            prcName = delegateTask.getVariable("prcName", String.class);
         }else {
-            prcName = delegateTask.getVariable("stId", String.class) + "-项目合规评估流程-责任人填写评估反馈";
+            prcName = delegateTask.getVariable("prcName", String.class);
         }
         QueryWrapper queryWrapper2 = new QueryWrapper();
         queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());

src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAjgManagerDistributeAfter.java

@@ -76,7 +76,7 @@ public class PCAjgManagerDistributeAfter 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)+"-项目合规评估流程-流程下发";
+        String prcName = delegateTask.getVariable("prcName",String.class);
         QueryWrapper queryWrapper2 = new QueryWrapper();
         queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
         BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);

src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAstartAfter.java

@@ -54,7 +54,8 @@ public class PCAstartAfter implements TaskListener {
         delegateTask.setVariable("prcCreateUser", user);
         delegateTask.setVariable("prcCreateUserName", username);
         delegateTask.setVariable("stId",object.getString("projectNumber"));
-        String prcName = object.getString("projectNumber")+"-项目合规评估流程-项目维度";
+        String prcName = object.getString("projectNumber")+"-合规评估";
+        delegateTask.setVariable("prcName",prcName);
         QueryWrapper queryWrapper2 = new QueryWrapper();
         queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
         BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);

src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAsumAfter.java

@@ -43,7 +43,7 @@ public class PCAsumAfter 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)+"-项目合规评估流程-标准法规部部长审核";
+        String prcName =  delegateTask.getVariable("prcName",String.class);
         QueryWrapper queryWrapper2 = new QueryWrapper();
         queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
         BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);

src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/StartSurveyAfter.java

@@ -9,15 +9,9 @@ import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNameService;
 import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService;
 import com.ydw.bat.wkflow.business_main.datas.service.IDatasService;
 import com.ydw.bat.wkflow.util.SpringContextUtil;
-import org.activiti.engine.ActivitiException;
 import org.activiti.engine.delegate.DelegateTask;
 import org.activiti.engine.delegate.TaskListener;
-import org.apache.commons.lang.StringUtils;
-
-import java.text.SimpleDateFormat;
 import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Date;
 import java.util.List;
 
 public class StartSurveyAfter implements TaskListener {

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

@@ -28,7 +28,7 @@ public class Step3Before implements TaskListener {
             busBean.saveOrUpdate(one1);
 
             // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
-            one1.setLink("xmpgStep6?prcType=5&routerType=oa");
+            one1.setLink("bzpgStep3?prcType=5&routerType=oa");
             one1.setTaskInfo(delegateTask.getName());
             oaService.sendTodoMq(one1);
         }

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

@@ -28,7 +28,7 @@ public class Step4Before implements TaskListener {
             busBean.saveOrUpdate(one1);
 
             // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
-            one1.setLink("xmpgStep6?prcType=5&routerType=oa");
+            one1.setLink("bzpgStep4?prcType=5&routerType=oa");
             one1.setTaskInfo(delegateTask.getName());
             oaService.sendTodoMq(one1);
         }

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

@@ -28,7 +28,7 @@ public class Step5Before implements TaskListener {
             busBean.saveOrUpdate(one1);
 
             // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
-            one1.setLink("xmpgStep6?prcType=5&routerType=oa");
+            one1.setLink("bzpgStep5?prcType=5&routerType=oa");
             one1.setTaskInfo(delegateTask.getName());
             oaService.sendTodoMq(one1);
         }

src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step6Before.java

@@ -28,7 +28,7 @@ public class Step6Before implements TaskListener {
             busBean.saveOrUpdate(one1);
 
             // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
-            one1.setLink("xmpgStep6?prcType=5&routerType=oa");
+            one1.setLink("bzpgStep6?prcType=5&routerType=oa");
             one1.setTaskInfo(delegateTask.getName());
             oaService.sendTodoMq(one1);
         }

src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step7Before.java

@@ -28,7 +28,7 @@ public class Step7Before implements TaskListener {
             busBean.saveOrUpdate(one1);
 
             // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
-            one1.setLink("xmpgStep6?prcType=5&routerType=oa");
+            one1.setLink("bzpgStep7?prcType=5&routerType=oa");
             one1.setTaskInfo(delegateTask.getName());
             oaService.sendTodoMq(one1);
         }

src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step8Before.java

@@ -28,7 +28,7 @@ public class Step8Before implements TaskListener {
             busBean.saveOrUpdate(one1);
 
             // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
-            one1.setLink("xmpgStep6?prcType=5&routerType=oa");
+            one1.setLink("bzpgStep8?prcType=5&routerType=oa");
             one1.setTaskInfo(delegateTask.getName());
             oaService.sendTodoMq(one1);
         }

src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step9Before.java

@@ -28,7 +28,7 @@ public class Step9Before implements TaskListener {
             busBean.saveOrUpdate(one1);
 
             // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
-            one1.setLink("xmpgStep6?prcType=5&routerType=oa");
+            one1.setLink("bzpgStep8-1?prcType=5&routerType=oa");
             one1.setTaskInfo(delegateTask.getName());
             oaService.sendTodoMq(one1);
         }

src/main/java/com/ydw/bat/wkflow/listener/standardRead/ChooseZrAfter.java

@@ -46,7 +46,7 @@ public class ChooseZrAfter implements TaskListener{
         String user = object.getString("applyUserId");
         String username = object.getString("applyUserIdName");
 
-        String prcName = delegateTask.getVariable("titles",String.class)+"-标准解读流程";
+        String prcName = delegateTask.getVariable("prcName",String.class);
         QueryWrapper queryWrapper2 = new QueryWrapper();
         queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
         BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);

src/main/java/com/ydw/bat/wkflow/listener/standardRead/ResolveAfter.java

@@ -70,6 +70,7 @@ public class ResolveAfter implements TaskListener{
 //        String prcName = title+"-标准解读流程-选择执行人";
         String prcName = object.getString("itemsNum")+"-"+object.getString("itemsName")+"-"+"解读";
         String prcName1 = object.getString("itemsNum")+"-"+object.getString("itemsName")+"-"+"解读";
+        delegateTask.setVariable("prcName",prcName);
         QueryWrapper queryWrapper2 = new QueryWrapper();
         queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
         BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);

src/main/java/com/ydw/bat/wkflow/listener/standardRegulatoryProcess/CountersignSRPAfter.java

@@ -52,7 +52,7 @@ public class CountersignSRPAfter implements TaskListener{
         String user = object.getString("prcCreateUser");
         String username = object.getString("prcCreateUserName");
 //        object.getString("standName")
-        String prcName = delegateTask.getVariable("listName",String.class)+"-标准法规清单-修订";
+        String prcName = delegateTask.getVariable("prcName",String.class);
         QueryWrapper queryWrapper2 = new QueryWrapper();
         queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
         BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);

src/main/java/com/ydw/bat/wkflow/listener/standardRegulatoryProcess/SRPApplyApplicantAfter.java

@@ -50,7 +50,7 @@ public class SRPApplyApplicantAfter implements TaskListener{
         String username = object.getString("prcCreateUserName");
 //        object.getString("standName")
 
-        String prcName = delegateTask.getVariable("listName",String.class)+"-标准法规清单申请-经理人审批";
+        String prcName = delegateTask.getVariable("prcName",String.class);
         QueryWrapper queryWrapper2 = new QueryWrapper();
         queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
         BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);

src/main/java/com/ydw/bat/wkflow/listener/standardRegulatoryProcess/SRPManagerApproveAfter.java

@@ -55,7 +55,7 @@ public class SRPManagerApproveAfter implements TaskListener{
             busProcessNew.setFinishFlag("0");
             busProcessNew.setTaskInfo(delegateTask.getName());
             busProcessNew.setUserId(delegateTask.getVariable("createUser",String.class));
-            busProcessNew.setPrcName(delegateTask.getVariable("listName",String.class)+"-标准法规清单-修订");
+            busProcessNew.setPrcName(delegateTask.getVariable("prcName",String.class));
             busBean.save(busProcessNew);
 
             func1(delegateTask, busBean, object,"1");

src/main/java/com/ydw/bat/wkflow/listener/standardRegulatoryProcess/SRPstartAfter.java

@@ -22,8 +22,6 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 
 public class SRPstartAfter implements TaskListener {
 
@@ -92,6 +90,7 @@ public class SRPstartAfter implements TaskListener {
         String standName = object.getString("listName");
         delegateTask.setVariable("listName",standName);
         String prcName=object.getString("listName")+"-清单确认";
+        delegateTask.setVariable("prcName",prcName);
         QueryWrapper queryWrapper2 = new QueryWrapper();
         queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
         BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);