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

src/main/java/com/ydw/bat/wkflow/listener/KCSTPReviewProcess/AdminReviewAfter.java

@@ -59,7 +59,6 @@ public class AdminReviewAfter implements TaskListener {
 
 
         //截止时间 流程描述 创建人
-        String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
         String user = object.getString("prcCreateUser");
         String username = object.getString("prcCreateUserName");
 //        object.getString("standName")
@@ -69,7 +68,6 @@ public class AdminReviewAfter implements TaskListener {
         queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
         BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
         if(one1!=null){
-            one1.setOverTime(OVERTIME);
             one1.setPrcType("laws3");
 //            one1.setPrcName(prcName);
             one1.setCreatUser(user);

src/main/java/com/ydw/bat/wkflow/listener/KCSTPReviewProcess/DeptLeaderReviewAfter.java

@@ -58,7 +58,6 @@ public class DeptLeaderReviewAfter implements TaskListener {
 
 
         //截止时间 流程描述 创建人
-        String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
         String user = object.getString("prcCreateUser");
         String username = object.getString("prcCreateUserName");
 //        object.getString("standName")
@@ -68,7 +67,6 @@ public class DeptLeaderReviewAfter implements TaskListener {
         queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
         BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
         if(one1!=null){
-            one1.setOverTime(OVERTIME);
             one1.setPrcType("laws3");
 //            one1.setPrcName(prcName);
             one1.setCreatUser(user);

src/main/java/com/ydw/bat/wkflow/listener/KCSTPReviewProcess/DistributionAfter.java

@@ -57,7 +57,6 @@ public class DistributionAfter implements TaskListener {
         }
 
         //截止时间 流程描述 创建人
-        String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
         String user = object.getString("prcCreateUser");
         String username = object.getString("prcCreateUserName");
 //        object.getString("standName")
@@ -67,7 +66,6 @@ public class DistributionAfter implements TaskListener {
         queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
         BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
         if(one1!=null){
-            one1.setOverTime(OVERTIME);
             one1.setPrcType("laws3");
 //            one1.setPrcName(prcName);
             one1.setCreatUser(user);

src/main/java/com/ydw/bat/wkflow/listener/KCSTPReviewProcess/FeedBackAfter.java

@@ -51,7 +51,6 @@ public class FeedBackAfter implements TaskListener {
         }
 
         //截止时间 流程描述 创建人
-        String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
         String user = object.getString("prcCreateUser");
         String username = object.getString("prcCreateUserName");
 //        object.getString("standName")
@@ -61,7 +60,6 @@ public class FeedBackAfter implements TaskListener {
         queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
         BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
         if(one1!=null){
-            one1.setOverTime(OVERTIME);
             one1.setPrcType("laws3");
 //            one1.setPrcName(prcName);
             one1.setCreatUser(user);

src/main/java/com/ydw/bat/wkflow/listener/KCSTPReviewProcess/LaunchAfter.java

@@ -51,7 +51,6 @@ public class LaunchAfter implements TaskListener {
 
 
         //截止时间 流程描述 创建人
-        String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
         String user = object.getString("prcCreateUser");
         String username = object.getString("prcCreateUserName");
 //        object.getString("standName")
@@ -61,7 +60,6 @@ public class LaunchAfter implements TaskListener {
         queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
         BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
         if(one1!=null){
-//            one1.setOverTime(OVERTIME);
             one1.setPrcType("laws3");
             one1.setPrcName(prcName);
             one1.setCreatUser(user);

src/main/java/com/ydw/bat/wkflow/listener/KCSTPReviewProcess/MinisterReviewAfter.java

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

src/main/java/com/ydw/bat/wkflow/listener/KCSTPReviewProcess/ReLaunchAfter.java

@@ -60,9 +60,7 @@ public class ReLaunchAfter implements TaskListener {
         queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
         BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
         if(one1!=null){
-//            one1.setOverTime(OVERTIME);
             one1.setPrcType("laws3");
-//            one1.setPrcName(prcName);
             one1.setCreatUser(user);
             one1.setCreatUserName(username);
             busProcessNameService.saveOrUpdate(one1);

src/main/java/com/ydw/bat/wkflow/listener/KCSTPReviewProcess/SubMinisterReviewAfter.java

@@ -56,7 +56,6 @@ public class SubMinisterReviewAfter implements TaskListener {
 
 
         //截止时间 流程描述 创建人
-        String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
         String user = object.getString("prcCreateUser");
         String username = object.getString("prcCreateUserName");
 //        object.getString("standName")
@@ -66,7 +65,6 @@ public class SubMinisterReviewAfter implements TaskListener {
         queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
         BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
         if(one1!=null){
-//            one1.setOverTime(OVERTIME);
             one1.setPrcType("laws3");
 //            one1.setPrcName(prcName);
             one1.setCreatUser(user);

src/main/java/com/ydw/bat/wkflow/listener/KCSTPReviewProcess/SubViceDirectorAfter.java

@@ -36,6 +36,12 @@ public class SubViceDirectorAfter implements TaskListener {
         JSONObject object =  JSONObject.parseObject(datas.getFormValsJson());
         delegateTask.setVariable("objectJson",object);
 
+        int i=1;
+        if (null!=delegateTask.getVariable("finishCount")){
+            i=delegateTask.getVariable("finishCount",Integer.class)+1;
+        }
+        delegateTask.setVariable("finishCount",i);
+
 
         /**
          * next 结束
@@ -71,7 +77,9 @@ public class SubViceDirectorAfter implements TaskListener {
         queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
         BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
         if(one1!=null){
-//            one1.setOverTime(OVERTIME);
+            if (i>=delegateTask.getVariable("responseUserIdList",List.class).size()) {
+                one1.setOverTime(OVERTIME);
+            }
             one1.setPrcType("laws3");
             one1.setPrcName(prcName);
             one1.setCreatUser(user);

src/main/java/com/ydw/bat/wkflow/listener/KCSTPReviewProcess/ViceDirectorAfter.java

@@ -72,7 +72,6 @@ public class ViceDirectorAfter implements TaskListener {
 
 
         //截止时间 流程描述 创建人
-        String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
         String user = object.getString("prcCreateUser");
         String username = object.getString("prcCreateUserName");
 //        object.getString("standName")
@@ -81,9 +80,7 @@ public class ViceDirectorAfter implements TaskListener {
         queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
         BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
         if(one1!=null){
-//            one1.setOverTime(OVERTIME);
             one1.setPrcType("laws3");
-//            one1.setPrcName(prcName);
             one1.setCreatUser(user);
             one1.setCreatUserName(username);
             busProcessNameService.saveOrUpdate(one1);