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

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

@@ -1,17 +1,14 @@
 package com.ydw.bat.wkflow.business_auth;
 
-import com.github.pagehelper.PageInfo;
+
-import com.tmsps.fk.common.wrapper.Wrapper;
 import com.ydw.bat.wkflow.business_main.datas.dto.*;
 import com.ydw.bat.wkflow.business_main.datas.entity.*;
 import com.ydw.bat.wkflow.business_slrs.dao.*;
-import feign.Headers;
-import org.apache.ibatis.annotations.Param;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.stereotype.Component;
 import org.springframework.web.bind.annotation.*;
 
-import javax.validation.constraints.NotNull;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
@@ -125,5 +122,22 @@ public interface LawsUserInfoService {
 
 
 
+    @PostMapping("/sapMeetInfo/addMeeting")
+    public int addMeeting(@RequestBody SapMeeting sapMeeting);
+
+    @GetMapping("/sapMeetInfo/getMeetingsByMonth")
+    public List<SapMeeting> getMeetingsByMonth(@RequestParam("date") @DateTimeFormat(pattern = "yyyy-MM-dd") Date date);
+
+    @GetMapping("/sapMeetInfo/getMeetingsByMonthType")
+    public List<SapMeeting> getMeetingsByMonthType(@RequestParam("date") @DateTimeFormat(pattern = "yyyy-MM-dd") Date date,@RequestParam("type") int type);
+
+    @GetMapping("/sapMeetInfo/getMeetingsByDate")
+    public List<SapMeeting> getMeetingsByDate(@RequestParam("date") @DateTimeFormat(pattern = "yyyy-MM-dd") Date date,@RequestParam("type") int type);
+
+    @GetMapping("/sapMeetInfo/getOneById")
+    public SapMeeting getOneById(@RequestParam("id") String id);
+
+    @PostMapping("/sapMeetInfo/getDateMeeting")
+    public int getDateMeeting(@RequestParam("date") @DateTimeFormat(pattern = "yyyy-MM-dd") Date date,@RequestParam("id") String id,@RequestParam("type") int type);
 
 }

src/main/java/com/ydw/bat/wkflow/business_main/datas/controller/BusProcessNewController.java

@@ -54,6 +54,13 @@ public class BusProcessNewController extends BaseAction {
         return findtodotask;
     }
 
+    @ApiOperation(value = "每天十点需要启动 标准化活动参会流程")
+    @GetMapping("/everyDayTenOlockSAM")
+    public List<BusProcessNew> everyDayTenOlockSAM() {
+        List<BusProcessNew> findtodotask = iBusProcessNewService.everyDayTenOlockSAM();
+        return findtodotask;
+    }
+
 
 }
 

src/main/java/com/ydw/bat/wkflow/business_main/datas/mapper/BusProcessNewMapper.java

@@ -30,4 +30,6 @@ public interface BusProcessNewMapper extends BaseMapper<BusProcessNew> {
 
     List<BusProcessNew> everyDayTenOlock();
 
+    List<BusProcessNew> everyDayTenOlockSAM();
+
 }

src/main/java/com/ydw/bat/wkflow/business_main/datas/service/IBusProcessNewService.java

@@ -34,4 +34,6 @@ public interface IBusProcessNewService extends IService<BusProcessNew> {
 
     List<BusProcessNew> everyDayTenOlock();
 
+    List<BusProcessNew> everyDayTenOlockSAM();
+
 }

src/main/java/com/ydw/bat/wkflow/business_main/datas/service/impl/BusProcessNewServiceImpl.java

@@ -78,4 +78,9 @@ public class BusProcessNewServiceImpl extends ServiceImpl<BusProcessNewMapper, B
     public List<BusProcessNew> everyDayTenOlock() {
         return baseMapper.everyDayTenOlock();
     }
+
+    @Override
+    public List<BusProcessNew> everyDayTenOlockSAM() {
+        return baseMapper.everyDayTenOlockSAM();
+    }
 }

src/main/java/com/ydw/bat/wkflow/business_slrs/dao/SapMeeting.java

@@ -0,0 +1,44 @@
+package com.ydw.bat.wkflow.business_slrs.dao;
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+/**
+ * <p>
+ * 流程通过的 标准化活动会议信息表
+standard_activity_pass
+
+ * </p>
+ *
+ * @author super_liu
+ * @since 2021-11-09
+ */
+@Data
+@Accessors(chain = true)
+@ApiModel(value="SapMeeting对象", description="流程通过的 标准化活动会议信息表 standard_activity_pass")
+public class SapMeeting {
+
+    private static final long serialVersionUID = 1L;
+
+    private String id;//主键-会议id
+
+    private String title;//会议标题
+
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private Date date;//会议开始时间
+
+    private String content;//会议内容大纲
+
+    private int type;//标志位--1标准化活动会议,0政策组会议
+
+    private String attend;//参与人 {id,name} json
+
+    private String files;//附件 json
+
+
+}

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

@@ -36,11 +36,15 @@ public class JSFApproveAfter implements TaskListener {
         JSONObject object = JSONObject.parseObject(datas.getFormValsJson());
         delegateTask.setVariable("objectJson", object);
 
+        List<String> nextUserList = new ArrayList();
+
         String approvalOpinion = object.get("bzFlag") == null ? "" : object.get("bzFlag").toString();
 
         if ("1".equalsIgnoreCase(approvalOpinion)) {
-            delegateTask.setVariable("Standardizer2", object.getString("Standardizer2User"));
+            delegateTask.setVariable("bzFlag", 1);
+            func1(delegateTask, busBean, object, "1", busProcessNameService);
 
+        } else {
             BusProcessNew busProcessNew = new BusProcessNew();
             busProcessNew.setMsgType("clause");
             busProcessNew.setPId(delegateTask.getProcessInstanceId());
@@ -48,41 +52,38 @@ public class JSFApproveAfter implements TaskListener {
             busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey());
             busProcessNew.setFinishFlag("0");
             busProcessNew.setTaskInfo(delegateTask.getName());
-            busProcessNew.setUserId(object.getString("Standardizer2User"));
+            busProcessNew.setUserId(object.getString("passUser"));
-            busProcessNew.setPrcName(delegateTask.getVariable("prcs",String.class));
+            busProcessNew.setPrcName("加入标准化协会信息备案-修改入会信息");
             busBean.save(busProcessNew);
-
+            func2(delegateTask, busBean, object, "0");
-            func1(delegateTask, busBean, object, "1");
             delegateTask.setVariable("bzFlag", 2);
-        } else {
+            delegateTask.setVariable("statuteengineer",delegateTask.getVariable("prcCreateUser",String.class));
-            delegateTask.setVariable("bzFlag", 1);
-            func2(delegateTask, busBean, object, "0", busProcessNameService);
         }
     }
 
-    private void func1(DelegateTask delegateTask, IBusProcessNewService busBean, JSONObject object, String commitFlag) {
+    private void func1(DelegateTask delegateTask, IBusProcessNewService busBean, JSONObject object, String commitFlag, IBusProcessNameService busProcessNameService) {
-        QueryWrapper queryWrapper1 = new QueryWrapper();
-        queryWrapper1.eq("TASK_ID", delegateTask.getId());
-        BusProcessNew one1 = busBean.getOne(queryWrapper1);
-        if (one1 != null) {
-            one1.setCommitFlag(commitFlag);
-            one1.setCommitText(object.getString("commentText"));
-            busBean.saveOrUpdate(one1);
-        }
-    }
-
-    private void func2(DelegateTask delegateTask, IBusProcessNewService busBean, JSONObject object, String commitFlag, IBusProcessNameService busProcessNameService) {
         QueryWrapper queryWrapper2 = new QueryWrapper();
         queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
         BusProcessName one2 = busProcessNameService.getOne(queryWrapper2);
         String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
         if (one2 != null) {
-            //one2.setPrcName("入库流程结束");
+//            one2.setPrcName("入库流程结束");
             one2.setOverTime(OVERTIME);
             one2.setPrcType("1");
             busProcessNameService.saveOrUpdate(one2);
         }
 
+        QueryWrapper queryWrapper1 = new QueryWrapper();
+        queryWrapper1.eq("TASK_ID", delegateTask.getId());
+        BusProcessNew one1 = busBean.getOne(queryWrapper1);
+        if (one1 != null) {
+            one1.setPrcName("加入标准化协会信息备案-入库流程结束");
+            one1.setCommitFlag(commitFlag);
+            one1.setCommitText(object.getString("commentText"));
+            busBean.saveOrUpdate(one1);
+        }
+    }
+    private void func2(DelegateTask delegateTask, IBusProcessNewService busBean, JSONObject object, String commitFlag) {
         QueryWrapper queryWrapper1 = new QueryWrapper();
         queryWrapper1.eq("TASK_ID", delegateTask.getId());
         BusProcessNew one1 = busBean.getOne(queryWrapper1);

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

@@ -38,34 +38,22 @@ public class JSFAuditAfter implements TaskListener {
 
         if(object.getString("signFlag").equals("1")) {
             delegateTask.setVariable("gcsFlag", 1);
-            if (StringUtils.isNotBlank(object.getString("statuteministerUser"))) {
+            delegateTask.setVariable("statuteminister",delegateTask.getVariable("statuteminister1",String.class));
-
+            nextUserList.add(delegateTask.getVariable("statuteminister1",String.class));
-                if (object.getString("statuteministerUser").contains(",")) {
-                    nextUserList = Arrays.asList(object.getString("statuteministerUser").split(","));
-                } else {
-                    nextUserList.add(object.getString("statuteministerUser"));
-                }
-            }
         } else {
-            delegateTask.setVariable("gcsFlag", 2);
+            delegateTask.setVariable("gcsFlag", 0);
-            if (StringUtils.isNotBlank(object.getString("dockUser"))) {
+            delegateTask.setVariable("Standardizer2",delegateTask.getVariable("Standardizer1",String.class));
-                delegateTask.setVariable("Standardizer2", object.getString("dockUser"));
+            nextUserList.add(delegateTask.getVariable("Standardizer1",String.class));
-                nextUserList.add(object.getString("dockUser"));
-            }
         }
 
         //截止时间 流程描述 创建人
-        String user = object.getString("prcCreateUser");
+        String user = delegateTask.getVariable("prcCreateUser", String.class);
-        String username = object.getString("prcCreateUserName");
+        String username = delegateTask.getVariable("prcCreateUserName",String.class);
-        delegateTask.setVariable("prcCreateUser", user);
+        String prcName;
-        delegateTask.setVariable("prcCreateUserName", username);
-        String standName = object.getString("listName");
-        delegateTask.setVariable("listName",standName);
-        String prcName="";
         if(object.getString("signFlag").equals("1")) {
-            prcName = "-加入标准化协会信息备案-批准";
+            prcName = "加入标准化协会信息备案-批准";
         }else {
-            prcName = "-加入标准化协会信息备案-填写入会信息";
+            prcName = "加入标准化协会信息备案-修改入会信息";
         }
 
 

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

@@ -41,6 +41,7 @@ public class JSFFillinformationAfter implements TaskListener {
         JSONObject object = JSONObject.parseObject(datas.getFormValsJson());
         delegateTask.setVariable("objectJson", object);
 
+
         String approvalOpinion = object.get("dlFlag") == null ? "" : object.get("dlFlag").toString();
 
         if ("1".equalsIgnoreCase(approvalOpinion)) {
@@ -53,11 +54,12 @@ public class JSFFillinformationAfter implements TaskListener {
             busProcessNew.setFinishFlag("0");
             busProcessNew.setTaskInfo(delegateTask.getName());
             busProcessNew.setUserId(object.getString("passUser"));
-            busProcessNew.setPrcName(delegateTask.getVariable("prcs",String.class));
+            busProcessNew.setPrcName("加入标准化协会信息备案-标准法规工程师审核");
             busBean.save(busProcessNew);
 
             func1(delegateTask, busBean, object, "1");
             delegateTask.setVariable("dlFlag", 1);
+            delegateTask.setVariable("statuteengineer",delegateTask.getVariable("prcCreateUser",String.class));
         } else {
             delegateTask.setVariable("dlFlag", 0);
             func2(delegateTask, busBean, object, "0", busProcessNameService);
@@ -81,7 +83,7 @@ public class JSFFillinformationAfter implements TaskListener {
         BusProcessName one2 = busProcessNameService.getOne(queryWrapper2);
         String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
         if (one2 != null) {
-            //one2.setPrcName("入库流程结束");
+//            one2.setPrcName("入库流程结束");
             one2.setOverTime(OVERTIME);
             one2.setPrcType("1");
             busProcessNameService.saveOrUpdate(one2);
@@ -91,6 +93,7 @@ public class JSFFillinformationAfter implements TaskListener {
         queryWrapper1.eq("TASK_ID", delegateTask.getId());
         BusProcessNew one1 = busBean.getOne(queryWrapper1);
         if (one1 != null) {
+            one1.setPrcName("加入标准化协会信息备案-流程结束");
             one1.setCommitFlag(commitFlag);
             one1.setCommitText(object.getString("commentText"));
             busBean.saveOrUpdate(one1);

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

@@ -44,7 +44,10 @@ public class JSFstartAfter implements TaskListener {
         // 配置多实例
         delegateTask.setVariable("Standardizer2list",nextUserList);
 
-        delegateTask.setVariable("Standardizer2", object.getString("dockUser"));
+        delegateTask.setVariable("Standardizer1", object.getString("dockUser"));
+        delegateTask.setVariable("statuteengineer1", object.getString("passUser"));
+        delegateTask.setVariable("statuteminister1", object.getString("directorUser"));
+
         //截止时间 流程描述 创建人
         String user = object.getString("prcCreateUser");
         String username = object.getString("prcCreateUserName");

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

@@ -13,7 +13,9 @@ import org.activiti.engine.delegate.DelegateTask;
 import org.activiti.engine.delegate.TaskListener;
 
 import java.text.SimpleDateFormat;
+import java.util.ArrayList;
 import java.util.Date;
+import java.util.List;
 
 public class PRFApproveAfter implements TaskListener {
     @Override
@@ -31,54 +33,78 @@ public class PRFApproveAfter implements TaskListener {
 
         JSONObject object = JSONObject.parseObject(datas.getFormValsJson());
         delegateTask.setVariable("objectJson", object);
-
+        List<String> nextUserList = new ArrayList();
-        String approvalOpinion = object.get("approvalOpinion") == null ? "" : object.get("approvalOpinion").toString();
+        String approvalOpinion = object.get("bzFlag") == null ? "" : object.get("bzFlag").toString();
 
         if ("1".equalsIgnoreCase(approvalOpinion)) {
-            delegateTask.setVariable("Liabilityengineer", object.getString("LiabilityengineerUser"));
-
-            BusProcessNew busProcessNew = new BusProcessNew();
-            busProcessNew.setMsgType("clause");
-            busProcessNew.setPId(delegateTask.getProcessInstanceId());
-            busProcessNew.setMesg(object.toJSONString());
-            busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey());
-            busProcessNew.setFinishFlag("0");
-            busProcessNew.setTaskInfo(delegateTask.getName());
-            busProcessNew.setUserId(object.getString("LiabilityengineerUser"));
-            busProcessNew.setPrcName(delegateTask.getVariable("prcs",String.class));
-            busBean.save(busProcessNew);
-
-            func1(delegateTask, busBean, object, "1");
-            delegateTask.setVariable("bzFlag", 2);
-        } else {
             delegateTask.setVariable("bzFlag", 1);
-            func2(delegateTask, busBean, object, "0", busProcessNameService);
+            func1(delegateTask, busBean, object, "1", busProcessNameService);
+
+        } else {
+            delegateTask.setVariable("bzFlag", 2);
+            delegateTask.setVariable("Liabilityengineer",delegateTask.getVariable("Liabilityengineer1",String.class));
+            nextUserList.add(delegateTask.getVariable("Liabilityengineer1",String.class));
+        }
+        String user = object.getString("prcCreateUser");
+        String username = object.getString("prcCreateUserName");
+        delegateTask.setVariable("prcCreateUser", user);
+        delegateTask.setVariable("prcCreateUserName", username);
+        String prcName="";
+        if(object.get("bzFlag").equals("2")) {
+            prcName = "参与外部标准制修订备案-修改备案信息";
+        }
+
+        QueryWrapper queryWrapper2 = new QueryWrapper();
+        queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
+        BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
+
+        if(one1!=null){
+            one1.setPrcType("14");
+            one1.setPrcName(prcName);
+            one1.setCreatUser(user);
+            one1.setCreatUserName(username);
+            busProcessNameService.saveOrUpdate(one1);
+        }
+
+        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 void func1(DelegateTask delegateTask, IBusProcessNewService busBean, JSONObject object, String commitFlag) {
+    private void func1(DelegateTask delegateTask, IBusProcessNewService busBean, JSONObject object, String commitFlag, IBusProcessNameService busProcessNameService) {
-        QueryWrapper queryWrapper1 = new QueryWrapper();
-        queryWrapper1.eq("TASK_ID", delegateTask.getId());
-        BusProcessNew one1 = busBean.getOne(queryWrapper1);
-        if (one1 != null) {
-            one1.setCommitFlag(commitFlag);
-            one1.setCommitText(object.getString("commentText"));
-            busBean.saveOrUpdate(one1);
-        }
-    }
-
-    private void func2(DelegateTask delegateTask, IBusProcessNewService busBean, JSONObject object, String commitFlag, IBusProcessNameService busProcessNameService) {
         QueryWrapper queryWrapper2 = new QueryWrapper();
         queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
         BusProcessName one2 = busProcessNameService.getOne(queryWrapper2);
         String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
         if (one2 != null) {
-            one2.setPrcName("入库流程结束");
+//            one2.setPrcName("入库流程结束");
             one2.setOverTime(OVERTIME);
             one2.setPrcType("1");
             busProcessNameService.saveOrUpdate(one2);
         }
 
+        QueryWrapper queryWrapper1 = new QueryWrapper();
+        queryWrapper1.eq("TASK_ID", delegateTask.getId());
+        BusProcessNew one1 = busBean.getOne(queryWrapper1);
+        if (one1 != null) {
+            one1.setPrcName("参与外部标准制修订备案-入库流程结束");
+            one1.setCommitFlag(commitFlag);
+            one1.setCommitText(object.getString("commentText"));
+            busBean.saveOrUpdate(one1);
+        }
+    }
+    private void func2(DelegateTask delegateTask, IBusProcessNewService busBean, JSONObject object, String commitFlag) {
         QueryWrapper queryWrapper1 = new QueryWrapper();
         queryWrapper1.eq("TASK_ID", delegateTask.getId());
         BusProcessNew one1 = busBean.getOne(queryWrapper1);

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

@@ -35,30 +35,15 @@ public class PRFEngineerreviewAfter implements TaskListener {
         delegateTask.setVariable("objectJson", object);
 
         List<String> nextUserList = new ArrayList();
-//      赋值
-        delegateTask.setVariable("statuteminister", object.getString("statuteministerUser"));
-        nextUserList.add(object.getString("statuteministerUser"));
-        delegateTask.setVariable("Liabilityengineer", object.getString("LiabilityengineerUser"));
-        nextUserList.add(object.getString("LiabilityengineerUser"));
-
-// 逻辑判断是否会签 signFlag
 
         if(object.getString("signFlag").equals("1")) {
             delegateTask.setVariable("gcsFlag", 1);
-            if (StringUtils.isNotBlank(object.getString("statuteministerUser"))) {
+            delegateTask.setVariable("statuteminister",delegateTask.getVariable("statuteminister1",String.class));
-
+            nextUserList.add(delegateTask.getVariable("statuteminister1",String.class));
-                if (object.getString("statuteministerUser").contains(",")) {
-                    nextUserList = Arrays.asList(object.getString("statuteministerUser").split(","));
-                } else {
-                    nextUserList.add(object.getString("statuteministerUser"));
-                }
-            }
         } else {
             delegateTask.setVariable("gcsFlag", 2);
-            if (StringUtils.isNotBlank(object.getString("LiabilityengineerUser"))) {
+            delegateTask.setVariable("Liabilityengineer",delegateTask.getVariable("Liabilityengineer1",String.class));
-                delegateTask.setVariable("Liabilityengineer", object.getString("LiabilityengineerUser"));
+            nextUserList.add(delegateTask.getVariable("Liabilityengineer1",String.class));
-                nextUserList.add(object.getString("LiabilityengineerUser"));
-            }
         }
 
         //截止时间 流程描述 创建人
@@ -66,13 +51,11 @@ public class PRFEngineerreviewAfter implements TaskListener {
         String username = object.getString("prcCreateUserName");
         delegateTask.setVariable("prcCreateUser", user);
         delegateTask.setVariable("prcCreateUserName", username);
-        String standName = object.getString("listName");
-        delegateTask.setVariable("listName",standName);
         String prcName="";
         if(object.getString("signFlag").equals("1")) {
-            prcName = standName + "-参与外部标准制修订备案-部长批准";
+            prcName = "参与外部标准制修订备案-部长批准";
         }else {
-            prcName = standName + "-参与外部标准制修订备案-填写备案信息";
+            prcName = "参与外部标准制修订备案-修改备案信息";
         }
 
 

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

@@ -12,7 +12,9 @@ import com.ydw.bat.wkflow.util.SpringContextUtil;
 import org.activiti.engine.delegate.DelegateTask;
 import org.activiti.engine.delegate.TaskListener;
 
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 public class PRFFillinformationAfter implements TaskListener {
@@ -33,25 +35,30 @@ public class PRFFillinformationAfter implements TaskListener {
         delegateTask.setVariable("objectJson", object);
 
         List<String> nextUserList = new ArrayList();
-
+        if (object.getString("signFlag").equals("1")) {
-//      赋值
+            delegateTask.setVariable("dlFlag", 1);
-        delegateTask.setVariable("Buttpeople2", object.getString("Buttpeople2User"));
+            delegateTask.setVariable("Buttpeople2", delegateTask.getVariable("Buttpeople3", String.class));
-        nextUserList.add(object.getString("Buttpeople2User"));
+            nextUserList.add(delegateTask.getVariable("Buttpeople3", String.class));
-
+        } else {
+            delegateTask.setVariable("dlFlag", 2);
+            func2(delegateTask, busBean, object, "0", busProcessNameService);
+        }
 
         //截止时间 流程描述 创建人
         String user = object.getString("prcCreateUser");
         String username = object.getString("prcCreateUserName");
         delegateTask.setVariable("prcCreateUser", user);
         delegateTask.setVariable("prcCreateUserName", username);
-//        delegateTask.setVariable("stId",object.getString("projectNumber"));
+        String prcName = "";
+        if (object.getString("signFlag").equals("1")) {
+            prcName = "参与外部标准制修订备案-责任部门对接人审核";
+        }
 
-        String prcName = delegateTask.getVariable("listName", String.class) + "-参与外部标准制修订备案-对接人审核";
         QueryWrapper queryWrapper2 = new QueryWrapper();
         queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
         BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
 
-        if(one1!=null){
+        if (one1 != null) {
             one1.setPrcType("14");
             one1.setPrcName(prcName);
             one1.setCreatUser(user);
@@ -74,4 +81,25 @@ public class PRFFillinformationAfter implements TaskListener {
             }
         }
     }
+    private void func2(DelegateTask delegateTask, IBusProcessNewService busBean, JSONObject object, String commitFlag, IBusProcessNameService busProcessNameService) {
+        QueryWrapper queryWrapper2 = new QueryWrapper();
+        queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
+        BusProcessName one2 = busProcessNameService.getOne(queryWrapper2);
+        String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
+        if (one2 != null) {
+            one2.setOverTime(OVERTIME);
+            one2.setPrcType("1");
+            busProcessNameService.saveOrUpdate(one2);
+        }
+
+        QueryWrapper queryWrapper1 = new QueryWrapper();
+        queryWrapper1.eq("TASK_ID", delegateTask.getId());
+        BusProcessNew one1 = busBean.getOne(queryWrapper1);
+        if (one1 != null) {
+            one1.setPrcName("参与外部标准制修订备案-流程结束");
+            one1.setCommitFlag(commitFlag);
+            one1.setCommitText(object.getString("commentText"));
+            busBean.saveOrUpdate(one1);
+        }
+    }
 }

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

@@ -35,28 +35,15 @@ public class PRFReviewdockAfter implements TaskListener {
         delegateTask.setVariable("objectJson", object);
 
         List<String> nextUserList = new ArrayList();
-//      赋值
-        delegateTask.setVariable("statuteengineer", object.getString("statuteengi6neerUser"));
-        nextUserList.add(object.getString("statuteengineerUser"));
-        delegateTask.setVariable("Liabilityengineer", object.getString("LiabilityengineerUser"));
-        nextUserList.add(object.getString("LiabilityengineerUser"));
 
         if(object.getString("signFlag").equals("1")) {
             delegateTask.setVariable("djrFlag", 1);
-            if (StringUtils.isNotBlank(object.getString("statuteengineerUser"))) {
+            delegateTask.setVariable("statuteengineer",delegateTask.getVariable("statuteengineer1",String.class));
-
+            nextUserList.add(delegateTask.getVariable("statuteengineer1",String.class));
-                if (object.getString("statuteengineerUser").contains(",")) {
-                    nextUserList = Arrays.asList(object.getString("statuteengineerUser").split(","));
-                } else {
-                    nextUserList.add(object.getString("statuteengineerUser"));
-                }
-            }
         } else {
             delegateTask.setVariable("djrFlag", 2);
-            if (StringUtils.isNotBlank(object.getString("LiabilityengineerUser"))) {
+            delegateTask.setVariable("Liabilityengineer",delegateTask.getVariable("Liabilityengineer1",String.class));
-                delegateTask.setVariable("Liabilityengineer", object.getString("LiabilityengineerUser"));
+            nextUserList.add(delegateTask.getVariable("Liabilityengineer1",String.class));
-                nextUserList.add(object.getString("LiabilityengineerUser"));
-            }
         }
 
         //截止时间 流程描述 创建人
@@ -64,13 +51,11 @@ public class PRFReviewdockAfter implements TaskListener {
         String username = object.getString("prcCreateUserName");
         delegateTask.setVariable("prcCreateUser", user);
         delegateTask.setVariable("prcCreateUserName", username);
-        String standName = object.getString("listName");
-        delegateTask.setVariable("listName",standName);
         String prcName="";
         if(object.getString("signFlag").equals("1")) {
-            prcName = standName + "-参与外部标准制修订备案-工程师审核";
+            prcName = "参与外部标准制修订备案-工程师审核";
         }else {
-            prcName = standName + "-参与外部标准制修订备案-填写备案信息";
+            prcName = "参与外部标准制修订备案-修改备案信息";
         }
 
 

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

@@ -13,6 +13,7 @@ import org.activiti.engine.delegate.DelegateTask;
 import org.activiti.engine.delegate.TaskListener;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 public class PRFUnderengineerAfter implements TaskListener {
@@ -33,21 +34,23 @@ public class PRFUnderengineerAfter implements TaskListener {
         delegateTask.setVariable("objectJson", object);
 
         List<String> nextUserList = new ArrayList();
+        String ids=object.getString("workPeople");
+        if(ids.contains(",")){
+            nextUserList=new ArrayList<>(Arrays.asList(ids.split(",")));
+        }else {
+            nextUserList.add(ids);
+        }
         // 配置多实例
         delegateTask.setVariable("Liabilityengineerlist",nextUserList);
 
-//      赋值
+        delegateTask.setVariable("Liabilityengineer1", object.getString("workPeople"));
-        delegateTask.setVariable("Liabilityengineer", object.getString("sonUser"));
-        nextUserList.add(object.getString("sonUser"));
-
-
         //截止时间 流程描述 创建人
         String user = object.getString("prcCreateUser");
         String username = object.getString("prcCreateUserName");
         delegateTask.setVariable("prcCreateUser", user);
         delegateTask.setVariable("prcCreateUserName", username);
 
-        String prcName = delegateTask.getVariable("listName", String.class) + "-参与外部标准制修订备案-填写备案信息";
+        String prcName = "参与外部标准制修订备案-填写备案信息";
         QueryWrapper queryWrapper2 = new QueryWrapper();
         queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
         BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);

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

@@ -34,23 +34,27 @@ public class PRFstartAfter implements TaskListener {
         delegateTask.setVariable("objectJson", object);
 
         List<String> nextUserList = new ArrayList();
-        String ids=object.getString("creatUser");
+        String ids=object.getString("dockUser");
         if(ids.contains(",")){
             nextUserList=new ArrayList<>(Arrays.asList(ids.split(",")));
         }else {
             nextUserList.add(ids);
         }
+        
 // 配置多实例
-        delegateTask.setVariable("Buttpeoplelist",nextUserList);
+        delegateTask.setVariable("Buttpeople1list",nextUserList);
+
+        delegateTask.setVariable("Buttpeople3", object.getString("dockUser"));
+        delegateTask.setVariable("statuteengineer1", object.getString("firstUser"));
+        delegateTask.setVariable("statuteminister1", object.getString("directorUser"));
 
         //截止时间 流程描述 创建人
         String user = object.getString("prcCreateUser");
         String username = object.getString("prcCreateUserName");
         delegateTask.setVariable("prcCreateUser", user);
         delegateTask.setVariable("prcCreateUserName", username);
-//        delegateTask.setVariable("stId",object.getString("projectNumber"));
 
-        String prcName = delegateTask.getVariable("listName", String.class) + "-参与外部标准制修订备案-备案任务下发";
+        String prcName = "参与外部标准制修订备案-备案任务下发";
         QueryWrapper queryWrapper2 = new QueryWrapper();
         queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
         BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);

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

@@ -6,15 +6,7 @@ import org.activiti.engine.delegate.TaskListener;
 public class PRFstartBefore implements TaskListener {
     @Override
     public void notify(DelegateTask delegateTask) {
-//        IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
+
-//        QueryWrapper queryWrapper1 = new QueryWrapper();
-//        queryWrapper1.isNull("TASK_ID");
-//        List<BusProcessNew> list = busBean.list(queryWrapper1);
-//        if(!list.isEmpty()){
-//            BusProcessNew one1 = list.get(0);
-//            one1.setTaskId(delegateTask.getId());
-//            busBean.saveOrUpdate(one1);
-//        }
     }
 
 }

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

@@ -36,10 +36,13 @@ public class RAApproveAfter implements TaskListener {
         JSONObject object = JSONObject.parseObject(datas.getFormValsJson());
         delegateTask.setVariable("objectJson", object);
 
-        String approvalOpinion = object.get("approvalOpinion") == null ? "" : object.get("approvalOpinion").toString();
+        String approvalOpinion = object.get("yzFlag") == null ? "" : object.get("yzFlag").toString();
 
         if ("1".equalsIgnoreCase(approvalOpinion)) {
-            delegateTask.setVariable("statuteengineer2", object.getString("prcCreateUser"));
+            delegateTask.setVariable("yzFlag", 1);
+            func1(delegateTask, busBean, object, "1", busProcessNameService);
+
+        } else {
             BusProcessNew busProcessNew = new BusProcessNew();
             busProcessNew.setMsgType("clause");
             busProcessNew.setPId(delegateTask.getProcessInstanceId());
@@ -47,41 +50,38 @@ public class RAApproveAfter implements TaskListener {
             busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey());
             busProcessNew.setFinishFlag("0");
             busProcessNew.setTaskInfo(delegateTask.getName());
-            busProcessNew.setUserId(object.getString("prcCreateUser"));
+            busProcessNew.setUserId(object.getJSONObject("roleForm").getString("passUser"));
-            busProcessNew.setPrcName(delegateTask.getVariable("prcs",String.class));
+            busProcessNew.setPrcName("外部署名推荐批准-修改信息");
             busBean.save(busProcessNew);
-
+            func2(delegateTask, busBean, object, "0");
-            func1(delegateTask, busBean, object, "1");
             delegateTask.setVariable("yzFlag", 2);
-        } else {
+            delegateTask.setVariable("statuteengineer2",delegateTask.getVariable("statuteengineer3",String.class));
-            delegateTask.setVariable("yzFlag", 1);
-            func2(delegateTask, busBean, object, "0", busProcessNameService);
         }
     }
 
-    private void func1(DelegateTask delegateTask, IBusProcessNewService busBean, JSONObject object, String commitFlag) {
+    private void func1(DelegateTask delegateTask, IBusProcessNewService busBean, JSONObject object, String commitFlag, IBusProcessNameService busProcessNameService) {
-        QueryWrapper queryWrapper1 = new QueryWrapper();
-        queryWrapper1.eq("TASK_ID", delegateTask.getId());
-        BusProcessNew one1 = busBean.getOne(queryWrapper1);
-        if (one1 != null) {
-            one1.setCommitFlag(commitFlag);
-            one1.setCommitText(object.getString("commentText"));
-            busBean.saveOrUpdate(one1);
-        }
-    }
-
-    private void func2(DelegateTask delegateTask, IBusProcessNewService busBean, JSONObject object, String commitFlag, IBusProcessNameService busProcessNameService) {
         QueryWrapper queryWrapper2 = new QueryWrapper();
         queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
         BusProcessName one2 = busProcessNameService.getOne(queryWrapper2);
         String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
         if (one2 != null) {
-            one2.setPrcName("入库流程结束");
+//            one2.setPrcName("入库流程结束");
             one2.setOverTime(OVERTIME);
             one2.setPrcType("1");
             busProcessNameService.saveOrUpdate(one2);
         }
 
+        QueryWrapper queryWrapper1 = new QueryWrapper();
+        queryWrapper1.eq("TASK_ID", delegateTask.getId());
+        BusProcessNew one1 = busBean.getOne(queryWrapper1);
+        if (one1 != null) {
+            one1.setPrcName("外部署名推荐批准-入库流程结束");
+            one1.setCommitFlag(commitFlag);
+            one1.setCommitText(object.getString("commentText"));
+            busBean.saveOrUpdate(one1);
+        }
+    }
+    private void func2(DelegateTask delegateTask, IBusProcessNewService busBean, JSONObject object, String commitFlag) {
         QueryWrapper queryWrapper1 = new QueryWrapper();
         queryWrapper1.eq("TASK_ID", delegateTask.getId());
         BusProcessNew one1 = busBean.getOne(queryWrapper1);

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

@@ -34,30 +34,15 @@ public class RAAuditAfter implements TaskListener {
         delegateTask.setVariable("objectJson", object);
 
         List<String> nextUserList = new ArrayList();
-//      赋值
-        delegateTask.setVariable("director", object.getString("directorUser"));
-        nextUserList.add(object.getString("directorUser"));
-        delegateTask.setVariable("statuteengineer2", object.getString("prcCreateUser"));
-        nextUserList.add(object.getString("prcCreateUser"));
-
-// 逻辑判断 signFlag
 
         if(object.getString("signFlag").equals("1")) {
             delegateTask.setVariable("bzFlag", 1);
-            if (StringUtils.isNotBlank(object.getString("directorUser"))) {
+            delegateTask.setVariable("director",delegateTask.getVariable("director1",String.class));
-
+            nextUserList.add(delegateTask.getVariable("director1",String.class));
-                if (object.getString("directorUser").contains(",")) {
-                    nextUserList = Arrays.asList(object.getString("directorUser").split(","));
-                } else {
-                    nextUserList.add(object.getString("directorUser"));
-                }
-            }
         } else {
             delegateTask.setVariable("bzFlag", 2);
-            if (StringUtils.isNotBlank(object.getString("prcCreateUser"))) {
+            delegateTask.setVariable("statuteengineer2",delegateTask.getVariable("statuteengineer3",String.class));
-                delegateTask.setVariable("statuteengineer2", object.getString("prcCreateUser"));
+            nextUserList.add(delegateTask.getVariable("statuteengineer3",String.class));
-                nextUserList.add(object.getString("prcCreateUser"));
-            }
         }
 
         //截止时间 流程描述 创建人
@@ -65,13 +50,11 @@ public class RAAuditAfter implements TaskListener {
         String username = object.getString("prcCreateUserName");
         delegateTask.setVariable("prcCreateUser", user);
         delegateTask.setVariable("prcCreateUserName", username);
-        String standName = object.getString("listName");
-        delegateTask.setVariable("listName",standName);
         String prcName="";
         if(object.getString("signFlag").equals("1")) {
-            prcName = standName + "-外部署名推荐批准-审核";
+            prcName = "外部署名推荐批准-审核";
         }else {
-            prcName = standName + "-外部署名推荐批准-修改信息";
+            prcName = "外部署名推荐批准-修改信息";
         }
 
 

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

@@ -32,11 +32,9 @@ public class RAModifyInformationAfter implements TaskListener {
         delegateTask.setVariable("objectJson", object);
 
         List<String> nextUserList = new ArrayList();
-//      赋值
-        delegateTask.setVariable("leadership", object.getString("dockUser"));
-        nextUserList.add(object.getString("dockUser"));
-
 
+        delegateTask.setVariable("leadership",delegateTask.getVariable("leadership1",String.class));
+        nextUserList.add(delegateTask.getVariable("leadership1",String.class));
 
 
         //截止时间 流程描述 创建人
@@ -45,7 +43,7 @@ public class RAModifyInformationAfter implements TaskListener {
         delegateTask.setVariable("prcCreateUser", user);
         delegateTask.setVariable("prcCreateUserName", username);
 
-        String prcName = delegateTask.getVariable("listName", String.class) + "-外部署名推荐批准-署名领导会签";
+        String prcName = "外部署名推荐批准-署名领导会签";
         QueryWrapper queryWrapper2 = new QueryWrapper();
         queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
         BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);

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

@@ -34,28 +34,15 @@ public class RASignAfter implements TaskListener {
         delegateTask.setVariable("objectJson", object);
 
         List<String> nextUserList = new ArrayList();
-//      赋值
-        delegateTask.setVariable("statuteminister", object.getString("ministerUser"));
-        nextUserList.add(object.getString("ministerUser"));
-        delegateTask.setVariable("statuteengineer2", object.getString("prcCreateUser"));
-        nextUserList.add(object.getString("prcCreateUser"));
 
         if(object.getString("signFlag").equals("1")) {
             delegateTask.setVariable("ldFlag", 1);
-            if (StringUtils.isNotBlank(object.getString("ministerUser"))) {
+            delegateTask.setVariable("statuteminister",delegateTask.getVariable("statuteminister1",String.class));
-
+            nextUserList.add(delegateTask.getVariable("statuteminister1",String.class));
-                if (object.getString("ministerUser").contains(",")) {
-                    nextUserList = Arrays.asList(object.getString("ministerUser").split(","));
-                } else {
-                    nextUserList.add(object.getString("ministerUser"));
-                }
-            }
         } else {
-                delegateTask.setVariable("ldFlag", 2);
+            delegateTask.setVariable("ldFlag", 2);
-                if (StringUtils.isNotBlank(object.getString("prcCreateUser"))) {
+            delegateTask.setVariable("statuteengineer2",delegateTask.getVariable("statuteengineer3",String.class));
-                    delegateTask.setVariable("statuteengineer2", object.getString("prcCreateUser"));
+            nextUserList.add(delegateTask.getVariable("statuteengineer3",String.class));
-                    nextUserList.add(object.getString("prcCreateUser"));
-                }
         }
 
         //截止时间 流程描述 创建人
@@ -63,13 +50,11 @@ public class RASignAfter implements TaskListener {
         String username = object.getString("prcCreateUserName");
         delegateTask.setVariable("prcCreateUser", user);
         delegateTask.setVariable("prcCreateUserName", username);
-        String standName = object.getString("listName");
-        delegateTask.setVariable("listName",standName);
         String prcName="";
         if(object.getString("signFlag").equals("1")) {
-            prcName = standName + "-外部署名推荐批准-审核";
+            prcName = "外部署名推荐批准-审核";
         }else {
-            prcName = standName + "-外部署名推荐批准-修改信息";
+            prcName = "外部署名推荐批准-修改信息";
         }
 
 

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

@@ -35,31 +35,15 @@ public class RAValidationAfter implements TaskListener {
         delegateTask.setVariable("objectJson", object);
 
         List<String> nextUserList = new ArrayList();
-//      赋值
-        delegateTask.setVariable("dean", object.getString("president"));
-        nextUserList.add(object.getString("president"));
-        delegateTask.setVariable("statuteengineer2", object.getString("prcCreateUser"));
-        nextUserList.add(object.getString("prcCreateUser"));
-
-// 逻辑判断是否审核 signFlag
 
         if(object.getString("signFlag").equals("1")) {
             delegateTask.setVariable("zrFlag", 1);
-
+            delegateTask.setVariable("dean",delegateTask.getVariable("dean1",String.class));
-            if (StringUtils.isNotBlank(object.getString("president"))) {
+            nextUserList.add(delegateTask.getVariable("dean1",String.class));
-
-                if (object.getString("president").contains(",")) {
-                    nextUserList = Arrays.asList(object.getString("president").split(","));
-                } else {
-                    nextUserList.add(object.getString("president"));
-                }
-            }
         } else {
             delegateTask.setVariable("zrFlag", 2);
-            if (StringUtils.isNotBlank(object.getString("prcCreateUser"))) {
+            delegateTask.setVariable("statuteengineer2",delegateTask.getVariable("statuteengineer3",String.class));
-                delegateTask.setVariable("statuteengineer2", object.getString("prcCreateUser"));
+            nextUserList.add(delegateTask.getVariable("statuteengineer3",String.class));
-                nextUserList.add(object.getString("prcCreateUser"));
-            }
         }
 
         //截止时间 流程描述 创建人
@@ -67,13 +51,12 @@ public class RAValidationAfter implements TaskListener {
         String username = object.getString("prcCreateUserName");
         delegateTask.setVariable("prcCreateUser", user);
         delegateTask.setVariable("prcCreateUserName", username);
-        String standName = object.getString("listName");
+
-        delegateTask.setVariable("listName",standName);
+        String prcName;
-        String prcName="";
         if(object.getString("signFlag").equals("1")) {
-            prcName = standName + "-外部署名推荐批准-批准";
+            prcName = "外部署名推荐批准-批准";
         }else {
-            prcName = standName + "-外部署名推荐批准-修改信息";
+            prcName = "外部署名推荐批准-修改信息";
         }
 
         QueryWrapper queryWrapper2 = new QueryWrapper();

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

@@ -12,6 +12,7 @@ import com.ydw.bat.wkflow.util.SpringContextUtil;
 import org.activiti.engine.delegate.DelegateTask;
 import org.activiti.engine.delegate.TaskListener;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 //外部署名推荐批准
 public class RAstartAfter implements TaskListener {
@@ -31,14 +32,23 @@ public class RAstartAfter implements TaskListener {
         JSONObject object = JSONObject.parseObject(datas.getFormValsJson());
         delegateTask.setVariable("objectJson", object);
 
+
         List<String> nextUserList = new ArrayList();
+        String ids= object.getJSONObject("roleForm").getString("dockUser");
+        if(ids.contains(",")){
+            nextUserList=new ArrayList<>(Arrays.asList(ids.split(",")));
+        }else {
+            nextUserList.add(ids);
+        }
         // 配置多实例
         delegateTask.setVariable("leadershiplist",nextUserList);
 
 //      赋值
-        delegateTask.setVariable("leadership", object.getString("dockUser"));
+        delegateTask.setVariable("leadership1", object.getJSONObject("roleForm").getString("dockUser"));
-        nextUserList.add(object.getString("dockUser"));
+        delegateTask.setVariable("director1", object.getJSONObject("roleForm").getString("directorUser"));
-
+        delegateTask.setVariable("statuteminister1", object.getJSONObject("roleForm").getString("ministerUser"));
+        delegateTask.setVariable("dean1", object.getJSONObject("roleForm").getString("president"));
+        delegateTask.setVariable("statuteengineer3", object.getJSONObject("roleForm").getString("passUser"));
 
         //截止时间 流程描述 创建人
         String user = object.getString("prcCreateUser");
@@ -46,7 +56,7 @@ public class RAstartAfter implements TaskListener {
         delegateTask.setVariable("prcCreateUser", user);
         delegateTask.setVariable("prcCreateUserName", username);
 
-        String prcName = delegateTask.getVariable("listName", String.class) + "-外部署名推荐批准-署名领导会签";
+        String prcName = "外部署名推荐批准-署名领导会签";
         QueryWrapper queryWrapper2 = new QueryWrapper();
         queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
         BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);

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

@@ -30,23 +30,26 @@ public class AutoStartAfter implements TaskListener {
         IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
         //流程信息
         IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class);
-
-        LawsUserInfoService lawsUserInfoService = SpringContextUtil.getBean(LawsUserInfoService.class);
-
         //根据流程id找到流程信息
         QueryWrapper<Datas> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId());
         Datas datas = datasService.getOne(queryWrapper);
-
         JSONObject object =  JSONObject.parseObject(datas.getFormValsJson());
         delegateTask.setVariable("objectJson",object);
         List<String> nextUserList = new ArrayList();
 
-        if(StringUtils.isNotBlank(object.getString("member"))) {
+        String prcName ="标准化活动会后流程-";
+        prcName = prcName + "参会人上传会议资料，填写标准及议题";
+        if ("1".equals(object.getString("auto"))){
+            delegateTask.setVariable("member", object.getString("member"));
             nextUserList.add(object.getString("member"));
-            delegateTask.setVariable("member", nextUserList);
         }
-
+        else {
+            if (StringUtils.isNotBlank(object.getString("memberId"))) {
+                delegateTask.setVariable("member", object.getString("memberId"));
+                nextUserList.add(object.getString("memberId"));
+            }
+        }
 
         //截止时间 流程描述 创建人
         String user = object.getString("prcCreateUser");
@@ -55,9 +58,6 @@ public class AutoStartAfter implements TaskListener {
         delegateTask.setVariable("createUserName", username);
         String standName = object.getString("listName");
         delegateTask.setVariable("listName", standName);
-        String prcName = "";
-
-        prcName = standName + "-标准化活动会后流程-";
 
         QueryWrapper queryWrapper2 = new QueryWrapper();
         queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
@@ -76,7 +76,6 @@ public class AutoStartAfter implements TaskListener {
                 busProcessNewNext.setMsgType("clause");
                 busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
                 busProcessNewNext.setMesg(object.toJSONString());
-//                busProcessNewNext.setMesg(object.toJSONString());
                 busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey());
                 busProcessNewNext.setFinishFlag("0");
                 busProcessNewNext.setTaskInfo(delegateTask.getName());

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

@@ -14,22 +14,22 @@ public class AutoStartBefore implements TaskListener {
     @Override
     public void notify(DelegateTask delegateTask) {
 
-        String link = "bzqdfbStep2?prcType=22";
+//        String link = "bzhhStep?prcType=22";
-        IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
+//        IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
-        QueryWrapper queryWrapper1 = new QueryWrapper();
+//        QueryWrapper queryWrapper1 = new QueryWrapper();
-        queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());
+//        queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());
-        queryWrapper1.eq("USER_ID",delegateTask.getAssignee());
+//        queryWrapper1.eq("USER_ID",delegateTask.getAssignee());
-        queryWrapper1.isNull("TASK_ID");
+//        queryWrapper1.isNull("TASK_ID");
-        List<BusProcessNew> list = busBean.list(queryWrapper1);
+//        List<BusProcessNew> list = busBean.list(queryWrapper1);
-        if(!list.isEmpty()){
+//        if(!list.isEmpty()){
-            BusProcessNew one1 = list.get(0);
+//            BusProcessNew one1 = list.get(0);
-            one1.setTaskId(delegateTask.getId());
+//            one1.setTaskId(delegateTask.getId());
-            busBean.saveOrUpdate(one1);
+//            busBean.saveOrUpdate(one1);
-
+//
-            CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class);
+//            CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class);
-            // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
+//            // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
-            one1.setLink(link);
+//            one1.setLink(link);
-            one1.setTaskInfo(delegateTask.getName());
+//            one1.setTaskInfo(delegateTask.getName());
-            oaService.sendTodoMq(one1);
+//            oaService.sendTodoMq(one1);
-        }
+//        }
     }}

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

@@ -16,7 +16,9 @@ import org.activiti.engine.delegate.DelegateTask;
 import org.activiti.engine.delegate.TaskListener;
 import org.apache.commons.lang.StringUtils;
 
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -30,30 +32,31 @@ public class DirectorVerifyAfter implements TaskListener {
         IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
         //流程信息
         IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class);
-
-        LawsUserInfoService lawsUserInfoService = SpringContextUtil.getBean(LawsUserInfoService.class);
-
         //根据流程id找到流程信息
         QueryWrapper<Datas> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId());
         Datas datas = datasService.getOne(queryWrapper);
-
         JSONObject object =  JSONObject.parseObject(datas.getFormValsJson());
         delegateTask.setVariable("objectJson",object);
         List<String> nextUserList = new ArrayList();
 
+        String prcName ="标准化活动会后流程-";
         if("1".equals(object.getString("passFlag"))){
             delegateTask.setVariable("pass",1);
-            //TODO 流程结束 入库操作待写
+            prcName = prcName + "流程结束";
+
         }else{
             delegateTask.setVariable("pass",0);
-
+            prcName = prcName + "参会人上传会议资料，填写标准及议题";
             if(StringUtils.isNotBlank(object.getString("member"))) {
                 nextUserList.add(object.getString("member"));
-                delegateTask.setVariable("member", nextUserList);
+                delegateTask.setVariable("member", object.getString("member"));
+            }else{
+                nextUserList.add(delegateTask.getVariable("member",String.class));
             }
         }
 
+
 //         存储当前节点意见
         if (null != object.getString("commentText")) {
             QueryWrapper queryWrapper3 = new QueryWrapper();
@@ -68,18 +71,14 @@ public class DirectorVerifyAfter implements TaskListener {
             }
         }
 
-
-
         //截止时间 流程描述 创建人
+        String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
         String user = object.getString("prcCreateUser");
         delegateTask.setVariable("createUser", user);
         String username = object.getString("prcCreateUserName");
         delegateTask.setVariable("createUserName", username);
         String standName = object.getString("listName");
         delegateTask.setVariable("listName", standName);
-        String prcName = "";
-
-        prcName = standName + "-标准化活动会后流程-";
 
         QueryWrapper queryWrapper2 = new QueryWrapper();
         queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
@@ -88,6 +87,7 @@ public class DirectorVerifyAfter implements TaskListener {
             one1.setPrcType("22");
             one1.setPrcName(prcName);
             one1.setCreatUser(user);
+            one1.setOverTime(OVERTIME);
             one1.setCreatUserName(username);
             busProcessNameService.saveOrUpdate(one1);
         }
@@ -98,7 +98,6 @@ public class DirectorVerifyAfter implements TaskListener {
                 busProcessNewNext.setMsgType("clause");
                 busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
                 busProcessNewNext.setMesg(object.toJSONString());
-//                busProcessNewNext.setMesg(object.toJSONString());
                 busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey());
                 busProcessNewNext.setFinishFlag("0");
                 busProcessNewNext.setTaskInfo(delegateTask.getName());
@@ -106,6 +105,15 @@ public class DirectorVerifyAfter implements TaskListener {
                 busProcessNewNext.setPrcName(prcName);
                 busBean.save(busProcessNewNext);
             }
+        }else {
+            BusProcessNew busProcessNewNext = new BusProcessNew();
+            busProcessNewNext.setMsgType("clause");
+            busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
+            busProcessNewNext.setMesg(object.toJSONString());
+            busProcessNewNext.setFinishFlag("0");
+            busProcessNewNext.setTaskInfo(delegateTask.getName());
+            busProcessNewNext.setPrcName(prcName);
+            busBean.save(busProcessNewNext);
         }
     }
 }

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

@@ -14,7 +14,7 @@ public class DirectorVerifyBefore implements TaskListener {
     @Override
     public void notify(DelegateTask delegateTask) {
 
-        String link = "bzqdfbStep2?prcType=22";
+        String link = "bzhhStep?prcType=22";
         IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
         QueryWrapper queryWrapper1 = new QueryWrapper();
         queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());

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

@@ -30,25 +30,21 @@ public class MemberUploadInfoAfter implements TaskListener {
         IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
         //流程信息
         IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class);
-
-        LawsUserInfoService lawsUserInfoService = SpringContextUtil.getBean(LawsUserInfoService.class);
-
         //根据流程id找到流程信息
         QueryWrapper<Datas> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId());
         Datas datas = datasService.getOne(queryWrapper);
-
         JSONObject object =  JSONObject.parseObject(datas.getFormValsJson());
         delegateTask.setVariable("objectJson",object);
         List<String> nextUserList = new ArrayList();
 
-
+        String prcName ="标准化活动会后流程-";
         if(StringUtils.isNotBlank(object.getString("director"))) {
+            prcName = prcName + "标准法规业务主管批准";
             nextUserList.add(object.getString("director"));
-            delegateTask.setVariable("director", nextUserList);
+            delegateTask.setVariable("director", object.getString("director"));
         }
 
-
         //截止时间 流程描述 创建人
         String user = object.getString("prcCreateUser");
         delegateTask.setVariable("createUser", user);
@@ -56,9 +52,6 @@ public class MemberUploadInfoAfter implements TaskListener {
         delegateTask.setVariable("createUserName", username);
         String standName = object.getString("listName");
         delegateTask.setVariable("listName", standName);
-        String prcName = "";
-
-        prcName = standName + "-标准化活动会后流程-";
 
         QueryWrapper queryWrapper2 = new QueryWrapper();
         queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
@@ -77,7 +70,6 @@ public class MemberUploadInfoAfter implements TaskListener {
                 busProcessNewNext.setMsgType("clause");
                 busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
                 busProcessNewNext.setMesg(object.toJSONString());
-//                busProcessNewNext.setMesg(object.toJSONString());
                 busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey());
                 busProcessNewNext.setFinishFlag("0");
                 busProcessNewNext.setTaskInfo(delegateTask.getName());

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

@@ -14,7 +14,7 @@ public class MemberUploadInfoBefore implements TaskListener {
     @Override
     public void notify(DelegateTask delegateTask) {
 
-        String link = "bzqdfbStep2?prcType=22";
+        String link = "bzhhStep?prcType=22";
         IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
         QueryWrapper queryWrapper1 = new QueryWrapper();
         queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());

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

@@ -30,74 +30,56 @@ public class ChargeVerifyAfter implements TaskListener {
         IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
         //流程信息
         IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class);
-
-        LawsUserInfoService lawsUserInfoService = SpringContextUtil.getBean(LawsUserInfoService.class);
-
         //根据流程id找到流程信息
         QueryWrapper<Datas> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId());
         Datas datas = datasService.getOne(queryWrapper);
-
         JSONObject object =  JSONObject.parseObject(datas.getFormValsJson());
         delegateTask.setVariable("objectJson",object);
         List<String> nextUserList = new ArrayList();
 
-
+        String prcName = "标准化活动参会流程-";
-
+        JSONObject sum = new JSONObject();
+        if(null == delegateTask.getVariable("membersSumJSON")){
+            delegateTask.setVariable("membersSumJSON",sum);
+        }
         Integer count = 0;
-
         if(null == delegateTask.getVariable("chargePassCount")){
             delegateTask.setVariable("chargePassCount",count);
         }
-        JSONArray objects = new JSONArray();
+
-        if(null == delegateTask.getVariable("chargePassList")) {
+        if("1".equals(object.getString("passFlag"))){//通过
-            delegateTask.setVariable("chargePassList", objects);
+            JSONArray os = object.getJSONObject("ch_pageData").getJSONArray("myPartRole");
-        }
+            sum = delegateTask.getVariable("membersSumJSON",JSONObject.class);
-        // 审批
+            if(sum.isEmpty()){
-        //防止重复审批同一对象
+                sum = object;
-        List<String> idList = new ArrayList<>();
+                delegateTask.setVariable("membersSumJSON",sum);
-        if(null == delegateTask.getVariable("chargeIdList")){
+            }else {
-            delegateTask.setVariable("chargeIdList", idList);
+                JSONObject o1 = sum.getJSONObject("ch_pageData");
-        }
+                JSONObject o = os.getJSONObject(0);
-        int rat = 0;
+                JSONArray os1 = sum.getJSONObject("ch_pageData").getJSONArray("myPartRole");
-        idList = delegateTask.getVariable("chargeIdList",List.class);
+                os1.add(o);
-        if(!idList.isEmpty()){
+                o1.put("myPartRole",os1);
-            for(String a : idList){
+                sum.put("ch_pageData",o1);
-                if(a.equals(object.getString("member"))){
+                delegateTask.setVariable("membersSumJSON",sum);
-                    rat = 1;
-                    break;
-                }
             }
-        }
+            count = delegateTask.getVariable("chargePassCount",Integer.class);
-        if(rat == 0){
+            delegateTask.setVariable("chargePassCount",count + 1);
-            if("1".equals(object.getString("passFlag"))){//通过
+            delegateTask.setVariable("pass2",1);//排他通道
-
+            System.out.println(delegateTask.getVariable("chargePassList"));
-                idList.add(object.getString("member"));
+            if(delegateTask.getVariable("memberCount", Integer.class).equals(delegateTask.getVariable("chargePassCount", Integer.class))){
-                delegateTask.setVariable("chargeIdList",idList);
+                prcName = prcName + "标准法规工程师修订";
-
+                if(StringUtils.isNotBlank(object.getString("engineerSum"))) {
-                delegateTask.setVariable("pass2",1);//排他通道
+                    nextUserList.add(object.getString("engineerSum"));
-                count = delegateTask.getVariable("chargePassCount",Integer.class);
+                    delegateTask.setVariable("engineerSum", object.getString("engineerSum"));
-                delegateTask.setVariable("chargePassCount",count + 1);
-                objects = delegateTask.getVariable("chargePassList",JSONArray.class);
-                objects.add(object);
-                delegateTask.setVariable("chargePassList",objects);
-                System.out.println(delegateTask.getVariable("chargePassList"));
-                if(delegateTask.getVariable("memberCount", Integer.class).equals(delegateTask.getVariable("chargePassCount", Integer.class))){
-                    if(StringUtils.isNotBlank(object.getString("engineerSum"))) {
-                        nextUserList.add(object.getString("engineerSum"));
-                        delegateTask.setVariable("engineerSum", nextUserList);
-                    }//下一节点
                 }
-            }else{
-                delegateTask.setVariable("pass2",0);//排他通道
-                if(StringUtils.isNotBlank(object.getString("member"))) {
-                    nextUserList.add(object.getString("member"));
-                    delegateTask.setVariable("member", nextUserList);
-                }//驳回重写
             }
         }else{
-            throw new ActivitiException("审批过了");
+            prcName = prcName + "参会代表填写参会信息表";
+            delegateTask.setVariable("pass2",0);//排他通道
+            nextUserList.add(object.getString("member"));
         }
+
 //         存储当前节点意见
         if (null != object.getString("commentText")) {
             QueryWrapper queryWrapper3 = new QueryWrapper();
@@ -112,8 +94,6 @@ public class ChargeVerifyAfter implements TaskListener {
             }
         }
 
-
-
         //截止时间 流程描述 创建人
         String user = object.getString("prcCreateUser");
         delegateTask.setVariable("createUser", user);
@@ -121,9 +101,6 @@ public class ChargeVerifyAfter implements TaskListener {
         delegateTask.setVariable("createUserName", username);
         String standName = object.getString("listName");
         delegateTask.setVariable("listName", standName);
-        String prcName = "";
-
-prcName = standName + "-标准化活动参会流程-";
 
         QueryWrapper queryWrapper2 = new QueryWrapper();
         queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
@@ -141,8 +118,12 @@ prcName = standName + "-标准化活动参会流程-";
                 BusProcessNew busProcessNewNext = new BusProcessNew();
                 busProcessNewNext.setMsgType("clause");
                 busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
-                busProcessNewNext.setMesg(objects.toJSONString());
+                if(delegateTask.getVariable("pass2",Integer.class).equals(0)){
-//                busProcessNewNext.setMesg(object.toJSONString());
+                    busProcessNewNext.setMesg(object.toJSONString());
+                }else{
+                    JSONObject hand = delegateTask.getVariable("membersSumJSON",JSONObject.class);
+                    busProcessNewNext.setMesg(hand.toJSONString());
+                }
                 busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey());
                 busProcessNewNext.setFinishFlag("0");
                 busProcessNewNext.setTaskInfo(delegateTask.getName());
@@ -151,5 +132,6 @@ prcName = standName + "-标准化活动参会流程-";
                 busBean.save(busProcessNewNext);
             }
         }
+
     }
 }

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

@@ -14,7 +14,7 @@ public class ChargeVerifyBefore implements TaskListener {
     @Override
     public void notify(DelegateTask delegateTask) {
 
-        String link = "bzqdfbStep2?prcType=21";
+        String link = "bzchStep4?prcType=21";
 
         IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
         QueryWrapper queryWrapper1 = new QueryWrapper();

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

@@ -30,59 +30,42 @@ public class DirectorChooseAfter implements TaskListener {
         //流程信息
         IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class);
 
-        LawsUserInfoService lawsUserInfoService = SpringContextUtil.getBean(LawsUserInfoService.class);
-
         //根据流程id找到流程信息
         QueryWrapper<Datas> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId());
         Datas datas = datasService.getOne(queryWrapper);
-
         JSONObject object =  JSONObject.parseObject(datas.getFormValsJson());
         delegateTask.setVariable("objectJson",object);
-
         List<String> nextUserList = new ArrayList();
-        System.out.println("后置搭建完成");
+
         //如果 他是通过 passFlag==1
         List<String> passMemberList = new ArrayList<>();
         if(null == delegateTask.getVariable("memberList")){
             delegateTask.setVariable("memberList", passMemberList);
         }
+        String prcName = "标准化活动参会流程-";
 
-        //防止重复审批同一对象
+        //全员不通过，检测条件 directorCount
-        List<String> idList = new ArrayList<>();
+        //TODO 1全员不通过,2会后需要多实例吗?
-        if(null == delegateTask.getVariable("memberIdList")){
+        Integer allCount = delegateTask.getVariable("directorList",List.class).size();;
-            delegateTask.setVariable("memberIdList", idList);
+        Integer count = 0;
+        if(null == delegateTask.getVariable("directorCount")){
+            delegateTask.setVariable("directorCount", count);
         }
-        int rat = 0;
+        count = delegateTask.getVariable("directorCount",Integer.class);
-        idList = delegateTask.getVariable("memberIdList",List.class);
+        delegateTask.setVariable("directorCount",count+1);
-        if(!idList.isEmpty()){
-            for(String a : idList){
-                if(a.equals(object.getString("memberId"))){
-                    rat = 1;
-                    break;
-                }
-            }
-        }
-        idList.add(object.getString("memberId"));
-        delegateTask.setVariable("memberIdList",idList);
 
-        if(rat == 0){
+        if("1".equals(object.getString("passFlag"))) {
-            if("1".equals(object.getString("passFlag"))) {
+            prcName = prcName + "参会代表填写参会信息表";
-
+            nextUserList.add(object.getString("memberId"));
-                nextUserList.add(object.getString("memberId"));
+            if (null!=delegateTask.getVariable("memberList")) {
-                if (null!=delegateTask.getVariable("memberList")) {
+                List<String> middle=delegateTask.getVariable("memberList",List.class);
-                    List<String> middle=delegateTask.getVariable("memberList",List.class);
+                middle.addAll(nextUserList);
-                    middle.addAll(nextUserList);
+                delegateTask.setVariable("memberList",middle);
-                    delegateTask.setVariable("memberList",middle);
+            }else {
-                }else {
+                delegateTask.setVariable("memberList",nextUserList);
-                    delegateTask.setVariable("memberList",nextUserList);
-                }
-                delegateTask.setVariable("memberCount",delegateTask.getVariable("memberList",List.class).size());
-            }else{
-                //TODO 如果所有人未通过，则结束流程
             }
-        }else{
+            delegateTask.setVariable("memberCount",delegateTask.getVariable("memberList",List.class).size());
-            throw new ActivitiException("此对象已经审批过了");
         }
 
 
@@ -106,9 +89,6 @@ public class DirectorChooseAfter implements TaskListener {
         delegateTask.setVariable("createUserName", username);
         String standName = object.getString("listName");
         delegateTask.setVariable("listName", standName);
-        String prcName = "";
-
-        prcName = standName + "-标准化活动参会流程-";
 
         QueryWrapper queryWrapper2 = new QueryWrapper();
         queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());

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

@@ -14,7 +14,7 @@ public class DirectorChooseBefore implements TaskListener {
     @Override
     public void notify(DelegateTask delegateTask) {
 
-        String link = "bzqdfbStep2?prcType=21";
+        String link = "bzchStep2?prcType=21";
         IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
         QueryWrapper queryWrapper1 = new QueryWrapper();
         queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());

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

@@ -2,7 +2,6 @@ package com.ydw.bat.wkflow.listener.StandardMeetProcess;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.ydw.bat.wkflow.business_auth.LawsUserInfoService;
 import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName;
 import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew;
 import com.ydw.bat.wkflow.business_main.datas.entity.Datas;
@@ -12,7 +11,6 @@ import com.ydw.bat.wkflow.business_main.datas.service.IDatasService;
 import com.ydw.bat.wkflow.util.SpringContextUtil;
 import org.activiti.engine.delegate.DelegateTask;
 import org.activiti.engine.delegate.TaskListener;
-import org.apache.commons.lang.StringUtils;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -28,23 +26,18 @@ public class EngineerReviseAfter implements TaskListener {
         IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
         //流程信息
         IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class);
-
-        LawsUserInfoService lawsUserInfoService = SpringContextUtil.getBean(LawsUserInfoService.class);
-
         //根据流程id找到流程信息
         QueryWrapper<Datas> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId());
         Datas datas = datasService.getOne(queryWrapper);
-
         JSONObject object =  JSONObject.parseObject(datas.getFormValsJson());
         delegateTask.setVariable("objectJson",object);
-
         List<String> nextUserList = new ArrayList();
 
-        if (StringUtils.isNotBlank(object.getString("leader"))) {
+        String prcName = "标准化活动参会流程-";
-            nextUserList.add(object.getString("leader"));
+        prcName = prcName + "技术管理中心主任审批";
-            delegateTask.setVariable("leader", nextUserList);
+        nextUserList.add(object.getString("leader"));
-        }
+        delegateTask.setVariable("leader", object.getString("leader"));
 
         //截止时间 流程描述 创建人
         String user = object.getString("prcCreateUser");
@@ -53,9 +46,6 @@ public class EngineerReviseAfter implements TaskListener {
         delegateTask.setVariable("createUserName", username);
         String standName = object.getString("listName");
         delegateTask.setVariable("listName", standName);
-        String prcName = "";
-
-        prcName = standName + "-标准化活动参会流程-";
 
         QueryWrapper queryWrapper2 = new QueryWrapper();
         queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());

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

@@ -14,7 +14,7 @@ public class EngineerReviseBefore implements TaskListener {
     @Override
     public void notify(DelegateTask delegateTask) {
 
-        String link = "bzqdfbStep2?prcType=21";
+        String link = "bzchStep5?prcType=21";
         IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
         QueryWrapper queryWrapper1 = new QueryWrapper();
         queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());

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

@@ -1,5 +1,7 @@
 package com.ydw.bat.wkflow.listener.StandardMeetProcess;
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.ydw.bat.wkflow.business_auth.LawsUserInfoService;
@@ -9,6 +11,7 @@ import com.ydw.bat.wkflow.business_main.datas.entity.Datas;
 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.business_main.datas.service.IDatasService;
+import com.ydw.bat.wkflow.business_slrs.dao.SapMeeting;
 import com.ydw.bat.wkflow.util.SpringContextUtil;
 import org.activiti.engine.delegate.DelegateTask;
 import org.activiti.engine.delegate.TaskListener;
@@ -17,6 +20,7 @@ import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.UUID;
 
 /**
  * EngineerReviseDone - 标准法规工程师汇总修订
@@ -27,26 +31,20 @@ public class EngineerReviseDoneAfter implements TaskListener {
         IDatasService datasService = SpringContextUtil.getBean(IDatasService.class);
         //流程节点信息
         IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
+        //存储会议信息
+        LawsUserInfoService lawsUserInfoService = SpringContextUtil.getBean(LawsUserInfoService.class);
         //流程信息
         IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class);
-
-        LawsUserInfoService lawsUserInfoService = SpringContextUtil.getBean(LawsUserInfoService.class);
-
         //根据流程id找到流程信息
         QueryWrapper<Datas> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId());
         Datas datas = datasService.getOne(queryWrapper);
-
         JSONObject object =  JSONObject.parseObject(datas.getFormValsJson());
         delegateTask.setVariable("objectJson",object);
-
         List<String> nextUserList = new ArrayList();
 
-
+        String prcName = "标准化活动参会流程-";
-        //TODO 流程结束，汇总
+        prcName = prcName + "流程结束";
-
-
-
 
 
         //截止时间 流程描述 创建人
@@ -57,9 +55,8 @@ public class EngineerReviseDoneAfter implements TaskListener {
         delegateTask.setVariable("createUserName", username);
         String standName = object.getString("listName");
         delegateTask.setVariable("listName", standName);
-        String prcName = "";
 
-        prcName = standName + "-标准化活动参会流程-";
+        prcName = "标准化活动参会流程";
 
         QueryWrapper queryWrapper2 = new QueryWrapper();
         queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
@@ -67,6 +64,7 @@ public class EngineerReviseDoneAfter implements TaskListener {
         if (one1 != null) {
             one1.setPrcType("21");
             one1.setPrcName(prcName);
+            one1.setOverTime(OVERTIME);
             one1.setCreatUser(user);
             one1.setCreatUserName(username);
             busProcessNameService.saveOrUpdate(one1);
@@ -85,6 +83,42 @@ public class EngineerReviseDoneAfter implements TaskListener {
                 busProcessNewNext.setPrcName(prcName);
                 busBean.save(busProcessNewNext);
             }
+        }else {
+            JSONObject json = object.getJSONObject("ch_pageData");
+            JSONArray attends = json.getJSONArray("myPartRole");
+            JSONArray files = json.getJSONArray("fileTextList");
+            JSONArray tables = json.getJSONArray("meetingTable");
+            StringBuilder contents = new StringBuilder();
+            for(Object table : tables){
+                JSONObject t = (JSONObject) table;
+                if(t.getString("meetingTheme") != null){
+                    if(contents.length() > 0){
+                        contents.append(";").append(t.getString("meetingTheme"));
+                    }else{
+                        contents.append(t.getString("meetingTheme"));
+                    }
+                }
+            }
+
+            SapMeeting sapMeeting= new SapMeeting();
+            sapMeeting.setTitle(json.getString("meetingName"));
+            sapMeeting.setDate(json.getDate("meetingStartTime"));
+            sapMeeting.setType(1);
+            sapMeeting.setId(UUID.randomUUID().toString());
+            sapMeeting.setAttend(attends.toJSONString());
+            sapMeeting.setFiles(files.toJSONString());
+            sapMeeting.setContent(contents.toString());
+
+            BusProcessNew busProcessNewNext = new BusProcessNew();
+            busProcessNewNext.setMsgType("clause");
+            busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
+            busProcessNewNext.setMesg(object.toJSONString());
+            busProcessNewNext.setFinishFlag("0");
+            busProcessNewNext.setTaskInfo("标准化活动参会流程-流程结束");
+            busProcessNewNext.setPrcName(prcName);
+            busBean.save(busProcessNewNext);
+            lawsUserInfoService.addMeeting(sapMeeting);
+
         }
     }
 }

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

@@ -14,7 +14,7 @@ public class EngineerReviseDoneBefore implements TaskListener {
     @Override
     public void notify(DelegateTask delegateTask) {
 
-        String link = "bzqdfbStep2?prcType=21";
+        String link = "bzchStep6?prcType=21";
         IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
         QueryWrapper queryWrapper1 = new QueryWrapper();
         queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());

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

@@ -29,19 +29,15 @@ public class LeaderVerifyAfter implements TaskListener {
         IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
         //流程信息
         IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class);
-
-        LawsUserInfoService lawsUserInfoService = SpringContextUtil.getBean(LawsUserInfoService.class);
-
         //根据流程id找到流程信息
         QueryWrapper<Datas> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId());
         Datas datas = datasService.getOne(queryWrapper);
-
         JSONObject object =  JSONObject.parseObject(datas.getFormValsJson());
         delegateTask.setVariable("objectJson",object);
-
         List<String> nextUserList = new ArrayList();
 
+        String prcName = "标准化活动参会流程-";
         if("1".equals(object.getString("passFlag"))) {//通过
             delegateTask.setVariable("pass3",1);
             if(StringUtils.isNotBlank(object.getString("manageDepartmentList"))) {
@@ -54,16 +50,12 @@ public class LeaderVerifyAfter implements TaskListener {
                 // 配置多实例
                 delegateTask.setVariable("manageDepartmentList", nextUserList);
                 delegateTask.setVariable("manageDepartmentCount",nextUserList.size());
-
+                prcName = prcName + "费用管理部门会签";
             }
         }else{
             delegateTask.setVariable("pass3",0);
-
+            nextUserList.add(delegateTask.getVariable("engineerSum",String.class));
-            //若有通过参数重新指定代理人，则更换代理人，否则使用之前节点设定的原有代理人
+            prcName = prcName + "标准法规工程师修订";
-            if(StringUtils.isNotBlank(object.getString("engineerSum"))) {
-                nextUserList.add(object.getString("engineerSum"));
-                delegateTask.setVariable("engineerSum", nextUserList);
-            }
         }
         //         存储当前节点意见
         if (null != object.getString("commentText")) {
@@ -87,9 +79,6 @@ public class LeaderVerifyAfter implements TaskListener {
         delegateTask.setVariable("createUserName", username);
         String standName = object.getString("listName");
         delegateTask.setVariable("listName", standName);
-        String prcName = "";
-
-        prcName = standName + "-标准化活动参会流程-";
 
         QueryWrapper queryWrapper2 = new QueryWrapper();
         queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());

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

@@ -14,7 +14,7 @@ public class LeaderVerifyBefore implements TaskListener {
     @Override
     public void notify(DelegateTask delegateTask) {
 
-        String link = "bzqdfbStep2?prcType=21";
+        String link = "bzchStep6?prcType=21";
         IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
         QueryWrapper queryWrapper1 = new QueryWrapper();
         queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());

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

@@ -29,65 +29,34 @@ public class ManageSignAfter implements TaskListener {
         IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
         //流程信息
         IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class);
-
-        LawsUserInfoService lawsUserInfoService = SpringContextUtil.getBean(LawsUserInfoService.class);
-
         //根据流程id找到流程信息
         QueryWrapper<Datas> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId());
         Datas datas = datasService.getOne(queryWrapper);
-
         JSONObject object =  JSONObject.parseObject(datas.getFormValsJson());
         delegateTask.setVariable("objectJson",object);
-
         List<String> nextUserList = new ArrayList();
+
+        String prcName = "标准化活动参会流程-";
         Integer count = 0;
         if(null == delegateTask.getVariable("managePassCount")){
             delegateTask.setVariable("managePassCount",count);
         }
-
+        if("1".equals(object.getString("passFlag"))) {//通过
-        //防止重复审批同一对象
+            count = delegateTask.getVariable("managePassCount",Integer.class);
-        List<String> idList = new ArrayList<>();
+            count++;
-        if(null == delegateTask.getVariable("manageIdList")){
+            delegateTask.setVariable("managePassCount",count);
-            delegateTask.setVariable("manageIdList", idList);
+            if(delegateTask.getVariable("manageDepartmentCount", Integer.class).equals(delegateTask.getVariable("managePassCount", Integer.class))){
-        }
+                prcName = prcName + "技术委员会常务副主任/总院院长审定";
-        int rat = 0;
+                nextUserList.add(object.getString("president"));
-        idList = delegateTask.getVariable("manageIdList",List.class);
+                delegateTask.setVariable("managePassCount",0);
-        if(!idList.isEmpty()){
+                delegateTask.setVariable("president", object.getString("president"));
-            for(String a : idList){
+                delegateTask.setVariable("pass4",1);
-                if(a.equals(object.getString("manageDepartment"))){
-                    rat = 1;
-                    break;
-                }
-            }
-        }
-        idList.add(object.getString("manageDepartment"));
-        delegateTask.setVariable("manageIdList",idList);
-        if(rat == 0){
-            if("1".equals(object.getString("passFlag"))) {//通过
-
-                count = delegateTask.getVariable("managePassCount",Integer.class);
-                count++;
-                delegateTask.setVariable("managePassCount",count);
-                if(delegateTask.getVariable("manageDepartmentCount", Integer.class).equals(delegateTask.getVariable("managePassCount", Integer.class))){
-                    if(StringUtils.isNotBlank(object.getString("president"))) {
-                        nextUserList.add(object.getString("president"));
-                        delegateTask.setVariable("president", nextUserList);
-                    }
-                    delegateTask.setVariable("pass4",1);
-                }
-
-            }else{
-                delegateTask.setVariable("pass4",0);
-
-                delegateTask.removeVariable("manageIdList");
-                if(StringUtils.isNotBlank(object.getString("engineerSum"))) {
-                    nextUserList.add(object.getString("engineerSum"));
-                    delegateTask.setVariable("engineerSum", nextUserList);
-                }
             }
         }else{
-            throw new ActivitiException("此对象已经审批过了");
+            prcName = prcName + "标准法规工程师修订";
+            delegateTask.setVariable("pass4",0);
+            nextUserList.add(delegateTask.getVariable("engineerSum",String.class));
         }
 //         存储当前节点意见
         if (null != object.getString("commentText")) {
@@ -102,6 +71,8 @@ public class ManageSignAfter implements TaskListener {
                 busBean.saveOrUpdate(busProcessNews);
             }
         }
+
+
         //截止时间 流程描述 创建人
         String user = object.getString("prcCreateUser");
         delegateTask.setVariable("createUser", user);
@@ -109,9 +80,6 @@ public class ManageSignAfter implements TaskListener {
         delegateTask.setVariable("createUserName", username);
         String standName = object.getString("listName");
         delegateTask.setVariable("listName", standName);
-        String prcName = "";
-
-        prcName = standName + "-标准化活动参会流程-";
 
         QueryWrapper queryWrapper2 = new QueryWrapper();
         queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());

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

@@ -14,7 +14,7 @@ public class ManageSignBefore implements TaskListener {
     @Override
     public void notify(DelegateTask delegateTask) {
 
-        String link = "bzqdfbStep2?prcType=21";
+        String link = "bzchStep6?prcType=21";
         IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
         QueryWrapper queryWrapper1 = new QueryWrapper();
         queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());

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

@@ -28,33 +28,24 @@ public class PresidentVerifyAfter implements TaskListener {
         IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
         //流程信息
         IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class);
-
-        LawsUserInfoService lawsUserInfoService = SpringContextUtil.getBean(LawsUserInfoService.class);
-
         //根据流程id找到流程信息
         QueryWrapper<Datas> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId());
         Datas datas = datasService.getOne(queryWrapper);
-
         JSONObject object =  JSONObject.parseObject(datas.getFormValsJson());
         delegateTask.setVariable("objectJson",object);
-
         List<String> nextUserList = new ArrayList();
 
-        // 入会申请信息重新封装
+        String prcName = "标准化活动参会流程-";
         if("1".equals(object.getString("passFlag"))) {//通过
+            prcName = prcName + "标准法规工程师修订完毕";
             delegateTask.setVariable("pass5",1);
-            if(StringUtils.isNotBlank(object.getString("engineerSumDone"))) {
+            nextUserList.add(object.getString("engineerSumDone"));
-                nextUserList.add(object.getString("engineerSumDone"));
+            delegateTask.setVariable("engineerSumDone", object.getString("engineerSumDone"));
-                delegateTask.setVariable("engineerSumDone", nextUserList);
-            }
-
         }else{
+            prcName = prcName + "标准法规工程师修订";
             delegateTask.setVariable("pass5",0);
-            if(StringUtils.isNotBlank(object.getString("engineerSum"))) {
+            nextUserList.add(delegateTask.getVariable("engineerSum",String.class));
-                nextUserList.add(object.getString("engineerSum"));
-                delegateTask.setVariable("engineerSum", nextUserList);
-            }
         }
         //         存储当前节点意见
         if (null != object.getString("commentText")) {
@@ -77,9 +68,6 @@ public class PresidentVerifyAfter implements TaskListener {
         delegateTask.setVariable("createUserName", username);
         String standName = object.getString("listName");
         delegateTask.setVariable("listName", standName);
-        String prcName = "";
-
-        prcName = standName + "-标准化活动参会流程-";
 
         QueryWrapper queryWrapper2 = new QueryWrapper();
         queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());

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

@@ -14,7 +14,7 @@ public class PresidentVerifyBefore implements TaskListener {
     @Override
     public void notify(DelegateTask delegateTask) {
 
-        String link = "bzqdfbStep2?prcType=21";
+        String link = "bzchStep6?prcType=21";
         IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
         QueryWrapper queryWrapper1 = new QueryWrapper();
         queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());

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

@@ -29,22 +29,16 @@ public class WriteMaterialAfter implements TaskListener {
         IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
         //流程信息
         IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class);
-
-        LawsUserInfoService lawsUserInfoService = SpringContextUtil.getBean(LawsUserInfoService.class);
-
         //根据流程id找到流程信息
         QueryWrapper<Datas> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId());
         Datas datas = datasService.getOne(queryWrapper);
-
         JSONObject object =  JSONObject.parseObject(datas.getFormValsJson());
         delegateTask.setVariable("objectJson",object);
-
         List<String> nextUserList = new ArrayList();
 
-        // 入会申请信息重新封装
+        String prcName = "标准化活动参会流程-";
         if(StringUtils.isNotBlank(object.getString("directorList"))) {
-
             if (object.getString("directorList").contains(",")) {
                 nextUserList = Arrays.asList(object.getString("directorList").split(","));
             } else {
@@ -52,7 +46,9 @@ public class WriteMaterialAfter implements TaskListener {
             }
             // 配置多实例
             delegateTask.setVariable("directorList", nextUserList);
+            prcName = prcName + "分委会主任/部门中心主任提名入会代表";
         }
+
         //截止时间 流程描述 创建人
         String user = object.getString("prcCreateUser");
         delegateTask.setVariable("createUser", user);
@@ -60,9 +56,6 @@ public class WriteMaterialAfter implements TaskListener {
         delegateTask.setVariable("createUserName", username);
         String standName = object.getString("listName");
         delegateTask.setVariable("listName", standName);
-        String prcName = "";
-
-        prcName = standName + "-标准化活动参会流程-";
 
         QueryWrapper queryWrapper2 = new QueryWrapper();
         queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
@@ -74,7 +67,6 @@ public class WriteMaterialAfter implements TaskListener {
             one1.setCreatUserName(username);
             busProcessNameService.saveOrUpdate(one1);
         }
-
         if (nextUserList != null && !nextUserList.isEmpty()) {
             for (String nextUser : nextUserList) {
                 BusProcessNew busProcessNewNext = new BusProcessNew();

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

@@ -15,7 +15,7 @@ public class WriteMaterialBefore implements TaskListener {
     @Override
     public void notify(DelegateTask delegateTask) {
 
-        String link = "bzqdfbStep2?prcType=21";
+        String link = "bzchStep?prcType=21";
         IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
         QueryWrapper queryWrapper1 = new QueryWrapper();
         queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());

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

@@ -29,27 +29,18 @@ public class WriteMemberInfoAfter implements TaskListener {
         IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
         //流程信息
         IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class);
-
-        LawsUserInfoService lawsUserInfoService = SpringContextUtil.getBean(LawsUserInfoService.class);
-
         //根据流程id找到流程信息
         QueryWrapper<Datas> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId());
         Datas datas = datasService.getOne(queryWrapper);
-
         JSONObject object =  JSONObject.parseObject(datas.getFormValsJson());
         delegateTask.setVariable("objectJson",object);
-
         List<String> nextUserList = new ArrayList();
 
-
+        String prcName = "标准化活动参会流程-";
-        //
+        prcName = prcName + "参会人员所在部门中心主任审核";
-        if(StringUtils.isNotBlank(object.getString("charge"))) {
+        nextUserList.add(object.getString("charge"));
-            nextUserList.add(object.getString("charge"));
+        delegateTask.setVariable("charge", object.getString("charge"));
-            delegateTask.setVariable("charge", nextUserList);
-            System.out.println(delegateTask.getVariable("charge"));
-        }
-
 
         //截止时间 流程描述 创建人
         String user = object.getString("prcCreateUser");
@@ -58,9 +49,6 @@ public class WriteMemberInfoAfter implements TaskListener {
         delegateTask.setVariable("createUserName", username);
         String standName = object.getString("listName");
         delegateTask.setVariable("listName", standName);
-        String prcName = "";
-
-        prcName = standName + "-标准化活动参会流程-";
 
         QueryWrapper queryWrapper2 = new QueryWrapper();
         queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());

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

@@ -14,7 +14,7 @@ public class WriteMemberInfoBefore implements TaskListener {
     @Override
     public void notify(DelegateTask delegateTask) {
 
-        String link = "bzqdfbStep2?prcType=21";
+        String link = "bzchStep3?prcType=21";
         IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
         QueryWrapper queryWrapper1 = new QueryWrapper();
         queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());

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

@@ -1,5 +1,6 @@
 package com.ydw.bat.wkflow.listener.standardApplyMeetProcess;
 
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -14,6 +15,7 @@ import com.ydw.bat.wkflow.util.SpringContextUtil;
 import org.activiti.engine.ActivitiException;
 import org.activiti.engine.delegate.DelegateTask;
 import org.activiti.engine.delegate.TaskListener;
+import org.activiti.engine.impl.json.JsonObjectConverter;
 import org.apache.commons.lang.StringUtils;
 
 import java.util.ArrayList;
@@ -30,74 +32,54 @@ public class ChargeVerifyAfter implements TaskListener {
         IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
         //流程信息
         IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class);
-
-        LawsUserInfoService lawsUserInfoService = SpringContextUtil.getBean(LawsUserInfoService.class);
-
         //根据流程id找到流程信息
         QueryWrapper<Datas> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId());
         Datas datas = datasService.getOne(queryWrapper);
-
         JSONObject object =  JSONObject.parseObject(datas.getFormValsJson());
         delegateTask.setVariable("objectJson",object);
         List<String> nextUserList = new ArrayList();
 
-
+        String prcName = "标准化活动入会流程-";
-
+        JSONObject sum = new JSONObject();
+        if(null == delegateTask.getVariable("membersSumJSON")){
+            delegateTask.setVariable("membersSumJSON",sum);
+        }
         Integer count = 0;
-
         if(null == delegateTask.getVariable("chargePassCount")){
             delegateTask.setVariable("chargePassCount",count);
         }
-        JSONArray objects = new JSONArray();
+        if("1".equals(object.getString("passFlag"))){//通过
-        if(null == delegateTask.getVariable("chargePassList")) {
+            JSONArray os = object.getJSONObject("rh_pageData").getJSONArray("myPartRole");
-            delegateTask.setVariable("chargePassList", objects);
+            sum = delegateTask.getVariable("membersSumJSON",JSONObject.class);
-        }
+            if(sum.isEmpty()){
-        // 审批
+                sum = object;
-        //防止重复审批同一对象
+                delegateTask.setVariable("membersSumJSON",sum);
-        List<String> idList = new ArrayList<>();
+            }else {
-        if(null == delegateTask.getVariable("chargeIdList")){
+                JSONObject o1 = sum.getJSONObject("rh_pageData");
-            delegateTask.setVariable("chargeIdList", idList);
+                JSONObject o = os.getJSONObject(0);
-        }
+                JSONArray os1 = sum.getJSONObject("rh_pageData").getJSONArray("myPartRole");
-        int rat = 0;
+                os1.add(o);
-        idList = delegateTask.getVariable("chargeIdList",List.class);
+                o1.put("myPartRole",os1);
-        if(!idList.isEmpty()){
+                sum.put("rh_pageData",o1);
-            for(String a : idList){
+                delegateTask.setVariable("membersSumJSON",sum);
-                if(a.equals(object.getString("member"))){
-                    rat = 1;
-                    break;
-                }
             }
-        }
+            count = delegateTask.getVariable("chargePassCount",Integer.class);
-        if(rat == 0){
+            delegateTask.setVariable("chargePassCount",count + 1);
-            if("1".equals(object.getString("passFlag"))){//通过
+            delegateTask.setVariable("pass2",1);//排他通道
-
+            if(delegateTask.getVariable("memberCount", Integer.class).equals(delegateTask.getVariable("chargePassCount", Integer.class))){
-                idList.add(object.getString("member"));
+                prcName = prcName + "标准法规工程师汇总修订";
-                delegateTask.setVariable("chargeIdList",idList);
+                if(StringUtils.isNotBlank(object.getString("engineerSum"))) {
-
+                    nextUserList.add(object.getString("engineerSum"));
-                delegateTask.setVariable("pass2",1);//排他通道
+                    delegateTask.setVariable("engineerSum", object.getString("engineerSum"));
-                count = delegateTask.getVariable("chargePassCount",Integer.class);
-                delegateTask.setVariable("chargePassCount",count + 1);
-                objects = delegateTask.getVariable("chargePassList",JSONArray.class);
-                objects.add(object);
-                delegateTask.setVariable("chargePassList",objects);
-                System.out.println(delegateTask.getVariable("chargePassList"));
-                if(delegateTask.getVariable("memberCount", Integer.class).equals(delegateTask.getVariable("chargePassCount", Integer.class))){
-                    if(StringUtils.isNotBlank(object.getString("engineerSum"))) {
-                        nextUserList.add(object.getString("engineerSum"));
-                        delegateTask.setVariable("engineerSum", nextUserList);
-                    }//下一节点
                 }
-            }else{
-                delegateTask.setVariable("pass2",0);//排他通道
-                if(StringUtils.isNotBlank(object.getString("member"))) {
-                    nextUserList.add(object.getString("member"));
-                    delegateTask.setVariable("member", nextUserList);
-                }//驳回重写
             }
         }else{
-            throw new ActivitiException("审批过了");
+                prcName = prcName + "入会代表填写入会信息表";
+                delegateTask.setVariable("pass2",0);//排他通道
+                nextUserList.add(object.getString("member"));
         }
+
 //         存储当前节点意见
         if (null != object.getString("commentText")) {
             QueryWrapper queryWrapper3 = new QueryWrapper();
@@ -113,7 +95,6 @@ public class ChargeVerifyAfter implements TaskListener {
         }
 
 
-
         //截止时间 流程描述 创建人
         String user = object.getString("prcCreateUser");
         delegateTask.setVariable("createUser", user);
@@ -121,9 +102,7 @@ public class ChargeVerifyAfter implements TaskListener {
         delegateTask.setVariable("createUserName", username);
         String standName = object.getString("listName");
         delegateTask.setVariable("listName", standName);
-        String prcName = "";
 
-prcName = standName + "-标准化活动入会流程-";
 
         QueryWrapper queryWrapper2 = new QueryWrapper();
         queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
@@ -141,8 +120,12 @@ prcName = standName + "-标准化活动入会流程-";
                 BusProcessNew busProcessNewNext = new BusProcessNew();
                 busProcessNewNext.setMsgType("clause");
                 busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
-                busProcessNewNext.setMesg(objects.toJSONString());
+                if(delegateTask.getVariable("pass2",Integer.class).equals(0)){
-//                busProcessNewNext.setMesg(object.toJSONString());
+                    busProcessNewNext.setMesg(object.toJSONString());
+                }else{
+                    JSONObject hand = delegateTask.getVariable("membersSumJSON",JSONObject.class);
+                    busProcessNewNext.setMesg(hand.toJSONString());
+                }
                 busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey());
                 busProcessNewNext.setFinishFlag("0");
                 busProcessNewNext.setTaskInfo(delegateTask.getName());

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

@@ -14,7 +14,7 @@ public class ChargeVerifyBefore implements TaskListener {
     @Override
     public void notify(DelegateTask delegateTask) {
 
-        String link = "bzqdfbStep2?prcType=20";
+        String link = "bzrhStep4?prcType=20";
         IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
         QueryWrapper queryWrapper1 = new QueryWrapper();
         queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());

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

@@ -28,59 +28,42 @@ public class DirectorChooseAfter implements TaskListener {
         IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
         //流程信息
         IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class);
-
-        LawsUserInfoService lawsUserInfoService = SpringContextUtil.getBean(LawsUserInfoService.class);
-
         //根据流程id找到流程信息
         QueryWrapper<Datas> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId());
         Datas datas = datasService.getOne(queryWrapper);
-
         JSONObject object =  JSONObject.parseObject(datas.getFormValsJson());
         delegateTask.setVariable("objectJson",object);
-
         List<String> nextUserList = new ArrayList();
-        System.out.println("后置搭建完成");
+
+
+        String prcName = "标准化活动入会流程-";
         //如果 他是通过 passFlag==1
         List<String> passMemberList = new ArrayList<>();
         if(null == delegateTask.getVariable("memberList")){
             delegateTask.setVariable("memberList", passMemberList);
         }
 
-        //防止重复审批同一对象
+        //全员不通过，检测条件 directorCount
-        List<String> idList = new ArrayList<>();
+        Integer allCount = delegateTask.getVariable("directorList",List.class).size();;
-        if(null == delegateTask.getVariable("memberIdList")){
+        Integer count = 0;
-            delegateTask.setVariable("memberIdList", idList);
+        if(null == delegateTask.getVariable("directorCount")){
+            delegateTask.setVariable("directorCount", count);
         }
-        int rat = 0;
+        count = delegateTask.getVariable("directorCount",Integer.class);
-        idList = delegateTask.getVariable("memberIdList",List.class);
+        delegateTask.setVariable("directorCount",count+1);
-        if(!idList.isEmpty()){
-            for(String a : idList){
-                if(a.equals(object.getString("memberId"))){
-                    rat = 1;
-                    break;
-                }
-            }
-        }
-        idList.add(object.getString("memberId"));
-        delegateTask.setVariable("memberIdList",idList);
-        if(rat == 0){
-            if("1".equals(object.getString("passFlag"))) {
 
-                nextUserList.add(object.getString("memberId"));
+        if("1".equals(object.getString("passFlag"))) {
-                if (null!=delegateTask.getVariable("memberList")) {
+            prcName = prcName + "入会代表填写入会信息表";
-                    List<String> middle=delegateTask.getVariable("memberList",List.class);
+            nextUserList.add(object.getString("memberId"));
-                    middle.addAll(nextUserList);
+            if (null!=delegateTask.getVariable("memberList")) {
-                    delegateTask.setVariable("memberList",middle);
+                List<String> middle=delegateTask.getVariable("memberList",List.class);
-                }else {
+                middle.addAll(nextUserList);
-                    delegateTask.setVariable("memberList",nextUserList);
+                delegateTask.setVariable("memberList",middle);
-                }
+            }else {
-                delegateTask.setVariable("memberCount",delegateTask.getVariable("memberList",List.class).size());
+                delegateTask.setVariable("memberList",nextUserList);
-            }else{
-                //TODO 如果所有人未通过，则结束流程
             }
-        }else{
+            delegateTask.setVariable("memberCount",delegateTask.getVariable("memberList",List.class).size());
-            throw new ActivitiException("此对象已经审批过了");
         }
 
 
@@ -104,9 +87,7 @@ public class DirectorChooseAfter implements TaskListener {
         delegateTask.setVariable("createUserName", username);
         String standName = object.getString("listName");
         delegateTask.setVariable("listName", standName);
-        String prcName = "";
 
-        prcName = standName + "-标准化活动入会流程-";
 
         QueryWrapper queryWrapper2 = new QueryWrapper();
         queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());

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

@@ -14,7 +14,7 @@ public class DirectorChooseBefore implements TaskListener {
     @Override
     public void notify(DelegateTask delegateTask) {
 
-        String link = "bzqdfbStep2?prcType=20";
+        String link = "bzrhStep2?prcType=20";
 
         IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
         QueryWrapper queryWrapper1 = new QueryWrapper();

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

@@ -28,23 +28,20 @@ public class EngineerReviseAfter implements TaskListener {
         IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
         //流程信息
         IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class);
-
-        LawsUserInfoService lawsUserInfoService = SpringContextUtil.getBean(LawsUserInfoService.class);
-
         //根据流程id找到流程信息
         QueryWrapper<Datas> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId());
         Datas datas = datasService.getOne(queryWrapper);
-
         JSONObject object =  JSONObject.parseObject(datas.getFormValsJson());
         delegateTask.setVariable("objectJson",object);
-
         List<String> nextUserList = new ArrayList();
 
-        if (StringUtils.isNotBlank(object.getString("leader"))) {
+        String prcName = "标准化活动入会流程-";
-            nextUserList.add(object.getString("leader"));
+        prcName = prcName + "标准法规部主管领导审核";
-            delegateTask.setVariable("leader", nextUserList);
+        nextUserList.add(object.getString("leader"));
-        }
+        delegateTask.setVariable("leader", object.getString("leader"));
+
+
 
         //截止时间 流程描述 创建人
         String user = object.getString("prcCreateUser");
@@ -53,9 +50,7 @@ public class EngineerReviseAfter implements TaskListener {
         delegateTask.setVariable("createUserName", username);
         String standName = object.getString("listName");
         delegateTask.setVariable("listName", standName);
-        String prcName = "";
 
-        prcName = standName + "-标准化活动入会流程-";
 
         QueryWrapper queryWrapper2 = new QueryWrapper();
         queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());

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

@@ -14,7 +14,7 @@ public class EngineerReviseBefore implements TaskListener {
     @Override
     public void notify(DelegateTask delegateTask) {
 
-        String link = "bzqdfbStep2?prcType=20";
+        String link = "bzrhStep5?prcType=20";
 
         IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
         QueryWrapper queryWrapper1 = new QueryWrapper();

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

@@ -30,23 +30,17 @@ public class EngineerReviseDoneAfter implements TaskListener {
         //流程信息
         IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class);
 
-        LawsUserInfoService lawsUserInfoService = SpringContextUtil.getBean(LawsUserInfoService.class);
-
         //根据流程id找到流程信息
         QueryWrapper<Datas> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId());
         Datas datas = datasService.getOne(queryWrapper);
-
         JSONObject object =  JSONObject.parseObject(datas.getFormValsJson());
         delegateTask.setVariable("objectJson",object);
-
         List<String> nextUserList = new ArrayList();
 
-
+        String prcName = "标准化活动入会流程-";
-
+//            prcName = "标准化活动入会流程-" + "会议结束";
-        //TODO 流程结束，汇总
+        prcName = prcName + "流程结束";
-
-
 
         //截止时间 流程描述 创建人
         String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
@@ -56,9 +50,7 @@ public class EngineerReviseDoneAfter implements TaskListener {
         delegateTask.setVariable("createUserName", username);
         String standName = object.getString("listName");
         delegateTask.setVariable("listName", standName);
-        String prcName = "";
 
-        prcName = standName + "-标准化活动入会流程-";
 
         QueryWrapper queryWrapper2 = new QueryWrapper();
         queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
@@ -67,6 +59,7 @@ public class EngineerReviseDoneAfter implements TaskListener {
             one1.setPrcType("20");
             one1.setPrcName(prcName);
             one1.setCreatUser(user);
+            one1.setOverTime(OVERTIME);
             one1.setCreatUserName(username);
             busProcessNameService.saveOrUpdate(one1);
         }
@@ -84,6 +77,15 @@ public class EngineerReviseDoneAfter implements TaskListener {
                 busProcessNewNext.setPrcName(prcName);
                 busBean.save(busProcessNewNext);
             }
+        }else {
+            BusProcessNew busProcessNewNext = new BusProcessNew();
+            busProcessNewNext.setMsgType("clause");
+            busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
+            busProcessNewNext.setMesg(object.toJSONString());
+            busProcessNewNext.setFinishFlag("0");
+            busProcessNewNext.setTaskInfo(delegateTask.getName());
+            busProcessNewNext.setPrcName(prcName);
+            busBean.save(busProcessNewNext);
         }
     }
 }

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

@@ -14,8 +14,8 @@ public class EngineerReviseDoneBefore implements TaskListener {
     @Override
     public void notify(DelegateTask delegateTask) {
 
-        String link = "bzqdfbStep2?prcType=20";
+        String link = "bzrhStep6?prcType=20";
-
+//taskInfo=标准法规工程师汇总修订完毕
         IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
         QueryWrapper queryWrapper1 = new QueryWrapper();
         queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());

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

@@ -29,19 +29,15 @@ public class LeaderVerifyAfter implements TaskListener {
         IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
         //流程信息
         IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class);
-
-        LawsUserInfoService lawsUserInfoService = SpringContextUtil.getBean(LawsUserInfoService.class);
-
         //根据流程id找到流程信息
         QueryWrapper<Datas> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId());
         Datas datas = datasService.getOne(queryWrapper);
-
         JSONObject object =  JSONObject.parseObject(datas.getFormValsJson());
         delegateTask.setVariable("objectJson",object);
-
         List<String> nextUserList = new ArrayList();
 
+        String prcName = "标准化活动入会流程-";
         if("1".equals(object.getString("passFlag"))) {//通过
             delegateTask.setVariable("pass3",1);
             if(StringUtils.isNotBlank(object.getString("manageDepartmentList"))) {
@@ -52,16 +48,14 @@ public class LeaderVerifyAfter implements TaskListener {
                     nextUserList.add(object.getString("manageDepartmentList"));
                 }
                 // 配置多实例
+                prcName = prcName + "费用管理部门会签";
                 delegateTask.setVariable("manageDepartmentList", nextUserList);
                 delegateTask.setVariable("manageDepartmentCount",nextUserList.size());
-
             }
         }else{
+            prcName = prcName + "标准法规工程师汇总修订";
             delegateTask.setVariable("pass3",0);
-            if(StringUtils.isNotBlank(object.getString("engineerSum"))) {
+            nextUserList.add(delegateTask.getVariable("engineerSum",String.class));
-                nextUserList.add(object.getString("engineerSum"));
-                delegateTask.setVariable("engineerSum", nextUserList);
-            }
         }
         //         存储当前节点意见
         if (null != object.getString("commentText")) {
@@ -85,9 +79,7 @@ public class LeaderVerifyAfter implements TaskListener {
         delegateTask.setVariable("createUserName", username);
         String standName = object.getString("listName");
         delegateTask.setVariable("listName", standName);
-        String prcName = "";
 
-        prcName = standName + "-标准化活动入会流程-";
 
         QueryWrapper queryWrapper2 = new QueryWrapper();
         queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());

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

@@ -14,7 +14,9 @@ public class LeaderVerifyBefore implements TaskListener {
     @Override
     public void notify(DelegateTask delegateTask) {
 
-        String link = "bzqdfbStep2?prcType=20";
+        String link = "bzrhStep6?prcType=20";
+//        taskInfo=标准法规部主管领导审核
+
 
         IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
         QueryWrapper queryWrapper1 = new QueryWrapper();

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

@@ -30,67 +30,36 @@ public class ManageSignAfter implements TaskListener {
         //流程信息
         IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class);
 
-        LawsUserInfoService lawsUserInfoService = SpringContextUtil.getBean(LawsUserInfoService.class);
-
         //根据流程id找到流程信息
         QueryWrapper<Datas> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId());
         Datas datas = datasService.getOne(queryWrapper);
-
         JSONObject object =  JSONObject.parseObject(datas.getFormValsJson());
         delegateTask.setVariable("objectJson",object);
-
         List<String> nextUserList = new ArrayList();
+
+        String prcName = "标准化活动入会流程-";
         Integer count = 0;
         if(null == delegateTask.getVariable("managePassCount")){
             delegateTask.setVariable("managePassCount",count);
         }
-        //防止重复审批同一对象
+        if("1".equals(object.getString("passFlag"))) {//通过
-        List<String> idList = new ArrayList<>();
+            count = delegateTask.getVariable("managePassCount",Integer.class);
-        if(null == delegateTask.getVariable("manageIdList")){
+            count++;
-            delegateTask.setVariable("manageIdList", idList);
+            delegateTask.setVariable("managePassCount",count);
-        }
+            if(delegateTask.getVariable("manageDepartmentCount", Integer.class).equals(delegateTask.getVariable("managePassCount", Integer.class))){
-        int rat = 0;
+                prcName = prcName + "技术委员会常务副主任/总院院长审定";
-        idList = delegateTask.getVariable("manageIdList",List.class);
+                nextUserList.add(object.getString("president"));
-        if(!idList.isEmpty()){
+                delegateTask.setVariable("president", object.getString("president"));
-            for(String a : idList){
+                delegateTask.setVariable("managePassCount",0);
-                if(a.equals(object.getString("manageDepartment"))){
+                delegateTask.setVariable("pass4",1);
-                    rat = 1;
-                    break;
-                }
-            }
-        }
-        idList.add(object.getString("manageDepartment"));
-        delegateTask.setVariable("manageIdList",idList);
-
-
-        if(rat == 0){
-            if("1".equals(object.getString("passFlag"))) {//通过
-
-
-                count = delegateTask.getVariable("managePassCount",Integer.class);
-                count++;
-                delegateTask.setVariable("managePassCount",count);
-                if(delegateTask.getVariable("manageDepartmentCount", Integer.class).equals(delegateTask.getVariable("managePassCount", Integer.class))){
-                    if(StringUtils.isNotBlank(object.getString("president"))) {
-                        nextUserList.add(object.getString("president"));
-                        delegateTask.setVariable("president", nextUserList);
-                    }
-                    delegateTask.setVariable("pass4",1);
-                }
-
-            }else{
-                delegateTask.setVariable("pass4",0);
-                delegateTask.removeVariable("manageIdList");
-
-                if(StringUtils.isNotBlank(object.getString("engineerSum"))) {
-                    nextUserList.add(object.getString("engineerSum"));
-                    delegateTask.setVariable("engineerSum", nextUserList);
-                }
             }
         }else{
-            throw new ActivitiException("此对象已经审批过了");
+            prcName = prcName + "标准法规工程师汇总修订";
+            delegateTask.setVariable("pass4",0);
+            nextUserList.add(delegateTask.getVariable("engineerSum",String.class));
         }
+
 //         存储当前节点意见
         if (null != object.getString("commentText")) {
             QueryWrapper queryWrapper3 = new QueryWrapper();
@@ -111,9 +80,7 @@ public class ManageSignAfter implements TaskListener {
         delegateTask.setVariable("createUserName", username);
         String standName = object.getString("listName");
         delegateTask.setVariable("listName", standName);
-        String prcName = "";
 
-        prcName = standName + "-标准化活动入会流程-";
 
         QueryWrapper queryWrapper2 = new QueryWrapper();
         queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());

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

@@ -14,8 +14,8 @@ public class ManageSignBefore implements TaskListener {
     @Override
     public void notify(DelegateTask delegateTask) {
 
-        String link = "bzqdfbStep2?prcType=20";
+        String link = "bzrhStep6?prcType=20";
-
+//taskInfo=费用管理部门会签
         IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
         QueryWrapper queryWrapper1 = new QueryWrapper();
         queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());

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

@@ -28,35 +28,26 @@ public class PresidentVerifyAfter implements TaskListener {
         IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
         //流程信息
         IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class);
-
-        LawsUserInfoService lawsUserInfoService = SpringContextUtil.getBean(LawsUserInfoService.class);
-
         //根据流程id找到流程信息
         QueryWrapper<Datas> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId());
         Datas datas = datasService.getOne(queryWrapper);
-
         JSONObject object =  JSONObject.parseObject(datas.getFormValsJson());
         delegateTask.setVariable("objectJson",object);
-
         List<String> nextUserList = new ArrayList();
 
-        // 入会申请信息重新封装
+        String prcName = "标准化活动入会流程-";
         if("1".equals(object.getString("passFlag"))) {//通过
+            prcName = prcName + "标准法规工程师汇总修订完毕";
             delegateTask.setVariable("pass5",1);
-            if(StringUtils.isNotBlank(object.getString("engineerSumDone"))) {
+            nextUserList.add(object.getString("engineerSumDone"));
-                nextUserList.add(object.getString("engineerSumDone"));
+            delegateTask.setVariable("engineerSumDone", object.getString("engineerSumDone"));
-                delegateTask.setVariable("engineerSumDone", nextUserList);
-            }
-
         }else{
+            prcName = prcName + "标准法规工程师汇总修订";
             delegateTask.setVariable("pass5",0);
-            if(StringUtils.isNotBlank(object.getString("engineerSum"))) {
+            nextUserList.add(delegateTask.getVariable("engineerSum",String.class));
-                nextUserList.add(object.getString("engineerSum"));
-                delegateTask.setVariable("engineerSum", nextUserList);
-            }
         }
-        //         存储当前节点意见
+        //存储当前节点意见
         if (null != object.getString("commentText")) {
             QueryWrapper queryWrapper3 = new QueryWrapper();
             queryWrapper3.eq("TASK_ID", delegateTask.getId());
@@ -77,9 +68,7 @@ public class PresidentVerifyAfter implements TaskListener {
         delegateTask.setVariable("createUserName", username);
         String standName = object.getString("listName");
         delegateTask.setVariable("listName", standName);
-        String prcName = "";
 
-        prcName = standName + "-标准化活动入会流程-";
 
         QueryWrapper queryWrapper2 = new QueryWrapper();
         queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());

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

@@ -14,8 +14,8 @@ public class PresidentVerifyBefore implements TaskListener {
     @Override
     public void notify(DelegateTask delegateTask) {
 
-        String link = "bzqdfbStep2?prcType=20";
+        String link = "bzrhStep6?prcType=20";
-
+//taskInfo=技术委员会常务副主任
         IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
         QueryWrapper queryWrapper1 = new QueryWrapper();
         queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());

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

@@ -30,8 +30,6 @@ public class WriteMaterialAfter implements TaskListener {
         //流程信息
         IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class);
 
-        LawsUserInfoService lawsUserInfoService = SpringContextUtil.getBean(LawsUserInfoService.class);
-
         //根据流程id找到流程信息
         QueryWrapper<Datas> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId());
@@ -42,6 +40,8 @@ public class WriteMaterialAfter implements TaskListener {
 
         List<String> nextUserList = new ArrayList();
 
+        String prcName = "标准化活动入会流程-";
+
         // 入会申请信息重新封装
         if(StringUtils.isNotBlank(object.getString("directorList"))) {
 
@@ -52,6 +52,7 @@ public class WriteMaterialAfter implements TaskListener {
             }
             // 配置多实例
             delegateTask.setVariable("directorList", nextUserList);
+            prcName = prcName + "技术委员会分委会主任/入会代表所在中心主任提名入会代表";
         }
         //截止时间 流程描述 创建人
         String user = object.getString("prcCreateUser");
@@ -60,9 +61,7 @@ public class WriteMaterialAfter implements TaskListener {
         delegateTask.setVariable("createUserName", username);
         String standName = object.getString("listName");
         delegateTask.setVariable("listName", standName);
-        String prcName = "";
 
-        prcName = standName + "-标准化活动入会流程-";
 
         QueryWrapper queryWrapper2 = new QueryWrapper();
         queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
@@ -91,6 +90,7 @@ public class WriteMaterialAfter implements TaskListener {
                 System.out.println("处理人:" + nextUser);
                 System.out.println("流程名:" + prcName);
                 System.out.println("节点信息:" + delegateTask.getName());
+                System.out.println("节点信息2:" + delegateTask.getTaskDefinitionKey());
             }
         }
     }

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

@@ -15,23 +15,5 @@ public class WriteMaterialBefore implements TaskListener {
     @Override
     public void notify(DelegateTask delegateTask) {
 
-        String link = "bzqdfbStep2?prcType=20";
 
-        IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
-        QueryWrapper queryWrapper1 = new QueryWrapper();
-        queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());
-        queryWrapper1.eq("USER_ID",delegateTask.getAssignee());
-        queryWrapper1.isNull("TASK_ID");
-        List<BusProcessNew> list = busBean.list(queryWrapper1);
-        if(!list.isEmpty()){
-            BusProcessNew one1 = list.get(0);
-            one1.setTaskId(delegateTask.getId());
-            busBean.saveOrUpdate(one1);
-
-            CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class);
-            // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
-            one1.setLink(link);
-            one1.setTaskInfo(delegateTask.getName());
-            oaService.sendTodoMq(one1);
-        }
     }}

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

@@ -29,27 +29,18 @@ public class WriteMemberInfoAfter implements TaskListener {
         IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
         //流程信息
         IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class);
-
-        LawsUserInfoService lawsUserInfoService = SpringContextUtil.getBean(LawsUserInfoService.class);
-
         //根据流程id找到流程信息
         QueryWrapper<Datas> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId());
         Datas datas = datasService.getOne(queryWrapper);
-
         JSONObject object =  JSONObject.parseObject(datas.getFormValsJson());
         delegateTask.setVariable("objectJson",object);
-
         List<String> nextUserList = new ArrayList();
 
-
+        String prcName = "标准化活动入会流程-";
-        //
+        prcName = prcName + "入会人员所在部门负责人审核";
-        if(StringUtils.isNotBlank(object.getString("charge"))) {
+        nextUserList.add(object.getString("charge"));
-            nextUserList.add(object.getString("charge"));
+        delegateTask.setVariable("charge",object.getString("charge"));
-            delegateTask.setVariable("charge", nextUserList);
-            System.out.println(delegateTask.getVariable("charge"));
-        }
-
 
         //截止时间 流程描述 创建人
         String user = object.getString("prcCreateUser");
@@ -58,9 +49,7 @@ public class WriteMemberInfoAfter implements TaskListener {
         delegateTask.setVariable("createUserName", username);
         String standName = object.getString("listName");
         delegateTask.setVariable("listName", standName);
-        String prcName = "";
 
-        prcName = standName + "-标准化活动入会流程-";
 
         QueryWrapper queryWrapper2 = new QueryWrapper();
         queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());

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

@@ -14,7 +14,7 @@ public class WriteMemberInfoBefore implements TaskListener {
     @Override
     public void notify(DelegateTask delegateTask) {
 
-        String link = "bzqdfbStep2?prcType=20";
+        String link = "bzrhStep3?prcType=20";
 
         IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
         QueryWrapper queryWrapper1 = new QueryWrapper();

src/main/resources/mapper/datas/BusProcessNewMapper.xml

@@ -45,4 +45,16 @@
 	CONCAT( date_sub( DATE_FORMAT( NOW(), '%Y-%m-%d' ), INTERVAL 1 DAY), '%')) and TASK_INFO = '政策课题组参会流程-流程结束'
     </select>
 
+    <select id="everyDayTenOlockSAM" resultType="com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew">
+      SELECT
+            *
+        FROM
+            bus_process_new
+        WHERE
+            MESG -> '$**.meetingStartTime' LIKE CONCAT(
+            '%',
+	CONCAT( date_sub( DATE_FORMAT( NOW(), '%Y-%m-%d' ), INTERVAL 1 DAY), '%')) and
+	TASK_INFO = '标准化活动参会流程-流程结束'
+    </select>
+
 </mapper>