工作流优化sql

Fix foton 20231031

See merge request laws-foton-slrs/foton-wkflow-rest!67

db/工作流数据库优化sql.sql

@@ -0,0 +1,10 @@
+ALTER TABLE `foton-bat-wkflow`.`bus_process_new`
+    ADD INDEX `PROCESS_NEW_TASK_ID_INDEX`(`TASK_ID`) USING BTREE COMMENT 'TASK_ID索引',
+ADD INDEX `PROCESS_NEW_P_ID_INDEX`(`P_ID`) USING BTREE COMMENT 'P_ID索引',
+ADD INDEX `PROCESS_NEW_TASK_AND_P_ID_INDEX`(`TASK_ID`, `P_ID`) USING BTREE COMMENT 'TASK_ID和P_ID的联合索引';
+ADD INDEX `PROCESS_NEW_TASK_INFO_INDEX`(`TASK_INFO`) USING BTREE COMMENT 'TASK_INFO索引',
+ADD INDEX `PROCESS_NEW_TASK_ID_AND_INFO_INDEX`(`TASK_INFO`, `TASK_ID`) USING BTREE COMMENT 'TASK_ID和TASK_INFO的联合索引';
+ADD INDEX `PROCESS_NEW_RECEIVE_STATUS_INDEX`(`RECEIVE_STATUS`) USING BTREE COMMENT 'RECEIVE_STATUS索引';
+
+ALTER TABLE `foton-bat-wkflow`.`bus_process_name`
+ADD INDEX `PROCESS_NAME_PRC_ID_INDEX`(`PRC_ID`) USING BTREE COMMENT 'PRC_ID索引';

src/main/java/com/ydw/bat/wkflow/business_activiti/task/TaskController.java

@@ -123,10 +123,14 @@ public class TaskController {
 					historicTaskInstance.put("assignee", str);
 				}
 			}else{
-				ResponseMessage<UserVO> assignee = lawsUserInfoService.getById(historicTaskInstance.get("assignee").toString());
+				ResponseMessage<UserVO> assignee = lawsUserInfoService.getByIdFeignClientWithDisabled(historicTaskInstance.get("assignee").toString());
 
 				if(assignee.getData()!=null){
-					historicTaskInstance.put("assignee", assignee.getData().getUname());
+					if (assignee.getData().getDisableFlag() == 1) {
+						historicTaskInstance.put("assignee", assignee.getData().getUname() + "(已禁用)");
+					} else{
+						historicTaskInstance.put("assignee", assignee.getData().getUname());
+					}
 					historicTaskInstance.put("assigneeId", assignee.getData().getUsid());
 					QueryWrapper queryWrapper2 = new QueryWrapper();
 					queryWrapper2.eq("TASK_ID",historicTaskInstance.get("id"));
@@ -134,7 +138,7 @@ public class TaskController {
 					List<BusProcessEntrust> list1 = iBusProcessEntrustService.list(queryWrapper2);
 					String str = "";
 					if(list1.size()>0){
-						ResponseMessage<UserVO> assignee1 = lawsUserInfoService.getById(list1.get(0).getUserId());
+						ResponseMessage<UserVO> assignee1 = lawsUserInfoService.getByIdFeignClientWithDisabled(list1.get(0).getUserId());
 						historicTaskInstance.put("assignee", assignee.getData().getUname()+"("+assignee1.getData().getUname()+" 转办)");
 					}
 				}
@@ -263,10 +267,14 @@ public class TaskController {
 					historicTaskInstance.put("assignee", str);
 				}
 			}else{
-				ResponseMessage<UserVO> assignee = lawsUserInfoService.getById(historicTaskInstance.get("assignee").toString());
+				ResponseMessage<UserVO> assignee = lawsUserInfoService.getByIdFeignClientWithDisabled(historicTaskInstance.get("assignee").toString());
 
 				if(assignee.getData()!=null){
-					historicTaskInstance.put("assignee", assignee.getData().getUname());
+					if (assignee.getData().getDisableFlag() == 1) {
+						historicTaskInstance.put("assignee", assignee.getData().getUname() + "(已禁用)");
+					} else {
+						historicTaskInstance.put("assignee", assignee.getData().getUname());
+					}
 					historicTaskInstance.put("assigneeId", assignee.getData().getUsid());
 					QueryWrapper queryWrapper2 = new QueryWrapper();
 					queryWrapper2.eq("TASK_ID",historicTaskInstance.get("id"));
@@ -274,7 +282,7 @@ public class TaskController {
 					List<BusProcessEntrust> list1 = iBusProcessEntrustService.list(queryWrapper2);
 					String str = "";
 					if(list1.size()>0){
-						ResponseMessage<UserVO> assignee1 = lawsUserInfoService.getById(list1.get(0).getUserId());
+						ResponseMessage<UserVO> assignee1 = lawsUserInfoService.getByIdFeignClientWithDisabled(list1.get(0).getUserId());
 						historicTaskInstance.put("assignee", assignee.getData().getUname()+"("+assignee1.getData().getUname()+" 转办)");
 					}
 				}

src/main/java/com/ydw/bat/wkflow/business_auth/LawsUserInfoService.java

@@ -63,6 +63,9 @@ public interface LawsUserInfoService {
     @GetMapping("sys/user/getById")
     public ResponseMessage<UserVO> getById(@RequestParam("id") String id);
 
+    @GetMapping("sys/user/getByIdWithDisabled")
+    public ResponseMessage<UserVO> getByIdFeignClientWithDisabled(@RequestParam("id") String id);
+
     @GetMapping("lawss/sarProductInfo/queryMap")
     public ResponseMessage<Map<String, List<String>>> queryMap();
 

src/main/java/com/ydw/bat/wkflow/config/DruidDataSourceConfig.java

@@ -0,0 +1,163 @@
+package com.ydw.bat.wkflow.config;
+
+import com.alibaba.druid.filter.Filter;
+import com.alibaba.druid.filter.logging.Slf4jLogFilter;
+import com.alibaba.druid.filter.stat.StatFilter;
+import com.alibaba.druid.pool.DruidDataSource;
+import com.alibaba.druid.support.http.StatViewServlet;
+import com.alibaba.druid.support.http.WebStatFilter;
+import com.alibaba.druid.support.spring.stat.DruidStatInterceptor;
+import com.alibaba.druid.wall.WallConfig;
+import com.alibaba.druid.wall.WallFilter;
+import org.springframework.aop.framework.autoproxy.BeanNameAutoProxyCreator;
+import org.springframework.boot.context.properties.bind.BindResult;
+import org.springframework.boot.context.properties.bind.Binder;
+import org.springframework.boot.context.properties.source.ConfigurationPropertySources;
+import org.springframework.boot.web.servlet.FilterRegistrationBean;
+import org.springframework.boot.web.servlet.ServletRegistrationBean;
+import org.springframework.context.EnvironmentAware;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.core.env.Environment;
+import org.springframework.transaction.annotation.EnableTransactionManagement;
+
+import javax.sql.DataSource;
+import java.sql.SQLException;
+import java.util.*;
+
+@Configuration
+@EnableTransactionManagement
+public class DruidDataSourceConfig implements EnvironmentAware {
+    private Properties propertyResolver;
+
+    private Properties configResolver;
+
+    public DruidDataSourceConfig() {
+    }
+
+    public void setEnvironment(Environment env) {
+        Iterable sources = ConfigurationPropertySources.get(env);
+        Binder binder = new Binder(sources);
+        BindResult<Properties> propertyResolverBind = binder.bind("spring.datasource", Properties.class);
+        BindResult<Properties> configResolverBind = binder.bind("spring.profiles", Properties.class);
+
+        propertyResolver= propertyResolverBind.get();
+        configResolver = configResolverBind.get();
+    }
+
+
+    @Bean(
+            name = {"dataSource"}
+    )
+    public DataSource dataSource() throws SQLException {
+        DruidDataSource datasource = new DruidDataSource();
+        datasource.setUrl(this.propertyResolver.getProperty("url"));
+        datasource.setDriverClassName(this.propertyResolver.getProperty("driver-class-name"));
+        datasource.setUsername(this.propertyResolver.getProperty("username"));
+        datasource.setPassword(this.propertyResolver.getProperty("password"));
+        datasource.setInitialSize(Integer.valueOf(this.propertyResolver.getProperty("initialSize")));
+        datasource.setMinIdle(Integer.valueOf(this.propertyResolver.getProperty("minIdle")));
+        datasource.setMaxWait(Long.valueOf(this.propertyResolver.getProperty("maxWait")));
+        datasource.setMaxActive(Integer.valueOf(this.propertyResolver.getProperty("maxActive")));
+        datasource.setTimeBetweenEvictionRunsMillis(Long.valueOf(this.propertyResolver.getProperty("timeBetweenEvictionRunsMillis")));
+        datasource.setMinEvictableIdleTimeMillis(Long.valueOf(this.propertyResolver.getProperty("minEvictableIdleTimeMillis")));
+//        datasource.setRemoveAbandoned(Boolean.valueOf(this.propertyResolver.getProperty("removeAbandoned")));
+//        datasource.setRemoveAbandonedTimeout(Integer.valueOf(this.propertyResolver.getProperty("removeAbandonedTimeout")));
+        datasource.setTestOnBorrow(Boolean.valueOf(this.propertyResolver.getProperty("testOnBorrow")));
+        datasource.setTestOnReturn(Boolean.valueOf(this.propertyResolver.getProperty("testOnReturn")));
+        datasource.setTestWhileIdle(Boolean.valueOf(this.propertyResolver.getProperty("testWhileIdle")));
+        datasource.setValidationQuery(this.propertyResolver.getProperty("validationQuery"));
+//        datasource.setValidationQueryTimeout(Integer.valueOf(this.propertyResolver.getProperty("validationQueryTimeout")));
+//        datasource.setKeepAlive(Boolean.valueOf(this.propertyResolver.getProperty("keepAlive")));
+        // if("prd".equals(this.configResolver.getProperty("active"))){
+        //     datasource.setConnectProperties(this.connectionProper());
+        // }
+        // datasource.setConnectProperties(this.connectionProper());
+        List<Filter> filters = new ArrayList();
+        filters.add(this.wallFilter());
+        filters.add(this.statFilter());
+        filters.add(this.slf4jLogFilter());
+        // if("prd".equals(this.configResolver.getProperty("active"))){
+        //     filters.add(new ConfigFilter());
+        // }
+        // filters.add(new ConfigFilter());
+        datasource.setProxyFilters(filters);
+        // 启动时自动初始化维护连接
+        datasource.init();
+        return datasource;
+    }
+
+    @Bean
+    public StatFilter statFilter() {
+        StatFilter statFilter = new StatFilter();
+        statFilter.setMergeSql(Boolean.valueOf(this.propertyResolver.getProperty("mergeSql")));
+        statFilter.setSlowSqlMillis(Long.valueOf(this.propertyResolver.getProperty("slowSqlMillis")));
+        statFilter.setLogSlowSql(Boolean.valueOf(this.propertyResolver.getProperty("logSlowSql")));
+        return statFilter;
+    }
+
+    @Bean
+    public WallFilter wallFilter() {
+        WallFilter wallFilter = new WallFilter();
+        wallFilter.setLogViolation(true);
+        wallFilter.setThrowException(false);
+        wallFilter.setConfig(this.wallConfig());
+        return wallFilter;
+    }
+
+    @Bean
+    public Slf4jLogFilter slf4jLogFilter() {
+        Slf4jLogFilter slf4jLogFilter = new Slf4jLogFilter();
+        return slf4jLogFilter;
+    }
+
+    public Properties connectionProper(){
+        Properties connection=new Properties();
+        connection.setProperty("config.decrypt","true");
+        connection.setProperty("config.decrypt.key",this.propertyResolver.getProperty("publicKey"));
+        return connection;
+    }
+
+    @Bean
+    public ServletRegistrationBean druidServlet() {
+        ServletRegistrationBean servletRegistrationBean = new ServletRegistrationBean();
+        servletRegistrationBean.setServlet(new StatViewServlet());
+        servletRegistrationBean.addUrlMappings(new String[]{"/druid/*"});
+        Map<String, String> initParameters = new HashMap();
+        initParameters.put("resetEnable", "true");
+        initParameters.put("loginUsername", "druid");
+        initParameters.put("loginPassword", "druid");
+        servletRegistrationBean.setInitParameters(initParameters);
+        return servletRegistrationBean;
+    }
+
+    @Bean
+    public FilterRegistrationBean filterRegistrationBean() {
+        FilterRegistrationBean filterRegistrationBean = new FilterRegistrationBean();
+        filterRegistrationBean.setFilter(new WebStatFilter());
+        filterRegistrationBean.addUrlPatterns(new String[]{"/*"});
+        filterRegistrationBean.addInitParameter("exclusions", "*.js,*.gif,*.jpg,*.bmp,*.png,*.css,*.ico,/druid/*");
+        return filterRegistrationBean;
+    }
+
+    @Bean({"druid-stat-interceptor"})
+    public DruidStatInterceptor DruidStatInterceptor() {
+        DruidStatInterceptor druidStatInterceptor = new DruidStatInterceptor();
+        return druidStatInterceptor;
+    }
+
+    @Bean
+    public BeanNameAutoProxyCreator beanNameAutoProxyCreator() {
+        BeanNameAutoProxyCreator beanNameAutoProxyCreator = new BeanNameAutoProxyCreator();
+        beanNameAutoProxyCreator.setProxyTargetClass(true);
+        beanNameAutoProxyCreator.setInterceptorNames(new String[]{"druid-stat-interceptor"});
+        return beanNameAutoProxyCreator;
+    }
+
+    @Bean
+    public WallConfig wallConfig() {
+        WallConfig wallConfig = new WallConfig();
+        wallConfig.setMultiStatementAllow(true);
+        return wallConfig;
+    }
+}

src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BLApplicantAfter.java

@@ -104,7 +104,7 @@ public class BLApplicantAfter implements TaskListener{
 //            throw new ActivitiException("1#2其他起草人参数不存在,请配置相关用户");
 //        }
 
-        QueryWrapper queryWrapper2 = new QueryWrapper();
+        QueryWrapper<BusProcessName> queryWrapper2 = new QueryWrapper<>();
         queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
         BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
         if(one1!=null){
@@ -121,14 +121,14 @@ public class BLApplicantAfter implements TaskListener{
         busProcessNew.setMsgType("clause");
         busProcessNew.setPId(delegateTask.getProcessInstanceId());
         busProcessNew.setMesg(object.toJSONString());
-        busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey());
+//        busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey());
         busProcessNew.setTaskId(delegateTask.getId());
         busProcessNew.setCommitText(object.getString("commentText"));
         busProcessNew.setFinishFlag("0");
         busProcessNew.setTaskInfo(delegateTask.getName());
         busBean.save(busProcessNew);
 
-        if(nextUserList != null && !nextUserList.isEmpty()){
+        if(!nextUserList.isEmpty()){
             for(String nextUser : nextUserList){
                 BusProcessNew busProcessNewNext = new BusProcessNew();
                 busProcessNewNext.setMsgType("clause");

src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BLApplicantC1After.java

@@ -1,6 +1,7 @@
 package com.ydw.bat.wkflow.listener.bussLibrary;
 
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName;
 import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew;
@@ -93,7 +94,7 @@ public class BLApplicantC1After implements TaskListener{
 //            throw new ActivitiException("1#2其他起草人参数不存在,请配置相关用户");
 //        }
 
-        QueryWrapper queryWrapper2 = new QueryWrapper();
+        QueryWrapper<BusProcessName> queryWrapper2 = new QueryWrapper<>();
         queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
         BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
         if(one1!=null){
@@ -106,18 +107,19 @@ public class BLApplicantC1After implements TaskListener{
         }
 
         // 存储当前节点意见
-        BusProcessNew busProcessNew = new BusProcessNew();
-        busProcessNew.setMsgType("clause");
-        busProcessNew.setPId(delegateTask.getProcessInstanceId());
-        busProcessNew.setMesg(object.toJSONString());
-        busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey());
-        busProcessNew.setTaskId(delegateTask.getId());
+        LambdaQueryWrapper<BusProcessNew> queryWrapper1 = new LambdaQueryWrapper<>();
+        queryWrapper1.eq(BusProcessNew::getTaskId,delegateTask.getId());
+        List<BusProcessNew> list = busBean.list(queryWrapper1);
+        if (list.isEmpty()) {
+            throw new ActivitiException("流程实例不存在");
+        }
+        // 当前节点
+        BusProcessNew busProcessNew = list.get(0);
         busProcessNew.setCommitText(object.getString("commentText"));
-        busProcessNew.setFinishFlag("0");
-        busProcessNew.setTaskInfo(delegateTask.getName());
-        busBean.save(busProcessNew);
+        busProcessNew.setTaskId(delegateTask.getName());
+        busBean.saveOrUpdate(busProcessNew);
 
-        if(nextUserList != null && !nextUserList.isEmpty()){
+        if(!nextUserList.isEmpty()){
             for(String nextUser : nextUserList){
                 BusProcessNew busProcessNewNext = new BusProcessNew();
                 busProcessNewNext.setMsgType("clause");

src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BLApplicantC1Before.java

@@ -18,7 +18,7 @@ public class BLApplicantC1Before implements TaskListener{
     public void notify(DelegateTask delegateTask) {
         IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
         CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class);
-        QueryWrapper queryWrapper1 = new QueryWrapper();
+        QueryWrapper<BusProcessNew> queryWrapper1 = new QueryWrapper<>();
         queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());
         queryWrapper1.eq("USER_ID",delegateTask.getAssignee());
         queryWrapper1.isNull("TASK_ID");

src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary10After.java

@@ -1,6 +1,7 @@
 package com.ydw.bat.wkflow.listener.bussLibrary;
 
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName;
 import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew;
@@ -34,7 +35,7 @@ public class BussLibrary10After implements TaskListener{
         JSONObject object =  JSONObject.parseObject(datas.getFormValsJson());
         delegateTask.setVariable("objectJson",object);
 
-        List<String> nextUserList = new ArrayList();
+        List<String> nextUserList = new ArrayList<>();
 
         String approvalOpinion = object.get("approvalOpinion") == null ? "" : object.get("approvalOpinion").toString();
         String user = object.getString("prcCreateUser");
@@ -45,7 +46,7 @@ public class BussLibrary10After implements TaskListener{
         }else {
             prcName = "企标制修订";
         }
-        QueryWrapper queryWrapper2 = new QueryWrapper();
+        QueryWrapper<BusProcessName> queryWrapper2 = new QueryWrapper<>();
         queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
         BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
         if(one1!=null){
@@ -64,7 +65,8 @@ public class BussLibrary10After implements TaskListener{
                     delegateTask.setVariable("zhrUserId",object.getString("zhrUserId"));
                     nextUserList.add(object.getString("zhrUserId"));
 
-                    BussUtils.approvalFunc2(delegateTask, object, prcName, nextUserList);
+//                    BussUtils.approvalFunc2(delegateTask, object, prcName, nextUserList);
+                    BussUtils.approvalFunc3(delegateTask, object, prcName, nextUserList);
                     delegateTask.setVariable("fzrFlag", 0);
                 }else {
                     throw new ActivitiException("1#2副主任用户参数不存在,请配置相关用户");
@@ -81,7 +83,7 @@ public class BussLibrary10After implements TaskListener{
                     busProcessNew.setUserId(object.getString("xdUserId"));
                     busProcessNew.setPrcName(prcName);
                     busBean.save(busProcessNew);
-
+                    busProcessNew.setCommitFlag("1");
                     BussUtils.approvalFunc1(delegateTask, busBean, object, prcName,"1");
                     delegateTask.setVariable("cxdUserId",object.getString("xdUserId"));
                     delegateTask.setVariable("fzrFlag", 1);

src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary10Before.java

@@ -18,7 +18,7 @@ public class BussLibrary10Before implements TaskListener{
     public void notify(DelegateTask delegateTask) {
         IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
         CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class);
-        QueryWrapper queryWrapper1 = new QueryWrapper();
+        QueryWrapper<BusProcessNew> queryWrapper1 = new QueryWrapper<>();
         queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());
         queryWrapper1.eq("USER_ID",delegateTask.getAssignee());
         queryWrapper1.isNull("TASK_ID");

src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary11After.java

@@ -1,6 +1,7 @@
 package com.ydw.bat.wkflow.listener.bussLibrary;
 
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName;
 import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew;
@@ -34,7 +35,7 @@ public class BussLibrary11After implements TaskListener{
         JSONObject object =  JSONObject.parseObject(datas.getFormValsJson());
         delegateTask.setVariable("objectJson",object);
 
-        List<String> nextUserList = new ArrayList();
+        List<String> nextUserList = new ArrayList<>();
 
         String approvalOpinion = object.get("approvalOpinion") == null ? "" : object.get("approvalOpinion").toString();
         String user = object.getString("prcCreateUser");
@@ -45,7 +46,7 @@ public class BussLibrary11After implements TaskListener{
         }else {
             prcName = "企标制修订";
         }
-        QueryWrapper queryWrapper2 = new QueryWrapper();
+        QueryWrapper<BusProcessName> queryWrapper2 = new QueryWrapper<>();
         queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
         BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
         if(one1!=null){
@@ -64,13 +65,15 @@ public class BussLibrary11After implements TaskListener{
                     delegateTask.setVariable("pxUserId",object.getString("pxUserId"));
                     nextUserList.add(object.getString("pxUserId"));
 
-                    BussUtils.approvalFunc2(delegateTask, object, prcName, nextUserList);
+//                    BussUtils.approvalFunc2(delegateTask, object, prcName, nextUserList);
+                    BussUtils.approvalFunc3(delegateTask, object, prcName, nextUserList);
                     delegateTask.setVariable("zrFlag", 0);
                 }else {
                     throw new ActivitiException("1#2主起草人用户参数不存在,请配置相关用户");
                 }
             } else {
                 if(StringUtils.isNotBlank(object.getString("xdUserId"))) {
+                    // 驳回节点数据
                     BusProcessNew busProcessNew = new BusProcessNew();
                     busProcessNew.setMsgType("clause");
                     busProcessNew.setPId(delegateTask.getProcessInstanceId());

src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary11Before.java

@@ -18,7 +18,7 @@ public class BussLibrary11Before implements TaskListener{
     public void notify(DelegateTask delegateTask) {
         IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
         CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class);
-        QueryWrapper queryWrapper1 = new QueryWrapper();
+        QueryWrapper<BusProcessNew> queryWrapper1 = new QueryWrapper<>();
         queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());
         queryWrapper1.eq("USER_ID",delegateTask.getAssignee());
         queryWrapper1.isNull("TASK_ID");

src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary12After.java

@@ -1,6 +1,7 @@
 package com.ydw.bat.wkflow.listener.bussLibrary;
 
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName;
 import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew;
@@ -34,7 +35,7 @@ public class BussLibrary12After implements TaskListener{
         JSONObject object =  JSONObject.parseObject(datas.getFormValsJson());
         delegateTask.setVariable("objectJson",object);
 
-        List<String> nextUserList = new ArrayList();
+        List<String> nextUserList = new ArrayList<>();
 
         if(StringUtils.isNotBlank(object.getString("fbUserId"))){
             delegateTask.setVariable("fbUserId",object.getString("fbUserId"));
@@ -52,7 +53,7 @@ public class BussLibrary12After implements TaskListener{
         }else {
             prcName = "企标制修订";
         }
-        QueryWrapper queryWrapper2 = new QueryWrapper();
+        QueryWrapper<BusProcessName> queryWrapper2 = new QueryWrapper<>();
         queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
         BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
         if(one1!=null){
@@ -65,30 +66,29 @@ public class BussLibrary12After implements TaskListener{
         }
 
         // 存储当前节点意见
-        BusProcessNew busProcessNew = new BusProcessNew();
-        busProcessNew.setMsgType("clause");
-        busProcessNew.setPId(delegateTask.getProcessInstanceId());
-        busProcessNew.setMesg(object.toJSONString());
-        busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey());
-        busProcessNew.setTaskId(delegateTask.getId());
+        LambdaQueryWrapper<BusProcessNew> queryWrapper1 = new LambdaQueryWrapper<>();
+        queryWrapper1.eq(BusProcessNew::getTaskId,delegateTask.getId());
+        List<BusProcessNew> list = busBean.list(queryWrapper1);
+        if (list.isEmpty()) {
+            throw new ActivitiException("流程实例不存在");
+        }
+        // 当前节点
+        BusProcessNew busProcessNew = list.get(0);
         busProcessNew.setCommitText(object.getString("commentText"));
-        busProcessNew.setFinishFlag("0");
-        busProcessNew.setTaskInfo(delegateTask.getName());
-        busBean.save(busProcessNew);
+        busProcessNew.setTaskId(delegateTask.getId());
+        busBean.saveOrUpdate(busProcessNew);
 
-        if(nextUserList != null && !nextUserList.isEmpty()){
-            for(String nextUser : nextUserList){
-                BusProcessNew busProcessNewNext = new BusProcessNew();
-                busProcessNewNext.setMsgType("clause");
-                busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
-                busProcessNewNext.setMesg(object.toJSONString());
-                busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey());
-                busProcessNewNext.setFinishFlag("0");
-                busProcessNewNext.setTaskInfo(delegateTask.getName());
-                busProcessNewNext.setUserId(nextUser);
-                busProcessNewNext.setPrcName(prcName);
-                busBean.save(busProcessNewNext);
-            }
+        for(String nextUser : nextUserList){
+            BusProcessNew busProcessNewNext = new BusProcessNew();
+            busProcessNewNext.setMsgType("clause");
+            busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
+            busProcessNewNext.setMesg(object.toJSONString());
+            busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey());
+            busProcessNewNext.setFinishFlag("0");
+            busProcessNewNext.setTaskInfo(delegateTask.getName());
+            busProcessNewNext.setUserId(nextUser);
+            busProcessNewNext.setPrcName(prcName);
+            busBean.save(busProcessNewNext);
         }
     }
 

src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary12Before.java

@@ -21,7 +21,7 @@ public class BussLibrary12Before implements TaskListener{
     public void notify(DelegateTask delegateTask) {
         IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
         CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class);
-        QueryWrapper queryWrapper1 = new QueryWrapper();
+        QueryWrapper<BusProcessNew> queryWrapper1 = new QueryWrapper<>();
         queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());
         queryWrapper1.eq("USER_ID",delegateTask.getAssignee());
         queryWrapper1.isNull("TASK_ID");

src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary13Before.java

@@ -18,7 +18,7 @@ public class BussLibrary13Before implements TaskListener{
     public void notify(DelegateTask delegateTask) {
         IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
         CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class);
-        QueryWrapper queryWrapper1 = new QueryWrapper();
+        QueryWrapper<BusProcessNew> queryWrapper1 = new QueryWrapper<>();
         queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());
         queryWrapper1.eq("USER_ID",delegateTask.getAssignee());
         queryWrapper1.isNull("TASK_ID");

src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary2After.java

@@ -2,6 +2,7 @@ package com.ydw.bat.wkflow.listener.bussLibrary;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName;
 import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew;
@@ -38,7 +39,7 @@ public class BussLibrary2After implements TaskListener{
         JSONObject object =  JSONObject.parseObject(datas.getFormValsJson());
         delegateTask.setVariable("objectJson",object);
 
-        List<String> nextUserList = new ArrayList();
+        List<String> nextUserList = new ArrayList<>();
 
         JSONArray fileList =delegateTask.getVariable("fileModelList", JSONArray.class);
         if (fileList==null) {
@@ -69,7 +70,7 @@ public class BussLibrary2After implements TaskListener{
         }else {
             prcName = "企标制修订";
         }
-        QueryWrapper queryWrapper2 = new QueryWrapper();
+        QueryWrapper<BusProcessName> queryWrapper2 = new QueryWrapper<>();
         queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
         BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
         if(one1!=null){
@@ -82,30 +83,29 @@ public class BussLibrary2After implements TaskListener{
         }
 
         // 存储当前节点意见
-        BusProcessNew busProcessNew = new BusProcessNew();
-        busProcessNew.setMsgType("clause");
-        busProcessNew.setPId(delegateTask.getProcessInstanceId());
-        busProcessNew.setMesg(object.toJSONString());
-        busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey());
-        busProcessNew.setTaskId(delegateTask.getId());
-        busProcessNew.setCommitText(object.getString("commentText"));
-        busProcessNew.setFinishFlag("0");
-        busProcessNew.setTaskInfo(delegateTask.getName());
-        busBean.save(busProcessNew);
 
-        if(nextUserList != null && !nextUserList.isEmpty()){
-            for(String nextUser : nextUserList){
-                BusProcessNew busProcessNewNext = new BusProcessNew();
-                busProcessNewNext.setMsgType("clause");
-                busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
-                busProcessNewNext.setMesg(object.toJSONString());
-                busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey());
-                busProcessNewNext.setFinishFlag("0");
-                busProcessNewNext.setTaskInfo(delegateTask.getName());
-                busProcessNewNext.setUserId(nextUser);
-                busProcessNewNext.setPrcName(prcName);
-                busBean.save(busProcessNewNext);
-            }
+        LambdaQueryWrapper<BusProcessNew> queryWrapper1 = new LambdaQueryWrapper<>();
+        queryWrapper1.eq(BusProcessNew::getTaskId,delegateTask.getId());
+        List<BusProcessNew> list = busBean.list(queryWrapper1);
+        if(!list.isEmpty()){
+            BusProcessNew busProcessNew = list.get(0);
+            busProcessNew.setTaskId(delegateTask.getId());
+            busProcessNew.setTaskInfo(delegateTask.getName());
+            busProcessNew.setCommitText(object.getString("commentText"));
+            busBean.saveOrUpdate(busProcessNew);
+        }
+
+        for(String nextUser : nextUserList){
+            BusProcessNew busProcessNewNext = new BusProcessNew();
+            busProcessNewNext.setMsgType("clause");
+            busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
+            busProcessNewNext.setMesg(object.toJSONString());
+//            busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey());
+            busProcessNewNext.setFinishFlag("0");
+//            busProcessNewNext.setTaskInfo(delegateTask.getName());
+            busProcessNewNext.setUserId(nextUser);
+            busProcessNewNext.setPrcName(prcName);
+            busBean.save(busProcessNewNext);
         }
     }
 

src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary2Before.java

@@ -19,7 +19,7 @@ public class BussLibrary2Before implements TaskListener{
     public void notify(DelegateTask delegateTask) {
         IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
         CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class);
-        QueryWrapper queryWrapper1 = new QueryWrapper();
+        QueryWrapper<BusProcessNew> queryWrapper1 = new QueryWrapper<>();
         queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());
         queryWrapper1.eq("USER_ID",delegateTask.getAssignee());
         queryWrapper1.isNull("TASK_ID");

src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary3After.java

@@ -1,6 +1,7 @@
 package com.ydw.bat.wkflow.listener.bussLibrary;
 
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName;
 import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew;
@@ -36,7 +37,7 @@ public class BussLibrary3After implements TaskListener{
         JSONObject object =  JSONObject.parseObject(datas.getFormValsJson());
         delegateTask.setVariable("objectJson",object);
 
-        List<String> nextUserList = new ArrayList();
+        List<String> nextUserList = new ArrayList<>();
 
         if(StringUtils.isNotBlank(object.getString("bzhUserId"))){
             delegateTask.setVariable("bzhUserId",object.getString("bzhUserId"));
@@ -59,7 +60,7 @@ public class BussLibrary3After implements TaskListener{
         }else {
             prcName = "企标制修订";
         }
-        QueryWrapper queryWrapper2 = new QueryWrapper();
+        QueryWrapper<BusProcessName> queryWrapper2 = new QueryWrapper<>();
         queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
         BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
         if(one1!=null){
@@ -70,32 +71,29 @@ public class BussLibrary3After implements TaskListener{
             one1.setCreatUserName(username);
             busProcessNameService.saveOrUpdate(one1);
         }
-
         // 存储当前节点意见
-        BusProcessNew busProcessNew = new BusProcessNew();
-        busProcessNew.setMsgType("clause");
-        busProcessNew.setPId(delegateTask.getProcessInstanceId());
-        busProcessNew.setMesg(object.toJSONString());
-        busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey());
-        busProcessNew.setTaskId(delegateTask.getId());
-        busProcessNew.setCommitText(object.getString("commentText"));
-        busProcessNew.setFinishFlag("0");
-        busProcessNew.setTaskInfo(delegateTask.getName());
-        busBean.save(busProcessNew);
+        LambdaQueryWrapper<BusProcessNew> queryWrapper1 = new LambdaQueryWrapper<>();
+        queryWrapper1.eq(BusProcessNew::getTaskId,delegateTask.getId());
+        List<BusProcessNew> list = busBean.list(queryWrapper1);
+        if(!list.isEmpty()){
+            BusProcessNew busProcessNew = list.get(0);
+            busProcessNew.setTaskId(delegateTask.getId());
+            busProcessNew.setTaskInfo(delegateTask.getName());
+            busProcessNew.setCommitText(object.getString("commentText"));
+            busBean.saveOrUpdate(busProcessNew);
+        }
 
-        if(nextUserList != null && !nextUserList.isEmpty()){
-            for(String nextUser : nextUserList){
-                BusProcessNew busProcessNewNext = new BusProcessNew();
-                busProcessNewNext.setMsgType("clause");
-                busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
-                busProcessNewNext.setMesg(object.toJSONString());
-                busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey());
-                busProcessNewNext.setFinishFlag("0");
-                busProcessNewNext.setTaskInfo(delegateTask.getName());
-                busProcessNewNext.setUserId(nextUser);
-                busProcessNewNext.setPrcName(prcName);
-                busBean.save(busProcessNewNext);
-            }
+        for(String nextUser : nextUserList){
+            BusProcessNew busProcessNewNext = new BusProcessNew();
+            busProcessNewNext.setMsgType("clause");
+            busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
+            busProcessNewNext.setMesg(object.toJSONString());
+            busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey());
+            busProcessNewNext.setFinishFlag("0");
+            busProcessNewNext.setTaskInfo(delegateTask.getName());
+            busProcessNewNext.setUserId(nextUser);
+            busProcessNewNext.setPrcName(prcName);
+            busBean.save(busProcessNewNext);
         }
     }
 

src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary3Before.java

@@ -21,7 +21,7 @@ public class BussLibrary3Before implements TaskListener{
     public void notify(DelegateTask delegateTask) {
         IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
         CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class);
-        QueryWrapper queryWrapper1 = new QueryWrapper();
+        QueryWrapper<BusProcessNew> queryWrapper1 = new QueryWrapper<>();
         queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());
         queryWrapper1.eq("USER_ID",delegateTask.getAssignee());
         queryWrapper1.isNull("TASK_ID");

src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary4After.java

@@ -1,6 +1,7 @@
 package com.ydw.bat.wkflow.listener.bussLibrary;
 
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName;
 import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew;
@@ -19,7 +20,7 @@ import java.util.Arrays;
 import java.util.List;
 
 /**
- *  标准化员审批后
+ *  初审，标准化员审批后
  */
 public class BussLibrary4After implements TaskListener{
     @Override
@@ -35,7 +36,7 @@ public class BussLibrary4After implements TaskListener{
         JSONObject object =  JSONObject.parseObject(datas.getFormValsJson());
         delegateTask.setVariable("objectJson",object);
 
-        List<String> nextUserList = new ArrayList();
+        List<String> nextUserList = new ArrayList<>();
 
         String approvalOpinion = object.get("approvalOpinion") == null ? "" : object.get("approvalOpinion").toString();
         String user = object.getString("prcCreateUser");
@@ -46,7 +47,7 @@ public class BussLibrary4After implements TaskListener{
         }else {
             prcName = "企标制修订";
         }
-        QueryWrapper queryWrapper2 = new QueryWrapper();
+        QueryWrapper<BusProcessName> queryWrapper2 = new QueryWrapper<>();
         queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
         BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
         if(one1!=null){
@@ -57,6 +58,14 @@ public class BussLibrary4After implements TaskListener{
             one1.setCreatUserName(username);
             busProcessNameService.saveOrUpdate(one1);
         }
+        LambdaQueryWrapper<BusProcessNew> queryWrapper1 = new LambdaQueryWrapper<>();
+        queryWrapper1.eq(BusProcessNew::getTaskId,delegateTask.getId());
+        List<BusProcessNew> list = busBean.list(queryWrapper1);
+        if (list.isEmpty()) {
+            throw new ActivitiException("流程实例不存在");
+        }
+        BusProcessNew busProcessNew = list.get(0);
+        busProcessNew.setCommitText(object.getString("commentText"));
 
         if(StringUtils.isNotBlank(approvalOpinion)){
             if ("0".equalsIgnoreCase(approvalOpinion)) {
@@ -68,7 +77,7 @@ public class BussLibrary4After implements TaskListener{
                         nextUserList.add(object.getString("hqUserId"));
                     }
 
-                    BussUtils.approvalFunc2(delegateTask, object, prcName, nextUserList);
+//                    BussUtils.approvalFunc2(delegateTask, object, prcName, nextUserList);
                     // 配置多实例
                     delegateTask.setVariable("hqUserList",nextUserList);
                     delegateTask.addCandidateUsers(nextUserList);
@@ -78,22 +87,39 @@ public class BussLibrary4After implements TaskListener{
                 }
             } else {
                 if(StringUtils.isNotBlank(object.getString("hzUserId"))) {
-                    BusProcessNew busProcessNew = new BusProcessNew();
-                    busProcessNew.setMsgType("clause");
-                    busProcessNew.setPId(delegateTask.getProcessInstanceId());
-                    busProcessNew.setMesg(object.toJSONString());
-                    busProcessNew.setFinishFlag("0");
-                    busProcessNew.setUserId(object.getString("hzUserId"));
-                    busProcessNew.setPrcName(prcName);
-                    busBean.save(busProcessNew);
+//                    BusProcessNew busProcessNew = new BusProcessNew();
+//                    busProcessNew.setMsgType("clause");
+//                    busProcessNew.setPId(delegateTask.getProcessInstanceId());
+//                    busProcessNew.setMesg(object.toJSONString());
+//                    busProcessNew.setFinishFlag("0");
+//                    busProcessNew.setUserId(object.getString("hzUserId"));
+//                    busProcessNew.setPrcName(prcName);
+//                    busBean.save(busProcessNew);
+                    busProcessNew.setFinishFlag("1");
 
-                    BussUtils.approvalFunc1(delegateTask, busBean, object, prcName,"1");
+//                    BussUtils.approvalFunc1(delegateTask, busBean, object, prcName,"1");
+                    nextUserList.add(object.getString("hzUserId"));
                     delegateTask.setVariable("chzUserId",object.getString("hzUserId"));
                     delegateTask.setVariable("bzhFlag", 1);
                 }else {
                     throw new ActivitiException("1#2汇总用户参数不存在,请配置相关用户");
                 }
             }
+
+            // 存储当前节点意见
+            busBean.saveOrUpdate(busProcessNew);
+            // 存储下一节点意见
+            for(String nextUser : nextUserList){
+                BusProcessNew busProcessNewNext = new BusProcessNew();
+                busProcessNewNext.setMsgType("clause");
+                busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
+                busProcessNewNext.setMesg(object.toJSONString());
+                busProcessNewNext.setFinishFlag("0");
+                busProcessNewNext.setTaskInfo(delegateTask.getName());
+                busProcessNewNext.setUserId(nextUser);
+                busProcessNewNext.setPrcName(prcName);
+                busBean.save(busProcessNewNext);
+            }
         }else {
             throw new ActivitiException("1#2 提交OR驳回参数不存在");
         }

src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary4Before.java

@@ -11,14 +11,14 @@ import org.activiti.engine.delegate.TaskListener;
 import java.util.List;
 
 /**
- *  标准化员审批前
+ *  初审，标准化员审批前
  */
 public class BussLibrary4Before implements TaskListener{
     @Override
     public void notify(DelegateTask delegateTask) {
         IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
         CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class);
-        QueryWrapper queryWrapper1 = new QueryWrapper();
+        QueryWrapper<BusProcessNew> queryWrapper1 = new QueryWrapper<>();
         queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());
         queryWrapper1.eq("USER_ID",delegateTask.getAssignee());
         queryWrapper1.isNull("TASK_ID");

src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary5After.java

@@ -2,6 +2,7 @@ package com.ydw.bat.wkflow.listener.bussLibrary;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessEvaluationHis;
 import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName;
@@ -42,7 +43,7 @@ public class BussLibrary5After implements TaskListener{
         JSONObject object =  JSONObject.parseObject(datasList.get(0).getFormValsJson());
         delegateTask.setVariable("objectJson",object);
 
-        List<String> nextUserList = new ArrayList();
+        List<String> nextUserList = new ArrayList<>();
 
         JSONArray ideaList =delegateTask.getVariable("ideaList", JSONArray.class);
         if (ideaList==null) {
@@ -68,7 +69,7 @@ public class BussLibrary5After implements TaskListener{
         }else {
             prcName = "企标制修订";
         }
-        QueryWrapper queryWrapper2 = new QueryWrapper();
+        QueryWrapper<BusProcessName> queryWrapper2 = new QueryWrapper<>();
         queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
         BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
         if(one1!=null){
@@ -81,33 +82,42 @@ public class BussLibrary5After implements TaskListener{
         }
 
         // 存储当前节点意见
-        BusProcessNew busProcessNew = new BusProcessNew();
-        busProcessNew.setMsgType("clause");
-        busProcessNew.setPId(delegateTask.getProcessInstanceId());
-        busProcessNew.setMesg(object.toJSONString());
-        busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey());
-        busProcessNew.setTaskId(delegateTask.getId());
-        busProcessNew.setCommitText(object.getString("commentText"));
-        busProcessNew.setFinishFlag("0");
-        busProcessNew.setTaskInfo(delegateTask.getName());
-        busBean.save(busProcessNew);
+        LambdaQueryWrapper<BusProcessNew> queryWrapper1 = new LambdaQueryWrapper<>();
+        queryWrapper1.eq(BusProcessNew::getTaskId,delegateTask.getId());
+        List<BusProcessNew> list = busBean.list(queryWrapper1);
+        if(!list.isEmpty()){
+            BusProcessNew busProcessNew = list.get(0);
+            busProcessNew.setTaskId(delegateTask.getId());
+            busProcessNew.setTaskInfo(delegateTask.getName());
+            busProcessNew.setCommitText(object.getString("commentText"));
+            busBean.saveOrUpdate(busProcessNew);
+        }
+        // 存储当前节点意见
+//        BusProcessNew busProcessNew = new BusProcessNew();
+//        busProcessNew.setMsgType("clause");
+//        busProcessNew.setPId(delegateTask.getProcessInstanceId());
+//        busProcessNew.setMesg(object.toJSONString());
+//        busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey());
+//        busProcessNew.setTaskId(delegateTask.getId());
+//        busProcessNew.setCommitText(object.getString("commentText"));
+//        busProcessNew.setFinishFlag("0");
+//        busProcessNew.setTaskInfo(delegateTask.getName());
+//        busBean.save(busProcessNew);
 
         // 评分存储
         BussUtils.evalSave(delegateTask, object, prcName, delegateTask.getAssignee());
 
-        if(nextUserList != null && !nextUserList.isEmpty()){
-            for(String nextUser : nextUserList){
-                BusProcessNew busProcessNewNext = new BusProcessNew();
-                busProcessNewNext.setMsgType("clause");
-                busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
-                busProcessNewNext.setMesg(object.toJSONString());
-                busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey());
-                busProcessNewNext.setFinishFlag("0");
-                busProcessNewNext.setTaskInfo(delegateTask.getName());
-                busProcessNewNext.setUserId(nextUser);
-                busProcessNewNext.setPrcName(prcName);
-                busBean.save(busProcessNewNext);
-            }
+        for(String nextUser : nextUserList){
+            BusProcessNew busProcessNewNext = new BusProcessNew();
+            busProcessNewNext.setMsgType("clause");
+            busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
+            busProcessNewNext.setMesg(object.toJSONString());
+            busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey());
+            busProcessNewNext.setFinishFlag("0");
+            busProcessNewNext.setTaskInfo(delegateTask.getName());
+            busProcessNewNext.setUserId(nextUser);
+            busProcessNewNext.setPrcName(prcName);
+            busBean.save(busProcessNewNext);
         }
     }
 

src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary5Before.java

@@ -19,7 +19,7 @@ public class BussLibrary5Before implements TaskListener{
     public void notify(DelegateTask delegateTask) {
         IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
         CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class);
-        QueryWrapper queryWrapper1 = new QueryWrapper();
+        QueryWrapper<BusProcessNew> queryWrapper1 = new QueryWrapper<>();
         queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());
         queryWrapper1.eq("USER_ID",delegateTask.getAssignee());
         queryWrapper1.isNull("TASK_ID");

src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary6After.java

@@ -1,6 +1,7 @@
 package com.ydw.bat.wkflow.listener.bussLibrary;
 
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName;
 import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew;
@@ -34,7 +35,7 @@ public class BussLibrary6After implements TaskListener{
         JSONObject object =  JSONObject.parseObject(datas.getFormValsJson());
         delegateTask.setVariable("objectJson",object);
 
-        List<String> nextUserList = new ArrayList();
+        List<String> nextUserList = new ArrayList<>();
 
         if(StringUtils.isNotBlank(object.getString("fggcsUserId"))){
             delegateTask.setVariable("fggcsUserId",object.getString("fggcsUserId"));
@@ -52,7 +53,7 @@ public class BussLibrary6After implements TaskListener{
         }else {
             prcName = "企标制修订";
         }
-        QueryWrapper queryWrapper2 = new QueryWrapper();
+        QueryWrapper<BusProcessName> queryWrapper2 = new QueryWrapper<>();
         queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
         BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
         if(one1!=null){
@@ -65,33 +66,42 @@ public class BussLibrary6After implements TaskListener{
         }
 
         // 存储当前节点意见
-        BusProcessNew busProcessNew = new BusProcessNew();
-        busProcessNew.setMsgType("clause");
-        busProcessNew.setPId(delegateTask.getProcessInstanceId());
-        busProcessNew.setMesg(object.toJSONString());
-        busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey());
-        busProcessNew.setTaskId(delegateTask.getId());
-        busProcessNew.setCommitText(object.getString("commentText"));
-        busProcessNew.setFinishFlag("0");
-        busProcessNew.setTaskInfo(delegateTask.getName());
-        busBean.save(busProcessNew);
-
-        if(nextUserList != null && !nextUserList.isEmpty()){
-            for(String nextUser : nextUserList){
-                BusProcessNew busProcessNewNext = new BusProcessNew();
-                busProcessNewNext.setMsgType("clause");
-                busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
-                busProcessNewNext.setMesg(object.toJSONString());
-                busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey());
-                busProcessNewNext.setFinishFlag("0");
-                busProcessNewNext.setTaskInfo(delegateTask.getName());
-                busProcessNewNext.setUserId(nextUser);
-                busProcessNewNext.setPrcName(prcName);
-                busBean.save(busProcessNewNext);
-            }
-            // 评分存储
-            BussUtils.evalSave(delegateTask, object, prcName, delegateTask.getAssignee());
+//        BusProcessNew busProcessNew = new BusProcessNew();
+//        busProcessNew.setMsgType("clause");
+//        busProcessNew.setPId(delegateTask.getProcessInstanceId());
+//        busProcessNew.setMesg(object.toJSONString());
+//        busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey());
+//        busProcessNew.setTaskId(delegateTask.getId());
+//        busProcessNew.setCommitText(object.getString("commentText"));
+//        busProcessNew.setFinishFlag("0");
+//        busProcessNew.setTaskInfo(delegateTask.getName());
+//        busBean.save(busProcessNew);
+        // 存储当前节点意见
+        LambdaQueryWrapper<BusProcessNew> queryWrapper1 = new LambdaQueryWrapper<>();
+        queryWrapper1.eq(BusProcessNew::getTaskId,delegateTask.getId());
+        List<BusProcessNew> list = busBean.list(queryWrapper1);
+        if(!list.isEmpty()){
+            BusProcessNew busProcessNew = list.get(0);
+            busProcessNew.setTaskId(delegateTask.getId());
+            busProcessNew.setTaskInfo(delegateTask.getName());
+            busProcessNew.setCommitText(object.getString("commentText"));
+            busBean.saveOrUpdate(busProcessNew);
         }
+
+        for(String nextUser : nextUserList){
+            BusProcessNew busProcessNewNext = new BusProcessNew();
+            busProcessNewNext.setMsgType("clause");
+            busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
+            busProcessNewNext.setMesg(object.toJSONString());
+            busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey());
+            busProcessNewNext.setFinishFlag("0");
+            busProcessNewNext.setTaskInfo(delegateTask.getName());
+            busProcessNewNext.setUserId(nextUser);
+            busProcessNewNext.setPrcName(prcName);
+            busBean.save(busProcessNewNext);
+        }
+        // 评分存储
+        BussUtils.evalSave(delegateTask, object, prcName, delegateTask.getAssignee());
     }
 
     private String verifyObj(String str){

src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary6Before.java

@@ -21,7 +21,7 @@ public class BussLibrary6Before implements TaskListener{
     public void notify(DelegateTask delegateTask) {
         IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
         CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class);
-        QueryWrapper queryWrapper1 = new QueryWrapper();
+        QueryWrapper<BusProcessNew> queryWrapper1 = new QueryWrapper<>();
         queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());
         queryWrapper1.eq("USER_ID",delegateTask.getAssignee());
         queryWrapper1.isNull("TASK_ID");

src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary7After.java

@@ -2,6 +2,7 @@ package com.ydw.bat.wkflow.listener.bussLibrary;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessEvaluationHis;
 import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName;
@@ -42,7 +43,7 @@ public class BussLibrary7After implements TaskListener{
         JSONObject object =  JSONObject.parseObject(datas.getFormValsJson());
         delegateTask.setVariable("objectJson",object);
 
-        List<String> nextUserList = new ArrayList();
+        List<String> nextUserList = new ArrayList<>();
 
         //截止时间 流程描述 创建人
         String approvalOpinion = object.get("approvalOpinion") == null ? "" : object.get("approvalOpinion").toString();
@@ -54,7 +55,7 @@ public class BussLibrary7After implements TaskListener{
         }else {
             prcName = "企标制修订";
         }
-        QueryWrapper queryWrapper2 = new QueryWrapper();
+        QueryWrapper<BusProcessName> queryWrapper2 = new QueryWrapper<>();
         queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
         BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
         if(one1!=null){
@@ -66,24 +67,34 @@ public class BussLibrary7After implements TaskListener{
             busProcessNameService.saveOrUpdate(one1);
         }
 
+        // 评分存储
+        if(StringUtils.isBlank(object.getString("fsRejectStatus")) || object.getString("fsRejectStatus").equalsIgnoreCase("2")){
+            BussUtils.evalSave(delegateTask, object, prcName, delegateTask.getAssignee());
+        }
+
         if(StringUtils.isNotBlank(approvalOpinion)){
+            // 通过
             if ("0".equalsIgnoreCase(approvalOpinion)) {
                 if(StringUtils.isNotBlank(object.getString("jsfzrUserId"))){
 
                     delegateTask.setVariable("jsfzrUserId",object.getString("jsfzrUserId"));
                     nextUserList.add(object.getString("jsfzrUserId"));
 
-                    BussUtils.approvalFunc2(delegateTask, object, prcName, nextUserList);
-                    // 评分存储
-                    if(StringUtils.isBlank(object.getString("fsRejectStatus")) || object.getString("fsRejectStatus").equalsIgnoreCase("2")){
-                        BussUtils.evalSave(delegateTask, object, prcName, delegateTask.getAssignee());
-                    }
+//                    BussUtils.approvalFunc2(delegateTask, object, prcName, nextUserList);
+//                     // 评分存储
+//                    if(StringUtils.isBlank(object.getString("fsRejectStatus")) || object.getString("fsRejectStatus").equalsIgnoreCase("2")){
+//                        BussUtils.evalSave(delegateTask, object, prcName, delegateTask.getAssignee());
+//                    }
+
+                    // 存储当前节点意见
+                    BussUtils.approvalFunc3(delegateTask, object, prcName, nextUserList);
 
                     delegateTask.setVariable("fs7Flag", 0);
                 }else {
                     throw new ActivitiException("1#2部长用户参数不存在,请配置相关用户");
                 }
             } else {
+                // 驳回
                 if(StringUtils.isNotBlank(object.getString("xdUserId"))) {
                     BusProcessNew busProcessNew = new BusProcessNew();
                     busProcessNew.setMsgType("clause");
@@ -108,34 +119,36 @@ public class BussLibrary7After implements TaskListener{
         }
 
         // 存储当前节点意见
-        BusProcessNew busProcessNew = new BusProcessNew();
-        busProcessNew.setMsgType("clause");
-        busProcessNew.setPId(delegateTask.getProcessInstanceId());
-        busProcessNew.setMesg(object.toJSONString());
-        busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey());
-        busProcessNew.setTaskId(delegateTask.getId());
-        busProcessNew.setCommitText(object.getString("commentText"));
-        busProcessNew.setFinishFlag("0");
-        busProcessNew.setTaskInfo(delegateTask.getName());
-        busBean.save(busProcessNew);
+//        BusProcessNew busProcessNew = new BusProcessNew();
+//        busProcessNew.setMsgType("clause");
+//        busProcessNew.setPId(delegateTask.getProcessInstanceId());
+//        busProcessNew.setMesg(object.toJSONString());
+//        busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey());
+//        busProcessNew.setTaskId(delegateTask.getId());
+//        busProcessNew.setCommitText(object.getString("commentText"));
+//        busProcessNew.setFinishFlag("0");
+//        busProcessNew.setTaskInfo(delegateTask.getName());
+//        busBean.save(busProcessNew);
 
+        // 存储当前节点意见
+//        busBean.saveOrUpdate(busProcessNew);
         // 评分存储
-        BussUtils.evalSave(delegateTask, object, prcName, delegateTask.getAssignee());
+//        BussUtils.evalSave(delegateTask, object, prcName, delegateTask.getAssignee());
 
-        if(nextUserList != null && !nextUserList.isEmpty()){
-            for(String nextUser : nextUserList){
-                BusProcessNew busProcessNewNext = new BusProcessNew();
-                busProcessNewNext.setMsgType("clause");
-                busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
-                busProcessNewNext.setMesg(object.toJSONString());
-                busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey());
-                busProcessNewNext.setFinishFlag("0");
-                busProcessNewNext.setTaskInfo(delegateTask.getName());
-                busProcessNewNext.setUserId(nextUser);
-                busProcessNewNext.setPrcName(prcName);
-                busBean.save(busProcessNewNext);
-            }
-        }
+//        if(nextUserList != null && !nextUserList.isEmpty()){
+//            for(String nextUser : nextUserList){
+//                BusProcessNew busProcessNewNext = new BusProcessNew();
+//                busProcessNewNext.setMsgType("clause");
+//                busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
+//                busProcessNewNext.setMesg(object.toJSONString());
+//                busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey());
+//                busProcessNewNext.setFinishFlag("0");
+//                busProcessNewNext.setTaskInfo(delegateTask.getName());
+//                busProcessNewNext.setUserId(nextUser);
+//                busProcessNewNext.setPrcName(prcName);
+//                busBean.save(busProcessNewNext);
+//            }
+//        }
     }
 
     private String verifyObj(String str){

src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary7Before.java

@@ -18,7 +18,7 @@ public class BussLibrary7Before implements TaskListener{
     public void notify(DelegateTask delegateTask) {
         IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
         CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class);
-        QueryWrapper queryWrapper1 = new QueryWrapper();
+        QueryWrapper<BusProcessNew> queryWrapper1 = new QueryWrapper<>();
         queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());
         queryWrapper1.eq("USER_ID",delegateTask.getAssignee());
         queryWrapper1.isNull("TASK_ID");

src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary8After.java

@@ -1,6 +1,7 @@
 package com.ydw.bat.wkflow.listener.bussLibrary;
 
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName;
 import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew;
@@ -34,7 +35,7 @@ public class BussLibrary8After implements TaskListener{
         JSONObject object =  JSONObject.parseObject(datas.getFormValsJson());
         delegateTask.setVariable("objectJson",object);
 
-        List<String> nextUserList = new ArrayList();
+        List<String> nextUserList = new ArrayList<>();
 
         String approvalOpinion = object.get("approvalOpinion") == null ? "" : object.get("approvalOpinion").toString();
         String user = object.getString("prcCreateUser");
@@ -45,7 +46,8 @@ public class BussLibrary8After implements TaskListener{
         }else {
             prcName = "企标制修订";
         }
-        QueryWrapper queryWrapper2 = new QueryWrapper();
+
+        QueryWrapper<BusProcessName> queryWrapper2 = new QueryWrapper<>();
         queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
         BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
         if(one1!=null){
@@ -64,7 +66,8 @@ public class BussLibrary8After implements TaskListener{
                     delegateTask.setVariable("bzUserId",object.getString("bzUserId"));
                     nextUserList.add(object.getString("bzUserId"));
 
-                    BussUtils.approvalFunc2(delegateTask, object, prcName, nextUserList);
+//                    BussUtils.approvalFunc2(delegateTask, object, prcName, nextUserList);
+                    BussUtils.approvalFunc3(delegateTask, object, prcName, nextUserList);
                     delegateTask.setVariable("jsfzrFlag", 0);
                 }else {
                     throw new ActivitiException("1#2部长用户参数不存在,请配置相关用户");

src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary8Before.java

@@ -18,7 +18,7 @@ public class BussLibrary8Before implements TaskListener{
     public void notify(DelegateTask delegateTask) {
         IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
         CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class);
-        QueryWrapper queryWrapper1 = new QueryWrapper();
+        QueryWrapper<BusProcessNew> queryWrapper1 = new QueryWrapper<>();
         queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());
         queryWrapper1.eq("USER_ID",delegateTask.getAssignee());
         queryWrapper1.isNull("TASK_ID");

src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary9After.java

@@ -1,6 +1,7 @@
 package com.ydw.bat.wkflow.listener.bussLibrary;
 
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName;
 import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew;
@@ -34,7 +35,7 @@ public class BussLibrary9After implements TaskListener{
         JSONObject object =  JSONObject.parseObject(datas.getFormValsJson());
         delegateTask.setVariable("objectJson",object);
 
-        List<String> nextUserList = new ArrayList();
+        List<String> nextUserList = new ArrayList<>();
 
         String approvalOpinion = object.get("approvalOpinion") == null ? "" : object.get("approvalOpinion").toString();
         String user = object.getString("prcCreateUser");
@@ -45,7 +46,7 @@ public class BussLibrary9After implements TaskListener{
         }else {
             prcName = "企标制修订";
         }
-        QueryWrapper queryWrapper2 = new QueryWrapper();
+        QueryWrapper<BusProcessName> queryWrapper2 = new QueryWrapper<>();
         queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
         BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
         if(one1!=null){
@@ -64,8 +65,31 @@ public class BussLibrary9After implements TaskListener{
                     delegateTask.setVariable("fzrUserId",object.getString("fzrUserId"));
                     nextUserList.add(object.getString("fzrUserId"));
 
-                    BussUtils.approvalFunc2(delegateTask, object, prcName, nextUserList);
+//                    BussUtils.approvalFunc2(delegateTask, object, prcName, nextUserList);
 
+                    LambdaQueryWrapper<BusProcessNew> queryWrapper1 = new LambdaQueryWrapper<>();
+                    queryWrapper1.eq(BusProcessNew::getTaskId,delegateTask.getId());
+                    List<BusProcessNew> list = busBean.list(queryWrapper1);
+                    if (list.isEmpty()) {
+                        throw new ActivitiException("流程实例不存在");
+                    }
+                    // 当前节点
+                    BusProcessNew busProcessNew = list.get(0);
+                    busProcessNew.setCommitText(object.getString("commentText"));
+                    busProcessNew.setTaskId(delegateTask.getName());
+                    busBean.saveOrUpdate(busProcessNew);
+                    // 下一个节点
+                    for(String nextUser : nextUserList){
+                        BusProcessNew busProcessNewNext = new BusProcessNew();
+                        busProcessNewNext.setMsgType("clause");
+                        busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
+                        busProcessNewNext.setMesg(object.toJSONString());
+                        busProcessNewNext.setFinishFlag("0");
+                        busProcessNewNext.setTaskInfo(delegateTask.getName());
+                        busProcessNewNext.setUserId(nextUser);
+                        busProcessNewNext.setPrcName(prcName);
+                        busBean.save(busProcessNewNext);
+                    }
                     // 评分存储
                     if(StringUtils.isBlank(object.getString("fsRejectStatus")) || object.getString("fsRejectStatus").equalsIgnoreCase("2")){
                         BussUtils.evalSave(delegateTask, object, prcName, delegateTask.getAssignee());

src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary9Before.java

@@ -18,7 +18,7 @@ public class BussLibrary9Before implements TaskListener{
     public void notify(DelegateTask delegateTask) {
         IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
         CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class);
-        QueryWrapper queryWrapper1 = new QueryWrapper();
+        QueryWrapper<BusProcessNew> queryWrapper1 = new QueryWrapper<>();
         queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());
         queryWrapper1.eq("USER_ID",delegateTask.getAssignee());
         queryWrapper1.isNull("TASK_ID");

src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibraryC3After.java

@@ -1,6 +1,7 @@
 package com.ydw.bat.wkflow.listener.bussLibrary;
 
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName;
 import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew;
@@ -20,9 +21,9 @@ import java.util.Date;
 import java.util.List;
 
 /**
- *  重新企标汇总修订后
+ * 重新企标汇总修订后
  */
-public class BussLibraryC3After implements TaskListener{
+public class BussLibraryC3After implements TaskListener {
     @Override
     public void notify(DelegateTask delegateTask) {
         IDatasService datasService = SpringContextUtil.getBean(IDatasService.class);
@@ -33,81 +34,75 @@ public class BussLibraryC3After implements TaskListener{
         queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId());
         Datas datas = datasService.getOne(queryWrapper);
 
-        JSONObject objectNew =  JSONObject.parseObject(datas.getFormValsJson());
+        JSONObject objectNew = JSONObject.parseObject(datas.getFormValsJson());
 //        delegateTask.setVariable("objectJson",object);
 
-        QueryWrapper queryWrapper1 = new QueryWrapper();
-        queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());
-        queryWrapper1.eq("USER_ID",delegateTask.getAssignee());
-        queryWrapper1.eq("TASK_ID",delegateTask.getId());
-        List<BusProcessNew> list = busBean.list(queryWrapper1);
-        if(!list.isEmpty()){
-            BusProcessNew one = list.get(0);
-            List<String> nextUserList = new ArrayList();
+//        QueryWrapper<BusProcessNew> queryWrapper1 = new QueryWrapper<>();
+//        queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());
+//        queryWrapper1.eq("USER_ID",delegateTask.getAssignee());
+//        queryWrapper1.eq("TASK_ID",delegateTask.getId());
+//        List<BusProcessNew> list = busBean.list(queryWrapper1);
+//            BusProcessNew one = list.get(0);
+        List<String> nextUserList = new ArrayList<>();
 
-            if(StringUtils.isNotBlank(objectNew.getString("bzhUserId"))){
-                delegateTask.setVariable("bzhUserId",objectNew.getString("bzhUserId"));
-                nextUserList.add(objectNew.getString("bzhUserId"));
-            }else {
-                throw new ActivitiException("1#2标准化员不存在,请配置相关人员");
-            }
+        if (StringUtils.isNotBlank(objectNew.getString("bzhUserId"))) {
+            delegateTask.setVariable("bzhUserId", objectNew.getString("bzhUserId"));
+            nextUserList.add(objectNew.getString("bzhUserId"));
+        } else {
+            throw new ActivitiException("1#2标准化员不存在,请配置相关人员");
+        }
 
 
-
-            //截止时间 流程描述 创建人
-            String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
-            String user = objectNew.getString("prcCreateUser");
-            String username = objectNew.getString("prcCreateUserName");
+        //截止时间 流程描述 创建人
+        String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
+        String user = objectNew.getString("prcCreateUser");
+        String username = objectNew.getString("prcCreateUserName");
 //        object.getString("standName")
-            String standName = "";
-            String prcName = "";
-            if(StringUtils.isNotBlank(objectNew.getString("standName")) && StringUtils.isNotBlank(objectNew.getString("standSort"))){
-                prcName = objectNew.getString("standSort")+"-"+objectNew.getString("standName") + "-企标制修订";
-            }else {
-                prcName = "企标制修订";
-            }
-            QueryWrapper queryWrapper2 = new QueryWrapper();
-            queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
-            BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
-            if(one1!=null){
+        String standName = "";
+        String prcName = "";
+        if (StringUtils.isNotBlank(objectNew.getString("standName")) && StringUtils.isNotBlank(objectNew.getString("standSort"))) {
+            prcName = objectNew.getString("standSort") + "-" + objectNew.getString("standName") + "-企标制修订";
+        } else {
+            prcName = "企标制修订";
+        }
+        QueryWrapper<BusProcessName> queryWrapper2 = new QueryWrapper<>();
+        queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
+        BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
+        if (one1 != null) {
 //            one1.setOverTime(OVERTIME);
-                one1.setPrcType("buss1");
-                one1.setPrcName(prcName);
-                one1.setCreatUser(user);
-                one1.setCreatUserName(username);
-                busProcessNameService.saveOrUpdate(one1);
-            }
+            one1.setPrcType("buss1");
+            one1.setPrcName(prcName);
+            one1.setCreatUser(user);
+            one1.setCreatUserName(username);
+            busProcessNameService.saveOrUpdate(one1);
+        }
 
-            // 存储当前节点意见
+        // 存储当前节点意见
+        LambdaQueryWrapper<BusProcessNew> queryWrapper1 = new LambdaQueryWrapper<>();
+        queryWrapper1.eq(BusProcessNew::getTaskId, delegateTask.getId());
+        List<BusProcessNew> list = busBean.list(queryWrapper1);
+        if (list.isEmpty()) {
+            throw new ActivitiException("流程实例不存在");
+        }
+        // 当前节点
+        BusProcessNew busProcessNew = list.get(0);
+        busProcessNew.setCommitText(objectNew.getString("commentText"));
+        busProcessNew.setTaskId(delegateTask.getId());
+        busBean.saveOrUpdate(busProcessNew);
 
-            BusProcessNew busProcessNew = new BusProcessNew();
-            busProcessNew.setId(one.getId());
-            busProcessNew.setMsgType("clause");
-            busProcessNew.setPId(delegateTask.getProcessInstanceId());
-            busProcessNew.setMesg(objectNew.toJSONString());
-            busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey());
-            busProcessNew.setTaskId(delegateTask.getId());
-            busProcessNew.setCommitText(objectNew.getString("commentText"));
-            busProcessNew.setFinishFlag("0");
-            busProcessNew.setTaskInfo(delegateTask.getName());
-            busBean.saveOrUpdate(busProcessNew);
-
-            if(nextUserList != null && !nextUserList.isEmpty()){
-                for(String nextUser : nextUserList){
-                    BusProcessNew busProcessNewNext = new BusProcessNew();
-                    busProcessNewNext.setMsgType("clause");
-                    busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
-                    busProcessNewNext.setMesg(objectNew.toJSONString());
-                    busProcessNewNext.setFinishFlag("0");
-                    busProcessNewNext.setUserId(nextUser);
-                    busProcessNewNext.setPrcName(prcName);
-                    busBean.save(busProcessNewNext);
-                }
-            }
+        for (String nextUser : nextUserList) {
+            BusProcessNew busProcessNewNext = new BusProcessNew();
+            busProcessNewNext.setMsgType("clause");
+            busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
+            busProcessNewNext.setMesg(objectNew.toJSONString());
+            busProcessNewNext.setFinishFlag("0");
+            busProcessNewNext.setUserId(nextUser);
+            busProcessNewNext.setPrcName(prcName);
+            busBean.save(busProcessNewNext);
         }
     }
 
-    private String verifyObj(String str){
+    private String verifyObj(String str) {
         return (str == null || str.equals("")) ? "" : str;
     }
 }

src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibraryC3Before.java

@@ -18,7 +18,7 @@ public class BussLibraryC3Before implements TaskListener{
     public void notify(DelegateTask delegateTask) {
         IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
         CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class);
-        QueryWrapper queryWrapper1 = new QueryWrapper();
+        QueryWrapper<BusProcessNew> queryWrapper1 = new QueryWrapper<>();
         queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());
         queryWrapper1.eq("USER_ID",delegateTask.getAssignee());
         queryWrapper1.isNull("TASK_ID");

src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibraryC6After.java

@@ -36,14 +36,14 @@ public class BussLibraryC6After implements TaskListener{
         JSONObject objectNew =  JSONObject.parseObject(datas.getFormValsJson());
 //        delegateTask.setVariable("objectJson",object);
 
-        QueryWrapper queryWrapper1 = new QueryWrapper();
+        QueryWrapper<BusProcessNew> queryWrapper1 = new QueryWrapper<>();
         queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());
         queryWrapper1.eq("USER_ID",delegateTask.getAssignee());
         queryWrapper1.eq("TASK_ID",delegateTask.getId());
         List<BusProcessNew> list = busBean.list(queryWrapper1);
         if(!list.isEmpty()){
             BusProcessNew one = list.get(0);
-            List<String> nextUserList = new ArrayList();
+            List<String> nextUserList = new ArrayList<>();
 
             if(StringUtils.isNotBlank(objectNew.getString("fggcsUserId"))){
                 delegateTask.setVariable("fggcsUserId",objectNew.getString("fggcsUserId"));
@@ -66,7 +66,7 @@ public class BussLibraryC6After implements TaskListener{
             }else {
                 prcName = "企标制修订";
             }
-            QueryWrapper queryWrapper2 = new QueryWrapper();
+            QueryWrapper<BusProcessName> queryWrapper2 = new QueryWrapper<>();
             queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
             BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
             if(one1!=null){
@@ -79,33 +79,33 @@ public class BussLibraryC6After implements TaskListener{
             }
 
             // 存储当前节点意见
-            BusProcessNew busProcessNew = new BusProcessNew();
-            busProcessNew.setId(one.getId());
-            busProcessNew.setMsgType("clause");
-            busProcessNew.setPId(delegateTask.getProcessInstanceId());
-            busProcessNew.setMesg(objectNew.toJSONString());
-            busProcessNew.setTaskId(delegateTask.getId());
-            busProcessNew.setCommitText(objectNew.getString("commentText"));
-            busProcessNew.setFinishFlag("0");
-            busProcessNew.setTaskInfo(delegateTask.getName());
-            busBean.saveOrUpdate(busProcessNew);
+//            BusProcessNew busProcessNew = new BusProcessNew();
+//            busProcessNew.setId(one.getId());
+//            busProcessNew.setMsgType("clause");
+//            busProcessNew.setPId(delegateTask.getProcessInstanceId());
+//            busProcessNew.setMesg(objectNew.toJSONString());
+//            busProcessNew.setTaskId(delegateTask.getId());
+//            busProcessNew.setCommitText(objectNew.getString("commentText"));
+//            busProcessNew.setFinishFlag("0");
+//            busProcessNew.setTaskInfo(delegateTask.getName());
+            one.setCommitText(objectNew.getString("commentText"));
+            one.setMesg(objectNew.toJSONString());
+            busBean.saveOrUpdate(one);
 
-            if(nextUserList != null && !nextUserList.isEmpty()){
-                for(String nextUser : nextUserList){
-                    BusProcessNew busProcessNewNext = new BusProcessNew();
-                    busProcessNewNext.setMsgType("clause");
-                    busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
-                    busProcessNewNext.setMesg(objectNew.toJSONString());
-                    busProcessNewNext.setFinishFlag("0");
-                    busProcessNewNext.setTaskInfo(delegateTask.getName());
-                    busProcessNewNext.setUserId(nextUser);
-                    busProcessNewNext.setPrcName(prcName);
-                    busBean.save(busProcessNewNext);
-                }
-                // 评分存储
-                if(StringUtils.isBlank(objectNew.getString("fsRejectStatus")) || objectNew.getString("fsRejectStatus").equalsIgnoreCase("2")) {
-                    BussUtils.evalSave(delegateTask, objectNew, prcName, delegateTask.getAssignee());
-                }
+            for(String nextUser : nextUserList){
+                BusProcessNew busProcessNewNext = new BusProcessNew();
+                busProcessNewNext.setMsgType("clause");
+                busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
+                busProcessNewNext.setMesg(objectNew.toJSONString());
+                busProcessNewNext.setFinishFlag("0");
+                busProcessNewNext.setTaskInfo(delegateTask.getName());
+                busProcessNewNext.setUserId(nextUser);
+                busProcessNewNext.setPrcName(prcName);
+                busBean.save(busProcessNewNext);
+            }
+            // 评分存储
+            if(StringUtils.isBlank(objectNew.getString("fsRejectStatus")) || objectNew.getString("fsRejectStatus").equalsIgnoreCase("2")) {
+                BussUtils.evalSave(delegateTask, objectNew, prcName, delegateTask.getAssignee());
             }
         }
     }

src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibraryC6Before.java

@@ -18,7 +18,7 @@ public class BussLibraryC6Before implements TaskListener{
     public void notify(DelegateTask delegateTask) {
         IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
         CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class);
-        QueryWrapper queryWrapper1 = new QueryWrapper();
+        QueryWrapper<BusProcessNew> queryWrapper1 = new QueryWrapper<>();
         queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());
         queryWrapper1.eq("USER_ID",delegateTask.getAssignee());
         queryWrapper1.isNull("TASK_ID");

src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussUtils.java

@@ -1,6 +1,7 @@
 package com.ydw.bat.wkflow.listener.bussLibrary;
 
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessEvaluationHis;
 import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName;
@@ -9,6 +10,7 @@ import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessEvaluationHisSe
 import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNameService;
 import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService;
 import com.ydw.bat.wkflow.util.SpringContextUtil;
+import org.activiti.engine.ActivitiException;
 import org.activiti.engine.delegate.DelegateTask;
 
 import java.text.SimpleDateFormat;
@@ -165,4 +167,38 @@ public class BussUtils {
         }
 
     }
+
+    public static void approvalFunc3(DelegateTask delegateTask, JSONObject object, String prcName, List<String> nextUserList) {
+        IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
+
+        // 存储当前节点意见
+        LambdaQueryWrapper<BusProcessNew> queryWrapper1 = new LambdaQueryWrapper<>();
+        queryWrapper1.eq(BusProcessNew::getTaskId,delegateTask.getId());
+        List<BusProcessNew> list = busBean.list(queryWrapper1);
+        if (list.isEmpty()) {
+            throw new ActivitiException("流程实例不存在");
+        }
+        // 当前节点
+        BusProcessNew busProcessNew = list.get(0);
+        busProcessNew.setCommitText(object.getString("commentText"));
+        busProcessNew.setTaskId(delegateTask.getId());
+        busProcessNew.setTaskInfo(delegateTask.getName());
+        busBean.saveOrUpdate(busProcessNew);
+
+        // 下一个节点
+        if(nextUserList != null && !nextUserList.isEmpty()){
+            for(String nextUser : nextUserList){
+                BusProcessNew busProcessNewNext = new BusProcessNew();
+                busProcessNewNext.setMsgType("clause");
+                busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
+                busProcessNewNext.setMesg(object.toJSONString());
+                busProcessNewNext.setFinishFlag("0");
+                busProcessNewNext.setTaskInfo(delegateTask.getName());
+                busProcessNewNext.setUserId(nextUser);
+                busProcessNewNext.setPrcName(prcName);
+                busBean.save(busProcessNewNext);
+            }
+        }
+
+    }
 }

src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct12After.java

@@ -34,6 +34,16 @@ public class BussLibraryProduct12After implements TaskListener{
         Datas datas = datasService.getOne(queryWrapper);
 
         JSONObject object =  JSONObject.parseObject(datas.getFormValsJson());
+        // 确保企标编号出错问题 进行修复
+        if (object.get("standCode") != null) {
+            String standCode = object.get("standCode").toString();
+            if (object.get("standSort") != null && object.get("standNumber") != null && object.get("standYear") != null) {
+                String newStandCode = object.get("standSort").toString() + object.get("standNumber").toString() + "-" + object.get("standYear").toString();
+                if (!standCode.replace(" ", "").equals(newStandCode)) {
+                    object.put("standCode",newStandCode);
+                }
+            }
+        }
         delegateTask.setVariable("objectJson",object);
 
         List<String> nextUserList = new ArrayList();

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

@@ -54,8 +54,8 @@ public class ProcessstartAfter implements TaskListener {
             delegateTask.setVariable("Step3", object.getString("approver")); // 批准人员
 
         } else {
-            nextUserList.add(object.getString("prcCreateUser"));
-            delegateTask.setVariable("createUser",object.getString("prcCreateUser")); // 技术标准起草人员
+            nextUserList.add(object.getString("drafter"));
+            delegateTask.setVariable("createUser",object.getString("drafter")); // 技术标准起草人员
             delegateTask.setVariable("addFlag", object.getString("addFlag"));
 
             // 处理 oaFlag 为待办

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

@@ -90,16 +90,18 @@ public class InspectorApprovalAfter implements TaskListener {
             busProcessNameService.saveOrUpdate(one1);
         }
 
-        for (String nextUser : nextUserList) {
-            BusProcessNew busProcessNewNext = new BusProcessNew();
-            busProcessNewNext.setMsgType("clause");
-            busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
-            busProcessNewNext.setMesg(object.toJSONString());
-            busProcessNewNext.setFinishFlag("0");
-            busProcessNewNext.setTaskInfo(taskInfo);
-            busProcessNewNext.setUserId(nextUser);
-            busProcessNewNext.setPrcName(prcName);
-            busBean.save(busProcessNewNext);
+        if (!nextUserList.isEmpty() && delegateTask.getVariable("nrOfCompletedInstances", Integer.class) == 0) {
+            for (String nextUser : nextUserList) {
+                BusProcessNew busProcessNewNext = new BusProcessNew();
+                busProcessNewNext.setMsgType("clause");
+                busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
+                busProcessNewNext.setMesg(object.toJSONString());
+                busProcessNewNext.setFinishFlag("0");
+                busProcessNewNext.setTaskInfo(taskInfo);
+                busProcessNewNext.setUserId(nextUser);
+                busProcessNewNext.setPrcName(prcName);
+                busBean.save(busProcessNewNext);
+            }
         }
     }
 }

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

@@ -26,12 +26,13 @@ public class InspectorApprovalBefore 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);
             // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
             one1.setLink("policyTopicParticipation/step3?prcType=31");
-            one1.setTaskInfo(delegateTask.getName());
+
             oaService.sendTodoMq(one1);
         }
     }

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

@@ -42,8 +42,7 @@ public class MinisterApprovalAfter implements TaskListener {
         String user = delegateTask.getVariable("applyUserId", String.class);
         String username = delegateTask.getVariable("applyUserName", String.class);
         String topicName = object.getString("topicName");
-        String prcName = topicName + "-政策课题组参会流程";
-        String taskInfo = "";
+        String prcName = topicName + "-政策课题参会流程";
         List<String> nextUserList = new ArrayList<>();
 
         if (object.getInteger("approvalOpinion") == 0) {
@@ -53,7 +52,6 @@ public class MinisterApprovalAfter implements TaskListener {
                 List<String> inspectorIdList = Arrays.asList(object.getString("inspectorId").split(","));
                 delegateTask.setVariable("inspectorIdList", inspectorIdList);
                 nextUserList.addAll(inspectorIdList);
-                taskInfo = "审定";
             } else {
                 throw new ActivitiException("1#2法规认证部副总监不存在,请配置相关人员");
             }
@@ -63,7 +61,6 @@ public class MinisterApprovalAfter implements TaskListener {
             if (StringUtils.isNotBlank(object.getString("applyUserId"))) {
                 delegateTask.setVariable("applyUserId", object.getString("applyUserId"));
                 nextUserList.add(object.getString("applyUserId"));
-                taskInfo = "重新起草";
             } else {
                 throw new ActivitiException("1#2起草人不存在,请配置相关人员");
             }
@@ -93,14 +90,13 @@ public class MinisterApprovalAfter implements TaskListener {
             busProcessNameService.saveOrUpdate(one1);
         }
 
-        if (!nextUserList.isEmpty()) {
+        if (!nextUserList.isEmpty() && delegateTask.getVariable("nrOfCompletedInstances", Integer.class) == 0) {
             for (String nextUser : nextUserList) {
                 BusProcessNew busProcessNewNext = new BusProcessNew();
                 busProcessNewNext.setMsgType("clause");
                 busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
                 busProcessNewNext.setMesg(object.toJSONString());
                 busProcessNewNext.setFinishFlag("0");
-                busProcessNewNext.setTaskInfo(taskInfo);
                 busProcessNewNext.setUserId(nextUser);
                 busProcessNewNext.setPrcName(prcName);
                 busBean.save(busProcessNewNext);

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

@@ -25,12 +25,12 @@ public class MinisterApprovalBefore 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);
             // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
             one1.setLink("policyTopicParticipation/step2?prcType=31");
-            one1.setTaskInfo(delegateTask.getName());
             oaService.sendTodoMq(one1);
         }
     }

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

@@ -85,8 +85,6 @@ public class PRGAMStartAfter implements TaskListener {
                 busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
                 busProcessNewNext.setMesg(object.toJSONString());
                 busProcessNewNext.setFinishFlag("0");
-//                busProcessNewNext.setTaskInfo(delegateTask.getName());
-                busProcessNewNext.setTaskInfo("审核");
                 busProcessNewNext.setUserId(nextUser);
                 busProcessNewNext.setPrcName(prcName);
                 busBean.save(busProcessNewNext);

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

@@ -25,12 +25,12 @@ public class PresidentApprovalBefore 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);
             // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
             one1.setLink("policyTopicParticipation/step4?prcType=31");
-            one1.setTaskInfo(delegateTask.getName());
             oaService.sendTodoMq(one1);
         }
     }

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

@@ -25,12 +25,12 @@ public class RevisionInformationBefore 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);
             // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
             one1.setLink("policyTopicParticipation/step1_1?prcType=31");
-            one1.setTaskInfo(delegateTask.getName());
             oaService.sendTodoMq(one1);
         }
     }

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

@@ -99,10 +99,7 @@ public class PGREPresidentApprovalAfter implements TaskListener {
                 busProcessNewNext.setMsgType("clause");
                 busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
                 busProcessNewNext.setMesg(object.toJSONString());
-//                busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey());
                 busProcessNewNext.setFinishFlag("0");
-//                busProcessNewNext.setTaskInfo(delegateTask.getName());
-                busProcessNewNext.setTaskInfo("重新起草");
                 busProcessNewNext.setUserId(nextUser);
                 busProcessNewNext.setPrcName(prcName);
                 busBean.save(busProcessNewNext);

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

@@ -25,12 +25,12 @@ public class PGREPresidentApprovalBefore 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);
             // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
             one1.setLink("policyTopicEnrollment/step4?prcType=30");
-            one1.setTaskInfo(delegateTask.getName());
             oaService.sendTodoMq(one1);
         }
     }

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

@@ -41,7 +41,6 @@ public class PRGEInspectorApprovalAfter implements TaskListener {
         String username = delegateTask.getVariable("applyUserName", String.class);
         String topicName = object.getString("topicName");
         String prcName= topicName + "-政策课题入会流程";
-        String taskInfo = "";
         List<String> nextUserList = new ArrayList<>();
 
         if (object.getInteger("approvalOpinion") == 0) {
@@ -50,7 +49,6 @@ public class PRGEInspectorApprovalAfter implements TaskListener {
             if (StringUtils.isNotBlank(object.getString("presidentId"))) {
                 delegateTask.setVariable("presidentId", object.getString("presidentId"));
                 nextUserList.add(object.getString("presidentId"));
-                taskInfo = "批准";
             } else {
                 throw new ActivitiException("1#2公司副总不存在,请配置相关人员");
             }
@@ -60,7 +58,6 @@ public class PRGEInspectorApprovalAfter implements TaskListener {
             if (StringUtils.isNotBlank(object.getString("applyUserId"))){
                 delegateTask.setVariable("applyUserId", object.getString("applyUserId"));
                 nextUserList.add(object.getString("applyUserId"));
-                taskInfo = "重新起草";
             } else {
                 throw new ActivitiException("1#2起草人不存在,请配置相关人员");
             }
@@ -91,16 +88,13 @@ public class PRGEInspectorApprovalAfter implements TaskListener {
             busProcessNameService.saveOrUpdate(one1);
         }
 
-        if (!nextUserList.isEmpty()) {
+        if (!nextUserList.isEmpty() && delegateTask.getVariable("nrOfCompletedInstances", Integer.class) == 0) {
             for (String nextUser : nextUserList) {
                 BusProcessNew busProcessNewNext = new BusProcessNew();
                 busProcessNewNext.setMsgType("clause");
                 busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
                 busProcessNewNext.setMesg(object.toJSONString());
-//                busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey());
                 busProcessNewNext.setFinishFlag("0");
-//                busProcessNewNext.setTaskInfo(delegateTask.getName());
-                busProcessNewNext.setTaskInfo(taskInfo);
                 busProcessNewNext.setUserId(nextUser);
                 busProcessNewNext.setPrcName(prcName);
                 busBean.save(busProcessNewNext);

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

@@ -26,12 +26,12 @@ public class PRGEInspectorApprovalBefore 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);
             // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
             one1.setLink("policyTopicParticipation/step3?prcType=30");
-            one1.setTaskInfo(delegateTask.getName());
             oaService.sendTodoMq(one1);
         }
     }

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

@@ -43,7 +43,7 @@ public class PRGEMinisterConfirmAfter implements TaskListener {
         String user = delegateTask.getVariable("applyUserId",String.class);
         String username = delegateTask.getVariable("applyUserName",String.class);
         String topicName = object.getString("topicName");
-        String prcName= topicName + "-政策课题组入会流程";
+        String prcName= topicName + "-政策课题入会流程";
         String taskInfo = "";
 
         List<String> nextUserList = new ArrayList<>();
@@ -97,16 +97,13 @@ public class PRGEMinisterConfirmAfter implements TaskListener {
             busProcessNameService.saveOrUpdate(one1);
         }
 
-        if (!nextUserList.isEmpty()) {
+        if (!nextUserList.isEmpty() && delegateTask.getVariable("nrOfCompletedInstances", Integer.class) ==0) {
             for (String nextUser : nextUserList) {
                 BusProcessNew busProcessNewNext = new BusProcessNew();
                 busProcessNewNext.setMsgType("clause");
                 busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
                 busProcessNewNext.setMesg(object.toJSONString());
-//                busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey());
                 busProcessNewNext.setFinishFlag("0");
-//                busProcessNewNext.setTaskInfo(delegateTask.getName());
-                busProcessNewNext.setTaskInfo(taskInfo);
                 busProcessNewNext.setUserId(nextUser);
                 busProcessNewNext.setPrcName(prcName);
                 busBean.save(busProcessNewNext);

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

@@ -26,12 +26,12 @@ public class PRGEMinisterConfirmBefore 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);
             // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
             one1.setLink("policyTopicEnrollment/step2?prcType=30");
-            one1.setTaskInfo(delegateTask.getName());
             oaService.sendTodoMq(one1);
         }
     }

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

@@ -1,6 +1,7 @@
 package com.ydw.bat.wkflow.listener.policyResearchGroupEnrollment;
 
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName;
 import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew;
@@ -65,21 +66,20 @@ 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());
+        // 存储当前节点意见
+        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.setFinishFlag("0");
+        busProcessNews.setTaskInfo(delegateTask.getName());
+        busProcessNews.setTaskId(delegateTask.getId());
 //            busProcessNews.setUserId("start");
-            busProcessNews.setUserId(user);
-            busProcessNews.setPrcName(prcName);
-            busProcessNews.setCommitText(object.getString("commentText"));
-            busBean.save(busProcessNews);
-        }
+        busProcessNews.setUserId(user);
+        busProcessNews.setPrcName(prcName);
+        busProcessNews.setCommitText(object.getString("commentText"));
+        busBean.save(busProcessNews);
 
         if (!nextUserList.isEmpty()) {
             for (String nextUser : nextUserList) {
@@ -87,10 +87,7 @@ public class PRGEStartAfter implements TaskListener {
                 busProcessNewNext.setMsgType("clause");
                 busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
                 busProcessNewNext.setMesg(object.toJSONString());
-//                busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey());
                 busProcessNewNext.setFinishFlag("0");
-//                busProcessNewNext.setTaskInfo(delegateTask.getName());
-                busProcessNewNext.setTaskInfo("审核");
                 busProcessNewNext.setUserId(nextUser);
                 busProcessNewNext.setPrcName(prcName);
                 busBean.save(busProcessNewNext);

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

@@ -41,6 +41,7 @@ public class RevisionInformationAfter implements TaskListener {
         List<String> nextUserList = new ArrayList<>();
 
         if (StringUtils.isNotBlank(object.getString("ministerId"))) {
+            delegateTask.setVariable("approvalOpinion", 0);
             List<String> ministerIdList = Arrays.asList(object.getString("ministerId").split(","));
             delegateTask.setVariable("ministerIdList",ministerIdList);
             nextUserList.addAll(ministerIdList);
@@ -51,7 +52,7 @@ public class RevisionInformationAfter implements TaskListener {
         String user = delegateTask.getVariable("applyUserId", String.class);
         String username = delegateTask.getVariable("applyUserName", String.class);
         String topicName = object.getString("topicName");
-        String prcName= topicName + "-政策课题组入会流程";
+        String prcName= topicName + "-政策课题入会流程";
 
         QueryWrapper<BusProcessName> queryWrapper2 = new QueryWrapper<>();
         queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
@@ -83,10 +84,7 @@ public class RevisionInformationAfter implements TaskListener {
                 busProcessNewNext.setMsgType("clause");
                 busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
                 busProcessNewNext.setMesg(object.toJSONString());
-//                busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey());
                 busProcessNewNext.setFinishFlag("0");
-//                busProcessNewNext.setTaskInfo(delegateTask.getName());
-                busProcessNewNext.setTaskInfo("审核");
                 busProcessNewNext.setUserId(nextUser);
                 busProcessNewNext.setPrcName(prcName);
                 busBean.save(busProcessNewNext);

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

@@ -25,12 +25,12 @@ public class RevisionInformationBefore 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);
             // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
             one1.setLink("policyTopicEnrollment/step1_1?prcType=30");
-            one1.setTaskInfo(delegateTask.getName());
             oaService.sendTodoMq(one1);
         }
     }

src/main/java/com/ydw/bat/wkflow/util/enums/FlowTypeEnum.java

@@ -4,8 +4,8 @@ package com.ydw.bat.wkflow.util.enums;
  * 流程类型枚举类
  */
 public enum FlowTypeEnum {
-    ZCZQYJLC("29","政策征求意见流程","policyConsultation"),
-    ZCHGXXMSCLC("30","重点认证标准/政策合规性项目审查流程","policyComplianceReview"),
+    ZCZQYJLC("33","政策征求意见流程","policyConsultation"),
+    ZCHGXXMSCLC("34","重点认证标准/政策合规性项目审查流程","policyComplianceReview"),
     ;
 
     private String value;

src/main/resources/application-prod.yml

@@ -33,6 +33,33 @@ spring:
     url: jdbc:mysql://test.eqbidding.com:3306/bat-wkflow?nullCatalogMeansCurrent=true&serverTimezone=Asia/Shanghai&useSSL=false&characterEncoding=utf-8
     username: fxd
     password: 123456
+    initialSize: 5
+    minIdle: 5
+    maxActive: 20
+    maxWait: 60000
+    timeBetweenEvictionRunsMillis: 60000
+    minEvictableIdleTimeMillis: 300000
+    validationQuery: SELECT 1 FROM DUAL
+    testWhileIdle: true
+    testOnBorrow: false
+    testOnReturn: false
+    slowSqlMillis: 5000
+    logSlowSql: true
+    # 打开PSCache
+    poolPreparedStatements: true
+    #配置监控统计拦截的filters，stat:监控统计、log4j：日志记录、wall：防御sql注入
+    #如果运行时报错  java.lang.ClassNotFoundException: org.apache.log4j.Priority
+    #则导入 log4j 依赖即可，Maven 地址： https://mvnrepository.com/artifact/log4j/log4j
+    filters: stat,wall
+    #指定每个连接上PSCache的大小
+    maxPoolPreparedStatementPerConnectionSize: 20
+    #合并多个DruidDataSource的监控数据
+    useGlobalDataSourceStat: true
+    stat-view-servlet:
+      enabled: true
+      login-username: druid
+      login-password: druid
+      url-pattern: /druid/*
   activiti:
     database-schema-update: true
     # 自动部署验证设置:true-开启（默认）、false-关闭

src/main/resources/application.yml

@@ -39,6 +39,33 @@ spring:
     url: jdbc:mysql://121.36.69.172:3307/foton-bat-wkflow-test?nullCatalogMeansCurrent=true&serverTimezone=Asia/Shanghai&useSSL=false&characterEncoding=utf-8
     username: root
     password: hzwlsoft.com
+    initialSize: 5
+    minIdle: 5
+    maxActive: 20
+    maxWait: 60000
+    timeBetweenEvictionRunsMillis: 60000
+    minEvictableIdleTimeMillis: 300000
+    validationQuery: SELECT 1 FROM DUAL
+    testWhileIdle: true
+    testOnBorrow: false
+    testOnReturn: false
+    slowSqlMillis: 5000
+    logSlowSql: true
+    # 打开PSCache
+    poolPreparedStatements: true
+    #配置监控统计拦截的filters，stat:监控统计、log4j：日志记录、wall：防御sql注入
+    #如果运行时报错  java.lang.ClassNotFoundException: org.apache.log4j.Priority
+    #则导入 log4j 依赖即可，Maven 地址： https://mvnrepository.com/artifact/log4j/log4j
+    filters: stat,wall
+    #指定每个连接上PSCache的大小
+    maxPoolPreparedStatementPerConnectionSize: 20
+    #合并多个DruidDataSource的监控数据
+    useGlobalDataSourceStat: true
+    stat-view-servlet:
+      enabled: true
+      login-username: druid
+      login-password: druid
+      url-pattern: /druid/*
   activiti:
     database-schema-update: true
     # 自动部署验证设置:true-开启（默认）、false-关闭