Merge branch 'develop' into Three

# Conflicts:
#	src/main/java/com/ydw/bat/wkflow/business_auth/LawsUserInfoService.java

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

@@ -44,10 +44,7 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.scheduling.annotation.Async;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import com.tmsps.fk.common.base.action.BaseAction;
 import com.tmsps.fk.common.util.ChkUtil;
@@ -190,6 +187,20 @@ public class TodoTaskController extends BaseAction {
         return todoList;
     }
 
+
+    @ApiOperation(value = "我的待办任务列表速度优化项")
+    @ApiImplicitParams({@ApiImplicitParam(name = "name", value = "名称"),
+            @ApiImplicitParam(name = "current", value = "当前页"),
+            @ApiImplicitParam(name = "size", value = "每页条数"),
+            @ApiImplicitParam(name = "userId", value = "用户Id")})
+    @PostMapping("/todoTaskListNew")
+    public List<BusProcessName> todoTaskListByUserIdNew(@RequestBody TaskCommonQuery taskCommonQuery) {
+        // 创建查询对象
+        List<BusProcessName> busProcessNames=new ArrayList<>();
+        busProcessNames=iBusProcessNameService.todoTask(taskCommonQuery);
+        return busProcessNames;
+    }
+
     @ApiOperation(value = "改派任务")
     @ApiImplicitParams({@ApiImplicitParam(name = "taskId", value = "任务id"),
             @ApiImplicitParam(name = "assignee", value = "改派人员")})
@@ -223,6 +234,7 @@ public class TodoTaskController extends BaseAction {
                 List<BusProcessNew> list1 = iBusProcessNewService.list(queryWrapper1);
                 if (list1.size() > 0) {
                     for (BusProcessNew busProcessNew : list1) {
+                        webServiceOAService.deleteOAByTaskIdResetTodo(busProcessNew,assignee);
                         busProcessNew.setUserId(assignee);
                         iBusProcessNewService.saveOrUpdate(busProcessNew);
                     }
@@ -240,86 +252,86 @@ public class TodoTaskController extends BaseAction {
         }
 
         //发送邮件
-        QueryWrapper queryWrapper = new QueryWrapper();
-        queryWrapper.eq("PRC_ID", pId);
-        BusProcessName name = iBusProcessNameService.getOne(queryWrapper);
-        String type = name.getPrcType();
-        Integer typeInt = 99;
-        if (StringUtils.isNotEmpty(type)){
-            typeInt = Integer.valueOf(type);
-        }
-        switch (typeInt){
-            case 1:
-                type = "法规入库及评估流程";
-                break;
-            case 2:
-                type = "标准法规技术储备评估流程";
-                break;
-            case 3:
-                type = "项目评估流程";
-                break;
-            case 4:
-                type = "企标制修订流程";
-                break;
-            case 5:
-                type = "未符合项跟踪流程";
-                break;
-            case 6:
-                type = "企标制修订申请流程";
-                break;
-            case 7:
-                type = "企标废止流程";
-                break;
-            case 8:
-                type = "企标延期制修订申请流程";
-                break;
-            case 9:
-                type = "标准采购流程";
-                break;
-            case 10:
-                type = "工作组会前申请流程";
-                break;
-            case 11:
-                type = "企标制修订评估流程";
-                break;
-            case 12:
-                type = "企标勘误流程";
-                break;
-            case 13:
-                type = "行政管理要求评估流程";
-                break;
-            case 14:
-                type = "政策入库及评估流程";
-                break;
-            case 15:
-                type = "标准翻译申请流程";
-                break;
-            case 16:
-                type = "工作组会后管理流程";
-                break;
-            case 17:
-                type = "企标备案流程";
-                break;
-            case 18:
-                type = "标准法规清单发布/更新流程";
-                break;
-            case 19:
-                type = "企标复审流程";
-                break;
-            default:
-                break;
-        }
-        ResponseMessage<UserVO> userVOResponseMessage = lawsUserInfoService.getById(userId);
-        UserVO userVO = userVOResponseMessage.getData();
-        String userName = "";
-        if (null != userVO) {
-            userName = userVO.getUname();
-        }
-        String content = "您好，"+name.getPrcNum()+"-"+ name.getPrcName() +" "+ userName +"委托您处理待办任务 ，请登录全球标准法规管理系统 ( http://39.98.140.126:10005/#/login ) 办理：链接( http://39.98.140.126:10005/#/processCenter?tabsName=ProcessCenter )。\n" +
-                "    ——来自 全球标准法规管理系统";
-        lawsUserInfoService.sendEmail(userId,content,"GSRM——【待办任务】["+type+"]有您的待办任务");
-
-        logger.info("task {} find " + taskId);
+//        QueryWrapper queryWrapper = new QueryWrapper();
+//        queryWrapper.eq("PRC_ID", pId);
+//        BusProcessName name = iBusProcessNameService.getOne(queryWrapper);
+//        String type = name.getPrcType();
+//        Integer typeInt = 99;
+//        if (StringUtils.isNotEmpty(type)){
+//            typeInt = Integer.valueOf(type);
+//        }
+//        switch (typeInt){
+//            case 1:
+//                type = "法规入库及评估流程";
+//                break;
+//            case 2:
+//                type = "标准法规技术储备评估流程";
+//                break;
+//            case 3:
+//                type = "项目评估流程";
+//                break;
+//            case 4:
+//                type = "企标制修订流程";
+//                break;
+//            case 5:
+//                type = "未符合项跟踪流程";
+//                break;
+//            case 6:
+//                type = "企标制修订申请流程";
+//                break;
+//            case 7:
+//                type = "企标废止流程";
+//                break;
+//            case 8:
+//                type = "企标延期制修订申请流程";
+//                break;
+//            case 9:
+//                type = "标准采购流程";
+//                break;
+//            case 10:
+//                type = "工作组会前申请流程";
+//                break;
+//            case 11:
+//                type = "企标制修订评估流程";
+//                break;
+//            case 12:
+//                type = "企标勘误流程";
+//                break;
+//            case 13:
+//                type = "行政管理要求评估流程";
+//                break;
+//            case 14:
+//                type = "政策入库及评估流程";
+//                break;
+//            case 15:
+//                type = "标准翻译申请流程";
+//                break;
+//            case 16:
+//                type = "工作组会后管理流程";
+//                break;
+//            case 17:
+//                type = "企标备案流程";
+//                break;
+//            case 18:
+//                type = "标准法规清单发布/更新流程";
+//                break;
+//            case 19:
+//                type = "企标复审流程";
+//                break;
+//            default:
+//                break;
+//        }
+//        ResponseMessage<UserVO> userVOResponseMessage = lawsUserInfoService.getById(userId);
+//        UserVO userVO = userVOResponseMessage.getData();
+//        String userName = "";
+//        if (null != userVO) {
+//            userName = userVO.getUname();
+//        }
+//        String content = "您好，"+name.getPrcNum()+"-"+ name.getPrcName() +" "+ userName +"委托您处理待办任务 ，请登录全球标准法规管理系统 ( http://39.98.140.126:10005/#/login ) 办理：链接( http://39.98.140.126:10005/#/processCenter?tabsName=ProcessCenter )。\n" +
+//                "    ——来自 全球标准法规管理系统";
+//        lawsUserInfoService.sendEmail(userId,content,"GSRM——【待办任务】["+type+"]有您的待办任务");
+//
+//        logger.info("task {} find " + taskId);
         return WrapMapper.ok("改派成功");
     }
 
@@ -1964,10 +1976,12 @@ public class TodoTaskController extends BaseAction {
                         queryWrapper1.eq("P_ID",busProcessName.getPrcId());
                         queryWrapper1.eq("TASK_ID",task.getId());
                         BusProcessNew busProcessNew=iBusProcessNewService.getOne(queryWrapper1);
-                        if (null!=busProcessNew.getPrcName()){
-                            busProcessName.setPrcName(busProcessNew.getPrcName());
-                        }else {
-                            busProcessNew.setPrcName("");
+                        if (null!=busProcessNew) {
+                            if (null != busProcessNew.getPrcName()) {
+                                busProcessName.setPrcName(busProcessNew.getPrcName());
+                            } else {
+                                busProcessNew.setPrcName("");
+                            }
                         }
 
                     }
@@ -2085,10 +2099,12 @@ public class TodoTaskController extends BaseAction {
                             queryWrapper1.eq("P_ID",busProcessName.getPrcId());
                             queryWrapper1.eq("TASK_ID",task.getId());
                             BusProcessNew busProcessNew=iBusProcessNewService.getOne(queryWrapper1);
-                            if (null!=busProcessNew.getPrcName()){
-                                busProcessName.setPrcName(busProcessNew.getPrcName());
-                            }else {
-                                busProcessNew.setPrcName("");
+                            if (null!=busProcessNew) {
+                                if (null != busProcessNew.getPrcName()) {
+                                    busProcessName.setPrcName(busProcessNew.getPrcName());
+                                } else {
+                                    busProcessNew.setPrcName("");
+                                }
                             }
                         }
                     }
@@ -2286,6 +2302,9 @@ public class TodoTaskController extends BaseAction {
     @GetMapping("/forceRecall")
     public Wrapper<String> forceRecall(String prcId) {
         runtimeService.deleteProcessInstance(prcId, "用户强制撤回");
+        if(StringUtils.isNotBlank(prcId)){
+            webServiceOAService.deleteOAByPid(prcId);
+        }
         Map map = new HashMap();
         map.put("P_ID", prcId);
         iBusProcessNewService.removeByMap(map);
@@ -2499,6 +2518,19 @@ public class TodoTaskController extends BaseAction {
     }
 
 
+    @ApiOperation(value = "删除草稿")
+    @PostMapping("/delCG")
+    public String delCG(@RequestParam("id") String id) {
+        List<String> strings=new ArrayList<>();
+        if (id.contains(",")){
+            strings.addAll(new ArrayList<>(Arrays.asList(id.split(","))));
+        }else {
+            strings.add(id);
+        }
+        return iBusProcessNameService.delDB(strings);
+    }
+
+
 //    @ApiOperation(value = "查询流程信息", notes = "根据流程流程编号查询名称等信息")
 //    @ApiImplicitParams({@ApiImplicitParam(name = "prcNum", value = "流程编号")})
 //    @PostMapping("/findProcessNameByPrcNum")

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

@@ -128,4 +128,35 @@ 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);
+
+    @PostMapping("/esRevisePlan/es-revise-plan/modPlanByWk")
+    public ResponseMessage<Object> modPlan(@RequestBody EsRevisePlanDTO esRevisePlan);
+
+    @PostMapping("/esRevisePlan/es-revise-plan/addPlanByWk")
+    public ResponseMessage<Object> addPlan(@RequestBody EsRevisePlanDTO esRevisePlan);
+
+    @GetMapping("/esRevisePlan/es-revise-plan/delPlanByWk")
+    public ResponseMessage<Object> delPlan(@RequestParam("id") String id);
+
+
+    @GetMapping("/lawss/sarBussionessStand/updateSarBussionessStand")
+    public ResponseMessage<Object> updateSarBussionessStand(@RequestBody SarBussionessStand sarBussionessStandEO);
+
+
+
+
 }

src/main/java/com/ydw/bat/wkflow/business_main/datas/dto/SarStandUnqualified.java

@@ -28,6 +28,9 @@ public class SarStandUnqualified  {
 
     private static final long serialVersionUID = 1L;
 
+    @ApiModelProperty(value = "产品线编号")
+    private String productId;
+
     @ApiModelProperty(value = "标准ID")
     private String standId;
 

src/main/java/com/ydw/bat/wkflow/business_main/datas/dto/SarStandardComplianceProductAssess.java

@@ -117,5 +117,17 @@ public class SarStandardComplianceProductAssess {
     @TableField("type")
     private String type;
 
+    @ApiModelProperty(value = "评估时间")
+    @TableField("evaluation_time")
+    private String evaluationTime;
+
+    @ApiModelProperty(value = "评估人")
+    @TableField("evaluation_people")
+    private String evaluationPeople;
+
+    @ApiModelProperty(value = "评估人")
+    @TableField("evaluation_people_name")
+    private String evaluationPeopleName;
+
 
 }

src/main/java/com/ydw/bat/wkflow/business_main/datas/entity/EsRevisePlanDTO.java

@@ -0,0 +1,71 @@
+package com.ydw.bat.wkflow.business_main.datas.entity;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+/**
+ * <p>
+ * 企标制修订计划
+ * </p>
+ *
+ * @author zcr
+ * @since 2021-11-14
+ */
+@Data
+@Accessors(chain = true)
+@ApiModel(value="EsRevisePlan对象", description="企标制修订计划")
+public class EsRevisePlanDTO  {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "主键")
+    private String id;
+
+    @ApiModelProperty(value = "企标名称")
+    private String esName;
+
+    @ApiModelProperty(value = "计划状态")
+    private String planStatus;
+
+    @ApiModelProperty(value = "制修订状态")
+    private String reviseStatus;
+
+    @ApiModelProperty(value = "起草人")
+    private String drafter;
+
+    @ApiModelProperty(value = "评审责任人")
+    private String resPerson;
+
+    @ApiModelProperty(value = "工作组组长")
+    private String wgLeader;
+
+
+    @ApiModelProperty(value = "起草人姓名")
+    private String drafterName;
+
+    @ApiModelProperty(value = "评审责任人姓名")
+    private String resPersonName;
+
+    @ApiModelProperty(value = "工作组组长姓名")
+    private String wgLeaderName;
+
+    @ApiModelProperty(value = "计划标准初稿完成时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    private Date draftTime;
+
+    @ApiModelProperty(value = "计划标准发布时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    private Date releaseTime;
+
+    @ApiModelProperty(value = "起草责任单位")
+    private String unit;
+
+}

src/main/java/com/ydw/bat/wkflow/business_main/datas/entity/SarBussionessStand.java

@@ -0,0 +1,528 @@
+package com.ydw.bat.wkflow.business_main.datas.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.util.*;
+
+/**
+ * <p>
+ * 企业标准信息表
+ * </p>
+ *
+ * @author super_liu
+ * @since 2021-07-13
+ */
+@Data
+@Accessors(chain = true)
+@ApiModel(value="SarBussionessStand对象", description="企业标准信息表")
+public class SarBussionessStand  {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "主键")
+    @TableId("ID")
+    private String id;
+
+    @ApiModelProperty(value = "企标标准号")
+    @TableField("STAND_CODE")
+    private String standCode;
+
+    @ApiModelProperty(value = "标准编号")
+    @TableField("STAND_NUMBER")
+    private String standNumber;
+
+    @ApiModelProperty(value = "标准名称")
+    @TableField("STAND_NAME")
+    private String standName;
+
+    @ApiModelProperty(value = "标准英文名称")
+    @TableField("STAND_EN_NAME")
+    private String standEnName;
+
+    @ApiModelProperty(value = "发布日期")
+    @TableField("ISSUE_TIME")
+    private String issueTime;
+
+    @ApiModelProperty(value = "实施日期")
+    @TableField("PUT_TIME")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    private String putTime;
+
+    @ApiModelProperty(value = "代替标准号")
+    @TableField("REPLACE_STAND_NUM")
+    private String replaceStandNum;
+
+    @ApiModelProperty(value = "被代替标准号")
+    @TableField("REPLACED_STAND_NUM")
+    private String replacedStandNum;
+
+    @ApiModelProperty(value = "标准状态")
+    @TableField("STAND_STATUS")
+    private String standStatus;
+
+    @ApiModelProperty(value = "适用国家/地区")
+    @TableField("APPLY_COUNTRY")
+    private String applyCountry;
+
+    @ApiModelProperty(value = "标准性质")
+    @TableField("STAND_NATURE")
+    private String standNature;
+
+    @ApiModelProperty(value = "标准类别")
+    @TableField("STAND_SORT")
+    private String standSort;
+
+    @ApiModelProperty(value = "标准年份")
+    @TableField("STAND_YEAR")
+    private String standYear;
+
+    @ApiModelProperty(value = "是否有效")
+    @TableField("VALID_FLAG")
+    private Integer validFlag;
+
+    @ApiModelProperty(value = "创建时间")
+    @TableField("CREATION_TIME")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date creationTime;
+
+    @ApiModelProperty(value = "修改时间")
+    @TableField("MODIFY_TIME")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date modifyTime;
+
+    // 新添加字段
+    @ApiModelProperty(value = "文本状态")
+    @TableField("TEXT_STATUS_BUSS")
+    private String textStatusBuss;
+
+
+    // 非表字段
+    @TableField(exist = false)
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    private String firstPutTime;
+
+    @TableField(exist = false)
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    private String putTimeShow;
+
+    @TableField(exist = false)
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    private String issueTimeShow;
+
+    @TableField(exist = false)
+    private String issueTimeStr;
+
+    @TableField(exist = false)
+    private String putTimeStr;
+
+    //目录ID   非标准信息表中的字段
+    @TableField(exist = false)
+    private String  menuId;
+
+    @TableField(exist = false)
+    private String menuParentId;
+
+    @TableField(exist = false)
+    private String standStatusShow; // 标准状态下拉框   --单选
+
+    @TableField(exist = false)
+    private String standNatrueShow;
+
+    @TableField(exist = false)
+    private String standSortShow;
+
+    @TableField(exist = false)
+    private String applyCountryShow;
+
+    @TableField(exist = false)
+    private List<AttFileVo> standFileList = new ArrayList<AttFileVo>();
+
+    @TableField(exist = false)
+    private List<AttFileVo> opinionFilesList = new ArrayList<AttFileVo>();
+
+    @TableField(exist = false)
+    private List<AttFileVo> relevanceFileList = new ArrayList<AttFileVo>();
+
+    @TableField(exist = false)
+    private String collectId;
+
+    //文件的类型
+    @TableField(exist = false)
+    private String standFileClassify;
+
+    //文件的下载id
+    @TableField(exist = false)
+    private String attId;
+
+    //记录是否修改了替代文件号
+    @TableField(exist = false)
+    private int upReplaceNumFlag;
+    //记录是否修改了文件号
+    @TableField(exist = false)
+    private int upNumFlag;
+    // 数据库新加的字段
+
+    @TableField(exist = false)
+    private String remark;//备注
+
+    @TableField(exist = false)
+    private Map<String, Object> attrInfoMap = new LinkedHashMap<>(); //属性表字段与值
+
+    @TableField(exist = false)
+    private Map<String, Object> attrInfoCaseMap = new LinkedHashMap<>(); //属性表字段与值小写前端带入渲染
+
+    @TableField(exist = false)
+    private String sarStandAttrEOStr; //新增修改时属性表信息
+
+    @TableField(exist = false)
+    private String fileIds; //全部文件ID
+
+    @TableField(exist = false)
+    private List<SarStandAttrDetailsEO> attrInfoList = new ArrayList<>();
+
+    public static long getSerialVersionUID() {
+        return serialVersionUID;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getStandCode() {
+        return standCode;
+    }
+
+    public void setStandCode(String standCode) {
+        this.standCode = standCode;
+    }
+
+    public String getStandName() {
+        return standName;
+    }
+
+    public void setStandName(String standName) {
+        this.standName = standName;
+    }
+
+    public String getStandEnName() {
+        return standEnName;
+    }
+
+    public void setStandEnName(String standEnName) {
+        this.standEnName = standEnName;
+    }
+
+    public String getIssueTime() {
+        return issueTime;
+    }
+
+    public void setIssueTime(String issueTime) {
+        this.issueTime = issueTime;
+    }
+
+    public String getPutTime() {
+        return putTime;
+    }
+
+    public void setPutTime(String putTime) {
+        this.putTime = putTime;
+    }
+
+    public String getReplaceStandNum() {
+        return replaceStandNum;
+    }
+
+    public void setReplaceStandNum(String replaceStandNum) {
+        this.replaceStandNum = replaceStandNum;
+    }
+
+    public String getReplacedStandNum() {
+        return replacedStandNum;
+    }
+
+    public void setReplacedStandNum(String replacedStandNum) {
+        this.replacedStandNum = replacedStandNum;
+    }
+
+    public String getStandStatus() {
+        return standStatus;
+    }
+
+    public void setStandStatus(String standStatus) {
+        this.standStatus = standStatus;
+    }
+
+    public String getApplyCountry() {
+        return applyCountry;
+    }
+
+    public void setApplyCountry(String applyCountry) {
+        this.applyCountry = applyCountry;
+    }
+
+    public String getStandNature() {
+        return standNature;
+    }
+
+    public void setStandNature(String standNature) {
+        this.standNature = standNature;
+    }
+
+    public String getStandSort() {
+        return standSort;
+    }
+
+    public void setStandSort(String standSort) {
+        this.standSort = standSort;
+    }
+
+    public String getStandYear() {
+        return standYear;
+    }
+
+    public void setStandYear(String standYear) {
+        this.standYear = standYear;
+    }
+
+    public Integer getValidFlag() {
+        return validFlag;
+    }
+
+    public void setValidFlag(Integer validFlag) {
+        this.validFlag = validFlag;
+    }
+
+    public Date getCreationTime() {
+        return creationTime;
+    }
+
+    public void setCreationTime(Date creationTime) {
+        this.creationTime = creationTime;
+    }
+
+    public Date getModifyTime() {
+        return modifyTime;
+    }
+
+    public void setModifyTime(Date modifyTime) {
+        this.modifyTime = modifyTime;
+    }
+
+    public String getTextStatusBuss() {
+        return textStatusBuss;
+    }
+
+    public void setTextStatusBuss(String textStatusBuss) {
+        this.textStatusBuss = textStatusBuss;
+    }
+
+    public String getFirstPutTime() {
+        return firstPutTime;
+    }
+
+    public void setFirstPutTime(String firstPutTime) {
+        this.firstPutTime = firstPutTime;
+    }
+
+    public String getPutTimeShow() {
+        return putTimeShow;
+    }
+
+    public void setPutTimeShow(String putTimeShow) {
+        this.putTimeShow = putTimeShow;
+    }
+
+    public String getIssueTimeShow() {
+        return issueTimeShow;
+    }
+
+    public void setIssueTimeShow(String issueTimeShow) {
+        this.issueTimeShow = issueTimeShow;
+    }
+
+    public String getIssueTimeStr() {
+        return issueTimeStr;
+    }
+
+    public void setIssueTimeStr(String issueTimeStr) {
+        this.issueTimeStr = issueTimeStr;
+    }
+
+    public String getPutTimeStr() {
+        return putTimeStr;
+    }
+
+    public void setPutTimeStr(String putTimeStr) {
+        this.putTimeStr = putTimeStr;
+    }
+
+    public String getMenuId() {
+        return menuId;
+    }
+
+    public void setMenuId(String menuId) {
+        this.menuId = menuId;
+    }
+
+    public String getMenuParentId() {
+        return menuParentId;
+    }
+
+    public void setMenuParentId(String menuParentId) {
+        this.menuParentId = menuParentId;
+    }
+
+    public String getStandStatusShow() {
+        return standStatusShow;
+    }
+
+    public void setStandStatusShow(String standStatusShow) {
+        this.standStatusShow = standStatusShow;
+    }
+
+    public String getStandNatrueShow() {
+        return standNatrueShow;
+    }
+
+    public void setStandNatrueShow(String standNatrueShow) {
+        this.standNatrueShow = standNatrueShow;
+    }
+
+    public String getStandSortShow() {
+        return standSortShow;
+    }
+
+    public void setStandSortShow(String standSortShow) {
+        this.standSortShow = standSortShow;
+    }
+
+    public String getApplyCountryShow() {
+        return applyCountryShow;
+    }
+
+    public void setApplyCountryShow(String applyCountryShow) {
+        this.applyCountryShow = applyCountryShow;
+    }
+
+    public List<AttFileVo> getStandFileList() {
+        return standFileList;
+    }
+
+    public void setStandFileList(List<AttFileVo> standFileList) {
+        this.standFileList = standFileList;
+    }
+
+    public List<AttFileVo> getOpinionFilesList() {
+        return opinionFilesList;
+    }
+
+    public void setOpinionFilesList(List<AttFileVo> opinionFilesList) {
+        this.opinionFilesList = opinionFilesList;
+    }
+
+    public List<AttFileVo> getRelevanceFileList() {
+        return relevanceFileList;
+    }
+
+    public void setRelevanceFileList(List<AttFileVo> relevanceFileList) {
+        this.relevanceFileList = relevanceFileList;
+    }
+
+    public String getCollectId() {
+        return collectId;
+    }
+
+    public void setCollectId(String collectId) {
+        this.collectId = collectId;
+    }
+
+    public String getStandFileClassify() {
+        return standFileClassify;
+    }
+
+    public void setStandFileClassify(String standFileClassify) {
+        this.standFileClassify = standFileClassify;
+    }
+
+    public String getAttId() {
+        return attId;
+    }
+
+    public void setAttId(String attId) {
+        this.attId = attId;
+    }
+
+    public int getUpReplaceNumFlag() {
+        return upReplaceNumFlag;
+    }
+
+    public void setUpReplaceNumFlag(int upReplaceNumFlag) {
+        this.upReplaceNumFlag = upReplaceNumFlag;
+    }
+
+    public int getUpNumFlag() {
+        return upNumFlag;
+    }
+
+    public void setUpNumFlag(int upNumFlag) {
+        this.upNumFlag = upNumFlag;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    public Map<String, Object> getAttrInfoMap() {
+        return attrInfoMap;
+    }
+
+    public void setAttrInfoMap(Map<String, Object> attrInfoMap) {
+        this.attrInfoMap = attrInfoMap;
+    }
+
+    public Map<String, Object> getAttrInfoCaseMap() {
+        return attrInfoCaseMap;
+    }
+
+    public void setAttrInfoCaseMap(Map<String, Object> attrInfoCaseMap) {
+        this.attrInfoCaseMap = attrInfoCaseMap;
+    }
+
+    public String getSarStandAttrEOStr() {
+        return sarStandAttrEOStr;
+    }
+
+    public void setSarStandAttrEOStr(String sarStandAttrEOStr) {
+        this.sarStandAttrEOStr = sarStandAttrEOStr;
+    }
+
+    public String getFileIds() {
+        return fileIds;
+    }
+
+    public void setFileIds(String fileIds) {
+        this.fileIds = fileIds;
+    }
+
+    public List<SarStandAttrDetailsEO> getAttrInfoList() {
+        return attrInfoList;
+    }
+
+    public void setAttrInfoList(List<SarStandAttrDetailsEO> attrInfoList) {
+        this.attrInfoList = attrInfoList;
+    }
+}

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

@@ -1,5 +1,6 @@
 package com.ydw.bat.wkflow.business_main.datas.mapper;
 
+import com.ydw.bat.wkflow.business_activiti.dto.TaskCommonQuery;
 import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
@@ -19,4 +20,6 @@ public interface BusProcessNameMapper extends BaseMapper<BusProcessName> {
     //查询符合要求的 name 信息
     List<BusProcessName> findBusProcessNameForEnd(String taskId);
 
+    List<BusProcessName> todoTask(@Param("task") TaskCommonQuery taskCommonQuery);
+
 }

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

@@ -28,6 +28,8 @@ public interface BusProcessNewMapper extends BaseMapper<BusProcessNew> {
 
     List<BusProcessNew> findLastworkPeople(@Param("key")String key,@Param("pId")String pId);
 
+    List<BusProcessNew> findLastworkPeople2(@Param("key")String key,@Param("pId")String pId);
+
     List<BusProcessNew> everyDayTenOlock();
 
 }

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

@@ -1,5 +1,6 @@
 package com.ydw.bat.wkflow.business_main.datas.service;
 
+import com.ydw.bat.wkflow.business_activiti.dto.TaskCommonQuery;
 import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -17,4 +18,10 @@ import java.util.List;
 public interface IBusProcessNameService extends IService<BusProcessName> {
 
     List<BusProcessName> findBusProcessNameForEnd(String prcNum);
+
+    //新查询代办接口 初步测试中
+    List<BusProcessName> todoTask(TaskCommonQuery taskCommonQuery);
+
+
+    String delDB(List<String> id);
 }

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

@@ -31,6 +31,7 @@ public interface IBusProcessNewService extends IService<BusProcessNew> {
     List<BusProcessNew> findNoExecuteBusProcessNewForEnd(List<String> taskIdList);
     //子流程 获取 阶段数据 专用 BY yzh
     List<BusProcessNew> findLastworkPeople(@Param("key")String key, @Param("pId")String pId);
+    List<BusProcessNew> findLastworkPeople2(@Param("key")String key, @Param("pId")String pId);
 
     List<BusProcessNew> everyDayTenOlock();
 

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

@@ -1,5 +1,6 @@
 package com.ydw.bat.wkflow.business_main.datas.service.impl;
 
+import com.ydw.bat.wkflow.business_activiti.dto.TaskCommonQuery;
 import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName;
 import com.ydw.bat.wkflow.business_main.datas.mapper.BusProcessNameMapper;
 import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNameService;
@@ -28,4 +29,18 @@ public class BusProcessNameServiceImpl extends ServiceImpl<BusProcessNameMapper,
         return busProcessNameMapper.findBusProcessNameForEnd(taskId);
     }
 
+    @Override
+    public List<BusProcessName> todoTask(TaskCommonQuery taskCommonQuery) {
+        return busProcessNameMapper.todoTask(taskCommonQuery);
+    }
+
+    @Override
+    public String delDB(List<String> id) {
+        if (busProcessNameMapper.deleteBatchIds(id)>0) {
+            return "success";
+        }else {
+            return "error";
+        }
+    }
+
 }

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

@@ -74,6 +74,11 @@ public class BusProcessNewServiceImpl extends ServiceImpl<BusProcessNewMapper, B
         return baseMapper.findLastworkPeople(key,pId);
     }
 
+    @Override
+    public List<BusProcessNew> findLastworkPeople2(String key, String pId) {
+        return baseMapper.findLastworkPeople2(key,pId);
+    }
+
     @Override
     public List<BusProcessNew> everyDayTenOlock() {
         return baseMapper.everyDayTenOlock();

src/main/java/com/ydw/bat/wkflow/business_mq/service/CreateMQService.java

@@ -20,6 +20,20 @@ public class CreateMQService {
     @Value("${oa.flag}")
     private Boolean oaFlag;
 
+
+    /**
+     * @author: super_liu
+     * @date: 2021年09月17日 14:40
+     **/
+    public void setTodoDeleteMq(String object){
+
+        if(oaFlag){
+            //发送消息队列
+            this.rabbitTemplate.convertAndSend("sendDelete-exchange_MQ_GSAR", "sendDelete-key_MQ_GSAR", object);
+
+        }
+    }
+
     /**
      * @author: super_liu
      * @date: 2021年09月17日 14:40

src/main/java/com/ydw/bat/wkflow/business_mq/service/SendDeleteMQService.java

@@ -0,0 +1,181 @@
+package com.ydw.bat.wkflow.business_mq.service;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.rabbitmq.client.Channel;
+import com.ydw.bat.wkflow.business_auth.LawsUserInfoService;
+import com.ydw.bat.wkflow.business_main.datas.entity.ResponseMessage;
+import com.ydw.bat.wkflow.business_main.datas.entity.SendTodoLog;
+import com.ydw.bat.wkflow.business_main.datas.entity.UserVO;
+import com.ydw.bat.wkflow.business_main.datas.mapper.SendTodoLogMapper;
+import com.ydw.bat.wkflow.business_main.datas.service.ISendTodoLogService;
+import com.ydw.bat.wkflow.business_oa.utils.EmailUtils;
+import com.ydw.bat.wkflow.business_oa.webService.service.WebServiceOAService;
+import com.ydw.bat.wkflow.business_oa.webService.todoContent.NotifyTodoSendContext;
+import com.ydw.bat.wkflow.business_oa.webService.todoResult.NotifyTodoAppDeleteResult;
+import com.ydw.bat.wkflow.business_oa.webService.todoResult.NotifyTodoAppResult;
+import net.sf.json.JSONObject;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.amqp.rabbit.annotation.Exchange;
+import org.springframework.amqp.rabbit.annotation.Queue;
+import org.springframework.amqp.rabbit.annotation.QueueBinding;
+import org.springframework.amqp.rabbit.annotation.RabbitListener;
+import org.springframework.amqp.support.AmqpHeaders;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.messaging.Message;
+import org.springframework.stereotype.Component;
+
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+@Component
+public class SendDeleteMQService {
+
+    private static final Logger logger = LoggerFactory.getLogger(SendDeleteMQService.class);
+
+    @Autowired
+    private CreateMQService convertMq;
+
+    @Autowired
+    private EmailUtils emailUtils;
+
+    @Autowired
+    private WebServiceOAService webServiceOAService;
+
+    @Autowired
+    private SendTodoLogMapper sendTodoLogMapper;
+
+    @Autowired
+    private LawsUserInfoService lawsUserInfoService;
+
+    @RabbitListener(bindings = @QueueBinding(
+            value = @Queue(value = "createMQDelete_SQ_GSAR", durable = "true"),
+            exchange = @Exchange(value = "sendDelete-exchange_MQ_GSAR", ignoreDeclarationExceptions = "true"),
+            key = "sendDelete-key_MQ_GSAR"))
+    public void createMQDone(String object, Message message, Channel channel) throws Exception{
+        try{
+            try{
+                Thread.sleep(5000);
+                insertOrUpdateInfo(object);
+            }catch(InterruptedException e){
+                logger.error(e.toString());
+                Thread.currentThread().interrupt();
+            }
+        } catch (Exception e) {
+            logger.error("消息队列进入添加数据方法前失败！");
+            logger.error(e.getMessage(),e);
+        }finally {
+            Long tag = (Long) message.getHeaders().get(AmqpHeaders.DELIVERY_TAG);
+            channel.basicAck(tag,false);
+            logger.debug("消息确认成功！！！！！！！！！");
+        }
+
+    }
+
+    public void insertOrUpdateInfo(String object) throws Exception {
+        Map<String,Object> objectMap = JSONObject.fromObject(object);
+        String todoId = objectMap.get("todoId").toString();
+        try {
+            NotifyTodoAppDeleteResult todoAppResult = webServiceOAService.setTodoDelete(object);
+            SimpleDateFormat sdf = new SimpleDateFormat("yyy-MM-dd HH:mm:ss");
+
+            if(todoAppResult.getSign().equals("0") || todoAppResult.getMassage().equals("操作成功")){
+                logger.info("--------------------------成功发送 ESP 已办任务----------------------------");
+                QueryWrapper wrapper = new QueryWrapper();
+                wrapper.eq("TODO_ID",todoId);
+                wrapper.eq("MSG_TYPE","3");
+                List<SendTodoLog> list = sendTodoLogMapper.selectList(wrapper);
+                if(!list.isEmpty()) {
+                    SendTodoLog sendTodoLog = list.get(0);
+                    sendTodoLog.setOperMesg(todoAppResult.getMassage());
+                    sendTodoLog.setMsgStatus("3");
+                    sendTodoLog.setCreateTime(sdf.format(new Date()));
+                    sendTodoLog.setUpdateTime(sdf.format(new Date()));
+                    sendTodoLogMapper.updateById(sendTodoLog);
+                }else {
+                    sendTodoSave(object,todoId, sdf, "2",todoAppResult.getMassage());
+                }
+            }else {
+                logger.error("ESP 发送待办任务异常 :" + "SIGN: "+todoAppResult.getSign()+",MASSAGE: "+todoAppResult.getMassage());
+                // 重试发送待办
+                logger.info("重试发送待办");
+                this.restartSendMq(object,todoId,todoAppResult.getMassage());
+            }
+        }catch (Exception e){
+            logger.error(e.getMessage(),e);
+            this.restartSendMq(object,todoId, e.getMessage());
+        }
+    }
+
+    public void restartSendMq(String object,String todoId,String operMesg) throws Exception{
+        QueryWrapper wrapper = new QueryWrapper();
+        wrapper.eq("TODO_ID",todoId);
+        wrapper.eq("MSG_TYPE","3");
+        List<SendTodoLog> list = sendTodoLogMapper.selectList(wrapper);
+        SimpleDateFormat sdf = new SimpleDateFormat("yyy-MM-dd HH:mm:ss");
+        if(!list.isEmpty()){
+            SendTodoLog sendTodoLog  = list.get(0);
+            int againNumNew = Integer.valueOf(sendTodoLog.getErrNum());
+            if(againNumNew >= 6){
+                // 发送待办 或 发送给管理员邮箱
+                logger.info("发送失败6次,发送给管理员邮箱");
+                List<String> emailList = new ArrayList<>();
+                ResponseMessage<UserVO> byId = lawsUserInfoService.getById("WY8J26MH23");
+                // 占时指定admin用户邮箱
+                emailList.add(byId == null ? "" : (byId.getData().getEmail() != null ? byId.getData().getEmail() : ""));
+                String[] arr = emailList.toArray(new String[emailList.size()]);
+                String title = "OA请求发送失败6次";
+                String countText = "<div style=\"font-size:16px\" ><div><p>您好：</p></div>" +
+                        "<span style=\"color:blue;\" >"+"OA请求发送失败6次,请线下协调处理"+"</span></div>";
+                emailUtils.sendMsgFeign(arr,title,countText);
+
+            }else {
+                restSendDoneTodo(object, sdf, sendTodoLog, againNumNew,operMesg);
+            }
+
+        }else {
+            sendTodoSave(object,todoId, sdf, "3",operMesg);
+        }
+    }
+
+    private void restSendDoneTodo(String object, SimpleDateFormat sdf, SendTodoLog sendTodoLog, int againNumNew,String operMesg)  throws Exception{
+        // 发送失败连续持续3次， 如果在失败等待1个小时后重试3次
+        if(againNumNew < 6){
+            Thread.sleep(3000);
+            logger.info("发送失败连续持续"+againNumNew+"次,存入延迟重试队列！！！！！！！！！");
+
+        }else {
+            logger.info("发送失败连续持续"+againNumNew+"次！！");
+        }
+        sendTodoLog.setErrNum(sendTodoLog.getErrNum()+1);
+        sendTodoLog.setUpdateTime(sdf.format(new Date()));
+        sendTodoLog.setOperMesg(operMesg);
+        sendTodoLogMapper.updateById(sendTodoLog);
+        convertMq.setTodoDeleteMq(object);
+        logger.info("已重新加入延迟队列");
+    }
+
+    private void sendTodoSave(String object, String todoId, SimpleDateFormat sdf, String s,String operMesg) {
+        SendTodoLog sendTodoLog = new SendTodoLog();
+        sendTodoLog.setMsgType("3");
+        sendTodoLog.setTodoId(todoId);
+        sendTodoLog.setMesg(object);
+        sendTodoLog.setMsgStatus(s);
+        sendTodoLog.setErrNum(1);
+        sendTodoLog.setOperMesg(operMesg);
+        sendTodoLog.setCreateTime(sdf.format(new Date()));
+        sendTodoLog.setUpdateTime(sdf.format(new Date()));
+        sendTodoLogMapper.insert(sendTodoLog);
+        if(s.equals("2")){
+            logger.info("发送成功,存入OA日志");
+        }else{
+            convertMq.setTodoDeleteMq(object);
+            logger.info("已重新加入延迟队列");
+        }
+
+    }
+
+}

src/main/java/com/ydw/bat/wkflow/business_oa/webService/service/WebServiceOAService.java

@@ -2,15 +2,24 @@ package com.ydw.bat.wkflow.business_oa.webService.service;
 
 import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew;
 import com.ydw.bat.wkflow.business_oa.webService.todoContent.NotifyTodoSendContext;
+import com.ydw.bat.wkflow.business_oa.webService.todoResult.NotifyTodoAppDeleteResult;
 import com.ydw.bat.wkflow.business_oa.webService.todoResult.NotifyTodoAppResult;
 import org.activiti.engine.task.Task;
 
+import java.util.List;
+
 public interface WebServiceOAService {
 
+    void deleteOAByPid(String pId);
+
+    void deleteOAByTaskIdResetTodo(BusProcessNew busProcessNew,String assignee);
+
     void completeOA(Task task);
 
     NotifyTodoAppResult sendTodo(BusProcessNew busProcessNew) throws Exception;
 
     NotifyTodoAppResult setTodoDone(NotifyTodoSendContext notifyTodoSendContext) throws Exception;
 
+    NotifyTodoAppDeleteResult setTodoDelete(String object) throws Exception;
+
 }

src/main/java/com/ydw/bat/wkflow/business_oa/webService/service/impl/WebServiceOAServiceImpl.java

@@ -1,12 +1,11 @@
 package com.ydw.bat.wkflow.business_oa.webService.service.impl;
 
+import com.alibaba.fastjson.JSON;
 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.ResponseMessage;
-import com.ydw.bat.wkflow.business_main.datas.entity.UserVO;
+import com.ydw.bat.wkflow.business_main.datas.entity.*;
+import com.ydw.bat.wkflow.business_main.datas.mapper.SendTodoLogMapper;
 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_mq.service.CreateMQService;
@@ -16,11 +15,13 @@ import com.ydw.bat.wkflow.business_oa.webService.service.WebServiceOAService;
 import com.ydw.bat.wkflow.business_oa.webService.todoContent.HEAD;
 import com.ydw.bat.wkflow.business_oa.webService.todoContent.JsonSend;
 import com.ydw.bat.wkflow.business_oa.webService.todoContent.NotifyTodoSendContext;
+import com.ydw.bat.wkflow.business_oa.webService.todoResult.NotifyTodoAppDeleteResult;
 import com.ydw.bat.wkflow.business_oa.webService.todoResult.NotifyTodoAppResult;
 import com.ydw.bat.wkflow.util.SpringContextUtil;
 import net.sf.json.JSONArray;
 import okhttp3.Credentials;
 import org.activiti.engine.task.Task;
+import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -59,6 +60,9 @@ public class WebServiceOAServiceImpl  implements WebServiceOAService {
     @Autowired
     private OkHttpUtil okHttpUtil;
 
+    @Autowired
+    private SendTodoLogMapper sendTodoLogMapper;
+
     @Autowired
     private LawsUserInfoService lawsUserInfoService;
 
@@ -72,6 +76,140 @@ public class WebServiceOAServiceImpl  implements WebServiceOAService {
         credentials =  Credentials.basic(api_key,api_secret);
     }
 
+    /**
+     * 单个删除OA待办 及 重发待办
+     */
+    @Override
+    @Async
+    public void deleteOAByTaskIdResetTodo(BusProcessNew busProcessNew,String assignee){
+        CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class);
+        log.info("--------------------------ESP 发送删除待办任务 及 再次发送待办----------------------------");
+
+        if(busProcessNew != null && StringUtils.isNotBlank(busProcessNew.getId())){
+
+            QueryWrapper wrapper = new QueryWrapper();
+            wrapper.eq("TODO_ID",busProcessNew.getId());
+            wrapper.eq("MSG_TYPE","0");
+            List<SendTodoLog> list = sendTodoLogMapper.selectList(wrapper);
+            if(!list.isEmpty()){
+                net.sf.json.JSONObject fromObject = net.sf.json.JSONObject.fromObject(list.get(0).getMesg());
+                net.sf.json.JSONObject jsonObjectFilter = net.sf.json.JSONObject.fromObject(list.get(0).getMesg());
+                jsonObjectFilter = jsonObjectFilter.discard("PId");
+                jsonObjectFilter.put("pid",fromObject.getString("PId"));
+                BusProcessNew object = JSON.parseObject(jsonObjectFilter.toString(),BusProcessNew.class);
+
+                List<NotifyTodoSendContext> notifyTodoSendContexts = new ArrayList<>();
+                NotifyTodoSendContext notifyTodoSendContext = new NotifyTodoSendContext();
+                notifyTodoSendContext.setAppName("FOTON");
+                notifyTodoSendContext.setModelId(busProcessNew.getId());
+                notifyTodoSendContext.setModelName(object.getTaskInfo());
+                notifyTodoSendContext.setType("1");
+                notifyTodoSendContext.setOptType("2");
+                Map<String, Object> map = new HashMap<>();
+                ResponseMessage<UserVO> byId = lawsUserInfoService.getById(busProcessNew.getUserId());
+                map.put("LoginName",byId == null ? "" : byId.getData().getAccount());
+                JSONObject jsonLoginName = new JSONObject(map);
+                notifyTodoSendContext.setTargets(jsonLoginName.toJSONString());
+                notifyTodoSendContext.setUserId(busProcessNew.getUserId());
+                notifyTodoSendContexts.add(notifyTodoSendContext);
+                Map<String,Object> objectMap = new TreeMap<>();
+                objectMap.put("todoId",busProcessNew.getId());
+                objectMap.put("list",notifyTodoSendContexts);
+                net.sf.json.JSONObject jsonObject = net.sf.json.JSONObject.fromObject(objectMap);
+                oaService.setTodoDeleteMq(jsonObject.toString());
+
+            // 重新发送OA待办
+                object.setUserId(assignee);
+                oaService.sendTodoMq(object);
+            }
+        }
+    }
+
+    /**
+     * 批量删除OA待办
+     * @param pId
+     */
+    @Override
+    @Async
+    public void deleteOAByPid(String pId){
+        CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class);
+        log.info("--------------------------ESP 批量发送删除待办任务----------------------------");
+
+        QueryWrapper queryWrapper1 = new QueryWrapper();
+        queryWrapper1.eq("P_ID",pId);
+        List<BusProcessNew> list = iBusProcessNewService.list(queryWrapper1);
+        if(!list.isEmpty()){
+            List<NotifyTodoSendContext> notifyTodoSendContexts = new ArrayList<>();
+            list.forEach(busProcessNew -> {
+                NotifyTodoSendContext notifyTodoSendContext = new NotifyTodoSendContext();
+                notifyTodoSendContext.setAppName("FOTON");
+                notifyTodoSendContext.setModelId(busProcessNew.getId());
+                notifyTodoSendContext.setModelName(busProcessNew.getTaskInfo());
+                notifyTodoSendContext.setType("1");
+                notifyTodoSendContext.setOptType("2");
+                Map<String, Object> map = new HashMap<>();
+                ResponseMessage<UserVO> byId = lawsUserInfoService.getById(busProcessNew.getUserId());
+                map.put("LoginName",byId == null ? "" : byId.getData().getAccount());
+                JSONObject jsonLoginName = new JSONObject(map);
+                notifyTodoSendContext.setTargets(jsonLoginName.toJSONString());
+                notifyTodoSendContext.setUserId(busProcessNew.getUserId());
+                notifyTodoSendContexts.add(notifyTodoSendContext);
+            });
+            Map<String,Object> map = new TreeMap<>();
+            map.put("todoId",pId);
+            map.put("list",notifyTodoSendContexts);
+            net.sf.json.JSONObject jsonObject = net.sf.json.JSONObject.fromObject(map);
+            oaService.setTodoDeleteMq(jsonObject.toString());
+        }
+    }
+
+    @Override
+    @Async
+    public NotifyTodoAppDeleteResult setTodoDelete(String object) throws Exception{
+        Map<String,Object> objectMap = net.sf.json.JSONObject.fromObject(object);
+        List<NotifyTodoSendContext> notifyTodoSendContexts = JSONObject.parseArray(objectMap.get("list").toString(), NotifyTodoSendContext.class);
+        NotifyTodoAppDeleteResult notifyTodoAppResult = new NotifyTodoAppDeleteResult();
+        String result = "";
+        SimpleDateFormat sdf=new SimpleDateFormat("yyy-MM-dd HH:mm:ss");
+
+        JsonSend jsonSend = new JsonSend();
+        HEAD head = new HEAD();
+        head.setACCOUNT("OA");
+        head.setBIZTRANSACTIONID("SYC_161320210206133219");
+        head.setCONSUMER("FOTON");
+        head.setCOUNT("1");
+        head.setPASSWORD("TEST_oa201611241710");
+        head.setSRVLEVEL("1");
+        List<Object> list = new ArrayList<>();
+        list.addAll(notifyTodoSendContexts);
+        jsonSend.setHEAD(head);
+        jsonSend.setLIST(list);
+        net.sf.json.JSONObject json = net.sf.json.JSONObject.fromObject(jsonSend);
+        Map<String,String> mapCtr = new TreeMap<>();
+        mapCtr.put("Authorization",credentials);
+        log.info("处理完文件数据，开始请求发送删除接口数据：【"+sdf.format(new Date())+"】");
+        result = okHttpUtil.postForJson("http://172.24.12.64:85/WP_FOTON_FSOA/APP_DOC_SERVICES/Proxy_Services/TA_OA/DOC_SYC_1020_SendRemoveTodo_PS",json.toString(),mapCtr);
+        log.info("请求发送删除接口完毕，返回响应状态：【"+sdf.format(new Date())+"】");
+//            JSONObject jsonObject = JSONObject.parseObject(result);
+        if(!result.contains("操作成功")){
+            log.error("请求发送删除接口出现异常："+result);
+            notifyTodoAppResult.setSign("1");
+            notifyTodoAppResult.setMassage(result);
+        }else {
+            log.info("--------------------------成功发送 ESP 删除待办 "+object+"----------------------------");
+            log.info("okHttp请求发送删除接口成功结果："+result);
+            notifyTodoAppResult = (NotifyTodoAppDeleteResult) net.sf.json.JSONObject.toBean(net.sf.json.JSONObject.fromObject(result), NotifyTodoAppDeleteResult.class);
+        }
+//        try {
+//
+//        } catch (Exception e) {
+//            log.error(errMes, e.getMessage());
+//        }
+
+        return notifyTodoAppResult;
+    }
+
+
     @Override
     @Async
     public void completeOA(Task task){

src/main/java/com/ydw/bat/wkflow/business_oa/webService/todoResult/NotifyTodoAppDeleteResult.java

@@ -0,0 +1,26 @@
+package com.ydw.bat.wkflow.business_oa.webService.todoResult;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description: TODO
+ * @author: super_liu
+ * @date: 2021年09月08日 15:23
+ */
+@Data
+public class NotifyTodoAppDeleteResult {
+
+//    @ApiModelProperty(value = "返回状态 0:表示未操作 1:表示操作失败 2:表示操作成功")
+    @ApiModelProperty(value = "返回状态 0:表示操作成功 1:表示操作失败")
+    private String sign;
+
+//    @ApiModelProperty(value = "返回信息 " +
+//            "返回状态值为0时，该值返回空 " +
+//            "返回状态值为1时，该值错误信息 " +
+//            "返回状态值为2时，该值返回空")
+    @ApiModelProperty(value = "返回信息 " +
+            "返回状态值为0时，表示操作成功 " +
+            "返回状态值为1时，该值错误信息 ")
+    private String massage;
+}

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

@@ -82,8 +82,12 @@ public class SarInterpretationNationalStandard {
 
     @ApiModelProperty(value = "评估时间")
     @TableField("INTERPRETATION_TIME")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     private Date interpretationTime;
 
 
+    @ApiModelProperty(value = "风险程度")
+    private String riskDegree;
+
+
 }

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

@@ -0,0 +1,111 @@
+package com.ydw.bat.wkflow.listener.KCSTPReviewProcess;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName;
+import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew;
+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.util.SpringContextUtil;
+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.Arrays;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 任务下发
+ */
+public class AdminReviewAfter implements TaskListener {
+    @Override
+    public void notify(DelegateTask delegateTask) {
+        IDatasService datasService = SpringContextUtil.getBean(IDatasService.class);
+        IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
+        IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class);
+
+        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();
+
+
+        /**
+         *  next 子任务-法规认证部长审定
+         */
+        if("0".equals(object.getString("actionFlag"))){
+            String lawsProveViceChief =object.getString("lawsProveMinisterId");
+
+            if(StringUtils.isNotBlank(lawsProveViceChief)){
+                nextUserList= Arrays.asList(lawsProveViceChief.split(","));
+
+                delegateTask.setVariable("standardAdministratorVerify",0);
+                // 配置多实例
+                delegateTask.setVariable("subLawsProveMinisterId",lawsProveViceChief);
+                delegateTask.addCandidateUsers(nextUserList);
+            }
+        }else {
+            //TODO 驳回
+        }
+
+
+        //截止时间 流程描述 创建人
+        String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
+        String user = object.getString("prcCreateUser");
+        String username = object.getString("prcCreateUserName");
+//        object.getString("standName")
+        String standName = "";
+        String prcName = "重点认证标准/政策合规性项目审查流程-法规认证部长审定";
+        QueryWrapper queryWrapper2 = new QueryWrapper();
+        queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
+        BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
+        if(one1!=null){
+            one1.setOverTime(OVERTIME);
+            one1.setPrcType("laws3");
+            one1.setPrcName(prcName);
+            one1.setCreatUser(user);
+            one1.setCreatUserName(username);
+            busProcessNameService.saveOrUpdate(one1);
+        }
+
+        // 存储当前节点意见
+        BusProcessNew busProcessNew = new BusProcessNew();
+        busProcessNew.setMsgType("clause");
+        busProcessNew.setPId(delegateTask.getProcessInstanceId());
+        busProcessNew.setMesg(object.toJSONString());
+        busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey());
+        busProcessNew.setTaskId(delegateTask.getId());
+        busProcessNew.setCommitText(object.getString("commentText"));
+        busProcessNew.setFinishFlag("0");
+        busProcessNew.setTaskInfo(delegateTask.getName());
+        busBean.save(busProcessNew);
+
+        if(nextUserList != null && !nextUserList.isEmpty()){
+            for(String nextUser : nextUserList){
+                BusProcessNew busProcessNewNext = new BusProcessNew();
+                busProcessNewNext.setMsgType("clause");
+                busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
+                busProcessNewNext.setMesg(object.toJSONString());
+                busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey());
+                busProcessNewNext.setFinishFlag("0");
+                busProcessNewNext.setTaskInfo(delegateTask.getName());
+                busProcessNewNext.setUserId(nextUser);
+                busProcessNewNext.setPrcName(prcName);
+                busBean.save(busProcessNewNext);
+            }
+        }
+    }
+
+    private String verifyObj(String str){
+        return (str == null || str.equals("")) ? "" : str;
+    }
+}

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

@@ -0,0 +1,39 @@
+package com.ydw.bat.wkflow.listener.KCSTPReviewProcess;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew;
+import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService;
+import com.ydw.bat.wkflow.business_mq.service.CreateMQService;
+import com.ydw.bat.wkflow.util.SpringContextUtil;
+import org.activiti.engine.delegate.DelegateTask;
+import org.activiti.engine.delegate.TaskListener;
+
+import java.util.List;
+
+/**
+ * 任务下发
+ */
+public class AdminReviewBefore implements TaskListener {
+
+    @Override
+    public void notify(DelegateTask delegateTask) {
+        IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
+        CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class);
+
+
+        QueryWrapper queryWrapper1 = new QueryWrapper();
+        queryWrapper1.isNull("TASK_ID");
+        queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());
+        List<BusProcessNew> list = busBean.list(queryWrapper1);
+        if(!list.isEmpty()){
+            BusProcessNew one1 = list.get(0);
+            one1.setTaskId(delegateTask.getId());
+            one1.setTaskInfo(delegateTask.getName());
+            busBean.saveOrUpdate(one1);
+            // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
+            one1.setLink("bzrkStep2?prcType=laws3");
+            one1.setTaskInfo(delegateTask.getName());
+            oaService.sendTodoMq(one1);
+        }
+    }
+}

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

@@ -0,0 +1,110 @@
+package com.ydw.bat.wkflow.listener.KCSTPReviewProcess;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName;
+import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew;
+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.util.SpringContextUtil;
+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.Arrays;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 任务下发
+ */
+public class DeptLeaderReviewAfter implements TaskListener {
+    @Override
+    public void notify(DelegateTask delegateTask) {
+        IDatasService datasService = SpringContextUtil.getBean(IDatasService.class);
+        IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
+        IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class);
+
+        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);
+
+        /**
+         * next 法规管理员审核
+         */
+        List<String> nextUserList = new ArrayList();
+
+        if("0".equals(object.getString("actionFlag"))){
+            String startUser = object.getString("startUser");
+
+            if(StringUtils.isNotBlank(startUser)){
+                nextUserList= Arrays.asList(startUser.split(","));
+
+                delegateTask.setVariable("leaderVerify",0);
+                // 配置多实例
+                delegateTask.setVariable("subStartUser",startUser);
+                delegateTask.addCandidateUsers(nextUserList);
+            }
+        }else {
+            //TODO 驳回
+        }
+
+
+        //截止时间 流程描述 创建人
+        String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
+        String user = object.getString("prcCreateUser");
+        String username = object.getString("prcCreateUserName");
+//        object.getString("standName")
+        String standName = "";
+        String prcName = "重点认证标准/政策合规性项目审查流程-法规管理员审核";
+        QueryWrapper queryWrapper2 = new QueryWrapper();
+        queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
+        BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
+        if(one1!=null){
+            one1.setOverTime(OVERTIME);
+            one1.setPrcType("laws3");
+            one1.setPrcName(prcName);
+            one1.setCreatUser(user);
+            one1.setCreatUserName(username);
+            busProcessNameService.saveOrUpdate(one1);
+        }
+
+        // 存储当前节点意见
+        BusProcessNew busProcessNew = new BusProcessNew();
+        busProcessNew.setMsgType("clause");
+        busProcessNew.setPId(delegateTask.getProcessInstanceId());
+        busProcessNew.setMesg(object.toJSONString());
+        busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey());
+        busProcessNew.setTaskId(delegateTask.getId());
+        busProcessNew.setCommitText(object.getString("commentText"));
+        busProcessNew.setFinishFlag("0");
+        busProcessNew.setTaskInfo(delegateTask.getName());
+        busBean.save(busProcessNew);
+
+        if(nextUserList != null && !nextUserList.isEmpty()){
+            for(String nextUser : nextUserList){
+                BusProcessNew busProcessNewNext = new BusProcessNew();
+                busProcessNewNext.setMsgType("clause");
+                busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
+                busProcessNewNext.setMesg(object.toJSONString());
+                busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey());
+                busProcessNewNext.setFinishFlag("0");
+                busProcessNewNext.setTaskInfo(delegateTask.getName());
+                busProcessNewNext.setUserId(nextUser);
+                busProcessNewNext.setPrcName(prcName);
+                busBean.save(busProcessNewNext);
+            }
+        }
+    }
+
+    private String verifyObj(String str){
+        return (str == null || str.equals("")) ? "" : str;
+    }
+}

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

@@ -0,0 +1,35 @@
+package com.ydw.bat.wkflow.listener.KCSTPReviewProcess;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew;
+import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService;
+import com.ydw.bat.wkflow.business_mq.service.CreateMQService;
+import com.ydw.bat.wkflow.util.SpringContextUtil;
+import org.activiti.engine.delegate.DelegateTask;
+import org.activiti.engine.delegate.TaskListener;
+
+import java.util.List;
+
+public class DeptLeaderReviewBefore implements TaskListener {
+    @Override
+    public void notify(DelegateTask delegateTask) {
+        IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
+        CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class);
+
+
+        QueryWrapper queryWrapper1 = new QueryWrapper();
+        queryWrapper1.isNull("TASK_ID");
+        queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());
+        List<BusProcessNew> list = busBean.list(queryWrapper1);
+        if(!list.isEmpty()){
+            BusProcessNew one1 = list.get(0);
+            one1.setTaskId(delegateTask.getId());
+            one1.setTaskInfo(delegateTask.getName());
+            busBean.saveOrUpdate(one1);
+            // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
+            one1.setLink("bzrkStep2?prcType=laws3");
+            one1.setTaskInfo(delegateTask.getName());
+            oaService.sendTodoMq(one1);
+        }
+    }
+}

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

@@ -0,0 +1,120 @@
+package com.ydw.bat.wkflow.listener.KCSTPReviewProcess;
+
+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_main.datas.entity.BusProcessName;
+import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew;
+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.util.SpringContextUtil;
+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.*;
+
+/**
+ * 任务下发
+ */
+public class DistributionAfter implements TaskListener {
+    @Override
+    public void notify(DelegateTask delegateTask) {
+        IDatasService datasService = SpringContextUtil.getBean(IDatasService.class);
+        IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
+        IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class);
+
+        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();
+        Map<String, String> userAndInstitutionNameMap = new HashMap<>();
+
+
+        /**
+         *  next 责任人反馈情况
+         */
+        if(StringUtils.isNotBlank(object.getString("responUserList"))){
+            nextUserList= Arrays.asList(object.getString("responUserList").split(","));
+
+
+            JSONArray mapArray = object.getJSONArray("responUserAndInstitutionNameMap");
+            for (Object jsonMap : mapArray) {
+                userAndInstitutionNameMap.putAll(JSONObject.parseObject(jsonMap.toString(), Map.class));
+
+            }
+            // 配置多实例
+            delegateTask.setVariable("responseUserIdList",nextUserList);
+            delegateTask.addCandidateUsers(nextUserList);
+        }
+
+        //截止时间 流程描述 创建人
+        String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
+        String user = object.getString("prcCreateUser");
+        String username = object.getString("prcCreateUserName");
+//        object.getString("standName")
+        String standName = "";
+        String prcName = "重点认证标准/政策合规性项目审查流程";
+        QueryWrapper queryWrapper2 = new QueryWrapper();
+        queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
+        BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
+        if(one1!=null){
+            one1.setOverTime(OVERTIME);
+            one1.setPrcType("laws3");
+            one1.setPrcName(prcName);
+            one1.setCreatUser(user);
+            one1.setCreatUserName(username);
+            busProcessNameService.saveOrUpdate(one1);
+        }
+
+        // 存储当前节点意见
+        BusProcessNew busProcessNew = new BusProcessNew();
+        busProcessNew.setMsgType("clause");
+        busProcessNew.setPId(delegateTask.getProcessInstanceId());
+        busProcessNew.setMesg(object.toJSONString());
+        busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey());
+        busProcessNew.setTaskId(delegateTask.getId());
+        busProcessNew.setCommitText(object.getString("commentText"));
+        busProcessNew.setFinishFlag("0");
+        busProcessNew.setTaskInfo(delegateTask.getName());
+        busBean.save(busProcessNew);
+
+        if(nextUserList != null && !nextUserList.isEmpty()){
+            for(String nextUser : nextUserList){
+                //标记此用户是事业部还是产品规划部
+                JSONObject repositoryObject =object;
+                if (userAndInstitutionNameMap.get(nextUser).contains("事业部")){
+                    repositoryObject.put("feedbackDept","1");
+                    prcName+="-责任人反馈事业部情况";
+                }else {
+                    repositoryObject.put("feedbackDept","2");
+                    prcName+="-责任人反馈产品规划部情况";
+
+
+                }
+                BusProcessNew busProcessNewNext = new BusProcessNew();
+                busProcessNewNext.setMsgType("clause");
+                busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
+                busProcessNewNext.setMesg(repositoryObject.toJSONString());
+                busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey());
+                busProcessNewNext.setFinishFlag("0");
+                busProcessNewNext.setTaskInfo(delegateTask.getName());
+                busProcessNewNext.setUserId(nextUser);
+                busProcessNewNext.setPrcName(prcName);
+                busBean.save(busProcessNewNext);
+            }
+        }
+    }
+
+    private String verifyObj(String str){
+        return (str == null || str.equals("")) ? "" : str;
+    }
+}

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

@@ -0,0 +1,39 @@
+package com.ydw.bat.wkflow.listener.KCSTPReviewProcess;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew;
+import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService;
+import com.ydw.bat.wkflow.business_mq.service.CreateMQService;
+import com.ydw.bat.wkflow.util.SpringContextUtil;
+import org.activiti.engine.delegate.DelegateTask;
+import org.activiti.engine.delegate.TaskListener;
+
+import java.util.List;
+
+/**
+ * 任务下发
+ */
+public class DistributionBefore implements TaskListener {
+
+    @Override
+    public void notify(DelegateTask delegateTask) {
+        IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
+        CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class);
+
+
+        QueryWrapper queryWrapper1 = new QueryWrapper();
+        queryWrapper1.isNull("TASK_ID");
+        queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());
+        List<BusProcessNew> list = busBean.list(queryWrapper1);
+        if(!list.isEmpty()){
+            BusProcessNew one1 = list.get(0);
+            one1.setTaskId(delegateTask.getId());
+            one1.setTaskInfo(delegateTask.getName());
+            busBean.saveOrUpdate(one1);
+            // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
+            one1.setLink("bzrkStep2?prcType=laws3");
+            one1.setTaskInfo(delegateTask.getName());
+            oaService.sendTodoMq(one1);
+        }
+    }
+}

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

@@ -0,0 +1,103 @@
+package com.ydw.bat.wkflow.listener.KCSTPReviewProcess;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName;
+import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew;
+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.util.SpringContextUtil;
+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.Arrays;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 任务下发
+ */
+public class FeedBackAfter implements TaskListener {
+    @Override
+    public void notify(DelegateTask delegateTask) {
+        IDatasService datasService = SpringContextUtil.getBean(IDatasService.class);
+        IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
+        IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class);
+
+        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);
+
+        /**
+         * next 责任部门领导批准
+         */
+        List<String> nextUserList = new ArrayList();
+        String subResponseDeptLeader =object.getString("responseDeptLeaderId");
+
+        if(StringUtils.isNotBlank(subResponseDeptLeader)){
+            nextUserList= Arrays.asList(subResponseDeptLeader.split(","));
+
+            // 配置多实例
+            delegateTask.setVariable("subResponseDeptLeaderId",subResponseDeptLeader);
+            delegateTask.addCandidateUsers(nextUserList);
+        }
+
+        //截止时间 流程描述 创建人
+        String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
+        String user = object.getString("prcCreateUser");
+        String username = object.getString("prcCreateUserName");
+//        object.getString("standName")
+        String standName = "";
+        String prcName = "重点认证标准/政策合规性项目审查流程-责任部门领导批准";
+        QueryWrapper queryWrapper2 = new QueryWrapper();
+        queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
+        BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
+        if(one1!=null){
+            one1.setOverTime(OVERTIME);
+            one1.setPrcType("laws3");
+            one1.setPrcName(prcName);
+            one1.setCreatUser(user);
+            one1.setCreatUserName(username);
+            busProcessNameService.saveOrUpdate(one1);
+        }
+
+        // 存储当前节点意见
+        BusProcessNew busProcessNew = new BusProcessNew();
+        busProcessNew.setMsgType("clause");
+        busProcessNew.setPId(delegateTask.getProcessInstanceId());
+        busProcessNew.setMesg(object.toJSONString());
+        busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey());
+        busProcessNew.setTaskId(delegateTask.getId());
+        busProcessNew.setCommitText(object.getString("commentText"));
+        busProcessNew.setFinishFlag("0");
+        busProcessNew.setTaskInfo(delegateTask.getName());
+        busBean.save(busProcessNew);
+
+        if(nextUserList != null && !nextUserList.isEmpty()){
+            for(String nextUser : nextUserList){
+                BusProcessNew busProcessNewNext = new BusProcessNew();
+                busProcessNewNext.setMsgType("clause");
+                busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
+                busProcessNewNext.setMesg(object.toJSONString());
+                busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey());
+                busProcessNewNext.setFinishFlag("0");
+                busProcessNewNext.setTaskInfo(delegateTask.getName());
+                busProcessNewNext.setUserId(nextUser);
+                busProcessNewNext.setPrcName(prcName);
+                busBean.save(busProcessNewNext);
+            }
+        }
+    }
+
+    private String verifyObj(String str){
+        return (str == null || str.equals("")) ? "" : str;
+    }
+}

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

@@ -0,0 +1,35 @@
+package com.ydw.bat.wkflow.listener.KCSTPReviewProcess;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew;
+import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService;
+import com.ydw.bat.wkflow.business_mq.service.CreateMQService;
+import com.ydw.bat.wkflow.util.SpringContextUtil;
+import org.activiti.engine.delegate.DelegateTask;
+import org.activiti.engine.delegate.TaskListener;
+
+import java.util.List;
+
+public class FeedBackBefore implements TaskListener {
+    @Override
+    public void notify(DelegateTask delegateTask) {
+        IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
+        CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class);
+
+
+        QueryWrapper queryWrapper1 = new QueryWrapper();
+        queryWrapper1.isNull("TASK_ID");
+        queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());
+        List<BusProcessNew> list = busBean.list(queryWrapper1);
+        if(!list.isEmpty()){
+            BusProcessNew one1 = list.get(0);
+            one1.setTaskId(delegateTask.getId());
+            one1.setTaskInfo(delegateTask.getName());
+            busBean.saveOrUpdate(one1);
+            // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
+            one1.setLink("bzrkStep2?prcType=laws3");
+            one1.setTaskInfo(delegateTask.getName());
+            oaService.sendTodoMq(one1);
+        }
+    }
+}

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

@@ -0,0 +1,103 @@
+package com.ydw.bat.wkflow.listener.KCSTPReviewProcess;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName;
+import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew;
+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.util.SpringContextUtil;
+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.Arrays;
+import java.util.Date;
+import java.util.List;
+
+public class LaunchAfter implements TaskListener {
+    @Override
+    public void notify(DelegateTask delegateTask) {
+        IDatasService datasService = SpringContextUtil.getBean(IDatasService.class);
+        IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
+        IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class);
+
+        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);
+
+
+        /**
+         * 指定下一个流程节点的操作人
+         * next 法规认证部长批准
+         */
+        List<String> nextUserList = new ArrayList();
+        String lawsProveMinister = object.getString("lawsProveMinisterId");
+        if(StringUtils.isNotBlank(lawsProveMinister)){
+            nextUserList= Arrays.asList(lawsProveMinister);
+
+
+            delegateTask.setVariable("startUser",object.get("startUser"));
+            delegateTask.setVariable("lawsProveMinisterId",lawsProveMinister);
+            delegateTask.addCandidateUsers(nextUserList);
+        }
+
+
+        //截止时间 流程描述 创建人
+        String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
+        String user = object.getString("prcCreateUser");
+        String username = object.getString("prcCreateUserName");
+//        object.getString("standName")
+        String standName = "";
+        String prcName = "重点认证标准/政策合规性项目审查流程-法规认证部长批准";
+        QueryWrapper queryWrapper2 = new QueryWrapper();
+        queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
+        BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
+        if(one1!=null){
+//            one1.setOverTime(OVERTIME);
+            one1.setPrcType("laws3");
+            one1.setPrcName(prcName);
+            one1.setCreatUser(user);
+            one1.setCreatUserName(username);
+            busProcessNameService.saveOrUpdate(one1);
+        }
+
+        // 存储当前节点意见
+        BusProcessNew busProcessNew = new BusProcessNew();
+        busProcessNew.setMsgType("clause");
+        busProcessNew.setPId(delegateTask.getProcessInstanceId());
+        busProcessNew.setMesg(object.toJSONString());
+        busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey());
+        busProcessNew.setTaskId(delegateTask.getId());
+        busProcessNew.setCommitText(object.getString("commentText"));
+        busProcessNew.setFinishFlag("0");
+        busProcessNew.setTaskInfo(delegateTask.getName());
+        busBean.save(busProcessNew);
+
+        if(nextUserList != null && !nextUserList.isEmpty()){
+            for(String nextUser : nextUserList){
+                BusProcessNew busProcessNewNext = new BusProcessNew();
+                busProcessNewNext.setMsgType("clause");
+                busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
+                busProcessNewNext.setMesg(object.toJSONString());
+                busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey());
+                busProcessNewNext.setFinishFlag("0");
+                busProcessNewNext.setTaskInfo(delegateTask.getName());
+                busProcessNewNext.setUserId(nextUser);
+                busProcessNewNext.setPrcName(prcName);
+                busBean.save(busProcessNewNext);
+            }
+        }
+    }
+
+    private String verifyObj(String str){
+        return (str == null || str.equals("")) ? "" : str;
+    }
+}

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

@@ -0,0 +1,35 @@
+package com.ydw.bat.wkflow.listener.KCSTPReviewProcess;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew;
+import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService;
+import com.ydw.bat.wkflow.business_mq.service.CreateMQService;
+import com.ydw.bat.wkflow.util.SpringContextUtil;
+import org.activiti.engine.delegate.DelegateTask;
+import org.activiti.engine.delegate.TaskListener;
+
+import java.util.List;
+
+public class LaunchBefore implements TaskListener {
+    @Override
+    public void notify(DelegateTask delegateTask) {
+        IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
+        CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class);
+
+
+        QueryWrapper queryWrapper1 = new QueryWrapper();
+        queryWrapper1.isNull("TASK_ID");
+        queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());
+        List<BusProcessNew> list = busBean.list(queryWrapper1);
+        if(!list.isEmpty()){
+            BusProcessNew one1 = list.get(0);
+            one1.setTaskId(delegateTask.getId());
+            one1.setTaskInfo(delegateTask.getName());
+            busBean.saveOrUpdate(one1);
+            // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
+            one1.setLink("bzrkStep2?prcType=laws3");
+            one1.setTaskInfo(delegateTask.getName());
+            oaService.sendTodoMq(one1);
+        }
+    }
+}

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

@@ -0,0 +1,119 @@
+package com.ydw.bat.wkflow.listener.KCSTPReviewProcess;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName;
+import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew;
+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.util.SpringContextUtil;
+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.Arrays;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 部长审核
+ */
+public class MinisterReviewAfter implements TaskListener {
+    @Override
+    public void notify(DelegateTask delegateTask) {
+        IDatasService datasService = SpringContextUtil.getBean(IDatasService.class);
+        IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
+        IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class);
+
+        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);
+
+        /**
+         * next 法规认证部副总监批准
+         */
+        String prcName = "重点认证标准/政策合规性项目审查流程";//下一步名称
+        List<String> nextUserList = new ArrayList();
+        if ("0".equals(object.getString("actionFlag"))){
+            String lawsProveViceChief = object.getString("lawsProveViceChiefId");
+            if(StringUtils.isNotBlank(lawsProveViceChief)){
+
+                prcName+="-法规认证副总监批准";
+                delegateTask.setVariable("lawsProveMinisterVerify",0);
+                delegateTask.setVariable("lawsProveViceChiefId",lawsProveViceChief);
+                nextUserList= Arrays.asList(lawsProveViceChief.split(","));
+                delegateTask.addCandidateUsers(nextUserList);
+            }
+        }else {
+            //TODO 驳回操作
+            String startUser = object.getString("startUser");
+            if (StringUtils.isNotBlank(startUser)){
+
+                prcName+="-重新发起重点认证标准/政策合规性项目审查流程";
+                delegateTask.setVariable("lawsProveMinisterVerify",1);
+                delegateTask.setVariable("startUser",startUser);
+                nextUserList=Arrays.asList(startUser.split(","));
+                delegateTask.addCandidateUsers(nextUserList);
+            }
+        }
+
+
+
+        //截止时间 流程描述 创建人
+        String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
+        String user = object.getString("prcCreateUser");
+        String username = object.getString("prcCreateUserName");
+//        object.getString("standName")
+        String standName = "";
+
+        QueryWrapper queryWrapper2 = new QueryWrapper();
+        queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
+        BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
+        if(one1!=null){
+//            one1.setOverTime(OVERTIME);
+            one1.setPrcType("laws3");
+            one1.setPrcName(prcName);
+            one1.setCreatUser(user);
+            one1.setCreatUserName(username);
+            busProcessNameService.saveOrUpdate(one1);
+        }
+
+        // 存储当前节点意见
+        BusProcessNew busProcessNew = new BusProcessNew();
+        busProcessNew.setMsgType("clause");
+        busProcessNew.setPId(delegateTask.getProcessInstanceId());
+        busProcessNew.setMesg(object.toJSONString());
+        busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey());
+        busProcessNew.setTaskId(delegateTask.getId());
+        busProcessNew.setCommitText(object.getString("commentText"));
+        busProcessNew.setFinishFlag("0");
+        busProcessNew.setTaskInfo(delegateTask.getName());
+        busBean.save(busProcessNew);
+
+        if(nextUserList != null && !nextUserList.isEmpty()){
+            for(String nextUser : nextUserList){
+                BusProcessNew busProcessNewNext = new BusProcessNew();
+                busProcessNewNext.setMsgType("clause");
+                busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
+                busProcessNewNext.setMesg(object.toJSONString());
+                busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey());
+                busProcessNewNext.setFinishFlag("0");
+                busProcessNewNext.setTaskInfo(delegateTask.getName());
+                busProcessNewNext.setUserId(nextUser);
+                busProcessNewNext.setPrcName(prcName);
+                busBean.save(busProcessNewNext);
+            }
+        }
+    }
+
+    private String verifyObj(String str){
+        return (str == null || str.equals("")) ? "" : str;
+    }
+}

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

@@ -0,0 +1,38 @@
+package com.ydw.bat.wkflow.listener.KCSTPReviewProcess;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew;
+import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService;
+import com.ydw.bat.wkflow.business_mq.service.CreateMQService;
+import com.ydw.bat.wkflow.util.SpringContextUtil;
+import org.activiti.engine.delegate.DelegateTask;
+import org.activiti.engine.delegate.TaskListener;
+
+import java.util.List;
+
+/**
+ * 部长审核
+ */
+public class MinisterReviewBefore implements TaskListener {
+    @Override
+    public void notify(DelegateTask delegateTask) {
+        IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
+        CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class);
+
+
+        QueryWrapper queryWrapper1 = new QueryWrapper();
+        queryWrapper1.isNull("TASK_ID");
+        queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());
+        List<BusProcessNew> list = busBean.list(queryWrapper1);
+        if(!list.isEmpty()){
+            BusProcessNew one1 = list.get(0);
+            one1.setTaskId(delegateTask.getId());
+            one1.setTaskInfo(delegateTask.getName());
+            busBean.saveOrUpdate(one1);
+            // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
+            one1.setLink("bzrkStep2?prcType=laws2");
+            one1.setTaskInfo(delegateTask.getName());
+            oaService.sendTodoMq(one1);
+        }
+    }
+}

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

@@ -0,0 +1,102 @@
+package com.ydw.bat.wkflow.listener.KCSTPReviewProcess;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName;
+import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew;
+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.util.SpringContextUtil;
+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.Arrays;
+import java.util.Date;
+import java.util.List;
+
+public class ReLaunchAfter implements TaskListener {
+    @Override
+    public void notify(DelegateTask delegateTask) {
+        IDatasService datasService = SpringContextUtil.getBean(IDatasService.class);
+        IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
+        IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class);
+
+        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);
+
+
+        /**
+         * 指定下一个流程节点的操作人
+         * next 法规认证部长批准
+         */
+        List<String> nextUserList = new ArrayList();
+        String lawsProveMinister = object.getString("lawsProveMinisterId");
+        if(StringUtils.isNotBlank(lawsProveMinister)){
+            nextUserList= Arrays.asList(lawsProveMinister);
+
+
+            delegateTask.setVariable("lawsProveMinisterId",lawsProveMinister);
+            delegateTask.addCandidateUsers(nextUserList);
+        }
+
+
+        //截止时间 流程描述 创建人
+        String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
+        String user = object.getString("prcCreateUser");
+        String username = object.getString("prcCreateUserName");
+//        object.getString("standName")
+        String standName = "";
+        String prcName = "重点认证标准/政策合规性项目审查流程-法规认证部长批准";
+        QueryWrapper queryWrapper2 = new QueryWrapper();
+        queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
+        BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
+        if(one1!=null){
+//            one1.setOverTime(OVERTIME);
+            one1.setPrcType("laws3");
+            one1.setPrcName(prcName);
+            one1.setCreatUser(user);
+            one1.setCreatUserName(username);
+            busProcessNameService.saveOrUpdate(one1);
+        }
+
+        // 存储当前节点意见
+        BusProcessNew busProcessNew = new BusProcessNew();
+        busProcessNew.setMsgType("clause");
+        busProcessNew.setPId(delegateTask.getProcessInstanceId());
+        busProcessNew.setMesg(object.toJSONString());
+        busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey());
+        busProcessNew.setTaskId(delegateTask.getId());
+        busProcessNew.setCommitText(object.getString("commentText"));
+        busProcessNew.setFinishFlag("0");
+        busProcessNew.setTaskInfo(delegateTask.getName());
+        busBean.saveOrUpdate(busProcessNew);
+
+        if(nextUserList != null && !nextUserList.isEmpty()){
+            for(String nextUser : nextUserList){
+                BusProcessNew busProcessNewNext = new BusProcessNew();
+                busProcessNewNext.setMsgType("clause");
+                busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
+                busProcessNewNext.setMesg(object.toJSONString());
+                busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey());
+                busProcessNewNext.setFinishFlag("0");
+                busProcessNewNext.setTaskInfo(delegateTask.getName());
+                busProcessNewNext.setUserId(nextUser);
+                busProcessNewNext.setPrcName(prcName);
+                busBean.save(busProcessNewNext);
+            }
+        }
+    }
+
+    private String verifyObj(String str){
+        return (str == null || str.equals("")) ? "" : str;
+    }
+}

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

@@ -0,0 +1,35 @@
+package com.ydw.bat.wkflow.listener.KCSTPReviewProcess;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew;
+import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService;
+import com.ydw.bat.wkflow.business_mq.service.CreateMQService;
+import com.ydw.bat.wkflow.util.SpringContextUtil;
+import org.activiti.engine.delegate.DelegateTask;
+import org.activiti.engine.delegate.TaskListener;
+
+import java.util.List;
+
+public class ReLaunchBefore implements TaskListener {
+    @Override
+    public void notify(DelegateTask delegateTask) {
+        IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
+        CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class);
+
+
+        QueryWrapper queryWrapper1 = new QueryWrapper();
+        queryWrapper1.isNull("TASK_ID");
+        queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());
+        List<BusProcessNew> list = busBean.list(queryWrapper1);
+        if(!list.isEmpty()){
+            BusProcessNew one1 = list.get(0);
+            one1.setTaskId(delegateTask.getId());
+            one1.setTaskInfo(delegateTask.getName());
+            busBean.saveOrUpdate(one1);
+            // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
+            one1.setLink("bzrkStep2?prcType=laws3");
+            one1.setTaskInfo(delegateTask.getName());
+            oaService.sendTodoMq(one1);
+        }
+    }
+}

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

@@ -0,0 +1,108 @@
+package com.ydw.bat.wkflow.listener.KCSTPReviewProcess;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName;
+import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew;
+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.util.SpringContextUtil;
+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.Arrays;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 部长审核
+ */
+public class SubMinisterReviewAfter implements TaskListener {
+    @Override
+    public void notify(DelegateTask delegateTask) {
+        IDatasService datasService = SpringContextUtil.getBean(IDatasService.class);
+        IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
+        IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class);
+
+        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);
+
+        /**
+         * next 法规认证部副总监批准
+         */
+        List<String> nextUserList = new ArrayList();
+        if ("0".equals(object.getString("actionFlag"))){
+            String lawsProveViceChief = object.getString("lawsProveViceChiefId");
+            if(StringUtils.isNotBlank(lawsProveViceChief)){
+
+                delegateTask.setVariable("lawsProveMinisterVerify",0);
+                delegateTask.setVariable("subLawsProveViceChiefId",lawsProveViceChief);
+                nextUserList= Arrays.asList(lawsProveViceChief.split(","));
+                delegateTask.addCandidateUsers(nextUserList);
+            }
+        }else {
+            //TODO 驳回操作
+        }
+
+
+
+        //截止时间 流程描述 创建人
+        String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
+        String user = object.getString("prcCreateUser");
+        String username = object.getString("prcCreateUserName");
+//        object.getString("standName")
+        String standName = "";
+        String prcName = "重点认证标准/政策合规性项目审查流程-法规认证副总监批准";
+        QueryWrapper queryWrapper2 = new QueryWrapper();
+        queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
+        BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
+        if(one1!=null){
+//            one1.setOverTime(OVERTIME);
+            one1.setPrcType("laws3");
+            one1.setPrcName(prcName);
+            one1.setCreatUser(user);
+            one1.setCreatUserName(username);
+            busProcessNameService.saveOrUpdate(one1);
+        }
+
+        // 存储当前节点意见
+        BusProcessNew busProcessNew = new BusProcessNew();
+        busProcessNew.setMsgType("clause");
+        busProcessNew.setPId(delegateTask.getProcessInstanceId());
+        busProcessNew.setMesg(object.toJSONString());
+        busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey());
+        busProcessNew.setTaskId(delegateTask.getId());
+        busProcessNew.setCommitText(object.getString("commentText"));
+        busProcessNew.setFinishFlag("0");
+        busProcessNew.setTaskInfo(delegateTask.getName());
+        busBean.save(busProcessNew);
+
+        if(nextUserList != null && !nextUserList.isEmpty()){
+            for(String nextUser : nextUserList){
+                BusProcessNew busProcessNewNext = new BusProcessNew();
+                busProcessNewNext.setMsgType("clause");
+                busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
+                busProcessNewNext.setMesg(object.toJSONString());
+                busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey());
+                busProcessNewNext.setFinishFlag("0");
+                busProcessNewNext.setTaskInfo(delegateTask.getName());
+                busProcessNewNext.setUserId(nextUser);
+                busProcessNewNext.setPrcName(prcName);
+                busBean.save(busProcessNewNext);
+            }
+        }
+    }
+
+    private String verifyObj(String str){
+        return (str == null || str.equals("")) ? "" : str;
+    }
+}

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

@@ -0,0 +1,38 @@
+package com.ydw.bat.wkflow.listener.KCSTPReviewProcess;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew;
+import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService;
+import com.ydw.bat.wkflow.business_mq.service.CreateMQService;
+import com.ydw.bat.wkflow.util.SpringContextUtil;
+import org.activiti.engine.delegate.DelegateTask;
+import org.activiti.engine.delegate.TaskListener;
+
+import java.util.List;
+
+/**
+ * 部长审核
+ */
+public class SubMinisterReviewBefore implements TaskListener {
+    @Override
+    public void notify(DelegateTask delegateTask) {
+        IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
+        CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class);
+
+
+        QueryWrapper queryWrapper1 = new QueryWrapper();
+        queryWrapper1.isNull("TASK_ID");
+        queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());
+        List<BusProcessNew> list = busBean.list(queryWrapper1);
+        if(!list.isEmpty()){
+            BusProcessNew one1 = list.get(0);
+            one1.setTaskId(delegateTask.getId());
+            one1.setTaskInfo(delegateTask.getName());
+            busBean.saveOrUpdate(one1);
+            // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
+            one1.setLink("bzrkStep2?prcType=laws2");
+            one1.setTaskInfo(delegateTask.getName());
+            oaService.sendTodoMq(one1);
+        }
+    }
+}

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

@@ -0,0 +1,136 @@
+package com.ydw.bat.wkflow.listener.KCSTPReviewProcess;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName;
+import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew;
+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.util.SpringContextUtil;
+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.Arrays;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 副总监审核
+ */
+public class SubViceDirectorAfter implements TaskListener {
+    @Override
+    public void notify(DelegateTask delegateTask) {
+        IDatasService datasService = SpringContextUtil.getBean(IDatasService.class);
+        IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
+        IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class);
+
+        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);
+
+
+        /**
+         * next 结束
+         */
+        List<String> nextUserList = new ArrayList();
+        if ("0".equals(object.getString("actionFlag"))){
+            delegateTask.setVariable("lawsProveViceChiefVerify",0);
+
+            //流程结束
+            func2(delegateTask, busBean, object, "0", busProcessNameService);
+
+        }else {
+            //TODO 驳回
+            String startUser = object.getString("startUser");
+            delegateTask.setVariable("startUser",startUser);
+            nextUserList = Arrays.asList(startUser.split(","));
+
+
+            delegateTask.setVariable("lawsProveViceChiefVerify",1);
+
+
+        }
+
+
+        //截止时间 流程描述 创建人
+        String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
+        String user = object.getString("prcCreateUser");
+        String username = object.getString("prcCreateUserName");
+//        object.getString("standName")
+        String standName = "";
+        String prcName = "重点认证标准/政策合规性项目审查流程-责任部门领导任务下发";
+        QueryWrapper queryWrapper2 = new QueryWrapper();
+        queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
+        BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
+        if(one1!=null){
+//            one1.setOverTime(OVERTIME);
+            one1.setPrcType("laws3");
+            one1.setPrcName(prcName);
+            one1.setCreatUser(user);
+            one1.setCreatUserName(username);
+            busProcessNameService.saveOrUpdate(one1);
+        }
+
+        // 存储当前节点意见
+        BusProcessNew busProcessNew = new BusProcessNew();
+        busProcessNew.setMsgType("clause");
+        busProcessNew.setPId(delegateTask.getProcessInstanceId());
+        busProcessNew.setMesg(object.toJSONString());
+        busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey());
+        busProcessNew.setTaskId(delegateTask.getId());
+        busProcessNew.setCommitText(object.getString("commentText"));
+        busProcessNew.setFinishFlag("0");
+        busProcessNew.setTaskInfo(delegateTask.getName());
+        busBean.save(busProcessNew);
+
+        if(nextUserList != null && !nextUserList.isEmpty()){
+            for(String nextUser : nextUserList){
+                BusProcessNew busProcessNewNext = new BusProcessNew();
+                busProcessNewNext.setMsgType("clause");
+                busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
+                busProcessNewNext.setMesg(object.toJSONString());
+                busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey());
+                busProcessNewNext.setFinishFlag("0");
+                busProcessNewNext.setTaskInfo(delegateTask.getName());
+                busProcessNewNext.setUserId(nextUser);
+                busProcessNewNext.setPrcName(prcName);
+                busBean.save(busProcessNewNext);
+            }
+        }
+    }
+
+    private String verifyObj(String str){
+        return (str == null || str.equals("")) ? "" : str;
+    }
+
+    //流程结束
+    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.setOverTime(OVERTIME);
+            one2.setPrcType("laws3");
+            busProcessNameService.saveOrUpdate(one2);
+        }
+
+        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);
+        }
+    }
+}

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

@@ -0,0 +1,39 @@
+package com.ydw.bat.wkflow.listener.KCSTPReviewProcess;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew;
+import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService;
+import com.ydw.bat.wkflow.business_mq.service.CreateMQService;
+import com.ydw.bat.wkflow.util.SpringContextUtil;
+import org.activiti.engine.delegate.DelegateTask;
+import org.activiti.engine.delegate.TaskListener;
+
+import java.util.List;
+
+/**
+ * 副总监审核
+ */
+public class SubViceDirectorBefore implements TaskListener {
+    @Override
+    public void notify(DelegateTask delegateTask) {
+        IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
+        CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class);
+
+
+        QueryWrapper queryWrapper1 = new QueryWrapper();
+        queryWrapper1.isNull("TASK_ID");
+        queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());
+        List<BusProcessNew> list = busBean.list(queryWrapper1);
+        if(!list.isEmpty()){
+            BusProcessNew one1 = list.get(0);
+            one1.setTaskId(delegateTask.getId());
+            one1.setTaskInfo(delegateTask.getName());
+            busBean.saveOrUpdate(one1);
+            // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
+            //TODO 设置路由
+            one1.setLink("bzrkStep2?prcType=laws3");
+            one1.setTaskInfo(delegateTask.getName());
+            oaService.sendTodoMq(one1);
+        }
+    }
+}

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

@@ -0,0 +1,123 @@
+package com.ydw.bat.wkflow.listener.KCSTPReviewProcess;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName;
+import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew;
+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.util.SpringContextUtil;
+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.Arrays;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 副总监审核
+ */
+public class ViceDirectorAfter implements TaskListener {
+    @Override
+    public void notify(DelegateTask delegateTask) {
+        IDatasService datasService = SpringContextUtil.getBean(IDatasService.class);
+        IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
+        IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class);
+
+        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);
+
+
+        /**
+         * next 责任部门领导
+         */
+        List<String> nextUserList = new ArrayList();
+        String prcName = "重点认证标准/政策合规性项目审查流程";
+
+        if ("0".equals(object.getString("actionFlag"))){
+            String responseDeptLeader = object.getString("responseDeptLeaderId");
+            if(StringUtils.isNotBlank(responseDeptLeader)){
+
+
+                prcName+="责任部门领导任务下发";
+                delegateTask.setVariable("lawsProveViceChiefVerify",0);
+                delegateTask.setVariable("responseDeptLeaderId",responseDeptLeader);
+                nextUserList= Arrays.asList(responseDeptLeader.split(","));
+                delegateTask.addCandidateUsers(nextUserList);
+            }
+        }else {
+            //TODO 驳回
+            String startUser = object.getString("startUser");
+
+            if (StringUtils.isNotBlank(startUser)){
+
+                prcName+="-重新发起重点认证标准/政策合规性项目审查流程";
+                delegateTask.setVariable("lawsProveViceChiefVerify",1);
+                delegateTask.setVariable("startUser",startUser);
+                nextUserList=Arrays.asList(startUser.split(","));
+                delegateTask.addCandidateUsers(nextUserList);
+            }
+
+
+        }
+
+
+        //截止时间 流程描述 创建人
+        String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
+        String user = object.getString("prcCreateUser");
+        String username = object.getString("prcCreateUserName");
+//        object.getString("standName")
+        String standName = "";
+        QueryWrapper queryWrapper2 = new QueryWrapper();
+        queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
+        BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
+        if(one1!=null){
+//            one1.setOverTime(OVERTIME);
+            one1.setPrcType("laws3");
+            one1.setPrcName(prcName);
+            one1.setCreatUser(user);
+            one1.setCreatUserName(username);
+            busProcessNameService.saveOrUpdate(one1);
+        }
+
+        // 存储当前节点意见
+        BusProcessNew busProcessNew = new BusProcessNew();
+        busProcessNew.setMsgType("clause");
+        busProcessNew.setPId(delegateTask.getProcessInstanceId());
+        busProcessNew.setMesg(object.toJSONString());
+        busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey());
+        busProcessNew.setTaskId(delegateTask.getId());
+        busProcessNew.setCommitText(object.getString("commentText"));
+        busProcessNew.setFinishFlag("0");
+        busProcessNew.setTaskInfo(delegateTask.getName());
+        busBean.save(busProcessNew);
+
+        if(nextUserList != null && !nextUserList.isEmpty()){
+            for(String nextUser : nextUserList){
+                BusProcessNew busProcessNewNext = new BusProcessNew();
+                busProcessNewNext.setMsgType("clause");
+                busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
+                busProcessNewNext.setMesg(object.toJSONString());
+                busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey());
+                busProcessNewNext.setFinishFlag("0");
+                busProcessNewNext.setTaskInfo(delegateTask.getName());
+                busProcessNewNext.setUserId(nextUser);
+                busProcessNewNext.setPrcName(prcName);
+                busBean.save(busProcessNewNext);
+            }
+        }
+    }
+
+    private String verifyObj(String str){
+        return (str == null || str.equals("")) ? "" : str;
+    }
+}

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

@@ -0,0 +1,39 @@
+package com.ydw.bat.wkflow.listener.KCSTPReviewProcess;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew;
+import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService;
+import com.ydw.bat.wkflow.business_mq.service.CreateMQService;
+import com.ydw.bat.wkflow.util.SpringContextUtil;
+import org.activiti.engine.delegate.DelegateTask;
+import org.activiti.engine.delegate.TaskListener;
+
+import java.util.List;
+
+/**
+ * 副总监审核
+ */
+public class ViceDirectorBefore implements TaskListener {
+    @Override
+    public void notify(DelegateTask delegateTask) {
+        IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
+        CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class);
+
+
+        QueryWrapper queryWrapper1 = new QueryWrapper();
+        queryWrapper1.isNull("TASK_ID");
+        queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());
+        List<BusProcessNew> list = busBean.list(queryWrapper1);
+        if(!list.isEmpty()){
+            BusProcessNew one1 = list.get(0);
+            one1.setTaskId(delegateTask.getId());
+            one1.setTaskInfo(delegateTask.getName());
+            busBean.saveOrUpdate(one1);
+            // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
+            //TODO 设置路由
+            one1.setLink("bzrkStep2?prcType=laws3");
+            one1.setTaskInfo(delegateTask.getName());
+            oaService.sendTodoMq(one1);
+        }
+    }
+}

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

@@ -19,6 +19,7 @@ import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.UUID;
 
 public class PCAComplianceAssessmentAfter implements TaskListener {
 
@@ -41,8 +42,33 @@ public class PCAComplianceAssessmentAfter implements TaskListener {
         List<String> nextUserList=new ArrayList<>();
         JSONArray jsonArray=JSONArray.parseArray(object.getString("dataList"));
         JSONObject jsonObject=JSONObject.parseObject(jsonArray.get(0).toString());
-        nextUserList.add(jsonObject.getString("liablePeopleId"));
-        delegateTask.setVariable("ffUserId",jsonObject.getString("liablePeopleId"));
+        //新去除数据之后的结果
+        JSONArray newRes=new JSONArray();
+        for (Object json:jsonArray) {
+            JSONObject jsonObject1=JSONObject.parseObject(json.toString());
+            JSONArray remove=new JSONArray();
+            for (Object os:jsonObject1.getJSONArray("children")) {
+                JSONObject jsonObject2=JSONObject.parseObject(os.toString());
+                if ("".equals(jsonObject2.get("complianceReasons"))&&"".equals(jsonObject2.get("noCompliance"))
+                && "".equals(jsonObject2.get("countermeasures")) && null==jsonObject2.get("completionTime")){
+                    remove.add(jsonObject2);
+                }
+            }
+            jsonObject1.getJSONArray("children").removeAll(remove);
+            if (jsonObject1.getJSONArray("children").size()==0 && "".equals(jsonObject1.get("complianceReasons"))&&"".equals(jsonObject1.get("noCompliance"))
+                    && "".equals(jsonObject1.get("countermeasures")) && null==jsonObject1.get("completionTime")){
+
+            }else {
+                newRes.add(jsonObject1);
+            }
+        }
+        String uuid= String.valueOf(UUID.randomUUID());
+        delegateTask.setVariable(uuid,jsonArray);
+        object.put("dataList",newRes);
+        object.put("key",uuid);
+        JSONObject res=JSONObject.parseObject(jsonArray.get(0).toString());
+        nextUserList.add(res.getString("liablePeopleId"));
+        delegateTask.setVariable("ffUserId",res.getString("liablePeopleId"));
         //截止时间 流程描述 创建人
         String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
         String user = delegateTask.getVariable("prcCreateUser",String.class);

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

@@ -4,6 +4,7 @@ package com.ydw.bat.wkflow.listener.ProjectComplianceAssessment;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.tmsps.fk.common.util.JsonUtil;
+import com.ydw.bat.wkflow.business_main.datas.dto.DataList;
 import com.ydw.bat.wkflow.business_main.datas.dto.PCA.PCAtotal;
 import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName;
 import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew;
@@ -53,6 +54,7 @@ public class PCAbafgManagerApproveAfter implements TaskListener {
                 delegateTask.setVariable("pass", "1");
             }
         } else {
+            object.put("dataList",delegateTask.getVariable(object.getString("key")));
             nextUserList.add(String.valueOf(delegateTask.getVariable("workPeople")));
             delegateTask.setVariable("bzFlag", "2");
         }
@@ -101,8 +103,10 @@ public class PCAbafgManagerApproveAfter implements TaskListener {
                     busProcessNewNext.setMesg(object.toJSONString());
                     busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey());
                     busProcessNewNext.setFinishFlag("0");
+                    busProcessNewNext.setTaskId("996");
                     busProcessNewNext.setTaskInfo(delegateTask.getName());
                     busProcessNewNext.setUserId(userId);
+                    busProcessNewNext.setPrcName(prcName);
                     busBean.save(busProcessNewNext);
                 }
             }

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

@@ -55,7 +55,7 @@ public class PCAdlApproveAfter implements TaskListener {
             List<SarStandUnqualified> standUnqualifieds = new ArrayList<>();
             //评估结果存储集合
             List<SarStandardComplianceProductAssess> sarStandardComplianceProductAssesses = new ArrayList<>();
-
+            SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
             res.getDataList().forEach(pcAdataList -> {
                 //标准一级别
                 if (null != pcAdataList.getNoCompliance()) {
@@ -68,12 +68,12 @@ public class PCAdlApproveAfter implements TaskListener {
                     sarStandUnqualified.setCloseState(1);
                     sarStandUnqualified.setCreateTime(new Date());
                     sarStandUnqualified.setProductName(res.getProjectName());
-//                    sarStandUnqualified.setProductLine(res.getProductLine());
                     sarStandUnqualified.setResponsibleUnit(pcAdataList.getZrbm());
                     sarStandUnqualified.setProductType("research");
                     sarStandUnqualified.setReason(pcAdataList.getNoCompliance());
                     sarStandUnqualified.setPlanCloseTime(pcAdataList.getCompletionTime());
                     sarStandUnqualified.setProductLine(delegateTask.getVariable("productLines",String.class));
+                    sarStandUnqualified.setProductId(delegateTask.getVariable("stId",String.class));
                     standUnqualifieds.add(sarStandUnqualified);
                 }
 
@@ -92,6 +92,7 @@ public class PCAdlApproveAfter implements TaskListener {
                     sarStandUnqualified.setReason(pcAdataList.getZcNoCompliance());
                     sarStandUnqualified.setProductType("product");
                     sarStandUnqualified.setPlanCloseTime(pcAdataList.getZcCompletionTime());
+                    sarStandUnqualified.setProductId(delegateTask.getVariable("stId",String.class));
                     standUnqualifieds.add(sarStandUnqualified);
                 }
 
@@ -120,8 +121,9 @@ public class PCAdlApproveAfter implements TaskListener {
                 sarStandard.setResearchImplementationTime(pcAdataList.getXcxssrqgj());
                 sarStandard.setClauseName(pcAdataList.getItemsName());
                 sarStandard.setStandardItem(pcAdataList.getItemNum());
-
-                SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+                sarStandard.setEvaluationTime(simpleDateFormat.format(new Date()));
+                sarStandard.setEvaluationPeopleName(pcAdataList.getWorkPeople());
+                sarStandard.setEvaluationPeople(pcAdataList.getWorkPeople());
                 sarStandard.setResearchImplementationTime(pcAdataList.getXcxssrqgj());
 //                simpleDateFormat.parse(String.valueOf(delegateTask.getVariable("XCXSSRQ")))
                 sarStandard.setProductionImplementationTime(pcAdataList.getZccssrqgj());
@@ -146,6 +148,7 @@ public class PCAdlApproveAfter implements TaskListener {
                         sarStandUnqualified.setProductType("research");
                         sarStandUnqualified.setReason(pcAchildren.getNoCompliance());
                         sarStandUnqualified.setPlanCloseTime(pcAchildren.getCompletionTime());
+                        sarStandUnqualified.setProductId(delegateTask.getVariable("stId",String.class));
                         standUnqualifieds.add(sarStandUnqualified);
                     }
 
@@ -167,6 +170,7 @@ public class PCAdlApproveAfter implements TaskListener {
                         sarStandUnqualified.setReason(pcAchildren.getZcNoCompliance());
                         sarStandUnqualified.setProductType("product");
                         sarStandUnqualified.setPlanCloseTime(pcAchildren.getZcCompletionTime());
+                        sarStandUnqualified.setProductId(delegateTask.getVariable("stId",String.class));
                         standUnqualifieds.add(sarStandUnqualified);
                     }
                     //合估评规 结果！
@@ -192,6 +196,9 @@ public class PCAdlApproveAfter implements TaskListener {
                     sarStandardChild.setProductionImplementationTime(pcAdataList.getZccssrqgj());
                     sarStandardChild.setClauseName(pcAchildren.getItemsName());
                     sarStandardChild.setStandardItem(pcAchildren.getItemsNum());
+                    sarStandardChild.setEvaluationTime(simpleDateFormat.format(new Date()));
+                    sarStandardChild.setEvaluationPeopleName(pcAchildren.getWorkPeople());
+                    sarStandardChild.setEvaluationPeople(pcAchildren.getWorkPeople());
                     sarStandardComplianceProductAssesses.add(sarStandardChild);
                 }
             });

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

@@ -1,8 +1,10 @@
 package com.ydw.bat.wkflow.listener.ProjectComplianceAssessment;
 
 
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.ydw.bat.wkflow.business_main.datas.dto.DataList;
 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;
@@ -42,6 +44,7 @@ public class PCAffLiableApproveAfter implements TaskListener {
             delegateTask.setVariable("JGManager", delegateTask.getVariable("JGUserId"));
             delegateTask.setVariable("ffFlag", "1");
         }else {
+            object.put("dataList",delegateTask.getVariable(object.getString("key")));
             nextUserList.add(String.valueOf(delegateTask.getVariable("workPeople")));
             delegateTask.setVariable("ffFlag", "2");
         }

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

@@ -43,55 +43,120 @@ public class PCAffLiableDistributeAfter implements TaskListener {
         Datas datas = datasService.getOne(queryWrapper);
         JSONObject object = JSONObject.parseObject(datas.getFormValsJson());
         delegateTask.setVariable("objectJson", object);
-        PCAtotal pcAtotal=JSONObject.parseObject(datas.getFormValsJson(),PCAtotal.class);
+        PCAtotal pcAtotal = JSONObject.parseObject(datas.getFormValsJson(), PCAtotal.class);
         //后续节点所需要的数据
-        List<String> nextUserList=new ArrayList<>();
+        List<String> nextUserList = new ArrayList<>();
         //猜测写代码
         //准备标准数据
-        Map<String,PCAdataList> mapData=new HashMap<>();
+        Map<String, PCAtotal> map = new HashMap<>();
+
+        Map<String, PCAdataList> mapData = new HashMap<>();
         pcAtotal.getDataList().forEach(pcAdataList -> {
-            List<PCAchildren> pcAchildren=new ArrayList<>();
+            List<PCAchildren> pcAchildren = new ArrayList<>();
             pcAdataList.setChildren(pcAchildren);
-            mapData.put(pcAdataList.getStandId(),pcAdataList);
+            mapData.put(pcAdataList.getStandId(), pcAdataList);
         });
-        Map<String, PCAtotal> map=new HashMap<>();
-        //获取被分发的条款
+
+        //获取被分发的条款----人员多选修改
         pcAtotal.getChildren().forEach(o -> {
-            if (null!=map.get(o.getWorkPeopleId())){
-                map.get(o.getWorkPeopleId()).getChildren().add(o);
-                int flag=0;
-                for (PCAdataList ps: map.get(o.getWorkPeopleId()).getDataList()) {
-                    if (ps.getStandId().equals(mapData.get(o.getKey()).getStandId())){
-                        flag++;
+            if (null!=o && null != o.getWorkPeopleId()) {
+                List<String> ids = new ArrayList(Arrays.asList(o.getWorkPeopleId().split(",")));
+                List<String> names = new ArrayList(Arrays.asList(o.getWorkPeople().split(",")));
+                int i = 0;
+                for (String id : ids) {
+                    //重组数据
+                    PCAchildren middle = new PCAchildren();
+                    BeanUtils.copyProperties(o, middle);
+                    middle.setWorkPeopleId(id);
+                    middle.setWorkPeople(names.get(i));
+                    if (null != map.get(id)) {
+                        map.get(id).getChildren().add(middle);
+                        int flag = 0;
+                        for (PCAdataList ps : map.get(id).getDataList()) {
+                            if (ps.getStandId().equals(mapData.get(middle.getKey()).getStandId())) {
+                                ps.getChildren().add(middle);
+                                flag++;
+                            }
+                        }
+                        if (flag == 0) {
+                            map.get(id).getDataList().add(mapData.get(middle.getKey()));
+                            mapData.get(middle.getKey()).getChildren().add(middle);
+                        }
+                    } else {
+                        PCAtotal pcs = new PCAtotal();
+                        BeanUtils.copyProperties(pcAtotal, pcs);
+                        //建立空的子 为了后面遍历
+                        List<PCAchildren> list = new ArrayList<>();
+                        List<PCAchildren> list1 = new ArrayList<>();
+                        list.add(middle);
+                        list1.add(middle);
+                        pcs.setChildren(list);
+                        List<PCAdataList> list2 = new ArrayList<>();
+                        PCAdataList adataLists = new PCAdataList();
+                        BeanUtils.copyProperties(mapData.get(middle.getKey()), adataLists);
+                        adataLists.setWorkPeopleId(id);
+                        adataLists.setWorkPeople(names.get(i));
+                        adataLists.setChildren(list1);
+                        list2.add(adataLists);
+                        pcs.setDataList(list2);
+                        map.put(id, pcs);
                     }
+                    i++;
+                }
+            }
+        });
+        mapData.keySet().forEach(s -> {
+            if (null != mapData.get(s).getWorkPeopleId()) {
+                List<String> peos = new ArrayList<>(Arrays.asList(mapData.get(s).getWorkPeopleId().split(",")));
+                List<String> names = new ArrayList<>(Arrays.asList(mapData.get(s).getWorkPeople().split(",")));
+                int count=0;
+                for (String i : peos) {
+                    if (null==map.get(i)){
+                        PCAtotal pcs = new PCAtotal();
+                        BeanUtils.copyProperties(pcAtotal, pcs);
+                        //建立空的子 为了后面遍历
+                        List<PCAchildren> list = new ArrayList<>();
+                        List<PCAdataList> list2 = new ArrayList<>();
+                        PCAdataList pcAdataList = new PCAdataList();
+                        BeanUtils.copyProperties(mapData.get(s),pcAdataList);
+                        pcAdataList.setChildren(list);
+                        pcAdataList.setWorkPeopleId(i);
+                        pcAdataList.setWorkPeople(names.get(count));
+                        list2.add(pcAdataList);
+                        pcs.setDataList(list2);
+                        map.put(i,pcs);
+                    }else {
+                        boolean flag=true;
+                        for (PCAdataList pc:map.get(i).getDataList()) {
+                            if (pc.getStandId().equals(mapData.get(s).getStandId())){
+                                flag=false;
+                            }
+                        }
+                        if (flag){
+                            List<PCAchildren> list = new ArrayList<>();
+                            PCAdataList pcAdataList = new PCAdataList();
+                            BeanUtils.copyProperties(mapData.get(s),pcAdataList);
+                            pcAdataList.setChildren(list);
+                            pcAdataList.setWorkPeopleId(i);
+                            pcAdataList.setWorkPeople(names.get(count));
+                            map.get(i).getDataList().add(pcAdataList);
+                        }
+                    }
+                    count++;
                 }
-            }else {
-                PCAtotal pcs=new PCAtotal();
-                BeanUtils.copyProperties(pcAtotal,pcs);
-                //建立空的子 为了后面遍历
-                List<PCAchildren> list=new ArrayList<>();
-                list.add(o);
-                pcs.setChildren(list);
-                List<PCAdataList> list2=new ArrayList<>();
-                PCAdataList adataLists=new PCAdataList();
-                BeanUtils.copyProperties(mapData.get(o.getKey()),adataLists);
-                adataLists.setChildren(list);
-                list2.add(adataLists);
-                pcs.setDataList(list2);
-                map.put(o.getWorkPeopleId(),pcs);
             }
         });
         map.forEach((s, pcAtotal1) -> {
-            if (null!=s) {
+            if (null != s && !"".equals(s)) {
                 nextUserList.add(s);
             }
         });
-        delegateTask.setVariable("workPeoples",nextUserList);
+        delegateTask.setVariable("workPeoples", nextUserList);
         //截止时间 流程描述 创建人
         String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
-        String user = delegateTask.getVariable("prcCreateUser",String.class);
-        String username = delegateTask.getVariable("prcCreateUserName",String.class);
-        String prcName = delegateTask.getVariable("stId",String.class)+"-项目合规评估流程-合规性评估";
+        String user = delegateTask.getVariable("prcCreateUser", String.class);
+        String username = delegateTask.getVariable("prcCreateUserName", String.class);
+        String prcName = delegateTask.getVariable("stId", String.class) + "-项目合规评估流程-合规性评估";
         QueryWrapper queryWrapper2 = new QueryWrapper();
         queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
         BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
@@ -105,8 +170,8 @@ public class PCAffLiableDistributeAfter implements TaskListener {
         }
 
         // 存储当前节点意见
-        if(nextUserList != null && !nextUserList.isEmpty()){
-            for(String userId : nextUserList){
+        if (nextUserList != null && !nextUserList.isEmpty()) {
+            for (String userId : nextUserList) {
                 BusProcessNew busProcessNewNext = new BusProcessNew();
                 busProcessNewNext.setMsgType("clause");
                 busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
@@ -119,5 +184,6 @@ public class PCAffLiableDistributeAfter implements TaskListener {
                 busBean.save(busProcessNewNext);
             }
         }
+
     }
 }

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

@@ -3,6 +3,7 @@ package com.ydw.bat.wkflow.listener.ProjectComplianceAssessment;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.ydw.bat.wkflow.business_main.datas.dto.DataList;
 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;
@@ -43,6 +44,7 @@ public class PCAgcManagerApproveAfter implements TaskListener {
             delegateTask.setVariable("bzManager", delegateTask.getVariable("bzfgl"));
             delegateTask.setVariable("gcFlag","1");
         }else {
+            object.put("dataList",delegateTask.getVariable(object.getString("key")));
             nextUserList.add(String.valueOf(delegateTask.getVariable("workPeople")));
             delegateTask.setVariable("gcFlag", "2");
         }

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

@@ -3,6 +3,7 @@ package com.ydw.bat.wkflow.listener.ProjectComplianceAssessment;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.ydw.bat.wkflow.business_main.datas.dto.DataList;
 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;
@@ -44,6 +45,7 @@ public class PCAjgManagerApproveAfter implements TaskListener {
             delegateTask.setVariable("gcManager", delegateTask.getVariable("gcjl"));
             delegateTask.setVariable("jgFlag","1");
         }else {
+            object.put("dataList",delegateTask.getVariable(object.getString("key")));
             nextUserList.add(String.valueOf(delegateTask.getVariable("workPeople")));
             delegateTask.setVariable("jgFlag", "2");
         }

src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/DockingApprovalAfter.java

@@ -105,4 +105,4 @@ public class DockingApprovalAfter implements TaskListener {
             busBean.save(busProcessNewNext);
         }
     }
-}
+}

src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/MinisterAndDockerSignAfter.java

@@ -98,9 +98,8 @@ public class MinisterAndDockerSignAfter implements TaskListener {
 
         Integer count=delegateTask.getVariable("task3OKCount",Integer.class);
         List<String> userList=delegateTask.getVariable("userList",List.class);
-
+        if(count==null)count=0;
         if(delegateTask.getVariable("actionFlag",Integer.class)==0){
-            if(count==null)count=0;
             count++;
             delegateTask.setVariable("task3OKCount",count);
         }

src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/DirectorSignAfter.java

@@ -42,10 +42,9 @@ public class DirectorSignAfter implements TaskListener {
 
 
         //截止时间 流程描述 创建人
-        String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
         String user = delegateTask.getVariable("startId",String.class);
         String username = delegateTask.getVariable("startName",String.class);
-        String standName = object.getString("title");
+        String standName = delegateTask.getVariable("title",String.class);
         String prcName = standName+"-标准调研流程";
         QueryWrapper queryWrapper2 = new QueryWrapper();
         queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());

src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/DockingApprovalAfter.java

@@ -43,7 +43,7 @@ public class DockingApprovalAfter implements TaskListener {
         String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
         String user = delegateTask.getVariable("startId",String.class);
         String username = delegateTask.getVariable("startName",String.class);
-        String standName = object.getString("title");
+        String standName = delegateTask.getVariable("title",String.class);
         String prcName = standName+"-标准调研流程";
         QueryWrapper queryWrapper2 = new QueryWrapper();
         queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());

src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/MinisterAndDockerSignAfter.java

@@ -47,7 +47,7 @@ public class MinisterAndDockerSignAfter implements TaskListener {
         String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
         String user = delegateTask.getVariable("startId",String.class);
         String username = delegateTask.getVariable("startName",String.class);
-        String standName = object.getString("title");
+        String standName = delegateTask.getVariable("title",String.class);
         String prcName = standName+"-标准调研流程";
         QueryWrapper queryWrapper2 = new QueryWrapper();
         queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());

src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/PresidentSignAfter.java

@@ -44,7 +44,7 @@ public class PresidentSignAfter implements TaskListener {
         String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
         String user = delegateTask.getVariable("startId",String.class);
         String username = delegateTask.getVariable("startName",String.class);
-        String standName = object.getString("title");
+        String standName = delegateTask.getVariable("title",String.class);
         String prcName = standName+"-标准调研流程";
         QueryWrapper queryWrapper2 = new QueryWrapper();
         queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());

src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/ResponUserSignAfter.java

@@ -54,7 +54,7 @@ public class ResponUserSignAfter implements TaskListener {
         String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
         String user = delegateTask.getVariable("startId",String.class);
         String username = delegateTask.getVariable("startName",String.class);
-        String standName = object.getString("title");
+        String standName = delegateTask.getVariable("title",String.class);
         String prcName = standName+"-标准调研流程";
         QueryWrapper queryWrapper2 = new QueryWrapper();
         queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());

src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/SelectResponsibleUserAfter.java

@@ -34,6 +34,8 @@ public class SelectResponsibleUserAfter implements TaskListener {
 
         List<String> nextUserList = new ArrayList();
 
+        object.put("docUser",delegateTask.getAssignee());
+
         String userListString=object.getString("responUserList");
         String userListStringName=object.getString("responUserListName");
 
@@ -54,23 +56,27 @@ public class SelectResponsibleUserAfter implements TaskListener {
             json.put("dockUser",delegateTask.getAssignee());
             responUserList.add(json);
             strings.add(userList.get(i));
-            map.put(userList.get(i),json);
+            map.put(delegateTask.getAssignee()+userList.get(i),json);
         }
-
+///
         delegateTask.setVariable("responUserList",responUserList);
         if (null == delegateTask.getVariable("responUserLists",List.class)){
             delegateTask.setVariable("responUserLists",strings);
         }else {
             delegateTask.getVariable("responUserLists", List.class).addAll(strings);
         }
-        delegateTask.setVariable("datas",map);
+        if (null == delegateTask.getVariable("datas")) {
+            delegateTask.setVariable("datas", map);
+        }else {
+            delegateTask.getVariable("datas", Map.class).putAll(map);
+        }
 
 
         //截止时间 流程描述 创建人
         String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
-        String user = object.getString("startUser");
-        String username = object.getString("startUserName");
-        String standName = object.getString("title");
+        String user = delegateTask.getVariable("startId",String.class);
+        String username = delegateTask.getVariable("startName",String.class);
+        String standName = delegateTask.getVariable("title",String.class);
         String prcName = standName+"-标准调研流程";
         QueryWrapper queryWrapper2 = new QueryWrapper();
         queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());

src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/StartSurveyAfter.java

@@ -69,6 +69,7 @@ public class StartSurveyAfter implements TaskListener {
         delegateTask.setVariable("startId",user);
         delegateTask.setVariable("startName",username);
         String standName = object.getString("title");
+        delegateTask.setVariable("title",standName);
         String prcName = standName+"-标准调研流程";
         QueryWrapper queryWrapper2 = new QueryWrapper();
         queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());

src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/SummarySurveyAfter.java

@@ -50,7 +50,7 @@ public class SummarySurveyAfter implements TaskListener {
         String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
         String user = delegateTask.getVariable("startId",String.class);
         String username = delegateTask.getVariable("startName",String.class);
-        String standName = object.getString("title");
+        String standName = delegateTask.getVariable("title",String.class);
         String prcName = standName+"-标准调研流程";
         QueryWrapper queryWrapper2 = new QueryWrapper();
         queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());

src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/UploadResearchResultAfter.java

@@ -37,23 +37,22 @@ public class UploadResearchResultAfter  implements TaskListener {
         JSONArray responUserList = delegateTask.getVariable("responUserList", JSONArray.class);
         String responUser = delegateTask.getVariable("responUser",String.class);
         Map map=delegateTask.getVariable("datas",Map.class);
-        JSONObject os=JSONObject.parseObject(String.valueOf(map.get(responUser)));
+        JSONObject os=JSONObject.parseObject(String.valueOf(map.get(object.getString("docUser")+responUser)));
         for (int i = 0; i < responUserList.size(); i++) {
             JSONObject obj=responUserList.getJSONObject(i);
-            if(obj.getString("id").equals(responUser)
-                    &&obj.getString("dockUser").equals(os.getString("dockUser"))
-            ){
+                if (obj.getString("id").equals(responUser)
+                        && obj.getString("dockUser").equals(os.getString("dockUser"))) {
 
-                object.put("responUser",obj.getString("id"));
-                object.put("responUserName",obj.getString("name"));
-                obj.put("dyhz",object.getString("dyhz"));
-                obj.put("fileId",object.getString("fileId"));
-                obj.put("fileName",object.getString("fileName"));
+                    object.put("responUser", obj.getString("id"));
+                    object.put("responUserName", obj.getString("name"));
+                    obj.put("dyhz", object.getString("dyhz"));
+                    obj.put("fileId", object.getString("fileId"));
+                    obj.put("fileName", object.getString("fileName"));
 
-                responUserList.set(i,obj);
+                    responUserList.set(i, obj);
+                    break;
 
-                break;
-            }
+                }
         }
 
         delegateTask.setVariable("dockUsers",os.getString("dockUser"));
@@ -67,7 +66,7 @@ public class UploadResearchResultAfter  implements TaskListener {
         String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
         String user = delegateTask.getVariable("startId",String.class);
         String username = delegateTask.getVariable("startName",String.class);
-        String standName = object.getString("title");
+        String standName = delegateTask.getVariable("title",String.class);
         String prcName = standName+"-标准调研流程";
         QueryWrapper queryWrapper2 = new QueryWrapper();
         queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());

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

@@ -0,0 +1,87 @@
+package com.ydw.bat.wkflow.listener.aboliish;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName;
+import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew;
+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.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 ProcessStep1After implements TaskListener {
+
+    //分发多个责任人
+    @Override
+    public void notify(DelegateTask delegateTask) {
+        //默认流程数据接口
+        IDatasService datasService = SpringContextUtil.getBean(IDatasService.class);
+        //流程节点信息
+        IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
+        //流程信息
+        IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.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);
+        //标准法规部业务经理Id ${passFlag==1}
+        List<String> nextUserList = new ArrayList();
+        if ("1".equals(object.getString("passFlag"))){
+            delegateTask.setVariable("passFlag","1");
+        }else {
+            if(delegateTask.getVariable("Step1",String.class).contains(",")){
+                nextUserList = new ArrayList<>(Arrays.asList(delegateTask.getVariable("Step1",String.class).split(",")));
+            }else {
+                nextUserList.add(delegateTask.getVariable("Step1",String.class));
+            }
+            delegateTask.setVariable("workPeopleList",nextUserList);
+            delegateTask.setVariable("passFlag","0");
+        }
+
+        //截止时间 流程描述 创建人
+        String user = delegateTask.getVariable("prcCreateUser",String.class);
+        String username = delegateTask.getVariable("prcCreateUserName", String.class);
+        String prcName = "";
+        if ("1".equals(object.getString("passFlag"))) {
+             prcName = "企标废止流程-流程结束";
+        }else {
+             prcName = "企标废止流程-会签";
+        }
+        QueryWrapper queryWrapper2 = new QueryWrapper();
+        queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
+        BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
+        if (one1 != null) {
+            one1.setPrcType("24");
+            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);
+            }
+        }
+    }
+}

src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep1Before.java

@@ -0,0 +1,36 @@
+package com.ydw.bat.wkflow.listener.aboliish;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew;
+import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService;
+import com.ydw.bat.wkflow.business_mq.service.CreateMQService;
+import com.ydw.bat.wkflow.util.SpringContextUtil;
+import org.activiti.engine.delegate.DelegateTask;
+import org.activiti.engine.delegate.TaskListener;
+
+import java.util.List;
+
+public class ProcessStep1Before implements TaskListener {
+
+    @Override
+    public void notify(DelegateTask delegateTask) {
+        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("qbfzStep2?prcType=24");
+            one1.setTaskInfo(delegateTask.getName());
+            oaService.sendTodoMq(one1);
+        }
+    }
+
+}

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

@@ -0,0 +1,98 @@
+package com.ydw.bat.wkflow.listener.aboliish;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName;
+import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew;
+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.util.SpringContextUtil;
+import org.activiti.engine.ActivitiException;
+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 ProcessStep2After implements TaskListener {
+
+    //分发多个责任人
+    @Override
+    public void notify(DelegateTask delegateTask) {
+        //默认流程数据接口
+        IDatasService datasService = SpringContextUtil.getBean(IDatasService.class);
+        //流程节点信息
+        IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
+        //流程信息
+        IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.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);
+        //标准法规部业务经理Id
+        List<String> nextUserList = new ArrayList();
+        if (null == delegateTask.getVariable("count")){
+            delegateTask.setVariable("count",delegateTask.getVariable("workPeopleList",List.class).size());
+        }
+        if (delegateTask.getVariable("count",Integer.class)==1){
+            //对数据进行处理 现阶段是数据貌似是只需要人和意见就可以了！！！！
+            QueryWrapper<BusProcessNew> wrapper=new QueryWrapper<>();
+            wrapper.eq("TASK_ID","6969696969696969");
+            wrapper.eq("P_ID",delegateTask.getProcessInstanceId());
+            List<BusProcessNew> busProcessNews = busBean.list(wrapper);
+            List<String> stings=new ArrayList<>();
+            stings.add(object.getString("presentPeople")+"-"+object.getString("reviewComments"));
+            busProcessNews.forEach(busProcessNew -> {
+                JSONObject object1=JSONObject.parseObject(busProcessNew.getMesg());
+                stings.add(object1.getString("presentPeople")+"-"+object1.getString("reviewComments"));
+            });
+            object.put("res", JSONArray.toJSON(stings.toString()));
+            delegateTask.setVariable("count",delegateTask.getVariable("count",Integer.class)-1);
+        }else {
+            delegateTask.setVariable("count",delegateTask.getVariable("count",Integer.class)-1);
+        }
+        nextUserList.add(delegateTask.getVariable("prcCreateUser",String.class));
+        delegateTask.setVariable("qcId",delegateTask.getVariable("prcCreateUser",String.class));
+
+        //截止时间 流程描述 创建人
+        String user = delegateTask.getVariable("prcCreateUser",String.class);
+        String username = delegateTask.getVariable("prcCreateUserName", String.class);
+        String prcName = "企标废止流程-起草人修改标准状态";
+        QueryWrapper queryWrapper2 = new QueryWrapper();
+        queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
+        BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
+        if (one1 != null) {
+            one1.setPrcType("24");
+            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);
+                if (delegateTask.getVariable("count",Integer.class)!=0){
+                    busProcessNewNext.setTaskId("6969696969696969");
+                }
+                busBean.save(busProcessNewNext);
+            }
+        }
+    }
+}

src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep2Before.java

@@ -0,0 +1,36 @@
+package com.ydw.bat.wkflow.listener.aboliish;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew;
+import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService;
+import com.ydw.bat.wkflow.business_mq.service.CreateMQService;
+import com.ydw.bat.wkflow.util.SpringContextUtil;
+import org.activiti.engine.delegate.DelegateTask;
+import org.activiti.engine.delegate.TaskListener;
+
+import java.util.List;
+
+public class ProcessStep2Before implements TaskListener {
+
+    @Override
+    public void notify(DelegateTask delegateTask) {
+        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("qbfzStep3?prcType=24");
+            one1.setTaskInfo(delegateTask.getName());
+            oaService.sendTodoMq(one1);
+        }
+    }
+
+}

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

@@ -0,0 +1,72 @@
+package com.ydw.bat.wkflow.listener.aboliish;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName;
+import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew;
+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.util.SpringContextUtil;
+import org.activiti.engine.delegate.DelegateTask;
+import org.activiti.engine.delegate.TaskListener;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class ProcessStep3After implements TaskListener {
+
+    //分发多个责任人
+    @Override
+    public void notify(DelegateTask delegateTask) {
+        //默认流程数据接口
+        IDatasService datasService = SpringContextUtil.getBean(IDatasService.class);
+        //流程节点信息
+        IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
+        //流程信息
+        IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.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);
+        //标准法规部业务经理Id ${passFlag==1}
+        List<String> nextUserList = new ArrayList();
+        nextUserList.add(delegateTask.getVariable("bzfgLeaderId",String.class));
+        delegateTask.setVariable("bzfgLeaderId1",delegateTask.getVariable("bzfgLeaderId",String.class));
+
+        //截止时间 流程描述 创建人
+        String user = delegateTask.getVariable("prcCreateUser",String.class);
+        String username = delegateTask.getVariable("prcCreateUserName", String.class);
+        String prcName = "企标废止流程-标准法规部部长审核";
+        QueryWrapper queryWrapper2 = new QueryWrapper();
+        queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
+        BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
+        if (one1 != null) {
+            one1.setPrcType("24");
+            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);
+            }
+        }
+    }
+}

src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep3Before.java

@@ -0,0 +1,36 @@
+package com.ydw.bat.wkflow.listener.aboliish;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew;
+import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService;
+import com.ydw.bat.wkflow.business_mq.service.CreateMQService;
+import com.ydw.bat.wkflow.util.SpringContextUtil;
+import org.activiti.engine.delegate.DelegateTask;
+import org.activiti.engine.delegate.TaskListener;
+
+import java.util.List;
+
+public class ProcessStep3Before implements TaskListener {
+
+    @Override
+    public void notify(DelegateTask delegateTask) {
+        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("qbfzStep4?prcType=24");
+            one1.setTaskInfo(delegateTask.getName());
+            oaService.sendTodoMq(one1);
+        }
+    }
+
+}

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

@@ -0,0 +1,83 @@
+package com.ydw.bat.wkflow.listener.aboliish;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName;
+import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew;
+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.util.SpringContextUtil;
+import org.activiti.engine.delegate.DelegateTask;
+import org.activiti.engine.delegate.TaskListener;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class ProcessStep4After implements TaskListener {
+
+    //分发多个责任人
+    @Override
+    public void notify(DelegateTask delegateTask) {
+        //默认流程数据接口
+        IDatasService datasService = SpringContextUtil.getBean(IDatasService.class);
+        //流程节点信息
+        IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
+        //流程信息
+        IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.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);
+        //标准法规部业务经理Id ${passFlag==1}
+        List<String> nextUserList = new ArrayList();
+        if ("0".equals(object.getString("bzFlag"))){
+            nextUserList.add(delegateTask.getVariable("Step4",String.class));
+            delegateTask.setVariable("sdId",delegateTask.getVariable("Step4",String.class));
+            delegateTask.setVariable("bzFlag","0");
+        }else {
+            delegateTask.setVariable("bzFlag","1");
+            nextUserList.add(delegateTask.getVariable("qcId",String.class));
+        }
+
+        //截止时间 流程描述 创建人
+        String user = delegateTask.getVariable("prcCreateUser",String.class);
+        String username = delegateTask.getVariable("prcCreateUserName", String.class);
+        String prcName="";
+        if ("0".equals(object.getString("bzFlag"))){
+             prcName = "企标废止流程-审定责任人审定";
+        }else {
+            prcName = "企标废止流程-起草人修改标准状态";
+        }
+        QueryWrapper queryWrapper2 = new QueryWrapper();
+        queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
+        BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
+        if (one1 != null) {
+            one1.setPrcType("24");
+            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);
+            }
+        }
+    }
+}

src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep4Before.java

@@ -0,0 +1,36 @@
+package com.ydw.bat.wkflow.listener.aboliish;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew;
+import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService;
+import com.ydw.bat.wkflow.business_mq.service.CreateMQService;
+import com.ydw.bat.wkflow.util.SpringContextUtil;
+import org.activiti.engine.delegate.DelegateTask;
+import org.activiti.engine.delegate.TaskListener;
+
+import java.util.List;
+
+public class ProcessStep4Before implements TaskListener {
+
+    @Override
+    public void notify(DelegateTask delegateTask) {
+        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("qbfzStep5?prcType=24");
+            one1.setTaskInfo(delegateTask.getName());
+            oaService.sendTodoMq(one1);
+        }
+    }
+
+}

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

@@ -0,0 +1,83 @@
+package com.ydw.bat.wkflow.listener.aboliish;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName;
+import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew;
+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.util.SpringContextUtil;
+import org.activiti.engine.delegate.DelegateTask;
+import org.activiti.engine.delegate.TaskListener;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class ProcessStep5After implements TaskListener {
+
+    //分发多个责任人
+    @Override
+    public void notify(DelegateTask delegateTask) {
+        //默认流程数据接口
+        IDatasService datasService = SpringContextUtil.getBean(IDatasService.class);
+        //流程节点信息
+        IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
+        //流程信息
+        IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.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);
+        //标准法规部业务经理Id ${sdFlag==0} bafzFlag
+        List<String> nextUserList = new ArrayList();
+        if ("0".equals(object.getString("sdFlag"))){
+            delegateTask.setVariable("bzfzId",delegateTask.getVariable("Step5",String.class));
+            delegateTask.setVariable("sdFlag","0");
+            nextUserList.add(delegateTask.getVariable("Step5",String.class));
+        }else {
+            delegateTask.setVariable("sdFlag","1");
+            nextUserList.add(delegateTask.getVariable("qcId",String.class));
+        }
+
+        //截止时间 流程描述 创建人
+        String user = delegateTask.getVariable("prcCreateUser",String.class);
+        String username = delegateTask.getVariable("prcCreateUserName", String.class);
+        String prcName = "";
+        if ("0".equals(object.getString("sdFlag"))){
+            prcName = "企标废止流程-批准负责人审批";
+        }else {
+            prcName = "企标废止流程-起草人修改标准状态";
+        }
+        QueryWrapper queryWrapper2 = new QueryWrapper();
+        queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
+        BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
+        if (one1 != null) {
+            one1.setPrcType("24");
+            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);
+            }
+        }
+    }
+}

src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep5Before.java

@@ -0,0 +1,36 @@
+package com.ydw.bat.wkflow.listener.aboliish;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew;
+import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService;
+import com.ydw.bat.wkflow.business_mq.service.CreateMQService;
+import com.ydw.bat.wkflow.util.SpringContextUtil;
+import org.activiti.engine.delegate.DelegateTask;
+import org.activiti.engine.delegate.TaskListener;
+
+import java.util.List;
+
+public class ProcessStep5Before implements TaskListener {
+
+    @Override
+    public void notify(DelegateTask delegateTask) {
+        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("qbfzStep6?prcType=24");
+            one1.setTaskInfo(delegateTask.getName());
+            oaService.sendTodoMq(one1);
+        }
+    }
+
+}

src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep6After.java

@@ -0,0 +1,122 @@
+package com.ydw.bat.wkflow.listener.aboliish;
+
+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;
+import com.ydw.bat.wkflow.business_main.datas.entity.SarBussionessStand;
+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.util.SpringContextUtil;
+import org.activiti.engine.ActivitiException;
+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 ProcessStep6After implements TaskListener {
+
+    //分发多个责任人
+    @Override
+    public void notify(DelegateTask delegateTask) {
+        //默认流程数据接口
+        IDatasService datasService = SpringContextUtil.getBean(IDatasService.class);
+        //流程节点信息
+        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);
+        //标准法规部业务经理Id ${sdFlag==0} bafzFlag
+        List<String> nextUserList = new ArrayList();
+        if ("0".equals(object.getString("bafzFlag"))){
+            delegateTask.setVariable("bafzFlag","0");
+            //入库"3lqnlgmgcn"
+            if ("废止".equals(object.getString("nextStatus"))) {
+                SarBussionessStand sarBussionessStand = new SarBussionessStand();
+                sarBussionessStand.setTextStatusBuss(object.getString("standtextStatus"));
+                sarBussionessStand.setId(object.getString("standId"));
+                lawsUserInfoService.updateSarBussionessStand(sarBussionessStand);
+            }
+        }else {
+            delegateTask.setVariable("bafzFlag","1");
+            nextUserList.add(delegateTask.getVariable("qcId",String.class));
+        }
+
+        //截止时间 流程描述 创建人
+        String user = delegateTask.getVariable("prcCreateUser",String.class);
+        String username = delegateTask.getVariable("prcCreateUserName", String.class);
+        String prcName = "";
+        if ("0".equals(object.getString("sdFlag"))){
+            prcName = "企标废止流程-批准负责人审批";
+        }else {
+            prcName = "企标废止流程-起草人修改标准状态";
+        }
+        String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
+        QueryWrapper queryWrapper2 = new QueryWrapper();
+        queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
+        BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
+        if (one1 != null) {
+            if ("0".equals(object.getString("bafzFlag"))){
+                one1.setOverTime(OVERTIME);
+            }
+            one1.setPrcType("24");
+            one1.setPrcName(prcName);
+            one1.setCreatUser(user);
+            one1.setCreatUserName(username);
+            busProcessNameService.saveOrUpdate(one1);
+        }
+
+        // 存储当前节点意见1
+        if (null!=object.getString("commentText")) {
+            QueryWrapper queryWrapper3 = new QueryWrapper();
+            queryWrapper3.eq("TASK_ID", delegateTask.getId());
+            queryWrapper3.eq("USER_ID",delegateTask.getAssignee());
+            List<BusProcessNew> list = busBean.list(queryWrapper3);
+            if(!list.isEmpty()){
+                BusProcessNew busProcessNews = list.get(0);
+                busProcessNews.setTaskId(delegateTask.getId());
+                busProcessNews.setCommitText(object.getString("commentText"));
+                busBean.saveOrUpdate(busProcessNews);
+            }
+        }
+
+        // 存储当前节点意见
+        if (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);
+            }
+        }else {
+            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.setPrcName("流程结束");
+            busBean.save(busProcessNewNext);
+        }
+    }
+}

src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep6Before.java

@@ -0,0 +1,36 @@
+package com.ydw.bat.wkflow.listener.aboliish;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew;
+import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService;
+import com.ydw.bat.wkflow.business_mq.service.CreateMQService;
+import com.ydw.bat.wkflow.util.SpringContextUtil;
+import org.activiti.engine.delegate.DelegateTask;
+import org.activiti.engine.delegate.TaskListener;
+
+import java.util.List;
+
+public class ProcessStep6Before implements TaskListener {
+
+    @Override
+    public void notify(DelegateTask delegateTask) {
+        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("qbfzStep7?prcType=24");
+            one1.setTaskInfo(delegateTask.getName());
+            oaService.sendTodoMq(one1);
+        }
+    }
+
+}

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

@@ -0,0 +1,83 @@
+package com.ydw.bat.wkflow.listener.aboliish;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName;
+import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew;
+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.util.SpringContextUtil;
+import org.activiti.engine.delegate.DelegateTask;
+import org.activiti.engine.delegate.TaskListener;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class ProcessstartAfter implements TaskListener {
+
+
+    @Override
+    public void notify(DelegateTask delegateTask) {
+        //默认流程数据接口
+        IDatasService datasService = SpringContextUtil.getBean(IDatasService.class);
+        //流程节点信息
+        IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
+        //流程信息
+        IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.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);
+        //标准法规部业务经理Id Ay:
+        //dockUser', '选择标准法规部部长
+        //countersigner" placeholder="选择会签人员
+        //examine', '选择审定责任人
+        //approver', '选择批准负责人
+        List<String> nextUserList = new ArrayList();
+        nextUserList.add(object.getString("dockUser"));
+        delegateTask.setVariable("bzfgLeaderId",object.getString("dockUser"));
+
+        delegateTask.setVariable("Step1",object.getString("countersigner"));
+        delegateTask.setVariable("Step4",object.getString("examine"));
+        delegateTask.setVariable("Step5",object.getString("approver"));
+
+
+        //截止时间 流程描述 创建人
+        String user = object.getString("prcCreateUser");
+        String username = object.getString("prcCreateUserName");
+        delegateTask.setVariable("prcCreateUser", user);
+        delegateTask.setVariable("prcCreateUserName", username);
+        String prcName = "企标废止流程-标准法规部部长审核";
+        QueryWrapper queryWrapper2 = new QueryWrapper();
+        queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
+        BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
+        if (one1 != null) {
+            one1.setPrcType("24");
+            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);
+            }
+        }
+    }
+}

src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessstartBefore.java

@@ -0,0 +1,13 @@
+package com.ydw.bat.wkflow.listener.aboliish;
+
+import org.activiti.engine.delegate.DelegateTask;
+import org.activiti.engine.delegate.TaskListener;
+
+public class ProcessstartBefore implements TaskListener {
+
+    @Override
+    public void notify(DelegateTask delegateTask) {
+
+    }
+
+}

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

@@ -0,0 +1,108 @@
+package com.ydw.bat.wkflow.listener.bussLibrary;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName;
+import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew;
+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.util.SpringContextUtil;
+import org.activiti.engine.ActivitiException;
+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.Arrays;
+import java.util.Date;
+import java.util.List;
+
+/**
+ *  发起企标制修订流程后
+ */
+public class BLApplicantAfter implements TaskListener{
+
+    @Override
+    public void notify(DelegateTask delegateTask) {
+        IDatasService datasService = SpringContextUtil.getBean(IDatasService.class);
+        IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
+        IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class);
+
+        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("qcUserId"))){
+
+            if(object.getString("qcUserId").contains(",")){
+                nextUserList = Arrays.asList(object.getString("qcUserId").split(","));
+            }else {
+                nextUserList.add(object.getString("qcUserId"));
+            }
+            // 配置多实例
+            delegateTask.setVariable("qcUserList",nextUserList);
+            delegateTask.addCandidateUsers(nextUserList);
+        }else {
+            throw new ActivitiException("1#2其他起草人参数不存在,请配置相关用户");
+        }
+
+
+        //截止时间 流程描述 创建人
+        String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
+        String user = object.getString("prcCreateUser");
+        String username = object.getString("prcCreateUserName");
+//        object.getString("standName")
+        String standName = "";
+        String prcName = "企标制修订流程及企业标准库流程";
+        QueryWrapper queryWrapper2 = new QueryWrapper();
+        queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
+        BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
+        if(one1!=null){
+//            one1.setOverTime(OVERTIME);
+            one1.setPrcType("buss1");
+            one1.setPrcName(prcName);
+            one1.setCreatUser(user);
+            one1.setCreatUserName(username);
+            busProcessNameService.saveOrUpdate(one1);
+        }
+
+        // 存储当前节点意见
+        BusProcessNew busProcessNew = new BusProcessNew();
+        busProcessNew.setMsgType("clause");
+        busProcessNew.setPId(delegateTask.getProcessInstanceId());
+        busProcessNew.setMesg(object.toJSONString());
+        busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey());
+        busProcessNew.setTaskId(delegateTask.getId());
+        busProcessNew.setCommitText(object.getString("commentText"));
+        busProcessNew.setFinishFlag("0");
+        busProcessNew.setTaskInfo(delegateTask.getName());
+        busBean.save(busProcessNew);
+
+        if(nextUserList != null && !nextUserList.isEmpty()){
+            for(String nextUser : nextUserList){
+                BusProcessNew busProcessNewNext = new BusProcessNew();
+                busProcessNewNext.setMsgType("clause");
+                busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
+                busProcessNewNext.setMesg(object.toJSONString());
+                busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey());
+                busProcessNewNext.setFinishFlag("0");
+                busProcessNewNext.setTaskInfo(delegateTask.getName());
+                busProcessNewNext.setUserId(nextUser);
+                busProcessNewNext.setPrcName(prcName);
+                busBean.save(busProcessNewNext);
+            }
+        }
+    }
+
+    private String verifyObj(String str){
+        return (str == null || str.equals("")) ? "" : str;
+    }
+}

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

@@ -0,0 +1,26 @@
+package com.ydw.bat.wkflow.listener.bussLibrary;
+
+import org.activiti.engine.delegate.DelegateTask;
+import org.activiti.engine.delegate.TaskListener;
+
+/**
+ *  发起企标制修订流程前
+ */
+public class BLApplicantBefore 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);
+//        }
+//
+
+//        WkFlowSendEmail.sendEmailTodo(delegateTask,"会前申请流程");
+    }
+}

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

@@ -0,0 +1,95 @@
+package com.ydw.bat.wkflow.listener.bussLibrary;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName;
+import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew;
+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.util.SpringContextUtil;
+import org.activiti.engine.ActivitiException;
+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;
+
+/**
+ *  专委会副主任/起草单位中心主任审定后
+ */
+public class BussLibrary10After implements TaskListener{
+    @Override
+    public void notify(DelegateTask delegateTask) {
+        IDatasService datasService = SpringContextUtil.getBean(IDatasService.class);
+        IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
+        IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class);
+
+        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 approvalOpinion = object.get("approvalOpinion") == null ? "" : object.get("approvalOpinion").toString();
+        String user = object.getString("prcCreateUser");
+        String username = object.getString("prcCreateUserName");
+        String prcName = "企标制修订流程及企业标准库流程";
+        QueryWrapper queryWrapper2 = new QueryWrapper();
+        queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
+        BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
+        if(one1!=null){
+//            one1.setOverTime(OVERTIME);
+            one1.setPrcType("buss1");
+            one1.setPrcName(prcName);
+            one1.setCreatUser(user);
+            one1.setCreatUserName(username);
+            busProcessNameService.saveOrUpdate(one1);
+        }
+
+        if(StringUtils.isNotBlank(approvalOpinion)){
+            if ("0".equalsIgnoreCase(approvalOpinion)) {
+                if(StringUtils.isNotBlank(object.getString("zhrUserId"))){
+
+                    delegateTask.setVariable("zhrUserId",object.getString("zhrUserId"));
+                    nextUserList.add(object.getString("zhrUserId"));
+
+                    BussUtils.approvalFunc2(delegateTask, object, prcName, nextUserList);
+                    delegateTask.setVariable("fzrFlag", 0);
+                }else {
+                    throw new ActivitiException("1#2副主任用户参数不存在,请配置相关用户");
+                }
+            } else {
+                if(StringUtils.isNotBlank(object.getString("xdUserId"))) {
+                    BusProcessNew busProcessNew = new BusProcessNew();
+                    busProcessNew.setMsgType("clause");
+                    busProcessNew.setPId(delegateTask.getProcessInstanceId());
+                    busProcessNew.setMesg(object.toJSONString());
+                    busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey());
+                    busProcessNew.setFinishFlag("0");
+                    busProcessNew.setTaskInfo(delegateTask.getName());
+                    busProcessNew.setUserId(object.getString("xdUserId"));
+                    busProcessNew.setPrcName(prcName);
+                    busBean.save(busProcessNew);
+
+                    BussUtils.approvalFunc1(delegateTask, busBean, object, prcName,"1");
+                    delegateTask.setVariable("cxdUserId",object.getString("xdUserId"));
+                    delegateTask.setVariable("fzrFlag", 1);
+                }else {
+                    throw new ActivitiException("1#2修订用户参数不存在,请配置相关用户");
+                }
+            }
+        }else {
+            throw new ActivitiException("1#2 提交OR驳回参数不存在");
+        }
+    }
+
+    private String verifyObj(String str){
+        return (str == null || str.equals("")) ? "" : str;
+    }
+}

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

@@ -0,0 +1,37 @@
+package com.ydw.bat.wkflow.listener.bussLibrary;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew;
+import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService;
+import com.ydw.bat.wkflow.business_mq.service.CreateMQService;
+import com.ydw.bat.wkflow.util.SpringContextUtil;
+import org.activiti.engine.delegate.DelegateTask;
+import org.activiti.engine.delegate.TaskListener;
+
+import java.util.List;
+
+/**
+ *  专委会副主任/起草单位中心主任审定前
+ */
+public class BussLibrary10Before implements TaskListener{
+    @Override
+    public void notify(DelegateTask delegateTask) {
+        IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
+        CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.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);
+
+            // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
+            one1.setLink("bussLibrary10?prcType=buss1");
+            one1.setTaskInfo(delegateTask.getName());
+            oaService.sendTodoMq(one1);
+        }
+    }
+}

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

@@ -0,0 +1,95 @@
+package com.ydw.bat.wkflow.listener.bussLibrary;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName;
+import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew;
+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.util.SpringContextUtil;
+import org.activiti.engine.ActivitiException;
+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;
+
+/**
+ *  专委会主任/总院院长或主管副院长批准后
+ */
+public class BussLibrary11After implements TaskListener{
+    @Override
+    public void notify(DelegateTask delegateTask) {
+        IDatasService datasService = SpringContextUtil.getBean(IDatasService.class);
+        IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
+        IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class);
+
+        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 approvalOpinion = object.get("approvalOpinion") == null ? "" : object.get("approvalOpinion").toString();
+        String user = object.getString("prcCreateUser");
+        String username = object.getString("prcCreateUserName");
+        String prcName = "企标制修订流程及企业标准库流程";
+        QueryWrapper queryWrapper2 = new QueryWrapper();
+        queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
+        BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
+        if(one1!=null){
+//            one1.setOverTime(OVERTIME);
+            one1.setPrcType("buss1");
+            one1.setPrcName(prcName);
+            one1.setCreatUser(user);
+            one1.setCreatUserName(username);
+            busProcessNameService.saveOrUpdate(one1);
+        }
+
+        if(StringUtils.isNotBlank(approvalOpinion)){
+            if ("0".equalsIgnoreCase(approvalOpinion)) {
+                if(StringUtils.isNotBlank(object.getString("zqcUsrId"))){
+
+                    delegateTask.setVariable("pxUserId",object.getString("zqcUsrId"));
+                    nextUserList.add(object.getString("zqcUsrId"));
+
+                    BussUtils.approvalFunc2(delegateTask, object, prcName, nextUserList);
+                    delegateTask.setVariable("zrFlag", 0);
+                }else {
+                    throw new ActivitiException("1#2主起草人用户参数不存在,请配置相关用户");
+                }
+            } else {
+                if(StringUtils.isNotBlank(object.getString("xdUserId"))) {
+                    BusProcessNew busProcessNew = new BusProcessNew();
+                    busProcessNew.setMsgType("clause");
+                    busProcessNew.setPId(delegateTask.getProcessInstanceId());
+                    busProcessNew.setMesg(object.toJSONString());
+                    busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey());
+                    busProcessNew.setFinishFlag("0");
+                    busProcessNew.setTaskInfo(delegateTask.getName());
+                    busProcessNew.setUserId(object.getString("xdUserId"));
+                    busProcessNew.setPrcName(prcName);
+                    busBean.save(busProcessNew);
+
+                    BussUtils.approvalFunc1(delegateTask, busBean, object, prcName,"1");
+                    delegateTask.setVariable("cxdUserId",object.getString("xdUserId"));
+                    delegateTask.setVariable("zrFlag", 1);
+                }else {
+                    throw new ActivitiException("1#2修订用户参数不存在,请配置相关用户");
+                }
+            }
+        }else {
+            throw new ActivitiException("1#2 提交OR驳回参数不存在");
+        }
+    }
+
+    private String verifyObj(String str){
+        return (str == null || str.equals("")) ? "" : str;
+    }
+}

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

@@ -0,0 +1,37 @@
+package com.ydw.bat.wkflow.listener.bussLibrary;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew;
+import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService;
+import com.ydw.bat.wkflow.business_mq.service.CreateMQService;
+import com.ydw.bat.wkflow.util.SpringContextUtil;
+import org.activiti.engine.delegate.DelegateTask;
+import org.activiti.engine.delegate.TaskListener;
+
+import java.util.List;
+
+/**
+ *  专委会主任/总院院长或主管副院长批准前
+ */
+public class BussLibrary11Before implements TaskListener{
+    @Override
+    public void notify(DelegateTask delegateTask) {
+        IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
+        CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.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);
+
+            // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
+            one1.setLink("bussLibrary11?prcType=buss1");
+            one1.setTaskInfo(delegateTask.getName());
+            oaService.sendTodoMq(one1);
+        }
+    }
+}

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

@@ -0,0 +1,55 @@
+package com.ydw.bat.wkflow.listener.bussLibrary;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName;
+import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew;
+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.util.SpringContextUtil;
+import org.activiti.engine.ActivitiException;
+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;
+
+/**
+ *  主起草人培训后
+ */
+public class BussLibrary12After implements TaskListener{
+    @Override
+    public void notify(DelegateTask delegateTask) {
+        IDatasService datasService = SpringContextUtil.getBean(IDatasService.class);
+        IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
+        IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class);
+
+        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("bzhUserId"))){
+            delegateTask.setVariable("bzhUserId",object.getString("bzhUserId"));
+            nextUserList.add(object.getString("bzhUserId"));
+        }else {
+            throw new ActivitiException("1#2标准化员不存在,请配置相关人员");
+        }
+
+        String prcName = "企标制修订流程及企业标准库流程";
+        BussUtils.endFunc(delegateTask, prcName,busBean, object, "0", busProcessNameService);
+    }
+
+    private String verifyObj(String str){
+        return (str == null || str.equals("")) ? "" : str;
+    }
+}

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

@@ -0,0 +1,37 @@
+package com.ydw.bat.wkflow.listener.bussLibrary;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew;
+import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService;
+import com.ydw.bat.wkflow.business_mq.service.CreateMQService;
+import com.ydw.bat.wkflow.util.SpringContextUtil;
+import org.activiti.engine.delegate.DelegateTask;
+import org.activiti.engine.delegate.TaskListener;
+
+import java.util.List;
+
+/**
+ *  主起草人培训前
+ */
+public class BussLibrary12Before implements TaskListener{
+    @Override
+    public void notify(DelegateTask delegateTask) {
+        IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
+        CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.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);
+
+            // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
+            one1.setLink("bussLibrary12?prcType=buss1");
+            one1.setTaskInfo(delegateTask.getName());
+            oaService.sendTodoMq(one1);
+        }
+    }
+}

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

@@ -0,0 +1,101 @@
+package com.ydw.bat.wkflow.listener.bussLibrary;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName;
+import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew;
+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.util.SpringContextUtil;
+import org.activiti.engine.ActivitiException;
+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.Arrays;
+import java.util.Date;
+import java.util.List;
+
+/**
+ *  企标协同编写后
+ */
+public class BussLibrary2After implements TaskListener{
+    @Override
+    public void notify(DelegateTask delegateTask) {
+        IDatasService datasService = SpringContextUtil.getBean(IDatasService.class);
+        IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
+        IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class);
+
+        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("hzUserId"))){
+            delegateTask.setVariable("hzUserId",object.getString("hzUserId"));
+            nextUserList.add(object.getString("hzUserId"));
+        }else {
+            throw new ActivitiException("1#2主起草人不存在,请配置相关人员");
+        }
+
+
+
+        //截止时间 流程描述 创建人
+        String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
+        String user = object.getString("prcCreateUser");
+        String username = object.getString("prcCreateUserName");
+//        object.getString("standName")
+        String standName = "";
+        String prcName = "企标制修订流程及企业标准库流程";
+        QueryWrapper queryWrapper2 = new QueryWrapper();
+        queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
+        BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
+        if(one1!=null){
+//            one1.setOverTime(OVERTIME);
+            one1.setPrcType("buss1");
+            one1.setPrcName(prcName);
+            one1.setCreatUser(user);
+            one1.setCreatUserName(username);
+            busProcessNameService.saveOrUpdate(one1);
+        }
+
+        // 存储当前节点意见
+        BusProcessNew busProcessNew = new BusProcessNew();
+        busProcessNew.setMsgType("clause");
+        busProcessNew.setPId(delegateTask.getProcessInstanceId());
+        busProcessNew.setMesg(object.toJSONString());
+        busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey());
+        busProcessNew.setTaskId(delegateTask.getId());
+        busProcessNew.setCommitText(object.getString("commentText"));
+        busProcessNew.setFinishFlag("0");
+        busProcessNew.setTaskInfo(delegateTask.getName());
+        busBean.save(busProcessNew);
+
+        if(nextUserList != null && !nextUserList.isEmpty()){
+            for(String nextUser : nextUserList){
+                BusProcessNew busProcessNewNext = new BusProcessNew();
+                busProcessNewNext.setMsgType("clause");
+                busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
+                busProcessNewNext.setMesg(object.toJSONString());
+                busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey());
+                busProcessNewNext.setFinishFlag("0");
+                busProcessNewNext.setTaskInfo(delegateTask.getName());
+                busProcessNewNext.setUserId(nextUser);
+                busProcessNewNext.setPrcName(prcName);
+                busBean.save(busProcessNewNext);
+            }
+        }
+    }
+
+    private String verifyObj(String str){
+        return (str == null || str.equals("")) ? "" : str;
+    }
+}

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

@@ -0,0 +1,37 @@
+package com.ydw.bat.wkflow.listener.bussLibrary;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew;
+import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService;
+import com.ydw.bat.wkflow.business_mq.service.CreateMQService;
+import com.ydw.bat.wkflow.util.SpringContextUtil;
+import org.activiti.engine.delegate.DelegateTask;
+import org.activiti.engine.delegate.TaskListener;
+
+import java.util.List;
+
+/**
+ *  企标协同编写前
+ */
+public class BussLibrary2Before implements TaskListener{
+    @Override
+    public void notify(DelegateTask delegateTask) {
+        IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
+        CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.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);
+
+            // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
+            one1.setLink("bussLibrary2?prcType=buss1");
+            one1.setTaskInfo(delegateTask.getName());
+            oaService.sendTodoMq(one1);
+        }
+    }
+}

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

@@ -0,0 +1,100 @@
+package com.ydw.bat.wkflow.listener.bussLibrary;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName;
+import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew;
+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.util.SpringContextUtil;
+import org.activiti.engine.ActivitiException;
+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;
+
+/**
+ *  企标汇总修订后
+ */
+public class BussLibrary3After implements TaskListener{
+    @Override
+    public void notify(DelegateTask delegateTask) {
+        IDatasService datasService = SpringContextUtil.getBean(IDatasService.class);
+        IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
+        IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class);
+
+        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("bzhUserId"))){
+            delegateTask.setVariable("bzhUserId",object.getString("bzhUserId"));
+            nextUserList.add(object.getString("bzhUserId"));
+        }else {
+            throw new ActivitiException("1#2标准化员不存在,请配置相关人员");
+        }
+
+
+
+        //截止时间 流程描述 创建人
+        String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
+        String user = object.getString("prcCreateUser");
+        String username = object.getString("prcCreateUserName");
+//        object.getString("standName")
+        String standName = "";
+        String prcName = "企标制修订流程及企业标准库流程";
+        QueryWrapper queryWrapper2 = new QueryWrapper();
+        queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
+        BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
+        if(one1!=null){
+//            one1.setOverTime(OVERTIME);
+            one1.setPrcType("buss1");
+            one1.setPrcName(prcName);
+            one1.setCreatUser(user);
+            one1.setCreatUserName(username);
+            busProcessNameService.saveOrUpdate(one1);
+        }
+
+        // 存储当前节点意见
+        BusProcessNew busProcessNew = new BusProcessNew();
+        busProcessNew.setMsgType("clause");
+        busProcessNew.setPId(delegateTask.getProcessInstanceId());
+        busProcessNew.setMesg(object.toJSONString());
+        busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey());
+        busProcessNew.setTaskId(delegateTask.getId());
+        busProcessNew.setCommitText(object.getString("commentText"));
+        busProcessNew.setFinishFlag("0");
+        busProcessNew.setTaskInfo(delegateTask.getName());
+        busBean.save(busProcessNew);
+
+        if(nextUserList != null && !nextUserList.isEmpty()){
+            for(String nextUser : nextUserList){
+                BusProcessNew busProcessNewNext = new BusProcessNew();
+                busProcessNewNext.setMsgType("clause");
+                busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
+                busProcessNewNext.setMesg(object.toJSONString());
+                busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey());
+                busProcessNewNext.setFinishFlag("0");
+                busProcessNewNext.setTaskInfo(delegateTask.getName());
+                busProcessNewNext.setUserId(nextUser);
+                busProcessNewNext.setPrcName(prcName);
+                busBean.save(busProcessNewNext);
+            }
+        }
+    }
+
+    private String verifyObj(String str){
+        return (str == null || str.equals("")) ? "" : str;
+    }
+}

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

@@ -0,0 +1,37 @@
+package com.ydw.bat.wkflow.listener.bussLibrary;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew;
+import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService;
+import com.ydw.bat.wkflow.business_mq.service.CreateMQService;
+import com.ydw.bat.wkflow.util.SpringContextUtil;
+import org.activiti.engine.delegate.DelegateTask;
+import org.activiti.engine.delegate.TaskListener;
+
+import java.util.List;
+
+/**
+ *  企标汇总修订前
+ */
+public class BussLibrary3Before implements TaskListener{
+    @Override
+    public void notify(DelegateTask delegateTask) {
+        IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
+        CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.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);
+
+            // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
+            one1.setLink("bussLibrary3?prcType=buss1");
+            one1.setTaskInfo(delegateTask.getName());
+            oaService.sendTodoMq(one1);
+        }
+    }
+}

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

@@ -0,0 +1,102 @@
+package com.ydw.bat.wkflow.listener.bussLibrary;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName;
+import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew;
+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.util.SpringContextUtil;
+import org.activiti.engine.ActivitiException;
+import org.activiti.engine.delegate.DelegateTask;
+import org.activiti.engine.delegate.TaskListener;
+import org.apache.commons.lang.StringUtils;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ *  标准化员审批后
+ */
+public class BussLibrary4After implements TaskListener{
+    @Override
+    public void notify(DelegateTask delegateTask) {
+        IDatasService datasService = SpringContextUtil.getBean(IDatasService.class);
+        IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
+        IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class);
+
+        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 approvalOpinion = object.get("approvalOpinion") == null ? "" : object.get("approvalOpinion").toString();
+        String user = object.getString("prcCreateUser");
+        String username = object.getString("prcCreateUserName");
+        String prcName = "企标制修订流程及企业标准库流程";
+        QueryWrapper queryWrapper2 = new QueryWrapper();
+        queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
+        BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
+        if(one1!=null){
+//            one1.setOverTime(OVERTIME);
+            one1.setPrcType("buss1");
+            one1.setPrcName(prcName);
+            one1.setCreatUser(user);
+            one1.setCreatUserName(username);
+            busProcessNameService.saveOrUpdate(one1);
+        }
+
+        if(StringUtils.isNotBlank(approvalOpinion)){
+            if ("0".equalsIgnoreCase(approvalOpinion)) {
+                if(StringUtils.isNotBlank(object.getString("hqUserId"))){
+
+                    if(object.getString("hqUserId").contains(",")){
+                        nextUserList = Arrays.asList(object.getString("hqUserId").split(","));
+                    }else {
+                        nextUserList.add(object.getString("hqUserId"));
+                    }
+
+                    BussUtils.approvalFunc2(delegateTask, object, prcName, nextUserList);
+                    // 配置多实例
+                    delegateTask.setVariable("hqUserList",nextUserList);
+                    delegateTask.addCandidateUsers(nextUserList);
+                    delegateTask.setVariable("bzhFlag", 0);
+                }else {
+                    throw new ActivitiException("1#2会签用户参数不存在,请配置相关用户");
+                }
+            } else {
+                if(StringUtils.isNotBlank(object.getString("hzUserId"))) {
+                    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("zqcUsrId"));
+                    busProcessNew.setPrcName(prcName);
+                    busBean.save(busProcessNew);
+
+                    BussUtils.approvalFunc1(delegateTask, busBean, object, prcName,"1");
+                    delegateTask.setVariable("chzUserId",object.getString("hzUserId"));
+                    delegateTask.setVariable("bzhFlag", 1);
+                }else {
+                    throw new ActivitiException("1#2汇总用户参数不存在,请配置相关用户");
+                }
+            }
+        }else {
+            throw new ActivitiException("1#2 提交OR驳回参数不存在");
+        }
+    }
+
+    private String verifyObj(String str){
+        return (str == null || str.equals("")) ? "" : str;
+    }
+}

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

@@ -0,0 +1,37 @@
+package com.ydw.bat.wkflow.listener.bussLibrary;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew;
+import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService;
+import com.ydw.bat.wkflow.business_mq.service.CreateMQService;
+import com.ydw.bat.wkflow.util.SpringContextUtil;
+import org.activiti.engine.delegate.DelegateTask;
+import org.activiti.engine.delegate.TaskListener;
+
+import java.util.List;
+
+/**
+ *  标准化员审批前
+ */
+public class BussLibrary4Before implements TaskListener{
+    @Override
+    public void notify(DelegateTask delegateTask) {
+        IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
+        CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class);
+        QueryWrapper queryWrapper1 = new QueryWrapper();
+        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);
+
+            // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
+            one1.setLink("bussLibrary4?prcType=buss1");
+            one1.setTaskInfo(delegateTask.getName());
+            oaService.sendTodoMq(one1);
+        }
+    }
+}

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

@@ -0,0 +1,104 @@
+package com.ydw.bat.wkflow.listener.bussLibrary;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName;
+import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew;
+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.util.SpringContextUtil;
+import org.activiti.engine.ActivitiException;
+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;
+
+/**
+ *  会签征求意见后
+ */
+public class BussLibrary5After implements TaskListener{
+    @Override
+    public void notify(DelegateTask delegateTask) {
+        IDatasService datasService = SpringContextUtil.getBean(IDatasService.class);
+        IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
+        IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class);
+
+        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();
+
+        JSONArray ideaList =delegateTask.getVariable("ideaList", JSONArray.class);
+        if (ideaList==null) {
+            ideaList=new JSONArray();
+        }
+
+        ideaList.addAll(object.getJSONArray("infoList"));
+        delegateTask.setVariable("ideaList",ideaList);
+
+        if(StringUtils.isNotBlank(object.getString("xdUserId"))){
+            delegateTask.setVariable("xdUserId",object.getString("xdUserId"));
+            nextUserList.add(object.getString("xdUserId"));
+        }else {
+            throw new ActivitiException("1#2标准化员不存在,请配置相关人员");
+        }
+
+        //截止时间 流程描述 创建人
+        String user = object.getString("prcCreateUser");
+        String username = object.getString("prcCreateUserName");
+        String prcName = "企标制修订流程及企业标准库流程";
+        QueryWrapper queryWrapper2 = new QueryWrapper();
+        queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
+        BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
+        if(one1!=null){
+//            one1.setOverTime(OVERTIME);
+            one1.setPrcType("buss1");
+            one1.setPrcName(prcName);
+            one1.setCreatUser(user);
+            one1.setCreatUserName(username);
+            busProcessNameService.saveOrUpdate(one1);
+        }
+
+        // 存储当前节点意见
+        BusProcessNew busProcessNew = new BusProcessNew();
+        busProcessNew.setMsgType("clause");
+        busProcessNew.setPId(delegateTask.getProcessInstanceId());
+        busProcessNew.setMesg(object.toJSONString());
+        busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey());
+        busProcessNew.setTaskId(delegateTask.getId());
+        busProcessNew.setCommitText(object.getString("commentText"));
+        busProcessNew.setFinishFlag("0");
+        busProcessNew.setTaskInfo(delegateTask.getName());
+        busBean.save(busProcessNew);
+
+        if(nextUserList != null && !nextUserList.isEmpty()){
+            for(String nextUser : nextUserList){
+                BusProcessNew busProcessNewNext = new BusProcessNew();
+                busProcessNewNext.setMsgType("clause");
+                busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
+                busProcessNewNext.setMesg(object.toJSONString());
+                busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey());
+                busProcessNewNext.setFinishFlag("0");
+                busProcessNewNext.setTaskInfo(delegateTask.getName());
+                busProcessNewNext.setUserId(nextUser);
+                busProcessNewNext.setPrcName(prcName);
+                busBean.save(busProcessNewNext);
+            }
+        }
+    }
+
+    private String verifyObj(String str){
+        return (str == null || str.equals("")) ? "" : str;
+    }
+}

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

@@ -0,0 +1,37 @@
+package com.ydw.bat.wkflow.listener.bussLibrary;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew;
+import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService;
+import com.ydw.bat.wkflow.business_mq.service.CreateMQService;
+import com.ydw.bat.wkflow.util.SpringContextUtil;
+import org.activiti.engine.delegate.DelegateTask;
+import org.activiti.engine.delegate.TaskListener;
+
+import java.util.List;
+
+/**
+ *  会签征求意见前
+ */
+public class BussLibrary5Before implements TaskListener{
+    @Override
+    public void notify(DelegateTask delegateTask) {
+        IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
+        CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.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);
+
+            // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
+            one1.setLink("bussLibrary5?prcType=buss1");
+            one1.setTaskInfo(delegateTask.getName());
+            oaService.sendTodoMq(one1);
+        }
+    }
+}

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

@@ -0,0 +1,93 @@
+package com.ydw.bat.wkflow.listener.bussLibrary;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName;
+import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew;
+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.util.SpringContextUtil;
+import org.activiti.engine.ActivitiException;
+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;
+
+/**
+ *  主起草人修订并组织评审后
+ */
+public class BussLibrary6After implements TaskListener{
+    @Override
+    public void notify(DelegateTask delegateTask) {
+        IDatasService datasService = SpringContextUtil.getBean(IDatasService.class);
+        IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
+        IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class);
+
+        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("fggcsUserId"))){
+            delegateTask.setVariable("fggcsUserId",object.getString("fggcsUserId"));
+            nextUserList.add(object.getString("fggcsUserId"));
+        }else {
+            throw new ActivitiException("1#2标准化员不存在,请配置相关人员");
+        }
+
+        //截止时间 流程描述 创建人
+        String user = object.getString("prcCreateUser");
+        String username = object.getString("prcCreateUserName");
+        String prcName = "企标制修订流程及企业标准库流程";
+        QueryWrapper queryWrapper2 = new QueryWrapper();
+        queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
+        BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
+        if(one1!=null){
+//            one1.setOverTime(OVERTIME);
+            one1.setPrcType("buss1");
+            one1.setPrcName(prcName);
+            one1.setCreatUser(user);
+            one1.setCreatUserName(username);
+            busProcessNameService.saveOrUpdate(one1);
+        }
+
+        // 存储当前节点意见
+        BusProcessNew busProcessNew = new BusProcessNew();
+        busProcessNew.setMsgType("clause");
+        busProcessNew.setPId(delegateTask.getProcessInstanceId());
+        busProcessNew.setMesg(object.toJSONString());
+        busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey());
+        busProcessNew.setTaskId(delegateTask.getId());
+        busProcessNew.setCommitText(object.getString("commentText"));
+        busProcessNew.setFinishFlag("0");
+        busProcessNew.setTaskInfo(delegateTask.getName());
+        busBean.save(busProcessNew);
+
+        if(nextUserList != null && !nextUserList.isEmpty()){
+            for(String nextUser : nextUserList){
+                BusProcessNew busProcessNewNext = new BusProcessNew();
+                busProcessNewNext.setMsgType("clause");
+                busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
+                busProcessNewNext.setMesg(object.toJSONString());
+                busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey());
+                busProcessNewNext.setFinishFlag("0");
+                busProcessNewNext.setTaskInfo(delegateTask.getName());
+                busProcessNewNext.setUserId(nextUser);
+                busProcessNewNext.setPrcName(prcName);
+                busBean.save(busProcessNewNext);
+            }
+        }
+    }
+
+    private String verifyObj(String str){
+        return (str == null || str.equals("")) ? "" : str;
+    }
+}

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

@@ -0,0 +1,50 @@
+package com.ydw.bat.wkflow.listener.bussLibrary;
+
+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_main.datas.entity.BusProcessNew;
+import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService;
+import com.ydw.bat.wkflow.business_mq.service.CreateMQService;
+import com.ydw.bat.wkflow.util.SpringContextUtil;
+import org.activiti.engine.delegate.DelegateTask;
+import org.activiti.engine.delegate.TaskListener;
+
+import java.util.List;
+
+/**
+ *  主起草人修订并组织评审前
+ */
+public class BussLibrary6Before implements TaskListener{
+    @Override
+    public void notify(DelegateTask delegateTask) {
+        IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
+        CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.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);
+
+            /**
+             * 汇总已审批通过的意见
+             */
+            String msg = one1.getMesg();
+            JSONObject jsonObject = JSON.parseObject(msg);
+            JSONArray ideaList=delegateTask.getVariable("ideaList",JSONArray.class);
+            jsonObject.put("infoList",ideaList);
+            one1.setMesg(jsonObject.toJSONString());
+
+            one1.setTaskId(delegateTask.getId());
+            busBean.saveOrUpdate(one1);
+
+            // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
+            one1.setLink("bussLibrary5?prcType=buss1");
+            one1.setTaskInfo(delegateTask.getName());
+            oaService.sendTodoMq(one1);
+        }
+    }
+}

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

@@ -0,0 +1,99 @@
+package com.ydw.bat.wkflow.listener.bussLibrary;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName;
+import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew;
+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.util.SpringContextUtil;
+import org.activiti.engine.ActivitiException;
+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;
+
+/**
+ *  标准法规工程师复审后
+ */
+public class BussLibrary7After implements TaskListener{
+    @Override
+    public void notify(DelegateTask delegateTask) {
+        IDatasService datasService = SpringContextUtil.getBean(IDatasService.class);
+        IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
+        IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class);
+
+        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("jsfzrUserId"))){
+            delegateTask.setVariable("jsfzrUserId",object.getString("jsfzrUserId"));
+            nextUserList.add(object.getString("jsfzrUserId"));
+        }else {
+            throw new ActivitiException("1#2标准化员不存在,请配置相关人员");
+        }
+
+        JSONArray evaluationData =delegateTask.getVariable("evaluationList", JSONArray.class);
+        if (evaluationData==null) {
+            throw new ActivitiException("1#2评分关联数据不存在");
+        }
+
+        //截止时间 流程描述 创建人
+        String user = object.getString("prcCreateUser");
+        String username = object.getString("prcCreateUserName");
+        String prcName = "企标制修订流程及企业标准库流程";
+        QueryWrapper queryWrapper2 = new QueryWrapper();
+        queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
+        BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
+        if(one1!=null){
+//            one1.setOverTime(OVERTIME);
+            one1.setPrcType("buss1");
+            one1.setPrcName(prcName);
+            one1.setCreatUser(user);
+            one1.setCreatUserName(username);
+            busProcessNameService.saveOrUpdate(one1);
+        }
+
+        // 存储当前节点意见
+        BusProcessNew busProcessNew = new BusProcessNew();
+        busProcessNew.setMsgType("clause");
+        busProcessNew.setPId(delegateTask.getProcessInstanceId());
+        busProcessNew.setMesg(object.toJSONString());
+        busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey());
+        busProcessNew.setTaskId(delegateTask.getId());
+        busProcessNew.setCommitText(object.getString("commentText"));
+        busProcessNew.setFinishFlag("0");
+        busProcessNew.setTaskInfo(delegateTask.getName());
+        busBean.save(busProcessNew);
+
+        if(nextUserList != null && !nextUserList.isEmpty()){
+            for(String nextUser : nextUserList){
+                BusProcessNew busProcessNewNext = new BusProcessNew();
+                busProcessNewNext.setMsgType("clause");
+                busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
+                busProcessNewNext.setMesg(object.toJSONString());
+                busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey());
+                busProcessNewNext.setFinishFlag("0");
+                busProcessNewNext.setTaskInfo(delegateTask.getName());
+                busProcessNewNext.setUserId(nextUser);
+                busProcessNewNext.setPrcName(prcName);
+                busBean.save(busProcessNewNext);
+            }
+        }
+    }
+
+    private String verifyObj(String str){
+        return (str == null || str.equals("")) ? "" : str;
+    }
+}

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

@@ -0,0 +1,37 @@
+package com.ydw.bat.wkflow.listener.bussLibrary;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew;
+import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService;
+import com.ydw.bat.wkflow.business_mq.service.CreateMQService;
+import com.ydw.bat.wkflow.util.SpringContextUtil;
+import org.activiti.engine.delegate.DelegateTask;
+import org.activiti.engine.delegate.TaskListener;
+
+import java.util.List;
+
+/**
+ *  标准法规工程师复审前
+ */
+public class BussLibrary7Before implements TaskListener{
+    @Override
+    public void notify(DelegateTask delegateTask) {
+        IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
+        CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.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);
+
+            // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
+            one1.setLink("bussLibrary7?prcType=buss1");
+            one1.setTaskInfo(delegateTask.getName());
+            oaService.sendTodoMq(one1);
+        }
+    }
+}

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

@@ -0,0 +1,95 @@
+package com.ydw.bat.wkflow.listener.bussLibrary;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName;
+import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew;
+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.util.SpringContextUtil;
+import org.activiti.engine.ActivitiException;
+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;
+
+/**
+ *  技术委员会负责人/起草中心主任审核后
+ */
+public class BussLibrary8After implements TaskListener{
+    @Override
+    public void notify(DelegateTask delegateTask) {
+        IDatasService datasService = SpringContextUtil.getBean(IDatasService.class);
+        IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
+        IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class);
+
+        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 approvalOpinion = object.get("approvalOpinion") == null ? "" : object.get("approvalOpinion").toString();
+        String user = object.getString("prcCreateUser");
+        String username = object.getString("prcCreateUserName");
+        String prcName = "企标制修订流程及企业标准库流程";
+        QueryWrapper queryWrapper2 = new QueryWrapper();
+        queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
+        BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
+        if(one1!=null){
+//            one1.setOverTime(OVERTIME);
+            one1.setPrcType("buss1");
+            one1.setPrcName(prcName);
+            one1.setCreatUser(user);
+            one1.setCreatUserName(username);
+            busProcessNameService.saveOrUpdate(one1);
+        }
+
+        if(StringUtils.isNotBlank(approvalOpinion)){
+            if ("0".equalsIgnoreCase(approvalOpinion)) {
+                if(StringUtils.isNotBlank(object.getString("bzUserId"))){
+
+                    delegateTask.setVariable("bzUserId",object.getString("bzUserId"));
+                    nextUserList.add(object.getString("bzUserId"));
+
+                    BussUtils.approvalFunc2(delegateTask, object, prcName, nextUserList);
+                    delegateTask.setVariable("jsfzrFlag", 0);
+                }else {
+                    throw new ActivitiException("1#2部长用户参数不存在,请配置相关用户");
+                }
+            } else {
+                if(StringUtils.isNotBlank(object.getString("xdUserId"))) {
+                    BusProcessNew busProcessNew = new BusProcessNew();
+                    busProcessNew.setMsgType("clause");
+                    busProcessNew.setPId(delegateTask.getProcessInstanceId());
+                    busProcessNew.setMesg(object.toJSONString());
+                    busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey());
+                    busProcessNew.setFinishFlag("0");
+                    busProcessNew.setTaskInfo(delegateTask.getName());
+                    busProcessNew.setUserId(object.getString("zqcUsrId"));
+                    busProcessNew.setPrcName(prcName);
+                    busBean.save(busProcessNew);
+
+                    BussUtils.approvalFunc1(delegateTask, busBean, object, prcName,"1");
+                    delegateTask.setVariable("cxdUserId",object.getString("xdUserId"));
+                    delegateTask.setVariable("jsfzrFlag", 1);
+                }else {
+                    throw new ActivitiException("1#2 提交OR驳回参数不存在");
+                }
+            }
+        }else {
+            throw new ActivitiException("1#2标准化员不存在,请配置相关人员");
+        }
+    }
+
+    private String verifyObj(String str){
+        return (str == null || str.equals("")) ? "" : str;
+    }
+}

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

@@ -0,0 +1,37 @@
+package com.ydw.bat.wkflow.listener.bussLibrary;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew;
+import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService;
+import com.ydw.bat.wkflow.business_mq.service.CreateMQService;
+import com.ydw.bat.wkflow.util.SpringContextUtil;
+import org.activiti.engine.delegate.DelegateTask;
+import org.activiti.engine.delegate.TaskListener;
+
+import java.util.List;
+
+/**
+ *  技术委员会负责人/起草中心主任审核前
+ */
+public class BussLibrary8Before implements TaskListener{
+    @Override
+    public void notify(DelegateTask delegateTask) {
+        IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
+        CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.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);
+
+            // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
+            one1.setLink("bussLibrary8?prcType=buss1");
+            one1.setTaskInfo(delegateTask.getName());
+            oaService.sendTodoMq(one1);
+        }
+    }
+}

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

@@ -0,0 +1,95 @@
+package com.ydw.bat.wkflow.listener.bussLibrary;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName;
+import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew;
+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.util.SpringContextUtil;
+import org.activiti.engine.ActivitiException;
+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;
+
+/**
+ *  标准法规部部长审核后
+ */
+public class BussLibrary9After implements TaskListener{
+    @Override
+    public void notify(DelegateTask delegateTask) {
+        IDatasService datasService = SpringContextUtil.getBean(IDatasService.class);
+        IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
+        IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class);
+
+        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 approvalOpinion = object.get("approvalOpinion") == null ? "" : object.get("approvalOpinion").toString();
+        String user = object.getString("prcCreateUser");
+        String username = object.getString("prcCreateUserName");
+        String prcName = "企标制修订流程及企业标准库流程";
+        QueryWrapper queryWrapper2 = new QueryWrapper();
+        queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
+        BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
+        if(one1!=null){
+//            one1.setOverTime(OVERTIME);
+            one1.setPrcType("buss1");
+            one1.setPrcName(prcName);
+            one1.setCreatUser(user);
+            one1.setCreatUserName(username);
+            busProcessNameService.saveOrUpdate(one1);
+        }
+
+        if(StringUtils.isNotBlank(approvalOpinion)){
+            if ("0".equalsIgnoreCase(approvalOpinion)) {
+                if(StringUtils.isNotBlank(object.getString("fzrUserId"))){
+
+                    delegateTask.setVariable("fzrUserId",object.getString("fzrUserId"));
+                    nextUserList.add(object.getString("fzrUserId"));
+
+                    BussUtils.approvalFunc2(delegateTask, object, prcName, nextUserList);
+                    delegateTask.setVariable("bzFlag", 0);
+                }else {
+                    throw new ActivitiException("1#2副主任用户参数不存在,请配置相关用户");
+                }
+            } else {
+                if(StringUtils.isNotBlank(object.getString("xdUserId"))) {
+                    BusProcessNew busProcessNew = new BusProcessNew();
+                    busProcessNew.setMsgType("clause");
+                    busProcessNew.setPId(delegateTask.getProcessInstanceId());
+                    busProcessNew.setMesg(object.toJSONString());
+                    busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey());
+                    busProcessNew.setFinishFlag("0");
+                    busProcessNew.setTaskInfo(delegateTask.getName());
+                    busProcessNew.setUserId(object.getString("xdUserId"));
+                    busProcessNew.setPrcName(prcName);
+                    busBean.save(busProcessNew);
+
+                    BussUtils.approvalFunc1(delegateTask, busBean, object, prcName,"1");
+                    delegateTask.setVariable("cxdUserId",object.getString("xdUserId"));
+                    delegateTask.setVariable("bzFlag", 1);
+                }else {
+                    throw new ActivitiException("1#2修订用户参数不存在,请配置相关用户");
+                }
+            }
+        }else {
+            throw new ActivitiException("1#2 提交OR驳回参数不存在");
+        }
+    }
+
+    private String verifyObj(String str){
+        return (str == null || str.equals("")) ? "" : str;
+    }
+}

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

@@ -0,0 +1,37 @@
+package com.ydw.bat.wkflow.listener.bussLibrary;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew;
+import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService;
+import com.ydw.bat.wkflow.business_mq.service.CreateMQService;
+import com.ydw.bat.wkflow.util.SpringContextUtil;
+import org.activiti.engine.delegate.DelegateTask;
+import org.activiti.engine.delegate.TaskListener;
+
+import java.util.List;
+
+/**
+ *  标准法规部部长审核前
+ */
+public class BussLibrary9Before implements TaskListener{
+    @Override
+    public void notify(DelegateTask delegateTask) {
+        IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
+        CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.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);
+
+            // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
+            one1.setLink("bussLibrary9?prcType=buss1");
+            one1.setTaskInfo(delegateTask.getName());
+            oaService.sendTodoMq(one1);
+        }
+    }
+}

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

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

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

@@ -0,0 +1,37 @@
+package com.ydw.bat.wkflow.listener.bussLibrary;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew;
+import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService;
+import com.ydw.bat.wkflow.business_mq.service.CreateMQService;
+import com.ydw.bat.wkflow.util.SpringContextUtil;
+import org.activiti.engine.delegate.DelegateTask;
+import org.activiti.engine.delegate.TaskListener;
+
+import java.util.List;
+
+/**
+ *  重新企标汇总修订前
+ */
+public class BussLibraryC3Before implements TaskListener{
+    @Override
+    public void notify(DelegateTask delegateTask) {
+        IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
+        CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.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);
+
+            // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
+            one1.setLink("bussLibrary3-1?prcType=buss1");
+            one1.setTaskInfo(delegateTask.getName());
+            oaService.sendTodoMq(one1);
+        }
+    }
+}

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

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

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

@@ -0,0 +1,37 @@
+package com.ydw.bat.wkflow.listener.bussLibrary;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew;
+import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService;
+import com.ydw.bat.wkflow.business_mq.service.CreateMQService;
+import com.ydw.bat.wkflow.util.SpringContextUtil;
+import org.activiti.engine.delegate.DelegateTask;
+import org.activiti.engine.delegate.TaskListener;
+
+import java.util.List;
+
+/**
+ *  重新修订并组织评审前
+ */
+public class BussLibraryC6Before implements TaskListener{
+    @Override
+    public void notify(DelegateTask delegateTask) {
+        IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
+        CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.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);
+
+            // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
+            one1.setLink("bussLibrary6-1?prcType=buss1");
+            one1.setTaskInfo(delegateTask.getName());
+            oaService.sendTodoMq(one1);
+        }
+    }
+}

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

@@ -0,0 +1,89 @@
+package com.ydw.bat.wkflow.listener.bussLibrary;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName;
+import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew;
+import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNameService;
+import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService;
+import com.ydw.bat.wkflow.util.SpringContextUtil;
+import org.activiti.engine.delegate.DelegateTask;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @Description: TODO
+ * @author: super_liu
+ * @date: 2021年11月16日 17:14
+ */
+public class BussUtils {
+
+    public static void endFunc(DelegateTask delegateTask, String prcName,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(prcName);
+            one2.setOverTime(OVERTIME);
+            one2.setPrcType("buss1");
+            busProcessNameService.saveOrUpdate(one2);
+        }
+
+        QueryWrapper queryWrapper1 = new QueryWrapper();
+        queryWrapper1.eq("TASK_ID", delegateTask.getId());
+        BusProcessNew one1 = busBean.getOne(queryWrapper1);
+        if (one1 != null) {
+            one1.setPrcName(prcName);
+            one1.setCommitFlag(commitFlag);
+            one1.setCommitText(object.getString("commentText"));
+            busBean.saveOrUpdate(one1);
+        }
+    }
+
+    public static void approvalFunc1(DelegateTask delegateTask, IBusProcessNewService busBean, JSONObject object, String prcName,String commitFlag) {
+        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);
+        }
+    }
+
+    public static void approvalFunc2(DelegateTask delegateTask, JSONObject object, String prcName, List<String> nextUserList) {
+        IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
+
+        // 存储当前节点意见
+        BusProcessNew busProcessNew = new BusProcessNew();
+        busProcessNew.setMsgType("clause");
+        busProcessNew.setPId(delegateTask.getProcessInstanceId());
+        busProcessNew.setMesg(object.toJSONString());
+        busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey());
+        busProcessNew.setTaskId(delegateTask.getId());
+        busProcessNew.setCommitText(object.getString("commentText"));
+        busProcessNew.setFinishFlag("0");
+        busProcessNew.setTaskInfo(delegateTask.getName());
+        busBean.save(busProcessNew);
+
+        if(nextUserList != null && !nextUserList.isEmpty()){
+            for(String nextUser : nextUserList){
+                BusProcessNew busProcessNewNext = new BusProcessNew();
+                busProcessNewNext.setMsgType("clause");
+                busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
+                busProcessNewNext.setMesg(object.toJSONString());
+                busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey());
+                busProcessNewNext.setFinishFlag("0");
+                busProcessNewNext.setTaskInfo(delegateTask.getName());
+                busProcessNewNext.setUserId(nextUser);
+                busProcessNewNext.setPrcName(prcName);
+                busBean.save(busProcessNewNext);
+            }
+        }
+
+    }
+}

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

@@ -0,0 +1,78 @@
+package com.ydw.bat.wkflow.listener.enterpriseBidReviewProcess;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName;
+import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew;
+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.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 ProcessStep1After implements TaskListener {
+
+    //分发多个责任人
+    @Override
+    public void notify(DelegateTask delegateTask) {
+        //默认流程数据接口
+        IDatasService datasService = SpringContextUtil.getBean(IDatasService.class);
+        //流程节点信息
+        IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
+        //流程信息
+        IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.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);
+        //标准法规部业务经理Id
+        List<String> nextUserList = new ArrayList();
+        if (object.getString("jgUserId").contains(",")) {
+            nextUserList=new ArrayList<>(Arrays.asList(object.getString("jgUserId").split(",")));
+        }else {
+            nextUserList.add(object.getString("jgUserId"));
+        }
+        delegateTask.setVariable("workPeopleList",nextUserList);
+
+
+        //截止时间 流程描述 创建人
+        String user = delegateTask.getVariable("prcCreateUser",String.class);
+        String username = delegateTask.getVariable("prcCreateUserName", String.class);
+        String prcName = "企标复审流程-工作组成员标准复审";
+        QueryWrapper queryWrapper2 = new QueryWrapper();
+        queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
+        BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
+        if (one1 != null) {
+            one1.setPrcType("23");
+            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);
+            }
+        }
+    }
+}