Merge branch 'develop' into FOTON
# Conflicts: # src/main/resources/application.yml
This commit is contained in:
@@ -168,4 +168,4 @@ public class TaskController {
|
|||||||
}
|
}
|
||||||
return list;
|
return list;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -61,7 +61,7 @@ public class SubMinisterReviewAfter implements TaskListener {
|
|||||||
String username = object.getString("prcCreateUserName");
|
String username = object.getString("prcCreateUserName");
|
||||||
// object.getString("standName")
|
// object.getString("standName")
|
||||||
String standName = "";
|
String standName = "";
|
||||||
String prcName = "重点认证标准/政策合规性项目审查流程-法规认证副总监批准";
|
String prcName = "重点认证标准/政策合规性项目审查流程-法规认证副总监审定";
|
||||||
QueryWrapper queryWrapper2 = new QueryWrapper();
|
QueryWrapper queryWrapper2 = new QueryWrapper();
|
||||||
queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
|
queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
|
||||||
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
|
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
|
||||||
|
|||||||
+13
-40
@@ -1,4 +1,4 @@
|
|||||||
package com.ydw.bat.wkflow.listener.KCSTPReviewProcess;
|
package com.ydw.bat.wkflow.listener.policyCommentProcess;
|
||||||
|
|
||||||
import com.alibaba.fastjson.JSONObject;
|
import com.alibaba.fastjson.JSONObject;
|
||||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||||
@@ -18,11 +18,10 @@ import java.util.ArrayList;
|
|||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
import java.util.Date;
|
import java.util.Date;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 副总监审核
|
* 总监审核
|
||||||
*/
|
*/
|
||||||
public class SubViceDirectorAfter implements TaskListener {
|
public class DirectorAfter implements TaskListener {
|
||||||
@Override
|
@Override
|
||||||
public void notify(DelegateTask delegateTask) {
|
public void notify(DelegateTask delegateTask) {
|
||||||
IDatasService datasService = SpringContextUtil.getBean(IDatasService.class);
|
IDatasService datasService = SpringContextUtil.getBean(IDatasService.class);
|
||||||
@@ -36,27 +35,12 @@ public class SubViceDirectorAfter implements TaskListener {
|
|||||||
JSONObject object = JSONObject.parseObject(datas.getFormValsJson());
|
JSONObject object = JSONObject.parseObject(datas.getFormValsJson());
|
||||||
delegateTask.setVariable("objectJson",object);
|
delegateTask.setVariable("objectJson",object);
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* next 结束
|
|
||||||
*/
|
|
||||||
List<String> nextUserList = new ArrayList();
|
List<String> nextUserList = new ArrayList();
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
if ("0".equals(object.getString("actionFlag"))){
|
if ("0".equals(object.getString("actionFlag"))){
|
||||||
delegateTask.setVariable("lawsProveViceChiefVerify",0);
|
delegateTask.setVariable("lawsProveChiefVerify",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);
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -66,13 +50,13 @@ public class SubViceDirectorAfter implements TaskListener {
|
|||||||
String username = object.getString("prcCreateUserName");
|
String username = object.getString("prcCreateUserName");
|
||||||
// object.getString("standName")
|
// object.getString("standName")
|
||||||
String standName = "";
|
String standName = "";
|
||||||
String prcName = "重点认证标准/政策合规性项目审查流程-责任部门领导任务下发";
|
String prcName = "政策征求意见流程";
|
||||||
QueryWrapper queryWrapper2 = new QueryWrapper();
|
QueryWrapper queryWrapper2 = new QueryWrapper();
|
||||||
queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
|
queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
|
||||||
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
|
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
|
||||||
if(one1!=null){
|
if(one1!=null){
|
||||||
// one1.setOverTime(OVERTIME);
|
// one1.setOverTime(OVERTIME);
|
||||||
one1.setPrcType("laws3");
|
one1.setPrcType("1");
|
||||||
one1.setPrcName(prcName);
|
one1.setPrcName(prcName);
|
||||||
one1.setCreatUser(user);
|
one1.setCreatUser(user);
|
||||||
one1.setCreatUserName(username);
|
one1.setCreatUserName(username);
|
||||||
@@ -90,21 +74,10 @@ public class SubViceDirectorAfter implements TaskListener {
|
|||||||
busProcessNew.setFinishFlag("0");
|
busProcessNew.setFinishFlag("0");
|
||||||
busProcessNew.setTaskInfo(delegateTask.getName());
|
busProcessNew.setTaskInfo(delegateTask.getName());
|
||||||
busBean.save(busProcessNew);
|
busBean.save(busProcessNew);
|
||||||
|
if (object.getString("lawsProveChiefVerify")=="0"){
|
||||||
if(nextUserList != null && !nextUserList.isEmpty()){
|
func2(delegateTask, busBean, object, "0", busProcessNameService);
|
||||||
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){
|
private String verifyObj(String str){
|
||||||
@@ -120,7 +93,7 @@ public class SubViceDirectorAfter implements TaskListener {
|
|||||||
if (one2 != null) {
|
if (one2 != null) {
|
||||||
//one2.setPrcName("入库流程结束");
|
//one2.setPrcName("入库流程结束");
|
||||||
one2.setOverTime(OVERTIME);
|
one2.setOverTime(OVERTIME);
|
||||||
one2.setPrcType("laws3");
|
one2.setPrcType("laws2");
|
||||||
busProcessNameService.saveOrUpdate(one2);
|
busProcessNameService.saveOrUpdate(one2);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -0,0 +1,37 @@
|
|||||||
|
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);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
+39
@@ -0,0 +1,39 @@
|
|||||||
|
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);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
+37
@@ -0,0 +1,37 @@
|
|||||||
|
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);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
+37
@@ -0,0 +1,37 @@
|
|||||||
|
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);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
+5
-5
@@ -40,12 +40,12 @@ public class EngineerRevisionAfter implements TaskListener {
|
|||||||
|
|
||||||
JSONObject form = JSONObject.parseObject(object.getString("form"));
|
JSONObject form = JSONObject.parseObject(object.getString("form"));
|
||||||
String lawsProveMinister = JSONObject.parseObject(form.getString("form")).getString("lawsProveMinisterId");
|
String lawsProveMinister = JSONObject.parseObject(form.getString("form")).getString("lawsProveMinisterId");
|
||||||
if(StringUtils.isNotBlank(lawsProveMinister)){
|
if(StringUtils.isNotBlank(lawsProveMinister)){
|
||||||
|
|
||||||
delegateTask.setVariable("lawsProveMinisterId",lawsProveMinister);
|
delegateTask.setVariable("lawsProveMinisterId",lawsProveMinister);
|
||||||
nextUserList= Arrays.asList(lawsProveMinister.split(","));
|
nextUserList= Arrays.asList(lawsProveMinister.split(","));
|
||||||
delegateTask.addCandidateUsers(nextUserList);
|
delegateTask.addCandidateUsers(nextUserList);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
//截止时间 流程描述 创建人
|
//截止时间 流程描述 创建人
|
||||||
|
|||||||
@@ -0,0 +1,37 @@
|
|||||||
|
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);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,96 @@
|
|||||||
|
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;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,36 @@
|
|||||||
|
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);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
+37
@@ -0,0 +1,37 @@
|
|||||||
|
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);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
+39
@@ -0,0 +1,39 @@
|
|||||||
|
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;
|
||||||
|
/**
|
||||||
|
* 副总监审核
|
||||||
|
* @author 22501
|
||||||
|
*/
|
||||||
|
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);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user