Merge branch 'develop' into 'FOTON'

Develop

See merge request foton-wkflow-group/foton-wkflow-rest!74

src/main/java/com/ydw/bat/wkflow/listener/JoinStandardFiling/JSFApproveAfter.java

@@ -40,6 +40,20 @@ public class JSFApproveAfter implements TaskListener {
 
         String approvalOpinion = object.get("bzFlag") == null ? "" : object.get("bzFlag").toString();
 
+        //存储当前节点意见
+        if (null != object.getString("commentText")) {
+            QueryWrapper queryWrapper3 = new QueryWrapper();
+            queryWrapper3.eq("TASK_ID", delegateTask.getId());
+            queryWrapper3.eq("USER_ID", delegateTask.getAssignee());
+            List<BusProcessNew> list = busBean.list(queryWrapper3);
+            if (!list.isEmpty()) {
+                BusProcessNew busProcessNews = list.get(0);
+                busProcessNews.setTaskId(delegateTask.getId());
+                busProcessNews.setCommitText(object.getString("commentText"));
+                busBean.saveOrUpdate(busProcessNews);
+            }
+        }
+
         if ("1".equalsIgnoreCase(approvalOpinion)) {
             delegateTask.setVariable("bzFlag", 1);
             func1(delegateTask, busBean, object, "1", busProcessNameService);

src/main/java/com/ydw/bat/wkflow/listener/JoinStandardFiling/JSFAuditAfter.java

@@ -68,7 +68,19 @@ public class JSFAuditAfter implements TaskListener {
             one1.setCreatUserName(username);
             busProcessNameService.saveOrUpdate(one1);
         }
-
+        //存储当前节点意见
+        if (null != object.getString("commentText")) {
+            QueryWrapper queryWrapper3 = new QueryWrapper();
+            queryWrapper3.eq("TASK_ID", delegateTask.getId());
+            queryWrapper3.eq("USER_ID", delegateTask.getAssignee());
+            List<BusProcessNew> list = busBean.list(queryWrapper3);
+            if (!list.isEmpty()) {
+                BusProcessNew busProcessNews = list.get(0);
+                busProcessNews.setTaskId(delegateTask.getId());
+                busProcessNews.setCommitText(object.getString("commentText"));
+                busBean.saveOrUpdate(busProcessNews);
+            }
+        }
         if (nextUserList != null && !nextUserList.isEmpty()) {
             for (String nextUser : nextUserList) {
                 BusProcessNew busProcessNewNext = new BusProcessNew();

src/main/java/com/ydw/bat/wkflow/listener/JoinStandardFiling/JSFFillinformationAfter.java

@@ -64,6 +64,19 @@ public class JSFFillinformationAfter implements TaskListener {
             delegateTask.setVariable("dlFlag", 0);
             func2(delegateTask, busBean, object, "0", busProcessNameService);
         }
+        //存储当前节点意见
+        if (null != object.getString("commentText")) {
+            QueryWrapper queryWrapper3 = new QueryWrapper();
+            queryWrapper3.eq("TASK_ID", delegateTask.getId());
+            queryWrapper3.eq("USER_ID", delegateTask.getAssignee());
+            List<BusProcessNew> list = busBean.list(queryWrapper3);
+            if (!list.isEmpty()) {
+                BusProcessNew busProcessNews = list.get(0);
+                busProcessNews.setTaskId(delegateTask.getId());
+                busProcessNews.setCommitText(object.getString("commentText"));
+                busBean.saveOrUpdate(busProcessNews);
+            }
+        }
     }
 
     private void func1(DelegateTask delegateTask, IBusProcessNewService busBean, JSONObject object, String commitFlag) {

src/main/java/com/ydw/bat/wkflow/listener/JoinStandardFiling/JSFstartAfter.java

@@ -66,6 +66,20 @@ public class JSFstartAfter implements TaskListener {
             one1.setCreatUserName(username);
             busProcessNameService.saveOrUpdate(one1);
         }
+        if (null != object.getString("commentText")) {
+            BusProcessNew busProcessNews = new BusProcessNew();
+            busProcessNews.setMsgType("clause");
+            busProcessNews.setPId(delegateTask.getProcessInstanceId());
+            busProcessNews.setMesg(object.toJSONString());
+            busProcessNews.setTaskInfo(delegateTask.getTaskDefinitionKey());
+            busProcessNews.setFinishFlag("0");
+            busProcessNews.setTaskInfo(delegateTask.getName());
+            busProcessNews.setTaskId(delegateTask.getId());
+            busProcessNews.setUserId("start");
+            busProcessNews.setPrcName(prcName);
+            busProcessNews.setCommitText(object.getString("commentText"));
+            busBean.save(busProcessNews);
+        }
 
         if (nextUserList != null && !nextUserList.isEmpty()) {
             for (String nextUser : nextUserList) {

src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFApproveAfter.java

@@ -66,6 +66,20 @@ public class PRFApproveAfter implements TaskListener {
             busProcessNameService.saveOrUpdate(one1);
         }
 
+        //存储当前节点意见
+        if (null != object.getString("commentText")) {
+            QueryWrapper queryWrapper3 = new QueryWrapper();
+            queryWrapper3.eq("TASK_ID", delegateTask.getId());
+            queryWrapper3.eq("USER_ID", delegateTask.getAssignee());
+            List<BusProcessNew> list = busBean.list(queryWrapper3);
+            if (!list.isEmpty()) {
+                BusProcessNew busProcessNews = list.get(0);
+                busProcessNews.setTaskId(delegateTask.getId());
+                busProcessNews.setCommitText(object.getString("commentText"));
+                busBean.saveOrUpdate(busProcessNews);
+            }
+        }
+
         if (nextUserList != null && !nextUserList.isEmpty()) {
             for (String nextUser : nextUserList) {
                 BusProcessNew busProcessNewNext = new BusProcessNew();

src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFEngineerreviewAfter.java

@@ -70,6 +70,19 @@ public class PRFEngineerreviewAfter implements TaskListener {
             one1.setCreatUserName(username);
             busProcessNameService.saveOrUpdate(one1);
         }
+        //存储当前节点意见
+        if (null != object.getString("commentText")) {
+            QueryWrapper queryWrapper3 = new QueryWrapper();
+            queryWrapper3.eq("TASK_ID", delegateTask.getId());
+            queryWrapper3.eq("USER_ID", delegateTask.getAssignee());
+            List<BusProcessNew> list = busBean.list(queryWrapper3);
+            if (!list.isEmpty()) {
+                BusProcessNew busProcessNews = list.get(0);
+                busProcessNews.setTaskId(delegateTask.getId());
+                busProcessNews.setCommitText(object.getString("commentText"));
+                busBean.saveOrUpdate(busProcessNews);
+            }
+        }
 
         if (nextUserList != null && !nextUserList.isEmpty()) {
             for (String nextUser : nextUserList) {

src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFFillinformationAfter.java

@@ -66,6 +66,20 @@ public class PRFFillinformationAfter implements TaskListener {
             busProcessNameService.saveOrUpdate(one1);
         }
 
+        //存储当前节点意见
+        if (null != object.getString("commentText")) {
+            QueryWrapper queryWrapper3 = new QueryWrapper();
+            queryWrapper3.eq("TASK_ID", delegateTask.getId());
+            queryWrapper3.eq("USER_ID", delegateTask.getAssignee());
+            List<BusProcessNew> list = busBean.list(queryWrapper3);
+            if (!list.isEmpty()) {
+                BusProcessNew busProcessNews = list.get(0);
+                busProcessNews.setTaskId(delegateTask.getId());
+                busProcessNews.setCommitText(object.getString("commentText"));
+                busBean.saveOrUpdate(busProcessNews);
+            }
+        }
+
         if (nextUserList != null && !nextUserList.isEmpty()) {
             for (String nextUser : nextUserList) {
                 BusProcessNew busProcessNewNext = new BusProcessNew();

src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFReviewdockAfter.java

@@ -71,6 +71,21 @@ public class PRFReviewdockAfter implements TaskListener {
             busProcessNameService.saveOrUpdate(one1);
         }
 
+        //存储当前节点意见
+        if (null != object.getString("commentText")) {
+            QueryWrapper queryWrapper3 = new QueryWrapper();
+            queryWrapper3.eq("TASK_ID", delegateTask.getId());
+            queryWrapper3.eq("USER_ID", delegateTask.getAssignee());
+            List<BusProcessNew> list = busBean.list(queryWrapper3);
+            if (!list.isEmpty()) {
+                BusProcessNew busProcessNews = list.get(0);
+                busProcessNews.setTaskId(delegateTask.getId());
+                busProcessNews.setCommitText(object.getString("commentText"));
+                busBean.saveOrUpdate(busProcessNews);
+            }
+        }
+
+
         if (nextUserList != null && !nextUserList.isEmpty()) {
             for (String nextUser : nextUserList) {
                 BusProcessNew busProcessNewNext = new BusProcessNew();

src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFUnderengineerAfter.java

@@ -63,6 +63,20 @@ public class PRFUnderengineerAfter implements TaskListener {
             busProcessNameService.saveOrUpdate(one1);
         }
 
+        //存储当前节点意见
+        if (null != object.getString("commentText")) {
+            QueryWrapper queryWrapper3 = new QueryWrapper();
+            queryWrapper3.eq("TASK_ID", delegateTask.getId());
+            queryWrapper3.eq("USER_ID", delegateTask.getAssignee());
+            List<BusProcessNew> list = busBean.list(queryWrapper3);
+            if (!list.isEmpty()) {
+                BusProcessNew busProcessNews = list.get(0);
+                busProcessNews.setTaskId(delegateTask.getId());
+                busProcessNews.setCommitText(object.getString("commentText"));
+                busBean.saveOrUpdate(busProcessNews);
+            }
+        }
+
         if (nextUserList != null && !nextUserList.isEmpty()) {
             for (String nextUser : nextUserList) {
                 BusProcessNew busProcessNewNext = new BusProcessNew();

src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFstartAfter.java

@@ -67,6 +67,21 @@ public class PRFstartAfter implements TaskListener {
             busProcessNameService.saveOrUpdate(one1);
         }
 
+        if (null != object.getString("commentText")) {
+            BusProcessNew busProcessNews = new BusProcessNew();
+            busProcessNews.setMsgType("clause");
+            busProcessNews.setPId(delegateTask.getProcessInstanceId());
+            busProcessNews.setMesg(object.toJSONString());
+            busProcessNews.setTaskInfo(delegateTask.getTaskDefinitionKey());
+            busProcessNews.setFinishFlag("0");
+            busProcessNews.setTaskInfo(delegateTask.getName());
+            busProcessNews.setTaskId(delegateTask.getId());
+            busProcessNews.setUserId("start");
+            busProcessNews.setPrcName(prcName);
+            busProcessNews.setCommitText(object.getString("commentText"));
+            busBean.save(busProcessNews);
+        }
+
         if (nextUserList != null && !nextUserList.isEmpty()) {
             for (String nextUser : nextUserList) {
                 BusProcessNew busProcessNewNext = new BusProcessNew();

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

@@ -67,6 +67,21 @@ public class PCAstartAfter implements TaskListener {
             busProcessNameService.saveOrUpdate(one1);
         }
 
+        if (null != object.getString("commentText")) {
+            BusProcessNew busProcessNews = new BusProcessNew();
+            busProcessNews.setMsgType("clause");
+            busProcessNews.setPId(delegateTask.getProcessInstanceId());
+            busProcessNews.setMesg(object.toJSONString());
+            busProcessNews.setTaskInfo(delegateTask.getTaskDefinitionKey());
+            busProcessNews.setFinishFlag("0");
+            busProcessNews.setTaskInfo(delegateTask.getName());
+            busProcessNews.setTaskId(delegateTask.getId());
+            busProcessNews.setUserId("start");
+            busProcessNews.setPrcName(prcName);
+            busProcessNews.setCommitText(object.getString("commentText"));
+            busBean.save(busProcessNews);
+        }
+
         // 存储当前节点意见
         if (nextUserList != null && !nextUserList.isEmpty()) {
             for (String nextUser : nextUserList) {

src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAApproveAfter.java

@@ -18,6 +18,7 @@ import org.activiti.engine.delegate.DelegateTask;
 import org.activiti.engine.delegate.TaskListener;
 import java.text.SimpleDateFormat;
 import java.util.Date;
+import java.util.List;
 
 public class RAApproveAfter implements TaskListener {
     @Override
@@ -38,6 +39,20 @@ public class RAApproveAfter implements TaskListener {
 
         String approvalOpinion = object.get("yzFlag") == null ? "" : object.get("yzFlag").toString();
 
+        //存储当前节点意见
+        if (null != object.getString("commentText")) {
+            QueryWrapper queryWrapper3 = new QueryWrapper();
+            queryWrapper3.eq("TASK_ID", delegateTask.getId());
+            queryWrapper3.eq("USER_ID", delegateTask.getAssignee());
+            List<BusProcessNew> list = busBean.list(queryWrapper3);
+            if (!list.isEmpty()) {
+                BusProcessNew busProcessNews = list.get(0);
+                busProcessNews.setTaskId(delegateTask.getId());
+                busProcessNews.setCommitText(object.getString("commentText"));
+                busBean.saveOrUpdate(busProcessNews);
+            }
+        }
+
         if ("1".equalsIgnoreCase(approvalOpinion)) {
             delegateTask.setVariable("yzFlag", 1);
             func1(delegateTask, busBean, object, "1", busProcessNameService);

src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAAuditAfter.java

@@ -70,6 +70,20 @@ public class RAAuditAfter implements TaskListener {
             busProcessNameService.saveOrUpdate(one1);
         }
 
+        //存储当前节点意见
+        if (null != object.getString("commentText")) {
+            QueryWrapper queryWrapper3 = new QueryWrapper();
+            queryWrapper3.eq("TASK_ID", delegateTask.getId());
+            queryWrapper3.eq("USER_ID", delegateTask.getAssignee());
+            List<BusProcessNew> list = busBean.list(queryWrapper3);
+            if (!list.isEmpty()) {
+                BusProcessNew busProcessNews = list.get(0);
+                busProcessNews.setTaskId(delegateTask.getId());
+                busProcessNews.setCommitText(object.getString("commentText"));
+                busBean.saveOrUpdate(busProcessNews);
+            }
+        }
+
         if (nextUserList != null && !nextUserList.isEmpty()) {
             for (String nextUser : nextUserList) {
                 BusProcessNew busProcessNewNext = new BusProcessNew();

src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAModifyInformationAfter.java

@@ -55,6 +55,20 @@ public class RAModifyInformationAfter implements TaskListener {
             busProcessNameService.saveOrUpdate(one1);
         }
 
+        //存储当前节点意见
+        if (null != object.getString("commentText")) {
+            QueryWrapper queryWrapper3 = new QueryWrapper();
+            queryWrapper3.eq("TASK_ID", delegateTask.getId());
+            queryWrapper3.eq("USER_ID", delegateTask.getAssignee());
+            List<BusProcessNew> list = busBean.list(queryWrapper3);
+            if (!list.isEmpty()) {
+                BusProcessNew busProcessNews = list.get(0);
+                busProcessNews.setTaskId(delegateTask.getId());
+                busProcessNews.setCommitText(object.getString("commentText"));
+                busBean.saveOrUpdate(busProcessNews);
+            }
+        }
+
         if (nextUserList != null && !nextUserList.isEmpty()) {
             for (String nextUser : nextUserList) {
                 BusProcessNew busProcessNewNext = new BusProcessNew();

src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RASignAfter.java

@@ -70,6 +70,20 @@ public class RASignAfter implements TaskListener {
             busProcessNameService.saveOrUpdate(one1);
         }
 
+        //存储当前节点意见
+        if (null != object.getString("commentText")) {
+            QueryWrapper queryWrapper3 = new QueryWrapper();
+            queryWrapper3.eq("TASK_ID", delegateTask.getId());
+            queryWrapper3.eq("USER_ID", delegateTask.getAssignee());
+            List<BusProcessNew> list = busBean.list(queryWrapper3);
+            if (!list.isEmpty()) {
+                BusProcessNew busProcessNews = list.get(0);
+                busProcessNews.setTaskId(delegateTask.getId());
+                busProcessNews.setCommitText(object.getString("commentText"));
+                busBean.saveOrUpdate(busProcessNews);
+            }
+        }
+
         if (nextUserList != null && !nextUserList.isEmpty()) {
             for (String nextUser : nextUserList) {
                 BusProcessNew busProcessNewNext = new BusProcessNew();

src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAValidationAfter.java

@@ -71,6 +71,20 @@ public class RAValidationAfter implements TaskListener {
             busProcessNameService.saveOrUpdate(one1);
         }
 
+        //存储当前节点意见
+        if (null != object.getString("commentText")) {
+            QueryWrapper queryWrapper3 = new QueryWrapper();
+            queryWrapper3.eq("TASK_ID", delegateTask.getId());
+            queryWrapper3.eq("USER_ID", delegateTask.getAssignee());
+            List<BusProcessNew> list = busBean.list(queryWrapper3);
+            if (!list.isEmpty()) {
+                BusProcessNew busProcessNews = list.get(0);
+                busProcessNews.setTaskId(delegateTask.getId());
+                busProcessNews.setCommitText(object.getString("commentText"));
+                busBean.saveOrUpdate(busProcessNews);
+            }
+        }
+
         if (nextUserList != null && !nextUserList.isEmpty()) {
             for (String nextUser : nextUserList) {
                 BusProcessNew busProcessNewNext = new BusProcessNew();

src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAstartAfter.java

@@ -69,6 +69,21 @@ public class RAstartAfter implements TaskListener {
             busProcessNameService.saveOrUpdate(one1);
         }
 
+        if (null != object.getString("commentText")) {
+            BusProcessNew busProcessNews = new BusProcessNew();
+            busProcessNews.setMsgType("clause");
+            busProcessNews.setPId(delegateTask.getProcessInstanceId());
+            busProcessNews.setMesg(object.toJSONString());
+            busProcessNews.setTaskInfo(delegateTask.getTaskDefinitionKey());
+            busProcessNews.setFinishFlag("0");
+            busProcessNews.setTaskInfo(delegateTask.getName());
+            busProcessNews.setTaskId(delegateTask.getId());
+            busProcessNews.setUserId("start");
+            busProcessNews.setPrcName(prcName);
+            busProcessNews.setCommitText(object.getString("commentText"));
+            busBean.save(busProcessNews);
+        }
+
         if (nextUserList != null && !nextUserList.isEmpty()) {
             for (String nextUser : nextUserList) {
                 BusProcessNew busProcessNewNext = new BusProcessNew();

src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/AutoStartAfter.java

@@ -65,6 +65,21 @@ public class AutoStartAfter implements TaskListener {
             busProcessNameService.saveOrUpdate(one1);
         }
 
+        if (null != object.getString("commentText")) {
+            BusProcessNew busProcessNews = new BusProcessNew();
+            busProcessNews.setMsgType("clause");
+            busProcessNews.setPId(delegateTask.getProcessInstanceId());
+            busProcessNews.setMesg(object.toJSONString());
+            busProcessNews.setTaskInfo(delegateTask.getTaskDefinitionKey());
+            busProcessNews.setFinishFlag("0");
+            busProcessNews.setTaskInfo(delegateTask.getName());
+            busProcessNews.setTaskId(delegateTask.getId());
+            busProcessNews.setUserId("start");
+            busProcessNews.setPrcName(prcName);
+            busProcessNews.setCommitText(object.getString("commentText"));
+            busBean.save(busProcessNews);
+        }
+
         if (nextUserList != null && !nextUserList.isEmpty()) {
             for (String nextUser : nextUserList) {
                 BusProcessNew busProcessNewNext = new BusProcessNew();

src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/DirectorVerifyAfter.java

@@ -89,6 +89,19 @@ public class DirectorVerifyAfter implements TaskListener {
             one1.setCreatUserName(username);
             busProcessNameService.saveOrUpdate(one1);
         }
+        //存储当前节点意见
+        if (null != object.getString("commentText")) {
+            QueryWrapper queryWrapper3 = new QueryWrapper();
+            queryWrapper3.eq("TASK_ID", delegateTask.getId());
+            queryWrapper3.eq("USER_ID", delegateTask.getAssignee());
+            List<BusProcessNew> list = busBean.list(queryWrapper3);
+            if (!list.isEmpty()) {
+                BusProcessNew busProcessNews = list.get(0);
+                busProcessNews.setTaskId(delegateTask.getId());
+                busProcessNews.setCommitText(object.getString("commentText"));
+                busBean.saveOrUpdate(busProcessNews);
+            }
+        }
 
         if (nextUserList != null && !nextUserList.isEmpty()) {
             for (String nextUser : nextUserList) {

src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/MemberUploadInfoAfter.java

@@ -64,6 +64,19 @@ public class MemberUploadInfoAfter implements TaskListener {
             busProcessNameService.saveOrUpdate(one1);
         }
 
+        //存储当前节点意见
+        if (null != object.getString("commentText")) {
+            QueryWrapper queryWrapper3 = new QueryWrapper();
+            queryWrapper3.eq("TASK_ID", delegateTask.getId());
+            queryWrapper3.eq("USER_ID", delegateTask.getAssignee());
+            List<BusProcessNew> list = busBean.list(queryWrapper3);
+            if (!list.isEmpty()) {
+                BusProcessNew busProcessNews = list.get(0);
+                busProcessNews.setTaskId(delegateTask.getId());
+                busProcessNews.setCommitText(object.getString("commentText"));
+                busBean.saveOrUpdate(busProcessNews);
+            }
+        }
         if (nextUserList != null && !nextUserList.isEmpty()) {
             for (String nextUser : nextUserList) {
                 BusProcessNew busProcessNewNext = new BusProcessNew();

src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step10After.java

@@ -96,19 +96,19 @@ public class Step10After implements TaskListener {
             busProcessNameService.saveOrUpdate(one1);
         }
 
-        // 存储当前节点意见
+        //存储当前节点意见
-        BusProcessNew busProcessNew = new BusProcessNew();
+        if (null != object.getString("commentText")) {
-        busProcessNew.setMsgType("clause");
+            QueryWrapper queryWrapper3 = new QueryWrapper();
-        busProcessNew.setPId(delegateTask.getProcessInstanceId());
+            queryWrapper3.eq("TASK_ID", delegateTask.getId());
-        busProcessNew.setMesg(object.toJSONString());
+            queryWrapper3.eq("USER_ID", delegateTask.getAssignee());
-        busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey());
+            List<BusProcessNew> list = busBean.list(queryWrapper3);
-        busProcessNew.setUserId(delegateTask.getAssignee());
+            if (!list.isEmpty()) {
-        busProcessNew.setTaskId(delegateTask.getId());
+                BusProcessNew busProcessNews = list.get(0);
-        busProcessNew.setCommitText(object.getString("commentText"));
+                busProcessNews.setTaskId(delegateTask.getId());
-        busProcessNew.setFinishFlag("0");
+                busProcessNews.setCommitText(object.getString("commentText"));
-        busProcessNew.setTaskInfo(delegateTask.getName());
+                busBean.saveOrUpdate(busProcessNews);
-
+            }
-        busBean.saveOrUpdate(busProcessNew);
+        }
 
         if(nextUserList != null && !nextUserList.isEmpty()){
             for(String nextUser : nextUserList){

src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step1After.java

@@ -83,19 +83,19 @@ public class Step1After implements TaskListener {
             busProcessNameService.saveOrUpdate(one1);
         }
 
-        // 存储当前节点意见
+        //存储当前节点意见
-        BusProcessNew busProcessNew = new BusProcessNew();
+        if (null != object.getString("commentText")) {
-        busProcessNew.setMsgType("clause");
+            QueryWrapper queryWrapper3 = new QueryWrapper();
-        busProcessNew.setPId(delegateTask.getProcessInstanceId());
+            queryWrapper3.eq("TASK_ID", delegateTask.getId());
-        busProcessNew.setMesg(object.toJSONString());
+            queryWrapper3.eq("USER_ID", delegateTask.getAssignee());
-        busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey());
+            List<BusProcessNew> list = busBean.list(queryWrapper3);
-        busProcessNew.setUserId(delegateTask.getAssignee());
+            if (!list.isEmpty()) {
-        busProcessNew.setTaskId(delegateTask.getId());
+                BusProcessNew busProcessNews = list.get(0);
-        busProcessNew.setCommitText(object.getString("commentText"));
+                busProcessNews.setTaskId(delegateTask.getId());
-        busProcessNew.setFinishFlag("0");
+                busProcessNews.setCommitText(object.getString("commentText"));
-        busProcessNew.setTaskInfo(delegateTask.getName());
+                busBean.saveOrUpdate(busProcessNews);
-
+            }
-        busBean.saveOrUpdate(busProcessNew);
+        }
 
         if(nextUserList != null && !nextUserList.isEmpty()){
             for(String nextUser : nextUserList){

src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step2After.java

@@ -80,18 +80,19 @@ public class Step2After implements TaskListener {
         }
 
         // 存储当前节点意见
-        BusProcessNew busProcessNew = new BusProcessNew();
+        //存储当前节点意见
-        busProcessNew.setMsgType("clause");
+        if (null != object.getString("commentText")) {
-        busProcessNew.setPId(delegateTask.getProcessInstanceId());
+            QueryWrapper queryWrapper3 = new QueryWrapper();
-        busProcessNew.setMesg(object.toJSONString());
+            queryWrapper3.eq("TASK_ID", delegateTask.getId());
-        busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey());
+            queryWrapper3.eq("USER_ID", delegateTask.getAssignee());
-        busProcessNew.setUserId(delegateTask.getAssignee());
+            List<BusProcessNew> list = busBean.list(queryWrapper3);
-        busProcessNew.setTaskId(delegateTask.getId());
+            if (!list.isEmpty()) {
-        busProcessNew.setCommitText(object.getString("commentText"));
+                BusProcessNew busProcessNews = list.get(0);
-        busProcessNew.setFinishFlag("0");
+                busProcessNews.setTaskId(delegateTask.getId());
-        busProcessNew.setTaskInfo(delegateTask.getName());
+                busProcessNews.setCommitText(object.getString("commentText"));
-
+                busBean.saveOrUpdate(busProcessNews);
-        busBean.saveOrUpdate(busProcessNew);
+            }
+        }
 
         if(nextUserList != null && !nextUserList.isEmpty()){
             for(String nextUser : nextUserList){

src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step3After.java

@@ -58,19 +58,19 @@ public class Step3After implements TaskListener {
             busProcessNameService.saveOrUpdate(one1);
         }
 
-        // 存储当前节点意见
+        //存储当前节点意见
-        BusProcessNew busProcessNew = new BusProcessNew();
+        if (null != object.getString("commentText")) {
-        busProcessNew.setMsgType("clause");
+            QueryWrapper queryWrapper3 = new QueryWrapper();
-        busProcessNew.setPId(delegateTask.getProcessInstanceId());
+            queryWrapper3.eq("TASK_ID", delegateTask.getId());
-        busProcessNew.setMesg(object.toJSONString());
+            queryWrapper3.eq("USER_ID", delegateTask.getAssignee());
-        busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey());
+            List<BusProcessNew> list = busBean.list(queryWrapper3);
-        busProcessNew.setUserId(delegateTask.getAssignee());
+            if (!list.isEmpty()) {
-        busProcessNew.setTaskId(delegateTask.getId());
+                BusProcessNew busProcessNews = list.get(0);
-        busProcessNew.setCommitText(object.getString("commentText"));
+                busProcessNews.setTaskId(delegateTask.getId());
-        busProcessNew.setFinishFlag("0");
+                busProcessNews.setCommitText(object.getString("commentText"));
-        busProcessNew.setTaskInfo(delegateTask.getName());
+                busBean.saveOrUpdate(busProcessNews);
-
+            }
-        busBean.saveOrUpdate(busProcessNew);
+        }
 
         if(nextUserList != null && !nextUserList.isEmpty()){
             for(String nextUser : nextUserList){

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

@@ -64,19 +64,19 @@ public class Step4After implements TaskListener {
             busProcessNameService.saveOrUpdate(one1);
         }
 
-        // 存储当前节点意见
+        //存储当前节点意见
-        BusProcessNew busProcessNew = new BusProcessNew();
+        if (null != object.getString("commentText")) {
-        busProcessNew.setMsgType("clause");
+            QueryWrapper queryWrapper3 = new QueryWrapper();
-        busProcessNew.setPId(delegateTask.getProcessInstanceId());
+            queryWrapper3.eq("TASK_ID", delegateTask.getId());
-        busProcessNew.setMesg(object.toJSONString());
+            queryWrapper3.eq("USER_ID", delegateTask.getAssignee());
-        busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey());
+            List<BusProcessNew> list = busBean.list(queryWrapper3);
-        busProcessNew.setUserId(delegateTask.getAssignee());
+            if (!list.isEmpty()) {
-        busProcessNew.setTaskId(delegateTask.getId());
+                BusProcessNew busProcessNews = list.get(0);
-        busProcessNew.setCommitText(object.getString("commentText"));
+                busProcessNews.setTaskId(delegateTask.getId());
-        busProcessNew.setFinishFlag("0");
+                busProcessNews.setCommitText(object.getString("commentText"));
-        busProcessNew.setTaskInfo(delegateTask.getName());
+                busBean.saveOrUpdate(busProcessNews);
-
+            }
-        busBean.saveOrUpdate(busProcessNew);
+        }
 
         if(nextUserList != null && !nextUserList.isEmpty()){
             for(String nextUser : nextUserList){

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

@@ -88,19 +88,19 @@ public class Step5After implements TaskListener {
             busProcessNameService.saveOrUpdate(one1);
         }
 
-        // 存储当前节点意见
+        //存储当前节点意见
-        BusProcessNew busProcessNew = new BusProcessNew();
+        if (null != object.getString("commentText")) {
-        busProcessNew.setMsgType("clause");
+            QueryWrapper queryWrapper3 = new QueryWrapper();
-        busProcessNew.setPId(delegateTask.getProcessInstanceId());
+            queryWrapper3.eq("TASK_ID", delegateTask.getId());
-        busProcessNew.setMesg(object.toJSONString());
+            queryWrapper3.eq("USER_ID", delegateTask.getAssignee());
-        busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey());
+            List<BusProcessNew> list = busBean.list(queryWrapper3);
-        busProcessNew.setUserId(delegateTask.getAssignee());
+            if (!list.isEmpty()) {
-        busProcessNew.setTaskId(delegateTask.getId());
+                BusProcessNew busProcessNews = list.get(0);
-        busProcessNew.setCommitText(object.getString("commentText"));
+                busProcessNews.setTaskId(delegateTask.getId());
-        busProcessNew.setFinishFlag("0");
+                busProcessNews.setCommitText(object.getString("commentText"));
-        busProcessNew.setTaskInfo(delegateTask.getName());
+                busBean.saveOrUpdate(busProcessNews);
-
+            }
-        busBean.saveOrUpdate(busProcessNew);
+        }
 
         if(nextUserList != null && !nextUserList.isEmpty()){
             for(String nextUser : nextUserList){

src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step6After.java

@@ -59,19 +59,19 @@ public class Step6After implements TaskListener {
             busProcessNameService.saveOrUpdate(one1);
         }
 
-        // 存储当前节点意见
+        //存储当前节点意见
-        BusProcessNew busProcessNew = new BusProcessNew();
+        if (null != object.getString("commentText")) {
-        busProcessNew.setMsgType("clause");
+            QueryWrapper queryWrapper3 = new QueryWrapper();
-        busProcessNew.setPId(delegateTask.getProcessInstanceId());
+            queryWrapper3.eq("TASK_ID", delegateTask.getId());
-        busProcessNew.setMesg(object.toJSONString());
+            queryWrapper3.eq("USER_ID", delegateTask.getAssignee());
-        busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey());
+            List<BusProcessNew> list = busBean.list(queryWrapper3);
-        busProcessNew.setUserId(delegateTask.getAssignee());
+            if (!list.isEmpty()) {
-        busProcessNew.setTaskId(delegateTask.getId());
+                BusProcessNew busProcessNews = list.get(0);
-        busProcessNew.setCommitText(object.getString("commentText"));
+                busProcessNews.setTaskId(delegateTask.getId());
-        busProcessNew.setFinishFlag("0");
+                busProcessNews.setCommitText(object.getString("commentText"));
-        busProcessNew.setTaskInfo(delegateTask.getName());
+                busBean.saveOrUpdate(busProcessNews);
-
+            }
-        busBean.saveOrUpdate(busProcessNew);
+        }
 
         if(nextUserList != null && !nextUserList.isEmpty()){
             for(String nextUser : nextUserList){

src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step7After.java

@@ -80,19 +80,19 @@ public class Step7After implements TaskListener {
             busProcessNameService.saveOrUpdate(one1);
         }
 
-        // 存储当前节点意见
+        //存储当前节点意见
-        BusProcessNew busProcessNew = new BusProcessNew();
+        if (null != object.getString("commentText")) {
-        busProcessNew.setMsgType("clause");
+            QueryWrapper queryWrapper3 = new QueryWrapper();
-        busProcessNew.setPId(delegateTask.getProcessInstanceId());
+            queryWrapper3.eq("TASK_ID", delegateTask.getId());
-        busProcessNew.setMesg(object.toJSONString());
+            queryWrapper3.eq("USER_ID", delegateTask.getAssignee());
-        busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey());
+            List<BusProcessNew> list = busBean.list(queryWrapper3);
-        busProcessNew.setUserId(delegateTask.getAssignee());
+            if (!list.isEmpty()) {
-        busProcessNew.setTaskId(delegateTask.getId());
+                BusProcessNew busProcessNews = list.get(0);
-        busProcessNew.setCommitText(object.getString("commentText"));
+                busProcessNews.setTaskId(delegateTask.getId());
-        busProcessNew.setFinishFlag("0");
+                busProcessNews.setCommitText(object.getString("commentText"));
-        busProcessNew.setTaskInfo(delegateTask.getName());
+                busBean.saveOrUpdate(busProcessNews);
-
+            }
-        busBean.saveOrUpdate(busProcessNew);
+        }
 
         if(nextUserList != null && !nextUserList.isEmpty()){
             for(String nextUser : nextUserList){

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

@@ -78,19 +78,19 @@ public class Step8After implements TaskListener {
             busProcessNameService.saveOrUpdate(one1);
         }
 
-        // 存储当前节点意见
+        //存储当前节点意见
-        BusProcessNew busProcessNew = new BusProcessNew();
+        if (null != object.getString("commentText")) {
-        busProcessNew.setMsgType("clause");
+            QueryWrapper queryWrapper3 = new QueryWrapper();
-        busProcessNew.setPId(delegateTask.getProcessInstanceId());
+            queryWrapper3.eq("TASK_ID", delegateTask.getId());
-        busProcessNew.setMesg(object.toJSONString());
+            queryWrapper3.eq("USER_ID", delegateTask.getAssignee());
-        busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey());
+            List<BusProcessNew> list = busBean.list(queryWrapper3);
-        busProcessNew.setUserId(delegateTask.getAssignee());
+            if (!list.isEmpty()) {
-        busProcessNew.setTaskId(delegateTask.getId());
+                BusProcessNew busProcessNews = list.get(0);
-        busProcessNew.setCommitText(object.getString("commentText"));
+                busProcessNews.setTaskId(delegateTask.getId());
-        busProcessNew.setFinishFlag("0");
+                busProcessNews.setCommitText(object.getString("commentText"));
-        busProcessNew.setTaskInfo(delegateTask.getName());
+                busBean.saveOrUpdate(busProcessNews);
-
+            }
-        busBean.saveOrUpdate(busProcessNew);
+        }
 
         if(nextUserList != null && !nextUserList.isEmpty()){
             for(String nextUser : nextUserList){

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

@@ -60,19 +60,19 @@ public class Step9After implements TaskListener {
             busProcessNameService.saveOrUpdate(one1);
         }
 
-        // 存储当前节点意见
+        //存储当前节点意见
-        BusProcessNew busProcessNew = new BusProcessNew();
+        if (null != object.getString("commentText")) {
-        busProcessNew.setMsgType("clause");
+            QueryWrapper queryWrapper3 = new QueryWrapper();
-        busProcessNew.setPId(delegateTask.getProcessInstanceId());
+            queryWrapper3.eq("TASK_ID", delegateTask.getId());
-        busProcessNew.setMesg(object.toJSONString());
+            queryWrapper3.eq("USER_ID", delegateTask.getAssignee());
-        busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey());
+            List<BusProcessNew> list = busBean.list(queryWrapper3);
-        busProcessNew.setUserId(delegateTask.getAssignee());
+            if (!list.isEmpty()) {
-        busProcessNew.setTaskId(delegateTask.getId());
+                BusProcessNew busProcessNews = list.get(0);
-        busProcessNew.setCommitText(object.getString("commentText"));
+                busProcessNews.setTaskId(delegateTask.getId());
-        busProcessNew.setFinishFlag("0");
+                busProcessNews.setCommitText(object.getString("commentText"));
-        busProcessNew.setTaskInfo(delegateTask.getName());
+                busBean.saveOrUpdate(busProcessNews);
-
+            }
-        busBean.saveOrUpdate(busProcessNew);
+        }
 
         if(nextUserList != null && !nextUserList.isEmpty()){
             for(String nextUser : nextUserList){

src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/EngineerReviseAfter.java

@@ -58,6 +58,20 @@ public class EngineerReviseAfter implements TaskListener {
             busProcessNameService.saveOrUpdate(one1);
         }
 
+        //存储当前节点意见
+        if (null != object.getString("commentText")) {
+            QueryWrapper queryWrapper3 = new QueryWrapper();
+            queryWrapper3.eq("TASK_ID", delegateTask.getId());
+            queryWrapper3.eq("USER_ID", delegateTask.getAssignee());
+            List<BusProcessNew> list = busBean.list(queryWrapper3);
+            if (!list.isEmpty()) {
+                BusProcessNew busProcessNews = list.get(0);
+                busProcessNews.setTaskId(delegateTask.getId());
+                busProcessNews.setCommitText(object.getString("commentText"));
+                busBean.saveOrUpdate(busProcessNews);
+            }
+        }
+
         if (nextUserList != null && !nextUserList.isEmpty()) {
             for (String nextUser : nextUserList) {
                 BusProcessNew busProcessNewNext = new BusProcessNew();

src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/EngineerReviseDoneAfter.java

@@ -134,6 +134,19 @@ public class EngineerReviseDoneAfter implements TaskListener {
             one1.setCreatUserName(username);
             busProcessNameService.saveOrUpdate(one1);
         }
+        //存储当前节点意见
+        if (null != object.getString("commentText")) {
+            QueryWrapper queryWrapper3 = new QueryWrapper();
+            queryWrapper3.eq("TASK_ID", delegateTask.getId());
+            queryWrapper3.eq("USER_ID", delegateTask.getAssignee());
+            List<BusProcessNew> list = busBean.list(queryWrapper3);
+            if (!list.isEmpty()) {
+                BusProcessNew busProcessNews = list.get(0);
+                busProcessNews.setTaskId(delegateTask.getId());
+                busProcessNews.setCommitText(object.getString("commentText"));
+                busBean.saveOrUpdate(busProcessNews);
+            }
+        }
 
         if (nextUserList != null && !nextUserList.isEmpty()) {
             for (String nextUser : nextUserList) {

src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/WriteMaterialAfter.java

@@ -67,6 +67,21 @@ public class WriteMaterialAfter implements TaskListener {
             one1.setCreatUserName(username);
             busProcessNameService.saveOrUpdate(one1);
         }
+        if (null != object.getString("commentText")) {
+            BusProcessNew busProcessNews = new BusProcessNew();
+            busProcessNews.setMsgType("clause");
+            busProcessNews.setPId(delegateTask.getProcessInstanceId());
+            busProcessNews.setMesg(object.toJSONString());
+            busProcessNews.setTaskInfo(delegateTask.getTaskDefinitionKey());
+            busProcessNews.setFinishFlag("0");
+            busProcessNews.setTaskInfo(delegateTask.getName());
+            busProcessNews.setTaskId(delegateTask.getId());
+            busProcessNews.setUserId("start");
+            busProcessNews.setPrcName(prcName);
+            busProcessNews.setCommitText(object.getString("commentText"));
+            busBean.save(busProcessNews);
+        }
+
         if (nextUserList != null && !nextUserList.isEmpty()) {
             for (String nextUser : nextUserList) {
                 BusProcessNew busProcessNewNext = new BusProcessNew();

src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/WriteMemberInfoAfter.java

@@ -60,6 +60,19 @@ public class WriteMemberInfoAfter implements TaskListener {
             one1.setCreatUserName(username);
             busProcessNameService.saveOrUpdate(one1);
         }
+        //存储当前节点意见
+        if (null != object.getString("commentText")) {
+            QueryWrapper queryWrapper3 = new QueryWrapper();
+            queryWrapper3.eq("TASK_ID", delegateTask.getId());
+            queryWrapper3.eq("USER_ID", delegateTask.getAssignee());
+            List<BusProcessNew> list = busBean.list(queryWrapper3);
+            if (!list.isEmpty()) {
+                BusProcessNew busProcessNews = list.get(0);
+                busProcessNews.setTaskId(delegateTask.getId());
+                busProcessNews.setCommitText(object.getString("commentText"));
+                busBean.saveOrUpdate(busProcessNews);
+            }
+        }
 
         if (nextUserList != null && !nextUserList.isEmpty()) {
             for (String nextUser : nextUserList) {

src/main/java/com/ydw/bat/wkflow/listener/enterpriseBidReviewProcess/ProcessStep1After.java

@@ -59,6 +59,19 @@ public class ProcessStep1After implements TaskListener {
             busProcessNameService.saveOrUpdate(one1);
         }
 
+        //存储当前节点意见
+        if (null != object.getString("commentText")) {
+            QueryWrapper queryWrapper3 = new QueryWrapper();
+            queryWrapper3.eq("TASK_ID", delegateTask.getId());
+            queryWrapper3.eq("USER_ID", delegateTask.getAssignee());
+            List<BusProcessNew> list = busBean.list(queryWrapper3);
+            if (!list.isEmpty()) {
+                BusProcessNew busProcessNews = list.get(0);
+                busProcessNews.setTaskId(delegateTask.getId());
+                busProcessNews.setCommitText(object.getString("commentText"));
+                busBean.saveOrUpdate(busProcessNews);
+            }
+        }
         // 存储当前节点意见
         if (nextUserList != null && !nextUserList.isEmpty()) {
             for (String nextUser : nextUserList) {

src/main/java/com/ydw/bat/wkflow/listener/enterpriseBidReviewProcess/ProcessStep2After.java

@@ -76,7 +76,20 @@ public class ProcessStep2After implements TaskListener {
             busProcessNameService.saveOrUpdate(one1);
         }
 
-        // 存储当前节点意见
+        //存储当前节点意见
+        if (null != object.getString("commentText")) {
+            QueryWrapper queryWrapper3 = new QueryWrapper();
+            queryWrapper3.eq("TASK_ID", delegateTask.getId());
+            queryWrapper3.eq("USER_ID", delegateTask.getAssignee());
+            List<BusProcessNew> list = busBean.list(queryWrapper3);
+            if (!list.isEmpty()) {
+                BusProcessNew busProcessNews = list.get(0);
+                busProcessNews.setTaskId(delegateTask.getId());
+                busProcessNews.setCommitText(object.getString("commentText"));
+                busBean.saveOrUpdate(busProcessNews);
+            }
+        }
+
         if (nextUserList != null && !nextUserList.isEmpty()) {
             for (String nextUser : nextUserList) {
                 BusProcessNew busProcessNewNext = new BusProcessNew();

src/main/java/com/ydw/bat/wkflow/listener/enterpriseBidReviewProcess/ProcessStep3After.java

@@ -62,7 +62,20 @@ public class ProcessStep3After implements TaskListener {
         }
 
 
-        // 存储当前节点意见1
+        //存储当前节点意见
+        if (null != object.getString("commentText")) {
+            QueryWrapper queryWrapper3 = new QueryWrapper();
+            queryWrapper3.eq("TASK_ID", delegateTask.getId());
+            queryWrapper3.eq("USER_ID", delegateTask.getAssignee());
+            List<BusProcessNew> list = busBean.list(queryWrapper3);
+            if (!list.isEmpty()) {
+                BusProcessNew busProcessNews = list.get(0);
+                busProcessNews.setTaskId(delegateTask.getId());
+                busProcessNews.setCommitText(object.getString("commentText"));
+                busBean.saveOrUpdate(busProcessNews);
+            }
+        }
+
         if (null!=object.getString("commentText")) {
             QueryWrapper queryWrapper3 = new QueryWrapper();
             queryWrapper3.eq("TASK_ID", delegateTask.getId());

src/main/java/com/ydw/bat/wkflow/listener/enterpriseBidReviewProcess/ProcessstartAfter.java

@@ -59,6 +59,21 @@ public class ProcessstartAfter implements TaskListener {
             busProcessNameService.saveOrUpdate(one1);
         }
 
+        if (null != object.getString("commentText")) {
+            BusProcessNew busProcessNews = new BusProcessNew();
+            busProcessNews.setMsgType("clause");
+            busProcessNews.setPId(delegateTask.getProcessInstanceId());
+            busProcessNews.setMesg(object.toJSONString());
+            busProcessNews.setTaskInfo(delegateTask.getTaskDefinitionKey());
+            busProcessNews.setFinishFlag("0");
+            busProcessNews.setTaskInfo(delegateTask.getName());
+            busProcessNews.setTaskId(delegateTask.getId());
+            busProcessNews.setUserId("start");
+            busProcessNews.setPrcName(prcName);
+            busProcessNews.setCommitText(object.getString("commentText"));
+            busBean.save(busProcessNews);
+        }
+
         // 存储当前节点意见
         if (nextUserList != null && !nextUserList.isEmpty()) {
             for (String nextUser : nextUserList) {

src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep1After.java

@@ -69,7 +69,19 @@ public class ProcessStep1After implements TaskListener {
             one1.setCreatUserName(username);
             busProcessNameService.saveOrUpdate(one1);
         }
-
+        //存储当前节点意见
+        if (null != object.getString("commentText")) {
+            QueryWrapper queryWrapper3 = new QueryWrapper();
+            queryWrapper3.eq("TASK_ID", delegateTask.getId());
+            queryWrapper3.eq("USER_ID", delegateTask.getAssignee());
+            List<BusProcessNew> list = busBean.list(queryWrapper3);
+            if (!list.isEmpty()) {
+                BusProcessNew busProcessNews = list.get(0);
+                busProcessNews.setTaskId(delegateTask.getId());
+                busProcessNews.setCommitText(object.getString("commentText"));
+                busBean.saveOrUpdate(busProcessNews);
+            }
+        }
         // 存储当前节点意见
         if (nextUserList != null && !nextUserList.isEmpty()) {
             for (String nextUser : nextUserList) {

src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep2After.java

@@ -72,7 +72,19 @@ public class ProcessStep2After implements TaskListener {
             one1.setCreatUserName(username);
             busProcessNameService.saveOrUpdate(one1);
         }
-
+        //存储当前节点意见
+        if (null != object.getString("commentText")) {
+            QueryWrapper queryWrapper3 = new QueryWrapper();
+            queryWrapper3.eq("TASK_ID", delegateTask.getId());
+            queryWrapper3.eq("USER_ID", delegateTask.getAssignee());
+            List<BusProcessNew> list = busBean.list(queryWrapper3);
+            if (!list.isEmpty()) {
+                BusProcessNew busProcessNews = list.get(0);
+                busProcessNews.setTaskId(delegateTask.getId());
+                busProcessNews.setCommitText(object.getString("commentText"));
+                busBean.saveOrUpdate(busProcessNews);
+            }
+        }
         // 存储当前节点意见
         if (nextUserList != null && !nextUserList.isEmpty()) {
             for (String nextUser : nextUserList) {

src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep3After.java

@@ -64,7 +64,19 @@ public class ProcessStep3After implements TaskListener {
             one1.setCreatUserName(username);
             busProcessNameService.saveOrUpdate(one1);
         }
-
+        //存储当前节点意见
+        if (null != object.getString("commentText")) {
+            QueryWrapper queryWrapper3 = new QueryWrapper();
+            queryWrapper3.eq("TASK_ID", delegateTask.getId());
+            queryWrapper3.eq("USER_ID", delegateTask.getAssignee());
+            List<BusProcessNew> list = busBean.list(queryWrapper3);
+            if (!list.isEmpty()) {
+                BusProcessNew busProcessNews = list.get(0);
+                busProcessNews.setTaskId(delegateTask.getId());
+                busProcessNews.setCommitText(object.getString("commentText"));
+                busBean.saveOrUpdate(busProcessNews);
+            }
+        }
         // 存储当前节点意见
         if (nextUserList != null && !nextUserList.isEmpty()) {
             for (String nextUser : nextUserList) {

src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep4After.java

@@ -115,7 +115,19 @@ public class ProcessStep4After implements TaskListener {
             busProcessNameService.saveOrUpdate(one1);
         }
 
-        // 存储当前节点意见
+        //存储当前节点意见
+        if (null != object.getString("commentText")) {
+            QueryWrapper queryWrapper3 = new QueryWrapper();
+            queryWrapper3.eq("TASK_ID", delegateTask.getId());
+            queryWrapper3.eq("USER_ID", delegateTask.getAssignee());
+            List<BusProcessNew> list = busBean.list(queryWrapper3);
+            if (!list.isEmpty()) {
+                BusProcessNew busProcessNews = list.get(0);
+                busProcessNews.setTaskId(delegateTask.getId());
+                busProcessNews.setCommitText(object.getString("commentText"));
+                busBean.saveOrUpdate(busProcessNews);
+            }
+        }
         if (nextUserList != null && !nextUserList.isEmpty()) {
             for (String nextUser : nextUserList) {
                 BusProcessNew busProcessNewNext = new BusProcessNew();

src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep5After.java

@@ -53,7 +53,19 @@ public class ProcessStep5After implements TaskListener {
             busProcessNameService.saveOrUpdate(one1);
         }
 
-        // 存储当前节点意见
+        //存储当前节点意见
+        if (null != object.getString("commentText")) {
+            QueryWrapper queryWrapper3 = new QueryWrapper();
+            queryWrapper3.eq("TASK_ID", delegateTask.getId());
+            queryWrapper3.eq("USER_ID", delegateTask.getAssignee());
+            List<BusProcessNew> list = busBean.list(queryWrapper3);
+            if (!list.isEmpty()) {
+                BusProcessNew busProcessNews = list.get(0);
+                busProcessNews.setTaskId(delegateTask.getId());
+                busProcessNews.setCommitText(object.getString("commentText"));
+                busBean.saveOrUpdate(busProcessNews);
+            }
+        }
         if (nextUserList != null && !nextUserList.isEmpty()) {
             for (String nextUser : nextUserList) {
                 BusProcessNew busProcessNewNext = new BusProcessNew();

src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessstartAfter.java

@@ -59,6 +59,20 @@ public class ProcessstartAfter implements TaskListener {
             one1.setCreatUserName(username);
             busProcessNameService.saveOrUpdate(one1);
         }
+        if (null != object.getString("commentText")) {
+            BusProcessNew busProcessNews = new BusProcessNew();
+            busProcessNews.setMsgType("clause");
+            busProcessNews.setPId(delegateTask.getProcessInstanceId());
+            busProcessNews.setMesg(object.toJSONString());
+            busProcessNews.setTaskInfo(delegateTask.getTaskDefinitionKey());
+            busProcessNews.setFinishFlag("0");
+            busProcessNews.setTaskInfo(delegateTask.getName());
+            busProcessNews.setTaskId(delegateTask.getId());
+            busProcessNews.setUserId("start");
+            busProcessNews.setPrcName(prcName);
+            busProcessNews.setCommitText(object.getString("commentText"));
+            busBean.save(busProcessNews);
+        }
 
         // 存储当前节点意见
         if (nextUserList != null && !nextUserList.isEmpty()) {

src/main/java/com/ydw/bat/wkflow/listener/itemlistvalidationprocess/itemlistvalidationprocessStartAfter.java

@@ -56,16 +56,18 @@ public class itemlistvalidationprocessStartAfter implements TaskListener {
 
         //存储当前节点意见
         if (null != object.getString("commentText")) {
-            QueryWrapper queryWrapper3 = new QueryWrapper();
+            BusProcessNew busProcessNews = new BusProcessNew();
-            queryWrapper3.eq("TASK_ID", delegateTask.getId());
+            busProcessNews.setMsgType("clause");
-            queryWrapper3.eq("USER_ID", delegateTask.getAssignee());
+            busProcessNews.setPId(delegateTask.getProcessInstanceId());
-            List<BusProcessNew> list = busBean.list(queryWrapper3);
+            busProcessNews.setMesg(object.toJSONString());
-            if (!list.isEmpty()) {
+            busProcessNews.setTaskInfo(delegateTask.getTaskDefinitionKey());
-                BusProcessNew busProcessNews = list.get(0);
+            busProcessNews.setFinishFlag("0");
-                busProcessNews.setTaskId(delegateTask.getId());
+            busProcessNews.setTaskInfo(delegateTask.getName());
-                busProcessNews.setCommitText(object.getString("commentText"));
+            busProcessNews.setTaskId(delegateTask.getId());
-                busBean.saveOrUpdate(busProcessNews);
+            busProcessNews.setUserId("start");
-            }
+            busProcessNews.setPrcName(prcName);
+            busProcessNews.setCommitText(object.getString("commentText"));
+            busBean.save(busProcessNews);
         }
 
         if(!nextUserList.isEmpty()){

src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/PRGAMStartAfter.java

@@ -67,18 +67,19 @@ public class PRGAMStartAfter implements TaskListener {
             busProcessNameService.saveOrUpdate(one1);
         }
         // 存储当前节点意见
-        // 存储当前节点意见
+        if (null != object.getString("commentText")) {
-        if (null!=object.getString("commentText")) {
+            BusProcessNew busProcessNews = new BusProcessNew();
-            QueryWrapper queryWrapper3 = new QueryWrapper();
+            busProcessNews.setMsgType("clause");
-            queryWrapper3.eq("TASK_ID", delegateTask.getId());
+            busProcessNews.setPId(delegateTask.getProcessInstanceId());
-            queryWrapper3.eq("USER_ID",delegateTask.getAssignee());
+            busProcessNews.setMesg(object.toJSONString());
-            List<BusProcessNew> list = busBean.list(queryWrapper3);
+            busProcessNews.setTaskInfo(delegateTask.getTaskDefinitionKey());
-            if(!list.isEmpty()){
+            busProcessNews.setFinishFlag("0");
-                BusProcessNew busProcessNews = list.get(0);
+            busProcessNews.setTaskInfo(delegateTask.getName());
-                busProcessNews.setTaskId(delegateTask.getId());
+            busProcessNews.setTaskId(delegateTask.getId());
-                busProcessNews.setCommitText(object.getString("commentText"));
+            busProcessNews.setUserId("start");
-                busBean.saveOrUpdate(busProcessNews);
+            busProcessNews.setPrcName(prcName);
-            }
+            busProcessNews.setCommitText(object.getString("commentText"));
+            busBean.save(busProcessNews);
         }
         if(nextUserList != null && !nextUserList.isEmpty()){
             for(String nextUser : nextUserList){

src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/PRGAMStartAfter.java

@@ -61,17 +61,19 @@ public class PRGAMStartAfter implements TaskListener {
             busProcessNameService.saveOrUpdate(one1);
         }
         // 存储当前节点意见
-        if (null!=object.getString("commentText")) {
+        if (null != object.getString("commentText")) {
-            QueryWrapper queryWrapper3 = new QueryWrapper();
+            BusProcessNew busProcessNews = new BusProcessNew();
-            queryWrapper3.eq("TASK_ID", delegateTask.getId());
+            busProcessNews.setMsgType("clause");
-            queryWrapper3.eq("USER_ID",delegateTask.getAssignee());
+            busProcessNews.setPId(delegateTask.getProcessInstanceId());
-            List<BusProcessNew> list = busBean.list(queryWrapper3);
+            busProcessNews.setMesg(object.toJSONString());
-            if(!list.isEmpty()){
+            busProcessNews.setTaskInfo(delegateTask.getTaskDefinitionKey());
-                BusProcessNew busProcessNews = list.get(0);
+            busProcessNews.setFinishFlag("0");
-                busProcessNews.setTaskId(delegateTask.getId());
+            busProcessNews.setTaskInfo(delegateTask.getName());
-                busProcessNews.setCommitText(object.getString("commentText"));
+            busProcessNews.setTaskId(delegateTask.getId());
-                busBean.saveOrUpdate(busProcessNews);
+            busProcessNews.setUserId("start");
-            }
+            busProcessNews.setPrcName(prcName);
+            busProcessNews.setCommitText(object.getString("commentText"));
+            busBean.save(busProcessNews);
         }
         if(nextUserList != null && !nextUserList.isEmpty()){
             for(String nextUser : nextUserList){

src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/RevisionInformationAfter.java

@@ -58,7 +58,19 @@ public class RevisionInformationAfter implements TaskListener {
             one1.setCreatUserName(username);
             busProcessNameService.saveOrUpdate(one1);
         }
-        // 存储当前节点意见
+        //存储当前节点意见
+        if (null != object.getString("commentText")) {
+            QueryWrapper queryWrapper3 = new QueryWrapper();
+            queryWrapper3.eq("TASK_ID", delegateTask.getId());
+            queryWrapper3.eq("USER_ID", delegateTask.getAssignee());
+            List<BusProcessNew> list = busBean.list(queryWrapper3);
+            if (!list.isEmpty()) {
+                BusProcessNew busProcessNews = list.get(0);
+                busProcessNews.setTaskId(delegateTask.getId());
+                busProcessNews.setCommitText(object.getString("commentText"));
+                busBean.saveOrUpdate(busProcessNews);
+            }
+        }
 
         if(nextUserList != null && !nextUserList.isEmpty()){
             for(String nextUser : nextUserList){

src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PRGEStartAfter.java

@@ -70,6 +70,21 @@ public class PRGEStartAfter implements TaskListener {
             busProcessNameService.saveOrUpdate(one1);
         }
 
+        if (null != object.getString("commentText")) {
+            BusProcessNew busProcessNews = new BusProcessNew();
+            busProcessNews.setMsgType("clause");
+            busProcessNews.setPId(delegateTask.getProcessInstanceId());
+            busProcessNews.setMesg(object.toJSONString());
+            busProcessNews.setTaskInfo(delegateTask.getTaskDefinitionKey());
+            busProcessNews.setFinishFlag("0");
+            busProcessNews.setTaskInfo(delegateTask.getName());
+            busProcessNews.setTaskId(delegateTask.getId());
+            busProcessNews.setUserId("start");
+            busProcessNews.setPrcName(prcName);
+            busProcessNews.setCommitText(object.getString("commentText"));
+            busBean.save(busProcessNews);
+        }
+
         if (!nextUserList.isEmpty()) {
             for (String nextUser : nextUserList) {
                 BusProcessNew busProcessNewNext = new BusProcessNew();

src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/RevisonInformationAfter.java

@@ -65,6 +65,19 @@ public class RevisonInformationAfter implements TaskListener {
             one1.setCreatUserName(username);
             busProcessNameService.saveOrUpdate(one1);
         }
+        //存储当前节点意见
+        if (null != object.getString("commentText")) {
+            QueryWrapper queryWrapper3 = new QueryWrapper();
+            queryWrapper3.eq("TASK_ID", delegateTask.getId());
+            queryWrapper3.eq("USER_ID", delegateTask.getAssignee());
+            List<BusProcessNew> list = busBean.list(queryWrapper3);
+            if (!list.isEmpty()) {
+                BusProcessNew busProcessNews = list.get(0);
+                busProcessNews.setTaskId(delegateTask.getId());
+                busProcessNews.setCommitText(object.getString("commentText"));
+                busBean.saveOrUpdate(busProcessNews);
+            }
+        }
 
         if (nextUserList != null && !nextUserList.isEmpty()) {
             for (String nextUser : nextUserList) {

src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationProcess/PEPstartAfter.java

@@ -75,6 +75,20 @@ public class PEPstartAfter implements TaskListener {
             busProcessNameService.saveOrUpdate(one1);
         }
 
+        if (null != object.getString("commentText")) {
+            BusProcessNew busProcessNews = new BusProcessNew();
+            busProcessNews.setMsgType("clause");
+            busProcessNews.setPId(delegateTask.getProcessInstanceId());
+            busProcessNews.setMesg(object.toJSONString());
+            busProcessNews.setTaskInfo(delegateTask.getTaskDefinitionKey());
+            busProcessNews.setFinishFlag("0");
+            busProcessNews.setTaskInfo(delegateTask.getName());
+            busProcessNews.setTaskId(delegateTask.getId());
+            busProcessNews.setUserId("start");
+            busProcessNews.setPrcName(prcName);
+            busProcessNews.setCommitText(object.getString("commentText"));
+            busBean.save(busProcessNews);
+        }
 
         if (nextUserList != null && !nextUserList.isEmpty()) {
             for (String nextUser : nextUserList) {

src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseAfter.java

@@ -63,6 +63,20 @@ public class EngineerReviseAfter implements TaskListener {
             busProcessNameService.saveOrUpdate(one1);
         }
 
+        //存储当前节点意见
+        if (null != object.getString("commentText")) {
+            QueryWrapper queryWrapper3 = new QueryWrapper();
+            queryWrapper3.eq("TASK_ID", delegateTask.getId());
+            queryWrapper3.eq("USER_ID", delegateTask.getAssignee());
+            List<BusProcessNew> list = busBean.list(queryWrapper3);
+            if (!list.isEmpty()) {
+                BusProcessNew busProcessNews = list.get(0);
+                busProcessNews.setTaskId(delegateTask.getId());
+                busProcessNews.setCommitText(object.getString("commentText"));
+                busBean.saveOrUpdate(busProcessNews);
+            }
+        }
+
         if (nextUserList != null && !nextUserList.isEmpty()) {
             for (String nextUser : nextUserList) {
                 BusProcessNew busProcessNewNext = new BusProcessNew();

src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseDoneAfter.java

@@ -127,6 +127,19 @@ public class EngineerReviseDoneAfter implements TaskListener {
             one1.setCreatUserName(username);
             busProcessNameService.saveOrUpdate(one1);
         }
+        //存储当前节点意见
+        if (null != object.getString("commentText")) {
+            QueryWrapper queryWrapper3 = new QueryWrapper();
+            queryWrapper3.eq("TASK_ID", delegateTask.getId());
+            queryWrapper3.eq("USER_ID", delegateTask.getAssignee());
+            List<BusProcessNew> list = busBean.list(queryWrapper3);
+            if (!list.isEmpty()) {
+                BusProcessNew busProcessNews = list.get(0);
+                busProcessNews.setTaskId(delegateTask.getId());
+                busProcessNews.setCommitText(object.getString("commentText"));
+                busBean.saveOrUpdate(busProcessNews);
+            }
+        }
 
         if (nextUserList != null && !nextUserList.isEmpty()) {
             for (String nextUser : nextUserList) {

src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMaterialAfter.java

@@ -74,6 +74,21 @@ public class WriteMaterialAfter implements TaskListener {
             busProcessNameService.saveOrUpdate(one1);
         }
 
+        if (null != object.getString("commentText")) {
+            BusProcessNew busProcessNews = new BusProcessNew();
+            busProcessNews.setMsgType("clause");
+            busProcessNews.setPId(delegateTask.getProcessInstanceId());
+            busProcessNews.setMesg(object.toJSONString());
+            busProcessNews.setTaskInfo(delegateTask.getTaskDefinitionKey());
+            busProcessNews.setFinishFlag("0");
+            busProcessNews.setTaskInfo(delegateTask.getName());
+            busProcessNews.setTaskId(delegateTask.getId());
+            busProcessNews.setUserId("start");
+            busProcessNews.setPrcName(prcName);
+            busProcessNews.setCommitText(object.getString("commentText"));
+            busBean.save(busProcessNews);
+        }
+
         if (nextUserList != null && !nextUserList.isEmpty()) {
             for (String nextUser : nextUserList) {
                 BusProcessNew busProcessNewNext = new BusProcessNew();

src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMemberInfoAfter.java

@@ -62,6 +62,20 @@ public class WriteMemberInfoAfter implements TaskListener {
             busProcessNameService.saveOrUpdate(one1);
         }
 
+        //存储当前节点意见
+        if (null != object.getString("commentText")) {
+            QueryWrapper queryWrapper3 = new QueryWrapper();
+            queryWrapper3.eq("TASK_ID", delegateTask.getId());
+            queryWrapper3.eq("USER_ID", delegateTask.getAssignee());
+            List<BusProcessNew> list = busBean.list(queryWrapper3);
+            if (!list.isEmpty()) {
+                BusProcessNew busProcessNews = list.get(0);
+                busProcessNews.setTaskId(delegateTask.getId());
+                busProcessNews.setCommitText(object.getString("commentText"));
+                busBean.saveOrUpdate(busProcessNews);
+            }
+        }
+
         if (nextUserList != null && !nextUserList.isEmpty()) {
             for (String nextUser : nextUserList) {
                 BusProcessNew busProcessNewNext = new BusProcessNew();

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

@@ -108,18 +108,19 @@ public class SRPstartAfter implements TaskListener {
             busProcessNameService.saveOrUpdate(one1);
         }
         // 存储当前节点意见
-        // 存储当前节点意见
+        if (null != object.getString("commentText")) {
-        if (null!=object.getString("commentText")) {
+            BusProcessNew busProcessNews = new BusProcessNew();
-            QueryWrapper queryWrapper3 = new QueryWrapper();
+            busProcessNews.setMsgType("clause");
-            queryWrapper3.eq("TASK_ID", delegateTask.getId());
+            busProcessNews.setPId(delegateTask.getProcessInstanceId());
-            queryWrapper3.eq("USER_ID",delegateTask.getAssignee());
+            busProcessNews.setMesg(object.toJSONString());
-            List<BusProcessNew> list = busBean.list(queryWrapper3);
+            busProcessNews.setTaskInfo(delegateTask.getTaskDefinitionKey());
-            if(!list.isEmpty()){
+            busProcessNews.setFinishFlag("0");
-                BusProcessNew busProcessNews = list.get(0);
+            busProcessNews.setTaskInfo(delegateTask.getName());
-                busProcessNews.setTaskId(delegateTask.getId());
+            busProcessNews.setTaskId(delegateTask.getId());
-                busProcessNews.setCommitText(object.getString("commentText"));
+            busProcessNews.setUserId("start");
-                busBean.saveOrUpdate(busProcessNews);
+            busProcessNews.setPrcName(prcName);
-            }
+            busProcessNews.setCommitText(object.getString("commentText"));
+            busBean.save(busProcessNews);
         }
         if(nextUserList != null && !nextUserList.isEmpty()){
             for(String nextUser : nextUserList){