FT/foton-wkflow-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
super_liu
2021-12-15 21:44:49 +08:00
parent 11b7631d87 f8cdb28f09
commit b6217fb721
19 changed files with 155 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAModifyInformationAfter.java
+1 -2
View File
@@ -33,8 +33,7 @@ public class RAModifyInformationAfter implements TaskListener {
List<String> nextUserList = new ArrayList();
delegateTask.setVariable("leadership",delegateTask.getVariable("leadership1",String.class));
nextUserList.add(delegateTask.getVariable("leadership1",String.class));
nextUserList.addAll(delegateTask.getVariable("leadershiplist",List.class));
//截止时间 流程描述 创建人
src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step10Before.java
+6
View File
@@ -3,6 +3,7 @@ package com.ydw.bat.wkflow.listener.StandardCommentNewProcess;
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;
@@ -13,6 +14,7 @@ public class Step10Before 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());
@@ -22,6 +24,10 @@ public class Step10Before implements TaskListener {
one1.setTaskId(delegateTask.getId());
one1.setTaskInfo(delegateTask.getName());
busBean.saveOrUpdate(one1);
// 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
one1.setLink("bzzqyjStep9?prcType=3");
one1.setTaskInfo(delegateTask.getName());
oaService.sendTodoMq(one1);
}
}
}
src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step1Before.java
+8
View File
@@ -3,6 +3,7 @@ package com.ydw.bat.wkflow.listener.StandardCommentNewProcess;
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;
@@ -13,6 +14,7 @@ public class Step1Before 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());
@@ -22,6 +24,12 @@ public class Step1Before implements TaskListener {
one1.setTaskId(delegateTask.getId());
one1.setTaskInfo(delegateTask.getName());
busBean.saveOrUpdate(one1);
// 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
one1.setLink("bzzqyjStep2?prcType=3");
one1.setTaskInfo(delegateTask.getName());
oaService.sendTodoMq(one1);
}
}
}
src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step2Before.java
+8
View File
@@ -3,6 +3,7 @@ package com.ydw.bat.wkflow.listener.StandardCommentNewProcess;
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;
@@ -13,6 +14,7 @@ public class Step2Before 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());
@@ -22,6 +24,12 @@ public class Step2Before implements TaskListener {
one1.setTaskId(delegateTask.getId());
one1.setTaskInfo(delegateTask.getName());
busBean.saveOrUpdate(one1);
// 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
one1.setLink("bzzqyjStep3?prcType=3");
one1.setTaskInfo(delegateTask.getName());
oaService.sendTodoMq(one1);
}
}
}
src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step3Before.java
+7
View File
@@ -3,6 +3,7 @@ package com.ydw.bat.wkflow.listener.StandardCommentNewProcess;
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;
@@ -13,6 +14,7 @@ public class Step3Before 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());
@@ -22,6 +24,11 @@ public class Step3Before implements TaskListener {
one1.setTaskId(delegateTask.getId());
one1.setTaskInfo(delegateTask.getName());
busBean.saveOrUpdate(one1);
// 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
one1.setLink("bzzqyjStep4?prcType=3");
one1.setTaskInfo(delegateTask.getName());
oaService.sendTodoMq(one1);
}
}
}
src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step4Before.java
+7
View File
@@ -3,6 +3,7 @@ package com.ydw.bat.wkflow.listener.StandardCommentNewProcess;
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;
@@ -13,6 +14,7 @@ public class Step4Before 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());
@@ -22,6 +24,11 @@ public class Step4Before implements TaskListener {
one1.setTaskId(delegateTask.getId());
one1.setTaskInfo(delegateTask.getName());
busBean.saveOrUpdate(one1);
// 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
one1.setLink("bzzqyjStep4-1?prcType=3");
one1.setTaskInfo(delegateTask.getName());
oaService.sendTodoMq(one1);
}
}
}
src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step5Before.java
+8
View File
@@ -3,6 +3,7 @@ package com.ydw.bat.wkflow.listener.StandardCommentNewProcess;
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;
@@ -13,6 +14,7 @@ public class Step5Before 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());
@@ -22,6 +24,12 @@ public class Step5Before implements TaskListener {
one1.setTaskId(delegateTask.getId());
one1.setTaskInfo(delegateTask.getName());
busBean.saveOrUpdate(one1);
// 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
one1.setLink("bzzqyjStep4-1?prcType=3");
one1.setTaskInfo(delegateTask.getName());
oaService.sendTodoMq(one1);
}
}
}
src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step6Before.java
+7
View File
@@ -3,6 +3,7 @@ package com.ydw.bat.wkflow.listener.StandardCommentNewProcess;
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;
@@ -13,6 +14,7 @@ public class Step6Before 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());
@@ -22,6 +24,11 @@ public class Step6Before implements TaskListener {
one1.setTaskId(delegateTask.getId());
one1.setTaskInfo(delegateTask.getName());
busBean.saveOrUpdate(one1);
// 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
one1.setLink("bzzqyjStep5?prcType=3");
one1.setTaskInfo(delegateTask.getName());
oaService.sendTodoMq(one1);
}
}
}
src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step7Before.java
+7
View File
@@ -3,6 +3,7 @@ package com.ydw.bat.wkflow.listener.StandardCommentNewProcess;
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;
@@ -13,6 +14,7 @@ public class Step7Before 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());
@@ -22,6 +24,11 @@ public class Step7Before implements TaskListener {
one1.setTaskId(delegateTask.getId());
one1.setTaskInfo(delegateTask.getName());
busBean.saveOrUpdate(one1);
// 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
one1.setLink("bzzqyjStep6?prcType=3");
one1.setTaskInfo(delegateTask.getName());
oaService.sendTodoMq(one1);
}
}
}
src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step8Before.java
+8
View File
@@ -3,6 +3,7 @@ package com.ydw.bat.wkflow.listener.StandardCommentNewProcess;
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;
@@ -13,6 +14,7 @@ public class Step8Before 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());
@@ -22,6 +24,12 @@ public class Step8Before implements TaskListener {
one1.setTaskId(delegateTask.getId());
one1.setTaskInfo(delegateTask.getName());
busBean.saveOrUpdate(one1);
// 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
one1.setLink("bzzqyjStep7?prcType=3");
one1.setTaskInfo(delegateTask.getName());
oaService.sendTodoMq(one1);
}
}
}
src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step9Before.java
+6
View File
@@ -3,6 +3,7 @@ package com.ydw.bat.wkflow.listener.StandardCommentNewProcess;
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;
@@ -13,6 +14,7 @@ public class Step9Before 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());
@@ -22,6 +24,10 @@ public class Step9Before implements TaskListener {
one1.setTaskId(delegateTask.getId());
one1.setTaskInfo(delegateTask.getName());
busBean.saveOrUpdate(one1);
// 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
one1.setLink("bzzqyjStep8?prcType=3");
one1.setTaskInfo(delegateTask.getName());
oaService.sendTodoMq(one1);
}
}
}
src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/DirectorChooseAfter.java
+12
View File
@@ -15,7 +15,9 @@ import org.activiti.engine.ActivitiException;
import org.activiti.engine.delegate.DelegateTask;
import org.activiti.engine.delegate.TaskListener;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
/**
@@ -65,9 +67,15 @@ public class DirectorChooseAfter implements TaskListener {
}else {
delegateTask.setVariable("memberList",nextUserList);
}
delegateTask.setVariable("passFlag","0");
delegateTask.setVariable("memberCount",delegateTask.getVariable("memberList",List.class).size());
}
if (delegateTask.getVariable("memberList",List.class).size()==0){
delegateTask.setVariable("passFlag","1");
prcName = prcName + "流程结束";
}
// 存储当前节点意见
if (null != object.getString("commentText")) {
@@ -93,7 +101,11 @@ public class DirectorChooseAfter implements TaskListener {
QueryWrapper queryWrapper2 = new QueryWrapper();
queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
if (one1 != null) {
if ("1".equals(delegateTask.getVariable("passFlag"))){
one1.setOverTime(OVERTIME);
}
one1.setPrcType("21");
one1.setPrcName(prcName);
one1.setCreatUser(user);
src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/DirectorChooseAfter.java
+12 -3
View File
@@ -14,7 +14,9 @@ import org.activiti.engine.ActivitiException;
import org.activiti.engine.delegate.DelegateTask;
import org.activiti.engine.delegate.TaskListener;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
/**
@@ -45,7 +47,7 @@ public class DirectorChooseAfter implements TaskListener {
}
//全员不通过，检测条件 directorCount
Integer allCount = delegateTask.getVariable("directorList",List.class).size();;
Integer allCount = delegateTask.getVariable("directorList",List.class).size();
Integer count = 0;
if(null == delegateTask.getVariable("directorCount")){
delegateTask.setVariable("directorCount", count);
@@ -63,9 +65,13 @@ public class DirectorChooseAfter implements TaskListener {
}else {
delegateTask.setVariable("memberList",nextUserList);
}
delegateTask.setVariable("passFlag","0");
delegateTask.setVariable("memberCount",delegateTask.getVariable("memberList",List.class).size());
}
if (delegateTask.getVariable("memberList",List.class).size()==0){
delegateTask.setVariable("passFlag","1");
prcName = prcName + "流程结束";
}
// 存储当前节点意见
if (null != object.getString("commentText")) {
@@ -88,11 +94,14 @@ public class DirectorChooseAfter implements TaskListener {
String standName = object.getString("listName");
delegateTask.setVariable("listName", standName);
String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
QueryWrapper queryWrapper2 = new QueryWrapper();
queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
if (one1 != null) {
if ("1".equals(delegateTask.getVariable("passFlag"))){
one1.setOverTime(OVERTIME);
}
one1.setPrcType("20");
one1.setPrcName(prcName);
one1.setCreatUser(user);
src/main/java/com/ydw/bat/wkflow/listener/standardRead/DeptApplayAfter.java
+16 -11
View File
@@ -43,6 +43,19 @@ public class DeptApplayAfter implements TaskListener{
delegateTask.setVariable("objectJson", object);
List<String> nextUserList = new ArrayList();
String standName = "";
if (null == object.getString("standInData")){
standName = "未知";
}else {
if(object.getString("standInData").equals("INLAND")){
standName = "国内";
}else {
standName = "海外";
}
}
String prcName = standName+"-标准解读流程";
//部长进行审批（1：通过）
if (object.getString("gcApplyFlag").equals("1")) {
delegateTask.setVariable("bzFlag", 1);
@@ -108,24 +121,16 @@ public class DeptApplayAfter implements TaskListener{
lawsUserInfoService.sarStandItemsSaveBatch(sarStandItems);
lawsUserInfoService.SarInterpretationNationalStandardSaveBatch(standards);
prcName=prcName+"-流程结束";
} else {
delegateTask.setVariable("bzFlag", 2);
prcName=prcName+"-填写解读分析";
}
//截止时间 流程描述 创建人
String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
String user = object.getString("applyUserId");
String username = object.getString("applyUserIdName");
String standName = "";
if (null == object.getString("standInData")){
standName = "未知";
}else {
if(object.getString("standInData").equals("INLAND")){
standName = "国内";
}else {
standName = "海外";
}
}
String prcName = standName+"-标准解读流程";
QueryWrapper queryWrapper2 = new QueryWrapper();
queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
src/main/java/com/ydw/bat/wkflow/listener/standardRead/DeptZrAfter.java
+1 -1
View File
@@ -67,7 +67,7 @@ public class DeptZrAfter implements TaskListener{
standName = "海外";
}
}
String prcName = standName+"-标准解读流程";
String prcName = standName+"-标准解读流程-填写解读分析";
QueryWrapper queryWrapper2 = new QueryWrapper();
queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
src/main/java/com/ydw/bat/wkflow/listener/standardRead/EngineerApplayAfter.java
+21 -16
View File
@@ -36,22 +36,7 @@ public class EngineerApplayAfter implements TaskListener{
delegateTask.setVariable("objectJson", object);
List<String> nextUserList = new ArrayList();
//工程师是否要进行审核
if (object.getString("zrApplyFlag").equals("1")) {
delegateTask.setVariable("gcFlag", 1);
if (StringUtils.isNotBlank(object.getString("deptUserId"))) {
delegateTask.setVariable("deptUserId", object.getString("deptUserId"));
nextUserList.add(object.getString("deptUserId"));
}
} else {
delegateTask.setVariable("gcFlag", 2);
JSONObject object1=delegateTask.getVariable("zxUserId",JSONObject.class);
nextUserList.add(object1.getString("id"));
}
//截止时间 流程描述 创建人
String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
String user = object.getString("applyUserId");
String username = object.getString("applyUserIdName");
String standName = "";
if (null == object.getString("standInData")){
standName = "未知";
@@ -63,6 +48,26 @@ public class EngineerApplayAfter implements TaskListener{
}
}
String prcName = standName + "-标准解读流程";
//工程师是否要进行审核
if (object.getString("zrApplyFlag").equals("1")) {
delegateTask.setVariable("gcFlag", 1);
prcName=prcName+"-部长审批";
if (StringUtils.isNotBlank(object.getString("deptUserId"))) {
delegateTask.setVariable("deptUserId", object.getString("deptUserId"));
nextUserList.add(object.getString("deptUserId"));
}
} else {
prcName=prcName+"-填写解读分析";
delegateTask.setVariable("gcFlag", 2);
JSONObject object1=delegateTask.getVariable("zxUserId",JSONObject.class);
nextUserList.add(object1.getString("id"));
}
//截止时间 流程描述 创建人
String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
String user = object.getString("applyUserId");
String username = object.getString("applyUserIdName");
QueryWrapper queryWrapper2 = new QueryWrapper();
queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
src/main/java/com/ydw/bat/wkflow/listener/standardRead/ExpainAfter.java
+1 -1
View File
@@ -51,7 +51,7 @@ public class ExpainAfter implements TaskListener{
standName = "海外";
}
}
String prcName = standName+"-标准解读流程";
String prcName = standName+"-标准解读流程-责任人审核";
QueryWrapper queryWrapper2 = new QueryWrapper();
queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
src/main/java/com/ydw/bat/wkflow/listener/standardRead/ResolveAfter.java
+1 -1
View File
@@ -74,7 +74,7 @@ public class ResolveAfter implements TaskListener{
standName = "海外";
}
}
String prcName = standName+"-标准解读流程";
String prcName = standName+"-标准解读流程-选择执行人";
QueryWrapper queryWrapper2 = new QueryWrapper();
queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
src/main/java/com/ydw/bat/wkflow/listener/standardRead/ZrApplayAfter.java
+18 -16
View File
@@ -36,22 +36,6 @@ public class ZrApplayAfter implements TaskListener{
delegateTask.setVariable("objectJson",object);
List<String> nextUserList = new ArrayList();
//责任人是否要进行审核
if(object.getString("resolveFlag").equals("1")){
delegateTask.setVariable("zrFlag",1);
if(StringUtils.isNotBlank(object.getString("applyUserId"))){
delegateTask.setVariable("engineerUserId",object.getString("applyUserId"));
nextUserList.add(object.getString("applyUserId"));
}
}else {
delegateTask.setVariable("zrFlag",2);
JSONObject object1=JSONObject.parseObject(String.valueOf(delegateTask.getVariable("zxUserId")));
nextUserList.add(String.valueOf(object1.getString("id")));
}
//截止时间 流程描述 创建人
String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
String user = object.getString("applyUserId");
String username = object.getString("applyUserIdName");
String standName = "";
if (null == object.getString("standInData")){
standName = "未知";
@@ -63,6 +47,24 @@ public class ZrApplayAfter implements TaskListener{
}
}
String prcName = standName+"-标准解读流程";
//责任人是否要进行审核
if(object.getString("resolveFlag").equals("1")){
delegateTask.setVariable("zrFlag",1);
prcName=prcName+"-工程师审核";
if(StringUtils.isNotBlank(object.getString("applyUserId"))){
delegateTask.setVariable("engineerUserId",object.getString("applyUserId"));
nextUserList.add(object.getString("applyUserId"));
}
}else {
prcName=prcName+"-填写解读分析";
delegateTask.setVariable("zrFlag",2);
JSONObject object1=JSONObject.parseObject(String.valueOf(delegateTask.getVariable("zxUserId")));
nextUserList.add(String.valueOf(object1.getString("id")));
}
//截止时间 流程描述 创建人
String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
String user = object.getString("applyUserId");
String username = object.getString("applyUserIdName");
QueryWrapper queryWrapper2 = new QueryWrapper();
queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);