Merge branch 'fix_foton_20240408' into test_20240409_for39

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

@@ -21,6 +21,7 @@ public class JSFApproveBefore implements TaskListener {
         List<BusProcessNew> list = busBean.list(queryWrapper1);
         if(!list.isEmpty()){
             BusProcessNew one1 = list.get(0);
+            one1.setTaskInfo(delegateTask.getName());
             one1.setTaskId(delegateTask.getId());
             busBean.saveOrUpdate(one1);
 

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

@@ -21,6 +21,7 @@ public class JSFAuditBefore implements TaskListener {
         List<BusProcessNew> list = busBean.list(queryWrapper1);
         if(!list.isEmpty()){
             BusProcessNew one1 = list.get(0);
+            one1.setTaskInfo(delegateTask.getName());
             one1.setTaskId(delegateTask.getId());
             busBean.saveOrUpdate(one1);
 

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

@@ -22,6 +22,7 @@ public class JSFFillinformationBefore implements TaskListener {
         if(!list.isEmpty()){
             BusProcessNew one1 = list.get(0);
             one1.setTaskId(delegateTask.getId());
+            one1.setTaskInfo(delegateTask.getName());
             busBean.saveOrUpdate(one1);
 
             CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class);

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

@@ -11,6 +11,7 @@ import com.ydw.bat.wkflow.business_main.datas.service.IDatasService;
 import com.ydw.bat.wkflow.util.SpringContextUtil;
 import org.activiti.engine.delegate.DelegateTask;
 import org.activiti.engine.delegate.TaskListener;
+import org.apache.commons.lang.StringUtils;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -66,20 +67,21 @@ public class JSFstartAfter implements TaskListener {
             one1.setCreatUserName(username);
             busProcessNameService.saveOrUpdate(one1);
         }
-        if (null != object.getString("commentText")) {
+        BusProcessNew busProcessNews = new BusProcessNew();
-            BusProcessNew busProcessNews = new BusProcessNew();
+        busProcessNews.setMsgType("clause");
-            busProcessNews.setMsgType("clause");
+        busProcessNews.setPId(delegateTask.getProcessInstanceId());
-            busProcessNews.setPId(delegateTask.getProcessInstanceId());
+        busProcessNews.setMesg(object.toJSONString());
-            busProcessNews.setMesg(object.toJSONString());
+        busProcessNews.setTaskInfo(delegateTask.getTaskDefinitionKey());
-            busProcessNews.setTaskInfo(delegateTask.getTaskDefinitionKey());
+        busProcessNews.setFinishFlag("0");
-            busProcessNews.setFinishFlag("0");
+        busProcessNews.setTaskInfo(delegateTask.getName());
-            busProcessNews.setTaskInfo(delegateTask.getName());
+        busProcessNews.setTaskId(delegateTask.getId());
-            busProcessNews.setTaskId(delegateTask.getId());
+        busProcessNews.setUserId("start");
-            busProcessNews.setUserId("start");
+        busProcessNews.setPrcName(prcName);
-            busProcessNews.setPrcName(prcName);
+        if (object.containsKey("commentText") && StringUtils.isNotBlank(object.getString("commentText"))) {
+            busProcessNews.setCommitFlag("1");
             busProcessNews.setCommitText(object.getString("commentText"));
-            busBean.save(busProcessNews);
         }
+        busBean.save(busProcessNews);
 
         if (nextUserList != null && !nextUserList.isEmpty()) {
             for (String nextUser : nextUserList) {

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

@@ -21,6 +21,7 @@ public class PRFApproveBefore implements TaskListener {
         List<BusProcessNew> list = busBean.list(queryWrapper1);
         if(!list.isEmpty()){
             BusProcessNew one1 = list.get(0);
+            one1.setTaskInfo(delegateTask.getName());
             one1.setTaskId(delegateTask.getId());
             busBean.saveOrUpdate(one1);
 

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

@@ -21,6 +21,7 @@ public class PRFEngineerreviewBefore implements TaskListener {
         List<BusProcessNew> list = busBean.list(queryWrapper1);
         if(!list.isEmpty()){
             BusProcessNew one1 = list.get(0);
+            one1.setTaskInfo(delegateTask.getName());
             one1.setTaskId(delegateTask.getId());
             busBean.saveOrUpdate(one1);
 

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

@@ -21,6 +21,7 @@ public class PRFFillinformationBefore implements TaskListener {
         List<BusProcessNew> list = busBean.list(queryWrapper1);
         if(!list.isEmpty()){
             BusProcessNew one1 = list.get(0);
+            one1.setTaskInfo(delegateTask.getName());
             one1.setTaskId(delegateTask.getId());
             busBean.saveOrUpdate(one1);
 

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

@@ -21,6 +21,7 @@ public class PRFReviewdockBefore implements TaskListener {
         List<BusProcessNew> list = busBean.list(queryWrapper1);
         if(!list.isEmpty()){
             BusProcessNew one1 = list.get(0);
+            one1.setTaskInfo(delegateTask.getName());
             one1.setTaskId(delegateTask.getId());
             busBean.saveOrUpdate(one1);
 

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

@@ -21,6 +21,7 @@ public class PRFUnderengineerBefore implements TaskListener {
         List<BusProcessNew> list = busBean.list(queryWrapper1);
         if(!list.isEmpty()){
             BusProcessNew one1 = list.get(0);
+            one1.setTaskInfo(delegateTask.getName());
             one1.setTaskId(delegateTask.getId());
             busBean.saveOrUpdate(one1);
 

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

@@ -11,6 +11,7 @@ import com.ydw.bat.wkflow.business_main.datas.service.IDatasService;
 import com.ydw.bat.wkflow.util.SpringContextUtil;
 import org.activiti.engine.delegate.DelegateTask;
 import org.activiti.engine.delegate.TaskListener;
+import org.apache.commons.lang.StringUtils;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -33,7 +34,7 @@ public class PRFstartAfter implements TaskListener {
         JSONObject object = JSONObject.parseObject(datas.getFormValsJson());
         delegateTask.setVariable("objectJson", object);
 
-        List<String> nextUserList = new ArrayList();
+        List<String> nextUserList = new ArrayList<>();
         String ids=object.getString("dockUser");
         if(ids.contains(",")){
             nextUserList=new ArrayList<>(Arrays.asList(ids.split(",")));
@@ -55,7 +56,7 @@ public class PRFstartAfter implements TaskListener {
         delegateTask.setVariable("prcCreateUserName", username);
 
         String prcName = "参与外部标准制修订备案-备案任务下发";
-        QueryWrapper queryWrapper2 = new QueryWrapper();
+        QueryWrapper<BusProcessName> queryWrapper2 = new QueryWrapper<>();
         queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
         BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
 
@@ -67,20 +68,21 @@ public class PRFstartAfter implements TaskListener {
             busProcessNameService.saveOrUpdate(one1);
         }
 
-        if (null != object.getString("commentText")) {
+        BusProcessNew busProcessNews = new BusProcessNew();
-            BusProcessNew busProcessNews = new BusProcessNew();
+        busProcessNews.setMsgType("clause");
-            busProcessNews.setMsgType("clause");
+        busProcessNews.setPId(delegateTask.getProcessInstanceId());
-            busProcessNews.setPId(delegateTask.getProcessInstanceId());
+        busProcessNews.setMesg(object.toJSONString());
-            busProcessNews.setMesg(object.toJSONString());
+        busProcessNews.setTaskInfo(delegateTask.getTaskDefinitionKey());
-            busProcessNews.setTaskInfo(delegateTask.getTaskDefinitionKey());
+        busProcessNews.setFinishFlag("0");
-            busProcessNews.setFinishFlag("0");
+        busProcessNews.setTaskInfo(delegateTask.getName());
-            busProcessNews.setTaskInfo(delegateTask.getName());
+        busProcessNews.setTaskId(delegateTask.getId());
-            busProcessNews.setTaskId(delegateTask.getId());
+        busProcessNews.setUserId("start");
-            busProcessNews.setUserId("start");
+        busProcessNews.setPrcName(prcName);
-            busProcessNews.setPrcName(prcName);
+        if (object.containsKey("commentText") && StringUtils.isNotBlank(object.getString("commentText"))) {
+            busProcessNews.setCommitFlag("1");
             busProcessNews.setCommitText(object.getString("commentText"));
-            busBean.save(busProcessNews);
         }
+        busBean.save(busProcessNews);
 
         if (nextUserList != null && !nextUserList.isEmpty()) {
             for (String nextUser : nextUserList) {

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

@@ -21,6 +21,7 @@ public class RAApproveBefore implements TaskListener{
                 List<BusProcessNew> list = busBean.list(queryWrapper1);
                 if(!list.isEmpty()){
                         BusProcessNew one1 = list.get(0);
+                        one1.setTaskInfo(delegateTask.getName());
                         one1.setTaskId(delegateTask.getId());
                         busBean.saveOrUpdate(one1);
 

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

@@ -31,6 +31,7 @@ public class RAAuditAfter implements TaskListener {
         Datas datas = datasService.getOne(queryWrapper);
 
         JSONObject object = JSONObject.parseObject(datas.getFormValsJson());
+        JSONObject roleForm = object.getJSONObject("roleForm");
         delegateTask.setVariable("objectJson", object);
 
         List<String> nextUserList = new ArrayList();
@@ -46,8 +47,8 @@ public class RAAuditAfter implements TaskListener {
         }
 
         //截止时间 流程描述 创建人
-        String user = object.getString("prcCreateUser");
+        String user = roleForm.getString("prcCreateUser");
-        String username = object.getString("prcCreateUserName");
+        String username = roleForm.getString("prcCreateUserName");
         delegateTask.setVariable("prcCreateUser", user);
         delegateTask.setVariable("prcCreateUserName", username);
         String prcName="";

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

@@ -21,6 +21,7 @@ public class RAAuditBefore implements TaskListener{
                 List<BusProcessNew> list = busBean.list(queryWrapper1);
                 if(!list.isEmpty()){
                         BusProcessNew one1 = list.get(0);
+                        one1.setTaskInfo(delegateTask.getName());
                         one1.setTaskId(delegateTask.getId());
                         busBean.saveOrUpdate(one1);
 

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

@@ -12,6 +12,7 @@ import com.ydw.bat.wkflow.util.SpringContextUtil;
 import org.activiti.engine.delegate.DelegateTask;
 import org.activiti.engine.delegate.TaskListener;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 public class RAModifyInformationAfter implements TaskListener {
@@ -31,19 +32,27 @@ public class RAModifyInformationAfter implements TaskListener {
         JSONObject object = JSONObject.parseObject(datas.getFormValsJson());
         delegateTask.setVariable("objectJson", object);
 
-        List<String> nextUserList = new ArrayList();
+        List<String> nextUserList = new ArrayList<>();
-
-        nextUserList.addAll(delegateTask.getVariable("leadershiplist",List.class));
-
 
         //截止时间 流程描述 创建人
-        String user = object.getString("prcCreateUser");
+        JSONObject roleForm = object.getJSONObject("roleForm");
-        String username = object.getString("prcCreateUserName");
+        String user = roleForm.getString("prcCreateUser");
+        String username = roleForm.getString("prcCreateUserName");
+        String dockUser = roleForm.getString("dockUser");
+        List<String> dockUserList = Arrays.asList(dockUser.split(","));
         delegateTask.setVariable("prcCreateUser", user);
         delegateTask.setVariable("prcCreateUserName", username);
 
+        // 赋值
+        delegateTask.setVariable("leadershiplist", dockUserList);
+        delegateTask.setVariable("statuteminister1", roleForm.getString("ministerUser"));
+        delegateTask.setVariable("director1", roleForm.getString("directorUser"));
+        delegateTask.setVariable("dean1", roleForm.getString("president"));
+        delegateTask.setVariable("statuteengineer3", roleForm.getString("passUser"));
+        nextUserList.addAll(dockUserList);
+
         String prcName = "外部署名推荐批准-署名领导会签";
-        QueryWrapper queryWrapper2 = new QueryWrapper();
+        QueryWrapper<BusProcessName> queryWrapper2 = new QueryWrapper<>();
         queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
         BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
 
@@ -52,6 +61,7 @@ public class RAModifyInformationAfter implements TaskListener {
 //            one1.setPrcName(prcName);
             one1.setCreatUser(user);
             one1.setCreatUserName(username);
+            one1.setMes(datas.getFormValsJson());
             busProcessNameService.saveOrUpdate(one1);
         }
 

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

@@ -21,6 +21,7 @@ public class RAModifyInformationBefore implements TaskListener{
                 List<BusProcessNew> list = busBean.list(queryWrapper1);
                 if(!list.isEmpty()){
                         BusProcessNew one1 = list.get(0);
+                        one1.setTaskInfo(delegateTask.getName());
                         one1.setTaskId(delegateTask.getId());
                         busBean.saveOrUpdate(one1);
 

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

@@ -31,6 +31,7 @@ public class RASignAfter implements TaskListener {
         Datas datas = datasService.getOne(queryWrapper);
 
         JSONObject object = JSONObject.parseObject(datas.getFormValsJson());
+        JSONObject roleForm = object.getJSONObject("roleForm");
         delegateTask.setVariable("objectJson", object);
 
         List<String> nextUserList = new ArrayList();
@@ -46,8 +47,8 @@ public class RASignAfter implements TaskListener {
         }
 
         //截止时间 流程描述 创建人
-        String user = object.getString("prcCreateUser");
+        String user = roleForm.getString("prcCreateUser");
-        String username = object.getString("prcCreateUserName");
+        String username = roleForm.getString("prcCreateUserName");
         delegateTask.setVariable("prcCreateUser", user);
         delegateTask.setVariable("prcCreateUserName", username);
         String prcName="";
@@ -58,7 +59,7 @@ public class RASignAfter implements TaskListener {
         }
 
 
-        QueryWrapper queryWrapper2 = new QueryWrapper();
+        QueryWrapper<BusProcessName> queryWrapper2 = new QueryWrapper<>();
         queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
         BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
 

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

@@ -21,6 +21,7 @@ public class RASignBefore implements TaskListener{
                 List<BusProcessNew> list = busBean.list(queryWrapper1);
                 if(!list.isEmpty()){
                         BusProcessNew one1 = list.get(0);
+                        one1.setTaskInfo(delegateTask.getName());
                         one1.setTaskId(delegateTask.getId());
                         busBean.saveOrUpdate(one1);
 

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

@@ -32,9 +32,10 @@ public class RAValidationAfter implements TaskListener {
         Datas datas = datasService.getOne(queryWrapper);
 
         JSONObject object = JSONObject.parseObject(datas.getFormValsJson());
+        JSONObject roleForm = object.getJSONObject("roleForm");
         delegateTask.setVariable("objectJson", object);
 
-        List<String> nextUserList = new ArrayList();
+        List<String> nextUserList = new ArrayList<>();
 
         if(object.getString("signFlag").equals("1")) {
             delegateTask.setVariable("zrFlag", 1);
@@ -47,8 +48,8 @@ public class RAValidationAfter implements TaskListener {
         }
 
         //截止时间 流程描述 创建人
-        String user = object.getString("prcCreateUser");
+        String user = roleForm.getString("prcCreateUser");
-        String username = object.getString("prcCreateUserName");
+        String username = roleForm.getString("prcCreateUserName");
         delegateTask.setVariable("prcCreateUser", user);
         delegateTask.setVariable("prcCreateUserName", username);
 
@@ -59,7 +60,7 @@ public class RAValidationAfter implements TaskListener {
             prcName = "外部署名推荐批准-修改信息";
         }
 
-        QueryWrapper queryWrapper2 = new QueryWrapper();
+        QueryWrapper<BusProcessName> queryWrapper2 = new QueryWrapper<>();
         queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
         BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
 

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

@@ -21,6 +21,7 @@ public class RAValidationBefore implements TaskListener{
         List<BusProcessNew> list = busBean.list(queryWrapper1);
         if(!list.isEmpty()){
             BusProcessNew one1 = list.get(0);
+            one1.setTaskInfo(delegateTask.getName());
             one1.setTaskId(delegateTask.getId());
             busBean.saveOrUpdate(one1);
 

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

@@ -11,6 +11,8 @@ import com.ydw.bat.wkflow.business_main.datas.service.IDatasService;
 import com.ydw.bat.wkflow.util.SpringContextUtil;
 import org.activiti.engine.delegate.DelegateTask;
 import org.activiti.engine.delegate.TaskListener;
+import org.apache.commons.lang.StringUtils;
+
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -69,20 +71,22 @@ public class RAstartAfter implements TaskListener {
             busProcessNameService.saveOrUpdate(one1);
         }
 
-        if (null != object.getString("commentText")) {
+        BusProcessNew busProcessNews = new BusProcessNew();
-            BusProcessNew busProcessNews = new BusProcessNew();
+        busProcessNews.setMsgType("clause");
-            busProcessNews.setMsgType("clause");
+        busProcessNews.setPId(delegateTask.getProcessInstanceId());
-            busProcessNews.setPId(delegateTask.getProcessInstanceId());
+        busProcessNews.setMesg(object.toJSONString());
-            busProcessNews.setMesg(object.toJSONString());
+        busProcessNews.setTaskInfo(delegateTask.getTaskDefinitionKey());
-            busProcessNews.setTaskInfo(delegateTask.getTaskDefinitionKey());
+        busProcessNews.setFinishFlag("0");
-            busProcessNews.setFinishFlag("0");
+        busProcessNews.setTaskInfo(delegateTask.getName());
-            busProcessNews.setTaskInfo(delegateTask.getName());
+        busProcessNews.setTaskId(delegateTask.getId());
-            busProcessNews.setTaskId(delegateTask.getId());
+        busProcessNews.setUserId("start");
-            busProcessNews.setUserId("start");
+        busProcessNews.setPrcName(prcName);
-            busProcessNews.setPrcName(prcName);
+        if (object.containsKey("commentText") && StringUtils.isNotBlank(object.getString("commentText"))) {
+            busProcessNews.setCommitFlag("1");
             busProcessNews.setCommitText(object.getString("commentText"));
-            busBean.save(busProcessNews);
         }
+        busBean.save(busProcessNews);
+
 
         if (nextUserList != null && !nextUserList.isEmpty()) {
             for (String nextUser : nextUserList) {

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

@@ -24,6 +24,7 @@ public class ChargeVerifyBefore implements TaskListener {
         List<BusProcessNew> list = busBean.list(queryWrapper1);
         if(!list.isEmpty()){
             BusProcessNew one1 = list.get(0);
+            one1.setTaskInfo(delegateTask.getName());
             one1.setTaskId(delegateTask.getId());
             busBean.saveOrUpdate(one1);
 

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

@@ -23,6 +23,7 @@ public class DirectorChooseBefore implements TaskListener {
         List<BusProcessNew> list = busBean.list(queryWrapper1);
         if(!list.isEmpty()){
             BusProcessNew one1 = list.get(0);
+            one1.setTaskInfo(delegateTask.getName());
             one1.setTaskId(delegateTask.getId());
             busBean.saveOrUpdate(one1);
 

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

@@ -23,6 +23,7 @@ public class EngineerReviseBefore implements TaskListener {
         List<BusProcessNew> list = busBean.list(queryWrapper1);
         if(!list.isEmpty()){
             BusProcessNew one1 = list.get(0);
+            one1.setTaskInfo(delegateTask.getName());
             one1.setTaskId(delegateTask.getId());
             busBean.saveOrUpdate(one1);
 

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

@@ -23,6 +23,7 @@ public class EngineerReviseDoneBefore implements TaskListener {
         List<BusProcessNew> list = busBean.list(queryWrapper1);
         if(!list.isEmpty()){
             BusProcessNew one1 = list.get(0);
+            one1.setTaskInfo(delegateTask.getName());
             one1.setTaskId(delegateTask.getId());
             busBean.saveOrUpdate(one1);
 

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

@@ -23,6 +23,7 @@ public class LeaderVerifyBefore implements TaskListener {
         List<BusProcessNew> list = busBean.list(queryWrapper1);
         if(!list.isEmpty()){
             BusProcessNew one1 = list.get(0);
+            one1.setTaskInfo(delegateTask.getName());
             one1.setTaskId(delegateTask.getId());
             busBean.saveOrUpdate(one1);
 

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

@@ -23,6 +23,7 @@ public class ManageSignBefore implements TaskListener {
         List<BusProcessNew> list = busBean.list(queryWrapper1);
         if(!list.isEmpty()){
             BusProcessNew one1 = list.get(0);
+            one1.setTaskInfo(delegateTask.getName());
             one1.setTaskId(delegateTask.getId());
             busBean.saveOrUpdate(one1);
 

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

@@ -23,6 +23,7 @@ public class PresidentVerifyBefore implements TaskListener {
         List<BusProcessNew> list = busBean.list(queryWrapper1);
         if(!list.isEmpty()){
             BusProcessNew one1 = list.get(0);
+            one1.setTaskInfo(delegateTask.getName());
             one1.setTaskId(delegateTask.getId());
             busBean.saveOrUpdate(one1);
 

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

@@ -61,7 +61,7 @@ public class WriteMaterialAfter implements TaskListener {
         String standName = object.getString("listName");
         delegateTask.setVariable("listName", standName);
 
-        QueryWrapper queryWrapper2 = new QueryWrapper();
+        QueryWrapper<BusProcessName> queryWrapper2 = new QueryWrapper<>();
         queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
         BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
         if (one1 != null) {
@@ -71,7 +71,6 @@ 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());
@@ -82,9 +81,11 @@ public class WriteMaterialAfter implements TaskListener {
             busProcessNews.setTaskId(delegateTask.getId());
             busProcessNews.setUserId("start");
             busProcessNews.setPrcName(prcName);
-            busProcessNews.setCommitText(object.getString("commentText"));
+            if (object.containsKey("commentText") && StringUtils.isNotBlank(object.getString("commentText"))) {
+                busProcessNews.setCommitFlag("1");
+                busProcessNews.setCommitText(object.getString("commentText"));
+            }
             busBean.save(busProcessNews);
-        }
 
 
         JSONObject object1 = object.getJSONObject("ch_pageData");

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

@@ -24,6 +24,7 @@ public class WriteMaterialBefore implements TaskListener {
         List<BusProcessNew> list = busBean.list(queryWrapper1);
         if(!list.isEmpty()){
             BusProcessNew one1 = list.get(0);
+            one1.setTaskInfo(delegateTask.getName());
             one1.setTaskId(delegateTask.getId());
             busBean.saveOrUpdate(one1);
 

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

@@ -23,6 +23,7 @@ public class WriteMemberInfoBefore implements TaskListener {
         List<BusProcessNew> list = busBean.list(queryWrapper1);
         if(!list.isEmpty()){
             BusProcessNew one1 = list.get(0);
+            one1.setTaskInfo(delegateTask.getName());
             one1.setTaskId(delegateTask.getId());
             busBean.saveOrUpdate(one1);
 

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

@@ -23,6 +23,7 @@ public class ChargeVerifyBefore implements TaskListener {
         List<BusProcessNew> list = busBean.list(queryWrapper1);
         if(!list.isEmpty()){
             BusProcessNew one1 = list.get(0);
+            one1.setTaskInfo(delegateTask.getName());
             one1.setTaskId(delegateTask.getId());
             busBean.saveOrUpdate(one1);
 

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

@@ -24,6 +24,7 @@ public class DirectorChooseBefore implements TaskListener {
         List<BusProcessNew> list = busBean.list(queryWrapper1);
         if(!list.isEmpty()){
             BusProcessNew one1 = list.get(0);
+            one1.setTaskInfo(delegateTask.getName());
             one1.setTaskId(delegateTask.getId());
             busBean.saveOrUpdate(one1);
 

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

@@ -24,6 +24,7 @@ public class EngineerReviseBefore implements TaskListener {
         List<BusProcessNew> list = busBean.list(queryWrapper1);
         if(!list.isEmpty()){
             BusProcessNew one1 = list.get(0);
+            one1.setTaskInfo(delegateTask.getName());
             one1.setTaskId(delegateTask.getId());
             busBean.saveOrUpdate(one1);
 

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

@@ -24,6 +24,7 @@ public class EngineerReviseDoneBefore implements TaskListener {
         List<BusProcessNew> list = busBean.list(queryWrapper1);
         if(!list.isEmpty()){
             BusProcessNew one1 = list.get(0);
+            one1.setTaskInfo(delegateTask.getName());
             one1.setTaskId(delegateTask.getId());
             busBean.saveOrUpdate(one1);
 

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

@@ -26,6 +26,7 @@ public class LeaderVerifyBefore implements TaskListener {
         List<BusProcessNew> list = busBean.list(queryWrapper1);
         if(!list.isEmpty()){
             BusProcessNew one1 = list.get(0);
+            one1.setTaskInfo(delegateTask.getName());
             one1.setTaskId(delegateTask.getId());
             busBean.saveOrUpdate(one1);
 

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

@@ -24,6 +24,7 @@ public class ManageSignBefore implements TaskListener {
         List<BusProcessNew> list = busBean.list(queryWrapper1);
         if(!list.isEmpty()){
             BusProcessNew one1 = list.get(0);
+            one1.setTaskInfo(delegateTask.getName());
             one1.setTaskId(delegateTask.getId());
             busBean.saveOrUpdate(one1);
 

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

@@ -24,6 +24,7 @@ public class PresidentVerifyBefore implements TaskListener {
         List<BusProcessNew> list = busBean.list(queryWrapper1);
         if(!list.isEmpty()){
             BusProcessNew one1 = list.get(0);
+            one1.setTaskInfo(delegateTask.getName());
             one1.setTaskId(delegateTask.getId());
             busBean.saveOrUpdate(one1);
 

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

@@ -77,20 +77,21 @@ public class WriteMaterialAfter implements TaskListener {
             busProcessNameService.saveOrUpdate(one1);
         }
 
-        if (null != object.getString("commentText")) {
+        BusProcessNew busProcessNews = new BusProcessNew();
-            BusProcessNew busProcessNews = new BusProcessNew();
+        busProcessNews.setMsgType("clause");
-            busProcessNews.setMsgType("clause");
+        busProcessNews.setPId(delegateTask.getProcessInstanceId());
-            busProcessNews.setPId(delegateTask.getProcessInstanceId());
+        busProcessNews.setMesg(object.toJSONString());
-            busProcessNews.setMesg(object.toJSONString());
+        busProcessNews.setTaskInfo(delegateTask.getTaskDefinitionKey());
-            busProcessNews.setTaskInfo(delegateTask.getTaskDefinitionKey());
+        busProcessNews.setFinishFlag("0");
-            busProcessNews.setFinishFlag("0");
+        busProcessNews.setTaskInfo(delegateTask.getName());
-            busProcessNews.setTaskInfo(delegateTask.getName());
+        busProcessNews.setTaskId(delegateTask.getId());
-            busProcessNews.setTaskId(delegateTask.getId());
+        busProcessNews.setUserId("start");
-            busProcessNews.setUserId("start");
+        busProcessNews.setPrcName(prcName);
-            busProcessNews.setPrcName(prcName);
+        if (object.containsKey("commentText") && StringUtils.isNotBlank(object.getString("commentText"))) {
+            busProcessNews.setCommitFlag("1");
             busProcessNews.setCommitText(object.getString("commentText"));
-            busBean.save(busProcessNews);
         }
+        busBean.save(busProcessNews);
 
         JSONObject object1 = object.getJSONObject("rh_pageData");
         WgWorkGroupShowDTO wgWorkGroupShowDTO = new WgWorkGroupShowDTO();

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

@@ -24,6 +24,7 @@ public class WriteMemberInfoBefore implements TaskListener {
         List<BusProcessNew> list = busBean.list(queryWrapper1);
         if(!list.isEmpty()){
             BusProcessNew one1 = list.get(0);
+            one1.setTaskInfo(delegateTask.getName());
             one1.setTaskId(delegateTask.getId());
             busBean.saveOrUpdate(one1);