Merge branch 'develop' into FOTON

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

@@ -131,6 +131,7 @@ public class Step8After implements TaskListener {
         queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
         BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
         if (one1 != null) {
+            one1.setOverTime(OVERTIME);
             one1.setPrcType("5");
             one1.setPrcName(prcName);
             one1.setCreatUser(user);

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

@@ -70,6 +70,9 @@ public class Step9After implements TaskListener {
             one1.setPrcName(prcName);
             one1.setCreatUser(user);
             one1.setCreatUserName(username);
+            if (null!=object.getJSONObject("newText")){
+                one1.setMes(object.getJSONObject("newText").toJSONString());
+            }
             busProcessNameService.saveOrUpdate(one1);
         }
 

src/main/java/com/ydw/bat/wkflow/listener/standardLibrary/ApplyApplicantAfter.java

@@ -66,7 +66,10 @@ public class ApplyApplicantAfter implements TaskListener{
         }else {
             standAllName = verifyObj(object.getString("standSort")) + " " + verifyObj(object.getString("standNumber"));
         }
-        String prcName = standAllName+"-"+standName+"标准入库";
+        /**
+         * 流程名称 标准号+"标准入库" + 下一个节点名称
+         */
+        String prcName = standAllName+"-"+standName+"标准入库"+" " + "经理人审批";
         QueryWrapper queryWrapper2 = new QueryWrapper();
         queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
         BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);

src/main/java/com/ydw/bat/wkflow/listener/standardLibrary/ManagerApproveAfter.java

@@ -35,6 +35,20 @@ public class ManagerApproveAfter implements TaskListener {
 
         String approvalOpinion = object.get("approvalOpinion") == null ? "" : object.get("approvalOpinion").toString();
 
+        String standName = "";
+        if(object.getString("standInData").equals("0")){
+            standName = "国内";
+        }else {
+            standName = "海外";
+        }
+        String standAllName = "";
+        if(object.getString("standYear") != null && !object.getString("standYear").equals("")){
+            standAllName = verifyObj(object.getString("standSort")) + " " + verifyObj(object.getString("standNumber")) + "-" + verifyObj(object.getString("standYear"));
+        }else {
+            standAllName = verifyObj(object.getString("standSort")) + " " + verifyObj(object.getString("standNumber"));
+        }
+
+
         if ("1".equalsIgnoreCase(approvalOpinion)) {
             delegateTask.setVariable("applyUserId", object.getString("applyUpdUserId"));
 
@@ -46,7 +60,13 @@ public class ManagerApproveAfter implements TaskListener {
             busProcessNew.setFinishFlag("0");
             busProcessNew.setTaskInfo(delegateTask.getName());
             busProcessNew.setUserId(object.getString("applyUpdUserId"));
-            busProcessNew.setPrcName(delegateTask.getVariable("prcs",String.class));
+
+            /**
+             * 流程名称 标准号+"标准入库" + 下一个节点名称
+             */
+            String prcName = standAllName+"-"+standName+"标准入库"+" " + "申请人修订";
+            busProcessNew.setPrcName(prcName);
+//            busProcessNew.setPrcName(delegateTask.getVariable("prcs",String.class));
             busBean.save(busProcessNew);
 
             func1(delegateTask, busBean, object, "1");
@@ -89,4 +109,8 @@ public class ManagerApproveAfter implements TaskListener {
             busBean.saveOrUpdate(one1);
         }
     }
+
+    private String verifyObj(String str){
+        return (str == null || str.equals("")) ? "" : str;
+    }
 }