diff --git a/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BLApplicantAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BLApplicantAfter.java index 2acfe29b..c5021341 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BLApplicantAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BLApplicantAfter.java @@ -8,6 +8,10 @@ import com.ydw.bat.wkflow.business_main.datas.mapper.EsTechRelationMapper; import com.ydw.bat.wkflow.business_main.datas.service.*; import com.ydw.bat.wkflow.listener.bussLibrary.Utils.FlowFinishEnum; import com.ydw.bat.wkflow.util.SpringContextUtil; +import com.ydw.bat.wkflow.util.enums.BussLibraryNodeKeyEnum; +import com.ydw.bat.wkflow.util.enums.FlowTypeEnum; +import com.ydw.bat.wkflow.util.enums.StandardCommentNewProcessNodeKeyEnum; +import com.ydw.bat.wkflow.util.enums.TaskStatusEnum; import net.sf.json.JSONArray; import net.sf.json.util.JSONTokener; import org.activiti.engine.ActivitiException; @@ -16,13 +20,12 @@ import org.activiti.engine.TaskService; import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; import org.activiti.engine.task.Task; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang.StringUtils; import org.apache.tomcat.util.digester.ArrayStack; import java.text.SimpleDateFormat; -import java.util.Arrays; -import java.util.Date; -import java.util.List; +import java.util.*; /** * 发起企标制修订流程后 @@ -191,9 +194,211 @@ public class BLApplicantAfter implements TaskListener{ } } + this.addBusProcessHistory(object,delegateTask); } private String verifyObj(String str){ return (str == null || str.equals("")) ? "" : str; } + + public void addBusProcessHistory(JSONObject json,DelegateTask delegateTask){ + IBusProcessHistoryService bphService = SpringContextUtil.getBean(IBusProcessHistoryService.class); + + List bphList = new ArrayList<>(); + + // 起草 + BusProcessHistory qcBph = new BusProcessHistory(); + qcBph.setActiProcInstId(delegateTask.getProcessInstanceId()); + qcBph.setUserId(delegateTask.getAssignee()); + qcBph.setTaskId(delegateTask.getId()); + qcBph.setTaskKey(delegateTask.getTaskDefinitionKey()); + qcBph.setFlowType(FlowTypeEnum.QBZXD_JSBZ.getValue()); + qcBph.setIsSub("2"); + qcBph.setTaskStatus(TaskStatusEnum.DONE.getValue()); + qcBph.setEndTime(new Date()); + qcBph.setCommitText(json.getString("commentText")); + qcBph.setIsMany("2"); + qcBph.setOrderNum(BussLibraryNodeKeyEnum.BUSS_LIBRARY1.getOrderNum()); + bphList.add(qcBph); + + List qcUserIdList = Arrays.asList(json.getString("qcUserId").split(",")); + if (CollectionUtils.isNotEmpty(qcUserIdList)) { + // 企标编写节点父节点信息 + BusProcessHistory qbbxPBph = new BusProcessHistory(); + String qbbxPBphId = UUID.randomUUID().toString(); + qbbxPBph.setId(qbbxPBphId); + qbbxPBph.setActiProcInstId(delegateTask.getProcessInstanceId()); + qbbxPBph.setTaskKey(BussLibraryNodeKeyEnum.BUSS_LIBRARY2.getValue()); + qbbxPBph.setFlowType(FlowTypeEnum.BZZQYJLC.getValue()); + qbbxPBph.setOrderNum(BussLibraryNodeKeyEnum.BUSS_LIBRARY2.getOrderNum()); + qbbxPBph.setIsSub("2"); + qbbxPBph.setIsMany("1"); + bphList.add(qbbxPBph); + + for (String qcUserId : qcUserIdList) { + // 企标编写子节点信息 + BusProcessHistory qbbxBph = new BusProcessHistory(); + qbbxBph.setActiProcInstId(delegateTask.getProcessInstanceId()); + qbbxBph.setUserId(qcUserId); + qbbxBph.setTaskKey(BussLibraryNodeKeyEnum.BUSS_LIBRARY2.getValue()); + qbbxBph.setFlowType(FlowTypeEnum.QBZXD_JSBZ.getValue()); + qbbxBph.setOrderNum(BussLibraryNodeKeyEnum.BUSS_LIBRARY2.getOrderNum()); + qbbxBph.setIsSub("2"); + qbbxBph.setIsMany("1"); + qbbxBph.setManyPId(qbbxPBphId); + bphList.add(qbbxBph); + } + } + + // 企标编写汇总 + String hzUserId = json.getString("hzUserId"); + BusProcessHistory qbbxhzBph = new BusProcessHistory(); + qbbxhzBph.setActiProcInstId(delegateTask.getProcessInstanceId()); + qbbxhzBph.setUserId(hzUserId); + qbbxhzBph.setTaskKey(BussLibraryNodeKeyEnum.BUSS_LIBRARY3.getValue()); + qbbxhzBph.setFlowType(FlowTypeEnum.QBZXD_JSBZ.getValue()); + qbbxhzBph.setOrderNum(BussLibraryNodeKeyEnum.BUSS_LIBRARY3.getOrderNum()); + qbbxhzBph.setIsSub("2"); + qbbxhzBph.setIsMany("2"); + bphList.add(qbbxhzBph); + + // 标准化初审 + String bzhUserId = json.getString("bzhUserId"); + BusProcessHistory bzhcsBph = new BusProcessHistory(); + bzhcsBph.setActiProcInstId(delegateTask.getProcessInstanceId()); + bzhcsBph.setUserId(bzhUserId); + bzhcsBph.setTaskKey(BussLibraryNodeKeyEnum.BUSS_LIBRARY4.getValue()); + bzhcsBph.setFlowType(FlowTypeEnum.QBZXD_JSBZ.getValue()); + bzhcsBph.setOrderNum(BussLibraryNodeKeyEnum.BUSS_LIBRARY4.getOrderNum()); + bzhcsBph.setIsSub("2"); + bzhcsBph.setIsMany("2"); + bphList.add(bzhcsBph); + + // 征求意见 + List hqUserIdList = Arrays.asList(json.getString("hqUserId").split(",")); + if (CollectionUtils.isNotEmpty(hqUserIdList)) { + // 企标编写节点父节点信息 + BusProcessHistory zqyjPBph = new BusProcessHistory(); + String zqyjPBphId = UUID.randomUUID().toString(); + zqyjPBph.setId(zqyjPBphId); + zqyjPBph.setActiProcInstId(delegateTask.getProcessInstanceId()); + zqyjPBph.setTaskKey(BussLibraryNodeKeyEnum.BUSS_LIBRARY5.getValue()); + zqyjPBph.setFlowType(FlowTypeEnum.BZZQYJLC.getValue()); + zqyjPBph.setOrderNum(BussLibraryNodeKeyEnum.BUSS_LIBRARY5.getOrderNum()); + zqyjPBph.setIsSub("2"); + zqyjPBph.setIsMany("1"); + bphList.add(zqyjPBph); + + for (String hqUserId : hqUserIdList) { + BusProcessHistory zqyjBph = new BusProcessHistory(); + zqyjBph.setActiProcInstId(delegateTask.getProcessInstanceId()); + zqyjBph.setUserId(hqUserId); + zqyjBph.setTaskKey(BussLibraryNodeKeyEnum.BUSS_LIBRARY5.getValue()); + zqyjBph.setFlowType(FlowTypeEnum.QBZXD_JSBZ.getValue()); + zqyjBph.setOrderNum(BussLibraryNodeKeyEnum.BUSS_LIBRARY5.getOrderNum()); + zqyjBph.setIsSub("2"); + zqyjBph.setIsMany("1"); + zqyjBph.setManyPId(zqyjPBphId); + bphList.add(zqyjBph); + } + } + + // 技术委员会评审、评审意见修改 + String xdUserId = json.getString("xdUserId"); + BusProcessHistory psyjxgBph = new BusProcessHistory(); + psyjxgBph.setActiProcInstId(delegateTask.getProcessInstanceId()); + psyjxgBph.setUserId(xdUserId); + psyjxgBph.setTaskKey(BussLibraryNodeKeyEnum.BUSS_LIBRARY6.getValue()); + psyjxgBph.setFlowType(FlowTypeEnum.QBZXD_JSBZ.getValue()); + psyjxgBph.setOrderNum(BussLibraryNodeKeyEnum.BUSS_LIBRARY6.getOrderNum()); + psyjxgBph.setIsSub("2"); + psyjxgBph.setIsMany("2"); + bphList.add(psyjxgBph); + + // 标准化复审 + String fggcsUserId = json.getString("fggcsUserId"); + BusProcessHistory hzhfsBph = new BusProcessHistory(); + hzhfsBph.setActiProcInstId(delegateTask.getProcessInstanceId()); + hzhfsBph.setUserId(fggcsUserId); + hzhfsBph.setTaskKey(BussLibraryNodeKeyEnum.BUSS_LIBRARY7.getValue()); + hzhfsBph.setFlowType(FlowTypeEnum.QBZXD_JSBZ.getValue()); + hzhfsBph.setOrderNum(BussLibraryNodeKeyEnum.BUSS_LIBRARY7.getOrderNum()); + hzhfsBph.setIsSub("2"); + hzhfsBph.setIsMany("2"); + bphList.add(hzhfsBph); + + // 起草单位高级经理审核 + String jsfzrUserId = json.getString("jsfzrUserId"); + BusProcessHistory qcdwgjjlshBph = new BusProcessHistory(); + qcdwgjjlshBph.setActiProcInstId(delegateTask.getProcessInstanceId()); + qcdwgjjlshBph.setUserId(jsfzrUserId); + qcdwgjjlshBph.setTaskKey(BussLibraryNodeKeyEnum.BUSS_LIBRARY8.getValue()); + qcdwgjjlshBph.setFlowType(FlowTypeEnum.QBZXD_JSBZ.getValue()); + qcdwgjjlshBph.setOrderNum(BussLibraryNodeKeyEnum.BUSS_LIBRARY8.getOrderNum()); + qcdwgjjlshBph.setIsSub("2"); + qcdwgjjlshBph.setIsMany("2"); + bphList.add(qcdwgjjlshBph); + + // 标准法规部高级经理审核 + String bzUserId = json.getString("bzUserId"); + BusProcessHistory bzfgbgjjlshBph = new BusProcessHistory(); + bzfgbgjjlshBph.setActiProcInstId(delegateTask.getProcessInstanceId()); + bzfgbgjjlshBph.setUserId(bzUserId); + bzfgbgjjlshBph.setTaskKey(BussLibraryNodeKeyEnum.BUSS_LIBRARY9.getValue()); + bzfgbgjjlshBph.setFlowType(FlowTypeEnum.QBZXD_JSBZ.getValue()); + bzfgbgjjlshBph.setOrderNum(BussLibraryNodeKeyEnum.BUSS_LIBRARY9.getOrderNum()); + bzfgbgjjlshBph.setIsSub("2"); + bzfgbgjjlshBph.setIsMany("2"); + bphList.add(bzfgbgjjlshBph); + + // 审定-起草单位中心主任 + String fzrUserId = json.getString("fzrUserId"); + BusProcessHistory sdBph = new BusProcessHistory(); + sdBph.setActiProcInstId(delegateTask.getProcessInstanceId()); + sdBph.setUserId(fzrUserId); + sdBph.setTaskKey(BussLibraryNodeKeyEnum.BUSS_LIBRARY10.getValue()); + sdBph.setFlowType(FlowTypeEnum.QBZXD_JSBZ.getValue()); + sdBph.setOrderNum(BussLibraryNodeKeyEnum.BUSS_LIBRARY10.getOrderNum()); + sdBph.setIsSub("2"); + sdBph.setIsMany("2"); + bphList.add(sdBph); + + // 批准 + String zhrUserId = json.getString("zhrUserId"); + BusProcessHistory pzBph = new BusProcessHistory(); + pzBph.setActiProcInstId(delegateTask.getProcessInstanceId()); + pzBph.setUserId(zhrUserId); + pzBph.setTaskKey(BussLibraryNodeKeyEnum.BUSS_LIBRARY11.getValue()); + pzBph.setFlowType(FlowTypeEnum.QBZXD_JSBZ.getValue()); + pzBph.setOrderNum(BussLibraryNodeKeyEnum.BUSS_LIBRARY11.getOrderNum()); + pzBph.setIsSub("2"); + pzBph.setIsMany("2"); + bphList.add(pzBph); + + // 培训 + String pxUserId = json.getString("pxUserId"); + BusProcessHistory pxBph = new BusProcessHistory(); + pxBph.setActiProcInstId(delegateTask.getProcessInstanceId()); + pxBph.setUserId(pxUserId); + pxBph.setTaskKey(BussLibraryNodeKeyEnum.BUSS_LIBRARY12.getValue()); + pxBph.setFlowType(FlowTypeEnum.QBZXD_JSBZ.getValue()); + pxBph.setOrderNum(BussLibraryNodeKeyEnum.BUSS_LIBRARY12.getOrderNum()); + pxBph.setIsSub("2"); + pxBph.setIsMany("2"); + bphList.add(pxBph); + + // 发布 + String fbUserId = json.getString("fbUserId"); + BusProcessHistory fbBph = new BusProcessHistory(); + fbBph.setActiProcInstId(delegateTask.getProcessInstanceId()); + fbBph.setUserId(fbUserId); + fbBph.setTaskKey(BussLibraryNodeKeyEnum.BUSS_LIBRARY13.getValue()); + fbBph.setFlowType(FlowTypeEnum.QBZXD_JSBZ.getValue()); + fbBph.setOrderNum(BussLibraryNodeKeyEnum.BUSS_LIBRARY13.getOrderNum()); + fbBph.setIsSub("2"); + fbBph.setIsMany("2"); + bphList.add(fbBph); + + bphService.insertBatch(bphList); + } } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BLApplicantC1Before.java b/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BLApplicantC1Before.java index c63e7641..3f953d76 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BLApplicantC1Before.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BLApplicantC1Before.java @@ -2,6 +2,7 @@ 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.IBusProcessHistoryService; 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; @@ -35,5 +36,7 @@ public class BLApplicantC1Before implements TaskListener{ one1.setTaskInfo(delegateTask.getName()); oaService.sendTodoMq(one1); } + IBusProcessHistoryService bphService = SpringContextUtil.getBean(IBusProcessHistoryService.class); + bphService.updateTaskInfo(delegateTask); } } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary10Before.java b/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary10Before.java index 485222ab..8cd0172b 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary10Before.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary10Before.java @@ -2,6 +2,7 @@ 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.IBusProcessHistoryService; 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; @@ -35,5 +36,7 @@ public class BussLibrary10Before implements TaskListener{ one1.setTaskInfo(delegateTask.getName()); oaService.sendTodoMq(one1); } + IBusProcessHistoryService bphService = SpringContextUtil.getBean(IBusProcessHistoryService.class); + bphService.updateTaskInfo(delegateTask); } } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary11Before.java b/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary11Before.java index d77caccb..78932f6e 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary11Before.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary11Before.java @@ -2,6 +2,7 @@ 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.IBusProcessHistoryService; 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; @@ -35,5 +36,7 @@ public class BussLibrary11Before implements TaskListener{ one1.setTaskInfo(delegateTask.getName()); oaService.sendTodoMq(one1); } + IBusProcessHistoryService bphService = SpringContextUtil.getBean(IBusProcessHistoryService.class); + bphService.updateTaskInfo(delegateTask); } } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary12Before.java b/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary12Before.java index 0670e2b2..bc69b208 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary12Before.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary12Before.java @@ -5,6 +5,7 @@ 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.IBusProcessHistoryService; 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; @@ -38,5 +39,7 @@ public class BussLibrary12Before implements TaskListener{ one1.setTaskInfo(delegateTask.getName()); oaService.sendTodoMq(one1); } + IBusProcessHistoryService bphService = SpringContextUtil.getBean(IBusProcessHistoryService.class); + bphService.updateTaskInfo(delegateTask); } } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary13Before.java b/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary13Before.java index a9456f58..fdfdc50a 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary13Before.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary13Before.java @@ -2,6 +2,7 @@ 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.IBusProcessHistoryService; 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; @@ -35,5 +36,7 @@ public class BussLibrary13Before implements TaskListener{ one1.setTaskInfo(delegateTask.getName()); oaService.sendTodoMq(one1); } + IBusProcessHistoryService bphService = SpringContextUtil.getBean(IBusProcessHistoryService.class); + bphService.updateTaskInfo(delegateTask); } } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary2Before.java b/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary2Before.java index 9464c443..046e1562 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary2Before.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary2Before.java @@ -3,6 +3,7 @@ package com.ydw.bat.wkflow.listener.bussLibrary; import com.alibaba.fastjson.JSONArray; 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.IBusProcessHistoryService; 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; @@ -63,5 +64,8 @@ public class BussLibrary2Before implements TaskListener{ // hisService.saveOrUpdate(modelHis); // } + IBusProcessHistoryService bphService = SpringContextUtil.getBean(IBusProcessHistoryService.class); + bphService.updateTaskInfo(delegateTask); + } } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary3Before.java b/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary3Before.java index 3219f851..11bcc7d5 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary3Before.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary3Before.java @@ -5,6 +5,7 @@ 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.IBusProcessHistoryService; 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; @@ -66,5 +67,8 @@ public class BussLibrary3Before implements TaskListener{ // modelHis.setEditFilePath(fileUrl); // hisService.save(modelHis); } + + IBusProcessHistoryService bphService = SpringContextUtil.getBean(IBusProcessHistoryService.class); + bphService.updateTaskInfo(delegateTask); } } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary4Before.java b/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary4Before.java index 78223958..02db721c 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary4Before.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary4Before.java @@ -2,6 +2,7 @@ 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.IBusProcessHistoryService; 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; @@ -35,5 +36,7 @@ public class BussLibrary4Before implements TaskListener{ one1.setTaskInfo(delegateTask.getName()); oaService.sendTodoMq(one1); } + IBusProcessHistoryService bphService = SpringContextUtil.getBean(IBusProcessHistoryService.class); + bphService.updateTaskInfo(delegateTask); } } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary5Before.java b/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary5Before.java index f8bef01f..7c741e56 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary5Before.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary5Before.java @@ -3,6 +3,7 @@ package com.ydw.bat.wkflow.listener.bussLibrary; import com.alibaba.fastjson.JSONArray; 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.IBusProcessHistoryService; 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; @@ -42,5 +43,7 @@ public class BussLibrary5Before implements TaskListener{ one1.setTaskInfo(delegateTask.getName()); oaService.sendTodoMq(one1); } + IBusProcessHistoryService bphService = SpringContextUtil.getBean(IBusProcessHistoryService.class); + bphService.updateTaskInfo(delegateTask); } } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary6Before.java b/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary6Before.java index c40a1c3f..9bb9505b 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary6Before.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary6Before.java @@ -5,6 +5,7 @@ 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.IBusProcessHistoryService; 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; @@ -48,5 +49,7 @@ public class BussLibrary6Before implements TaskListener{ one1.setTaskInfo(delegateTask.getName()); oaService.sendTodoMq(one1); } + IBusProcessHistoryService bphService = SpringContextUtil.getBean(IBusProcessHistoryService.class); + bphService.updateTaskInfo(delegateTask); } } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary7Before.java b/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary7Before.java index 2e79abb1..c4416a49 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary7Before.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary7Before.java @@ -2,6 +2,7 @@ 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.IBusProcessHistoryService; 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; @@ -35,5 +36,7 @@ public class BussLibrary7Before implements TaskListener{ one1.setTaskInfo(delegateTask.getName()); oaService.sendTodoMq(one1); } + IBusProcessHistoryService bphService = SpringContextUtil.getBean(IBusProcessHistoryService.class); + bphService.updateTaskInfo(delegateTask); } } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary8Before.java b/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary8Before.java index 9a7e845c..e9178248 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary8Before.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary8Before.java @@ -2,6 +2,7 @@ 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.IBusProcessHistoryService; 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; @@ -35,5 +36,7 @@ public class BussLibrary8Before implements TaskListener{ one1.setTaskInfo(delegateTask.getName()); oaService.sendTodoMq(one1); } + IBusProcessHistoryService bphService = SpringContextUtil.getBean(IBusProcessHistoryService.class); + bphService.updateTaskInfo(delegateTask); } } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary9Before.java b/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary9Before.java index 216f04f5..74338436 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary9Before.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary9Before.java @@ -2,6 +2,7 @@ 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.IBusProcessHistoryService; 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; @@ -35,5 +36,7 @@ public class BussLibrary9Before implements TaskListener{ one1.setTaskInfo(delegateTask.getName()); oaService.sendTodoMq(one1); } + IBusProcessHistoryService bphService = SpringContextUtil.getBean(IBusProcessHistoryService.class); + bphService.updateTaskInfo(delegateTask); } } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibraryC3Before.java b/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibraryC3Before.java index b08d134d..20d9f6fd 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibraryC3Before.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibraryC3Before.java @@ -2,6 +2,7 @@ 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.IBusProcessHistoryService; 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; @@ -35,5 +36,7 @@ public class BussLibraryC3Before implements TaskListener{ one1.setTaskInfo(delegateTask.getName()); oaService.sendTodoMq(one1); } + IBusProcessHistoryService bphService = SpringContextUtil.getBean(IBusProcessHistoryService.class); + bphService.updateTaskInfo(delegateTask); } } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibraryC6Before.java b/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibraryC6Before.java index 9a1966ec..55e47c96 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibraryC6Before.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibraryC6Before.java @@ -2,6 +2,7 @@ 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.IBusProcessHistoryService; 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; @@ -35,5 +36,7 @@ public class BussLibraryC6Before implements TaskListener{ one1.setTaskInfo(delegateTask.getName()); oaService.sendTodoMq(one1); } + IBusProcessHistoryService bphService = SpringContextUtil.getBean(IBusProcessHistoryService.class); + bphService.updateTaskInfo(delegateTask); } } diff --git a/src/main/java/com/ydw/bat/wkflow/util/enums/BussLibraryNodeKeyEnum.java b/src/main/java/com/ydw/bat/wkflow/util/enums/BussLibraryNodeKeyEnum.java new file mode 100644 index 00000000..ac300072 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/util/enums/BussLibraryNodeKeyEnum.java @@ -0,0 +1,56 @@ +package com.ydw.bat.wkflow.util.enums; + +import org.apache.commons.lang.StringUtils; + +/** + * 企标制修订-技术标准-任务节点定义key + */ +public enum BussLibraryNodeKeyEnum { + BUSS_LIBRARY1("BussLibrary1","起草",1), + BUSS_LIBRARY2("BussLibrary2","企标编写",2), + BUSS_LIBRARY3("BussLibrary3","企标编写汇总",3), + BUSS_LIBRARY4("BussLibrary4","标准化初审",4), + BUSS_LIBRARY_C3("BussLibraryC3","重新企标编写汇总",5), + BUSS_LIBRARY5("BussLibrary5","征求意见",6), + BUSS_LIBRARY6("BussLibrary6","技术委员会评审、评审意见修改",7), + BUSS_LIBRARY7("BussLibrary7","标准化复审",8), + BUSS_LIBRARY_C6("BussLibraryC6","重新技术委员会评审、评审意见修改",9), + BUSS_LIBRARY8("BussLibrary8","起草单位高级经理审核",10), + BUSS_LIBRARY9("BussLibrary9","标准法规部高级经理审核",11), + BUSS_LIBRARY_C1("BussLibraryC1","重新起草",12), + BUSS_LIBRARY10("BussLibrary10","审定",13), + BUSS_LIBRARY11("BussLibrary11","批准",14), + BUSS_LIBRARY12("BussLibrary12","主起草人培训",15), + BUSS_LIBRARY13("BussLibrary13","发布",16), + ; + + private String value; + private String lable; + private Integer orderNum; + + private BussLibraryNodeKeyEnum(String value, String lable, Integer orderNum) { + this.value = value; + this.lable = lable; + this.orderNum = orderNum; + } + public String getValue() { + return value; + } + public String getLable() { + return lable; + } + public Integer getOrderNum() { + return orderNum; + } + + public static String getLableByValue(String value){ + String result = ""; + for (BussLibraryNodeKeyEnum nodeKeyEnum : BussLibraryNodeKeyEnum.values()) { + if (StringUtils.equals(nodeKeyEnum.getValue(),value)) { + result = nodeKeyEnum.getLable(); + break; + } + } + return result; + } +} diff --git a/src/main/java/com/ydw/bat/wkflow/util/enums/FlowTypeEnum.java b/src/main/java/com/ydw/bat/wkflow/util/enums/FlowTypeEnum.java index 5be85d28..c0a1a0fb 100644 --- a/src/main/java/com/ydw/bat/wkflow/util/enums/FlowTypeEnum.java +++ b/src/main/java/com/ydw/bat/wkflow/util/enums/FlowTypeEnum.java @@ -7,6 +7,7 @@ import org.apache.commons.lang.StringUtils; */ public enum FlowTypeEnum { BZZQYJLC("3","标准征求意见流程",""), + QBZXD_JSBZ("buss1","企标制修订-技术标准",""), ZCZQYJLC("33","政策征求意见流程","policyConsultation"), ZCHGXXMSCLC("34","重点认证标准/政策合规性项目审查流程","policyComplianceReview"), ;