Merge branch 'Three' into 'develop'

Three

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

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

@@ -120,10 +120,16 @@ public interface LawsUserInfoService {
     public String batchInsert(@RequestBody List<StandProjectRelationDto> standProjectRelationDtos);
 
 
-
+    @PostMapping("/WgDept/saveBatch")
-
+    public String wgDeptSaveBatch(@RequestBody List<WgDept> wgdepts);
+    /**
+     * 日历显示会议日程--流程结束生成会议   （标准化活动，政策课题组）
+     * @param sapMeeting (id, title, type, ...)  type: 1,标准化活动;2,政策课题组
+     * @return 是否插入成功 int
+     */
     @PostMapping("/sapMeetInfo/addMeeting")
-    public int addMeeting(@RequestBody SapMeeting sapMeeting);
+    int addMeeting(@RequestBody SapMeeting sapMeeting);
+
 
     @GetMapping("/sapMeetInfo/getMeetingsByMonth")
     public List<SapMeeting> getMeetingsByMonth(@RequestParam("date") @DateTimeFormat(pattern = "yyyy-MM-dd") Date date);

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

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

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

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

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

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

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

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

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

@@ -2,7 +2,7 @@ package com.ydw.bat.wkflow.business_slrs.dao;
 
 import io.swagger.annotations.ApiModel;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
+import lombok.ToString;
 import lombok.experimental.Accessors;
 import org.springframework.format.annotation.DateTimeFormat;
 
@@ -20,6 +20,7 @@ standard_activity_pass
  */
 @Data
 @Accessors(chain = true)
+@ToString
 @ApiModel(value="SapMeeting对象", description="流程通过的 标准化活动会议信息表 standard_activity_pass")
 public class SapMeeting {
 

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

@@ -0,0 +1,46 @@
+package com.ydw.bat.wkflow.business_slrs.dao;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+@Data
+@Accessors(chain = true)
+@ApiModel(value="WgDept对象", description="集团参与情况")
+public class WgDept {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "id")
+    @TableId(value = "id",type = IdType.UUID)
+    private String id;
+
+    @ApiModelProperty(value = "工作组id")
+    @TableField("wg_id")
+    private String wgId;
+
+    @ApiModelProperty(value = "我司在工作组排名顺序")
+    @TableField("dept_order")
+    private String deptOrder;
+
+    @ApiModelProperty(value = "我司人员")
+    @TableField("dept_people_id")
+    private String deptPeopleId;
+
+    @ApiModelProperty(value = "身份")
+    @TableField("identity")
+    private String identity;
+
+    @ApiModelProperty(value = "资料")
+    @TableField("joinfile")
+    private String joinfile;
+
+    @ApiModelProperty(value = "前端id")
+    @TableField("join_id")
+    private String joinId;
+
+
+}

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

@@ -39,17 +39,12 @@ public class AutoStartAfter implements TaskListener {
         List<String> nextUserList = new ArrayList();
 
         String prcName ="标准化活动会后流程-";
-        prcName = prcName + "参会人上传会议资料，填写标准及议题";
+        if(StringUtils.isNotBlank(object.getString("member"))) {
-        if ("1".equals(object.getString("auto"))){
+            prcName = prcName + "参会人上传会议资料，填写标准及议题";
-            delegateTask.setVariable("member", object.getString("member"));
             nextUserList.add(object.getString("member"));
+            delegateTask.setVariable("member", object.getString("member"));
         }
-        else {
+
-            if (StringUtils.isNotBlank(object.getString("memberId"))) {
-                delegateTask.setVariable("member", object.getString("memberId"));
-                nextUserList.add(object.getString("memberId"));
-            }
-        }
 
         //截止时间 流程描述 创建人
         String user = object.getString("prcCreateUser");

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

@@ -51,8 +51,6 @@ public class DirectorVerifyAfter implements TaskListener {
             if(StringUtils.isNotBlank(object.getString("member"))) {
                 nextUserList.add(object.getString("member"));
                 delegateTask.setVariable("member", object.getString("member"));
-            }else{
-                nextUserList.add(delegateTask.getVariable("member",String.class));
             }
         }
 

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

@@ -1,6 +1,5 @@
 package com.ydw.bat.wkflow.listener.StandardMeetProcess;
 
-import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -12,6 +11,8 @@ import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNameService;
 import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService;
 import com.ydw.bat.wkflow.business_main.datas.service.IDatasService;
 import com.ydw.bat.wkflow.business_slrs.dao.SapMeeting;
+import com.ydw.bat.wkflow.entity.WgMeetingInfo;
+import com.ydw.bat.wkflow.entity.WgPayInfo;
 import com.ydw.bat.wkflow.util.SpringContextUtil;
 import org.activiti.engine.delegate.DelegateTask;
 import org.activiti.engine.delegate.TaskListener;
@@ -20,7 +21,6 @@ import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
-import java.util.UUID;
 
 /**
  * EngineerReviseDone - 标准法规工程师汇总修订
@@ -31,10 +31,9 @@ public class EngineerReviseDoneAfter implements TaskListener {
         IDatasService datasService = SpringContextUtil.getBean(IDatasService.class);
         //流程节点信息
         IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
-        //存储会议信息
-        LawsUserInfoService lawsUserInfoService = SpringContextUtil.getBean(LawsUserInfoService.class);
         //流程信息
         IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class);
+        LawsUserInfoService lawsUserInfoService = SpringContextUtil.getBean(LawsUserInfoService.class);
         //根据流程id找到流程信息
         QueryWrapper<Datas> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId());
@@ -44,9 +43,11 @@ public class EngineerReviseDoneAfter implements TaskListener {
         List<String> nextUserList = new ArrayList();
 
         String prcName = "标准化活动参会流程-";
+//            prcName = "标准化活动参会流程-" + "会议结束";
         prcName = prcName + "流程结束";
 
 
+
         //截止时间 流程描述 创建人
         String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
         String user = object.getString("prcCreateUser");
@@ -58,6 +59,57 @@ public class EngineerReviseDoneAfter implements TaskListener {
 
         prcName = "标准化活动参会流程";
 
+
+        JSONObject pageData = object.getJSONObject("ch_pageData");
+        JSONArray mt = pageData.getJSONArray("meetingTable");//议题1;议题2;议题3;--会议报告
+        StringBuilder report = new StringBuilder();
+        for(Object table : mt){
+            JSONObject t = (JSONObject) table;
+            if(t.getString("meetingTheme") != null){
+                if(report.length() > 0){
+                    report.append(";").append(t.getString("meetingTheme"));
+                }else{
+                    report.append(t.getString("meetingTheme"));
+                }
+            }
+        }
+//        WgMeetingUserRelation wgMeetingUserRelation = new WgMeetingUserRelation();
+//        JSONArray mp = pageData.getJSONArray("myPartRole");//参会人员;
+//        for(Object o : mp){
+//            JSONObject t = (JSONObject) o;
+//            wgMeetingUserRelation.setUserId(t.getString("fillPeopleId"));
+//        }
+
+        //入库操作
+//        WgMeetingInfo wgMeetingInfo = new WgMeetingInfo();//会议信息
+//        wgMeetingInfo.setWgId(object.getString("wgId"));//工作组id
+//        wgMeetingInfo.setMeetingTime(pageData.getDate("meetingStartTime"));//参会时间
+//        wgMeetingInfo.setMeetingName(pageData.getString("meetingName"));//会议名称
+////        wgMeetingInfo.setMeetingPeople();//会议人员
+////        wgMeetingInfo.setJoinMeetingPeopleInfo();//会议人员名称
+//
+////        wgMeetingInfo.setMeetingReport(object.getString("commentText"));//会议报告
+//        wgMeetingInfo.setMeetingReport(report.toString());//会议报告
+////        wgMeetingInfo.setJoinfile(pageData.getString("uploadFile"));//会议资料
+//        wgMeetingInfo.setJoinfile(pageData.getJSONArray("fileTextList").toJSONString());//会议资料
+//        wgMeetingInfo.setJoinId(object.getString("joinId"));//前端id
+//
+//        WgPayInfo wgPayInfo = new WgPayInfo();  //会议费用
+//        wgPayInfo.setWgId(object.getString("wgId"));//工作组id
+////        wgPayInfo.setPrice();//价格
+////        wgPayInfo.setYear();//年份
+////        wgPayInfo.setStatus();//支付状态(0:未支付,1:已支付)
+////        wgPayInfo.setInplan();//是否计划内(0:计划内,1:计划外)
+////        wgPayInfo.setPayWay();//支付方式
+////        wgPayInfo.setJoinfile();//支付资料
+//        wgPayInfo.setPayInfo(pageData.getString("feeKind"));//费用列支
+//        wgPayInfo.setJoinId(object.getString("joinId"));//前端id
+//
+//        lawsUserInfoService.saAddWgMeetInfo(wgMeetingInfo);
+//        lawsUserInfoService.saAddWgPay(wgPayInfo);
+
+
+
         QueryWrapper queryWrapper2 = new QueryWrapper();
         queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
         BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
@@ -114,7 +166,7 @@ public class EngineerReviseDoneAfter implements TaskListener {
             busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
             busProcessNewNext.setMesg(object.toJSONString());
             busProcessNewNext.setFinishFlag("0");
-            busProcessNewNext.setTaskInfo("标准化活动参会流程-流程结束");
+            busProcessNewNext.setTaskInfo(delegateTask.getName());
             busProcessNewNext.setPrcName(prcName);
             busBean.save(busProcessNewNext);
             lawsUserInfoService.addMeeting(sapMeeting);

src/main/java/com/ydw/bat/wkflow/listener/lawsLibrary/LLApplicantAfter.java

@@ -1,126 +0,0 @@
-package com.ydw.bat.wkflow.listener.lawsLibrary;
-
-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 LLApplicantAfter 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();
-
-        // 逻辑判断是否会签 signFlag
-//        JSONObject array = object.getJSONObject("hqsqForm");
-
-//        if(object.getString("signFlag").equals("1")){
-//            delegateTask.setVariable("hqFlag",1);
-//
-//            if(StringUtils.isNotBlank(object.getString("zrUserId"))){
-//
-//                if(object.getString("zrUserId").contains(",")){
-//                    nextUserList = Arrays.asList(object.getString("zrUserId").split(","));
-//                }else {
-//                    nextUserList.add(object.getString("zrUserId"));
-//                }
-//                // 配置多实例
-//                delegateTask.setVariable("hqUserList",nextUserList);
-//                delegateTask.addCandidateUsers(nextUserList);
-//            }else {
-//                throw new ActivitiException("1#2会签状态不存在,请配置相关状态");
-//            }
-//        }else {
-//            delegateTask.setVariable("hqFlag",2);
-//
-//        }
-
-        if(StringUtils.isNotBlank(object.getString("jlUserId"))){
-            delegateTask.setVariable("managerUserId",object.getString("jlUserId"));
-            nextUserList.add(object.getString("jlUserId"));
-        }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("laws1");
-            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/lawsLibrary/LLApplicantBefore.java

@@ -1,26 +0,0 @@
-package com.ydw.bat.wkflow.listener.lawsLibrary;
-
-import org.activiti.engine.delegate.DelegateTask;
-import org.activiti.engine.delegate.TaskListener;
-
-/**
- *  政策入库申请人发起前
- */
-public class LLApplicantBefore 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/policyCommentProcess/DirectorAfter.java

@@ -1,109 +0,0 @@
-package com.ydw.bat.wkflow.listener.policyCommentProcess;
-
-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 DirectorAfter 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 ("0".equals(object.getString("actionFlag"))){
-            delegateTask.setVariable("lawsProveChiefVerify",0);
-        }
-
-
-        //截止时间 流程描述 创建人
-        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("1");
-            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 (object.getString("lawsProveChiefVerify")=="0"){
-            func2(delegateTask, busBean, object, "0", busProcessNameService);
-        }
-
-    }
-
-    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("laws2");
-            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/policyCommentProcess/DirectorBefore.java

@@ -1,37 +0,0 @@
-package com.ydw.bat.wkflow.listener.policyCommentProcess;
-
-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 DirectorBefore 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/policyCommentProcess/DistributionBefore.java

@@ -1,39 +0,0 @@
-package com.ydw.bat.wkflow.listener.policyCommentProcess;
-
-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=laws2");
-            one1.setTaskInfo(delegateTask.getName());
-            oaService.sendTodoMq(one1);
-        }
-    }
-}

src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/DockerReviewBefore.java

@@ -1,37 +0,0 @@
-package com.ydw.bat.wkflow.listener.policyCommentProcess;
-
-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 DockerReviewBefore 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/policyCommentProcess/EngineerReviewBefore.java

@@ -1,37 +0,0 @@
-package com.ydw.bat.wkflow.listener.policyCommentProcess;
-
-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 EngineerReviewBefore 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/policyCommentProcess/FillCommentBefore.java

@@ -1,37 +0,0 @@
-package com.ydw.bat.wkflow.listener.policyCommentProcess;
-
-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 FillCommentBefore 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/policyCommentProcess/LaunchAfter.java

@@ -1,96 +0,0 @@
-package com.ydw.bat.wkflow.listener.policyCommentProcess;
-
-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 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);
-
-        List<String> nextUserList = new ArrayList();
-
-        if(StringUtils.isNotBlank(object.getString("responseDockerId"))){
-            nextUserList= Arrays.asList(object.getString("responseDockerId").split(","));
-            // 配置多实例
-            delegateTask.setVariable("counterpartUserList",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("laws2");
-            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/policyCommentProcess/LaunchBefore.java

@@ -1,36 +0,0 @@
-package com.ydw.bat.wkflow.listener.policyCommentProcess;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.netflix.eureka.util.batcher.TaskDispatcher;
-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=laws2");
-            one1.setTaskInfo(delegateTask.getName());
-            oaService.sendTodoMq(one1);
-        }
-    }
-}

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

@@ -1,37 +0,0 @@
-package com.ydw.bat.wkflow.listener.policyCommentProcess;
-
-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/policyCommentProcess/ViceDirectorBefore.java

@@ -1,38 +0,0 @@
-package com.ydw.bat.wkflow.listener.policyCommentProcess;
-
-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=laws2");
-            one1.setTaskInfo(delegateTask.getName());
-            oaService.sendTodoMq(one1);
-        }
-    }
-}

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

@@ -1,5 +1,6 @@
 package com.ydw.bat.wkflow.listener.policyResearchGroupAfterMeeting;
 
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.ydw.bat.wkflow.business_auth.LawsUserInfoService;
@@ -9,6 +10,10 @@ import com.ydw.bat.wkflow.business_main.datas.entity.Datas;
 import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNameService;
 import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService;
 import com.ydw.bat.wkflow.business_main.datas.service.IDatasService;
+import com.ydw.bat.wkflow.business_slrs.dao.SarFileSplitInfoEO;
+import com.ydw.bat.wkflow.business_slrs.dao.SarInterpretationNationalStandard;
+import com.ydw.bat.wkflow.business_slrs.dao.SarStandItems;
+import com.ydw.bat.wkflow.business_slrs.dao.WgDept;
 import com.ydw.bat.wkflow.util.SpringContextUtil;
 import org.activiti.engine.delegate.DelegateTask;
 import org.activiti.engine.delegate.TaskListener;
@@ -28,7 +33,7 @@ public class ApprovalAfter implements TaskListener {
         //流程信息
         IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class);
 
-
+        LawsUserInfoService lawsUserInfoService=SpringContextUtil.getBean(LawsUserInfoService.class);
         //根据流程id找到流程信息
         QueryWrapper<Datas> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId());
@@ -46,6 +51,35 @@ public class ApprovalAfter implements TaskListener {
 
         if("1".equals(object.getString("shyFlag"))){
             delegateTask.setVariable("shyFlag", "1");
+            JSONArray jsonArray=JSONArray.parseArray(object.getString("itemList"));
+            List<WgDept> wgDept=new ArrayList<>();
+            jsonArray.forEach(o -> {
+                JSONObject os=JSONObject.parseObject(o.toString());
+                WgDept wgDept1=new WgDept();
+                wgDept1.setWgId(object.getString("standId"));
+                wgDept1.setDeptOrder(os.getString("itemsNum"));
+                wgDept1.setDeptPeopleId(os.getString("itemsName"));
+                wgDept1.setIdentity(os.getString("responsibleUnitShow"));
+                wgDept1.setJoinfile(os.getString("zxUserIdName"));
+                wgDept1.setJoinId(os.getString("itermsConditions"));
+                wgDept.add(wgDept1);
+            });
+
+            JSONArray jsonArray1=JSONArray.parseArray(delegateTask.getVariable("itemListOld",String.class));
+            jsonArray1.forEach(obj ->{
+                JSONObject object1 = JSONObject.parseObject(obj.toString());
+                WgDept wgDept1=new WgDept();
+                wgDept1.setWgId(object.getString("standId"));
+                wgDept1.setDeptOrder(object1.getString("itemsNum"));
+                wgDept1.setDeptPeopleId(object1.getString("itemsName"));
+                wgDept1.setIdentity(object1.getString("responsibleUnitShow"));
+                wgDept1.setJoinfile(object1.getString("zx![](C:/Users/liao/AppData/Local/Temp/LogiUI/Pak/img/device.png)UserIdName"));
+                wgDept1.setJoinId(object1.getString("itermsConditions"));
+                wgDept.add(wgDept1);
+            });
+
+            lawsUserInfoService.wgDeptSaveBatch(wgDept);
+
             prcName =  "政策课题组会后流程";
         }else{
             delegateTask.setVariable("shyFlag", "0");

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

@@ -1,5 +1,6 @@
 package com.ydw.bat.wkflow.listener.policyResearchGroupAttendMeeting;
 
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.ydw.bat.wkflow.business_auth.LawsUserInfoService;
@@ -9,6 +10,7 @@ import com.ydw.bat.wkflow.business_main.datas.entity.Datas;
 import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNameService;
 import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService;
 import com.ydw.bat.wkflow.business_main.datas.service.IDatasService;
+import com.ydw.bat.wkflow.business_slrs.dao.WgDept;
 import com.ydw.bat.wkflow.util.SpringContextUtil;
 import org.activiti.engine.delegate.DelegateTask;
 import org.activiti.engine.delegate.TaskListener;
@@ -28,6 +30,7 @@ public class PresidentApprovalAfter implements TaskListener {
         //流程信息
         IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class);
 
+        LawsUserInfoService lawsUserInfoService=SpringContextUtil.getBean(LawsUserInfoService.class);
         //根据流程id找到流程信息
         QueryWrapper<Datas> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId());
@@ -44,6 +47,35 @@ public class PresidentApprovalAfter implements TaskListener {
 
         if("1".equals(object.getString("gsfz"))){
             delegateTask.setVariable("gsfz", "1");
+            JSONArray jsonArray=JSONArray.parseArray(object.getString("itemList"));
+            List<WgDept> wgDept=new ArrayList<>();
+            jsonArray.forEach(o -> {
+                JSONObject os=JSONObject.parseObject(o.toString());
+                WgDept wgDept1=new WgDept();
+                wgDept1.setWgId(object.getString("standId"));
+                wgDept1.setDeptOrder(os.getString("itemsNum"));
+                wgDept1.setDeptPeopleId(os.getString("itemsName"));
+                wgDept1.setIdentity(os.getString("responsibleUnitShow"));
+                wgDept1.setJoinfile(os.getString("zxUserIdName"));
+                wgDept1.setJoinId(os.getString("itermsConditions"));
+                wgDept.add(wgDept1);
+            });
+
+            JSONArray jsonArray1=JSONArray.parseArray(delegateTask.getVariable("itemListOld",String.class));
+            jsonArray1.forEach(obj ->{
+                JSONObject object1 = JSONObject.parseObject(obj.toString());
+                WgDept wgDept1=new WgDept();
+                wgDept1.setWgId(object.getString("standId"));
+                wgDept1.setDeptOrder(object1.getString("itemsNum"));
+                wgDept1.setDeptPeopleId(object1.getString("itemsName"));
+                wgDept1.setIdentity(object1.getString("responsibleUnitShow"));
+                wgDept1.setJoinfile(object1.getString("zxUserIdName"));
+                wgDept1.setJoinId(object1.getString("itermsConditions"));
+                wgDept.add(wgDept1);
+            });
+
+            lawsUserInfoService.wgDeptSaveBatch(wgDept);
+
             prcName = "政策课题组参会流程";
         }else{
             delegateTask.setVariable("gsfz", "0");

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

@@ -1,5 +1,6 @@
 package com.ydw.bat.wkflow.listener.policyResearchGroupEnrollment;
 
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.ydw.bat.wkflow.business_auth.LawsUserInfoService;
@@ -11,6 +12,7 @@ import com.ydw.bat.wkflow.business_main.datas.entity.Datas;
 import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNameService;
 import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService;
 import com.ydw.bat.wkflow.business_main.datas.service.IDatasService;
+import com.ydw.bat.wkflow.business_slrs.dao.WgDept;
 import com.ydw.bat.wkflow.util.SpringContextUtil;
 import org.activiti.engine.ActivitiException;
 import org.activiti.engine.delegate.DelegateTask;
@@ -51,6 +53,36 @@ public class PGREPresidentApprovalAfter implements TaskListener {
 
         if ("1".equals(object.getString("gsfz"))) {
             delegateTask.setVariable("gsfz", "1");
+
+            JSONArray jsonArray=JSONArray.parseArray(object.getString("itemList"));
+            List<WgDept> wgDept=new ArrayList<>();
+            jsonArray.forEach(o -> {
+                JSONObject os=JSONObject.parseObject(o.toString());
+                WgDept wgDept1=new WgDept();
+                wgDept1.setWgId(object.getString("standId"));
+                wgDept1.setDeptOrder(os.getString("itemsNum"));
+                wgDept1.setDeptPeopleId(os.getString("itemsName"));
+                wgDept1.setIdentity(os.getString("responsibleUnitShow"));
+                wgDept1.setJoinfile(os.getString("zxUserIdName"));
+                wgDept1.setJoinId(os.getString("itermsConditions"));
+                wgDept.add(wgDept1);
+            });
+
+            JSONArray jsonArray1=JSONArray.parseArray(delegateTask.getVariable("itemListOld",String.class));
+            jsonArray1.forEach(obj ->{
+                JSONObject object1 = JSONObject.parseObject(obj.toString());
+                WgDept wgDept1=new WgDept();
+                wgDept1.setWgId(object.getString("standId"));
+                wgDept1.setDeptOrder(object1.getString("itemsNum"));
+                wgDept1.setDeptPeopleId(object1.getString("itemsName"));
+                wgDept1.setIdentity(object1.getString("responsibleUnitShow"));
+                wgDept1.setJoinfile(object1.getString("zxUserIdName"));
+                wgDept1.setJoinId(object1.getString("itermsConditions"));
+                wgDept.add(wgDept1);
+            });
+
+            lawsUserInfoService.wgDeptSaveBatch(wgDept);
+
             prcName = "政策课题组入会流程";
         } else {
             delegateTask.setVariable("gsfz", "0");

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

@@ -30,6 +30,8 @@ public class WriteMaterialAfter implements TaskListener {
         //流程信息
         IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class);
 
+        LawsUserInfoService lawsUserInfoService = SpringContextUtil.getBean(LawsUserInfoService.class);
+
         //根据流程id找到流程信息
         QueryWrapper<Datas> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId());

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

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