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

。

Browse Source
This commit is contained in:
liao
2021-10-27 17:48:22 +08:00
parent 1436a42e9d
commit fe4913a9c1
16 changed files with 20 additions and 252 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/ydw/bat/wkflow/listener/JoinStandardFiling/JSFApproveAfter.java
+1 -1
View File
@@ -36,7 +36,7 @@ public class JSFApproveAfter implements TaskListener {
JSONObject object = JSONObject.parseObject(datas.getFormValsJson());
delegateTask.setVariable("objectJson", object);
String approvalOpinion = object.get("approvalOpinion") == null ? "" : object.get("approvalOpinion").toString();
String approvalOpinion = object.get("bzFlag") == null ? "" : object.get("bzFlag").toString();
if ("1".equalsIgnoreCase(approvalOpinion)) {
delegateTask.setVariable("Standardizer2", object.getString("Standardizer2User"));
src/main/java/com/ydw/bat/wkflow/listener/JoinStandardFiling/JSFApproveBefore.java
+1 -1
View File
@@ -26,7 +26,7 @@ public class JSFApproveBefore implements TaskListener {
CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class);
// 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
one1.setLink("bzqdfbStep5?prcType=15");
one1.setLink("bzqdfbStep4?prcType=15");
one1.setTaskInfo(delegateTask.getName());
oaService.sendTodoMq(one1);
}
src/main/java/com/ydw/bat/wkflow/listener/JoinStandardFiling/JSFAuditAfter.java
+5 -12
View File
@@ -35,13 +35,6 @@ public class JSFAuditAfter implements TaskListener {
delegateTask.setVariable("objectJson", object);
List<String> nextUserList = new ArrayList();
// 赋值
delegateTask.setVariable("statuteminister", object.getString("statuteministerUser"));
nextUserList.add(object.getString("statuteministerUser"));
delegateTask.setVariable("Standardizer2", object.getString("Standardizer2User"));
nextUserList.add(object.getString("Standardizer2User"));
// 逻辑判断是否会签 signFlag
if(object.getString("signFlag").equals("1")) {
delegateTask.setVariable("gcsFlag", 1);
@@ -55,9 +48,9 @@ public class JSFAuditAfter implements TaskListener {
}
} else {
delegateTask.setVariable("gcsFlag", 2);
if (StringUtils.isNotBlank(object.getString("Standardizer2User"))) {
delegateTask.setVariable("Standardizer2", object.getString("Standardizer2User"));
nextUserList.add(object.getString("Standardizer2User"));
if (StringUtils.isNotBlank(object.getString("dockUser"))) {
delegateTask.setVariable("Standardizer2", object.getString("dockUser"));
nextUserList.add(object.getString("dockUser"));
}
}
@@ -70,9 +63,9 @@ public class JSFAuditAfter implements TaskListener {
delegateTask.setVariable("listName",standName);
String prcName="";
if(object.getString("signFlag").equals("1")) {
prcName = standName + "-加入标准化协会信息备案-批准";
prcName = "-加入标准化协会信息备案-批准";
}else {
prcName = standName + "-加入标准化协会信息备案-填写入会信息";
prcName = "-加入标准化协会信息备案-填写入会信息";
}
src/main/java/com/ydw/bat/wkflow/listener/JoinStandardFiling/JSFAuditBefore.java
+1 -1
View File
@@ -26,7 +26,7 @@ public class JSFAuditBefore implements TaskListener {
CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class);
// 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
one1.setLink("bzqdfbStep4?prcType=15");
one1.setLink("bzqdfbStep3?prcType=15");
one1.setTaskInfo(delegateTask.getName());
oaService.sendTodoMq(one1);
}
src/main/java/com/ydw/bat/wkflow/listener/JoinStandardFiling/JSFFillinformationAfter.java
+2 -3
View File
@@ -41,10 +41,9 @@ public class JSFFillinformationAfter implements TaskListener {
JSONObject object = JSONObject.parseObject(datas.getFormValsJson());
delegateTask.setVariable("objectJson", object);
String approvalOpinion = object.get("approvalOpinion") == null ? "" : object.get("approvalOpinion").toString();
String approvalOpinion = object.get("dlFlag") == null ? "" : object.get("dlFlag").toString();
if ("1".equalsIgnoreCase(approvalOpinion)) {
delegateTask.setVariable("statuteengineer", object.getString("statuteengineerUser"));
BusProcessNew busProcessNew = new BusProcessNew();
busProcessNew.setMsgType("clause");
@@ -53,7 +52,7 @@ public class JSFFillinformationAfter implements TaskListener {
busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey());
busProcessNew.setFinishFlag("0");
busProcessNew.setTaskInfo(delegateTask.getName());
busProcessNew.setUserId(object.getString("statuteengineerUser"));
busProcessNew.setUserId(object.getString("passUser"));
busProcessNew.setPrcName(delegateTask.getVariable("prcs",String.class));
busBean.save(busProcessNew);
src/main/java/com/ydw/bat/wkflow/listener/JoinStandardFiling/JSFFillinformationBefore.java
+1 -1
View File
@@ -26,7 +26,7 @@ public class JSFFillinformationBefore implements TaskListener {
CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class);
// 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
one1.setLink("bzqdfbStep3?prcType=15");
one1.setLink("bzqdfbStep2?prcType=15");
one1.setTaskInfo(delegateTask.getName());
oaService.sendTodoMq(one1);
}
src/main/java/com/ydw/bat/wkflow/listener/JoinStandardFiling/JSFIssuedAfter.java
-78
View File
@@ -1,78 +0,0 @@
package com.ydw.bat.wkflow.listener.JoinStandardFiling;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName;
import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew;
import com.ydw.bat.wkflow.business_main.datas.entity.Datas;
import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNameService;
import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService;
import com.ydw.bat.wkflow.business_main.datas.service.IDatasService;
import com.ydw.bat.wkflow.util.SpringContextUtil;
import org.activiti.engine.delegate.DelegateTask;
import org.activiti.engine.delegate.TaskListener;
import java.util.ArrayList;
import java.util.List;
public class JSFIssuedAfter 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();
// 配置多实例
delegateTask.setVariable("Standardizer2list",nextUserList);
// 赋值署名领导
delegateTask.setVariable("Standardizer2", object.getString("sonUser"));
nextUserList.add(object.getString("sonUser"));
//截止时间 流程描述 创建人
String user = object.getString("prcCreateUser");
String username = object.getString("prcCreateUserName");
delegateTask.setVariable("prcCreateUser", user);
delegateTask.setVariable("prcCreateUserName", username);
String prcName = delegateTask.getVariable("listName", String.class) + "-加入标准化协会信息备案-填写入会信息";
QueryWrapper queryWrapper2 = new QueryWrapper();
queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
if (one1 != null) {
one1.setPrcType("15");
one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
}
if (nextUserList != null && !nextUserList.isEmpty()) {
for (String nextUser : nextUserList) {
BusProcessNew busProcessNewNext = new BusProcessNew();
busProcessNewNext.setMsgType("clause");
busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
busProcessNewNext.setMesg(object.toJSONString());
busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey());
busProcessNewNext.setFinishFlag("0");
busProcessNewNext.setTaskInfo(delegateTask.getName());
busProcessNewNext.setUserId(nextUser);
busProcessNewNext.setPrcName(prcName);
busBean.save(busProcessNewNext);
}
}
}
}
src/main/java/com/ydw/bat/wkflow/listener/JoinStandardFiling/JSFIssuedBefore.java
-34
View File
@@ -1,34 +0,0 @@
package com.ydw.bat.wkflow.listener.JoinStandardFiling;
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 JSFIssuedBefore implements TaskListener {
@Override
public void notify(DelegateTask delegateTask) {
IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
QueryWrapper queryWrapper1 = new QueryWrapper();
queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());
queryWrapper1.eq("USER_ID",delegateTask.getAssignee());
queryWrapper1.isNull("TASK_ID");
List<BusProcessNew> list = busBean.list(queryWrapper1);
if(!list.isEmpty()){
BusProcessNew one1 = list.get(0);
one1.setTaskId(delegateTask.getId());
busBean.saveOrUpdate(one1);
CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class);
// 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
one1.setLink("bzqdfbStep2?prcType=15");
one1.setTaskInfo(delegateTask.getName());
oaService.sendTodoMq(one1);
}
}
}
src/main/java/com/ydw/bat/wkflow/listener/JoinStandardFiling/JSFstartAfter.java
+4 -3
View File
@@ -40,16 +40,17 @@ public class JSFstartAfter implements TaskListener {
}else {
nextUserList.add(ids);
}
// 配置多实例
delegateTask.setVariable("Standardizer1list",nextUserList);
// 配置多实例
delegateTask.setVariable("Standardizer2list",nextUserList);
delegateTask.setVariable("Standardizer2", object.getString("dockUser"));
//截止时间 流程描述 创建人
String user = object.getString("prcCreateUser");
String username = object.getString("prcCreateUserName");
delegateTask.setVariable("prcCreateUser", user);
delegateTask.setVariable("prcCreateUserName", username);
String prcName = "加入标准化协会信息备案-备案任务发起";
String prcName = "加入标准化协会信息备案-填写入会信息";
QueryWrapper queryWrapper2 = new QueryWrapper();
queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFApproveBefore.java
+1 -1
View File
@@ -26,7 +26,7 @@ public class PRFApproveBefore implements TaskListener {
CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class);
// 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
one1.setLink("bzqdfbStep7?prcType=14");
one1.setLink("bzqdfbStep6?prcType=14");
one1.setTaskInfo(delegateTask.getName());
oaService.sendTodoMq(one1);
}
src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFEngineerreviewBefore.java
+1 -1
View File
@@ -26,7 +26,7 @@ public class PRFEngineerreviewBefore implements TaskListener {
CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class);
// 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
one1.setLink("bzqdfbStep6?prcType=14");
one1.setLink("bzqdfbStep5?prcType=14");
one1.setTaskInfo(delegateTask.getName());
oaService.sendTodoMq(one1);
}
src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFFillinformationBefore.java
+1 -1
View File
@@ -26,7 +26,7 @@ public class PRFFillinformationBefore implements TaskListener {
CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class);
// 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
one1.setLink("bzqdfbStep4?prcType=14");
one1.setLink("bzqdfbStep3?prcType=14");
one1.setTaskInfo(delegateTask.getName());
oaService.sendTodoMq(one1);
}
src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFIssuedAfter.java
-79
View File
@@ -1,79 +0,0 @@
package com.ydw.bat.wkflow.listener.ParticipateRevisionFiling;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName;
import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew;
import com.ydw.bat.wkflow.business_main.datas.entity.Datas;
import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNameService;
import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService;
import com.ydw.bat.wkflow.business_main.datas.service.IDatasService;
import com.ydw.bat.wkflow.util.SpringContextUtil;
import org.activiti.engine.delegate.DelegateTask;
import org.activiti.engine.delegate.TaskListener;
import java.util.ArrayList;
import java.util.List;
public class PRFIssuedAfter 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();
// 配置多实例
delegateTask.setVariable("Buttpeople1list",nextUserList);
// 赋值
delegateTask.setVariable("Buttpeople1", object.getString("Buttpeople1User"));
nextUserList.add(object.getString("Buttpeople1User"));
//截止时间 流程描述 创建人
String user = object.getString("prcCreateUser");
String username = object.getString("prcCreateUserName");
delegateTask.setVariable("prcCreateUser", user);
delegateTask.setVariable("prcCreateUserName", username);
// delegateTask.setVariable("stId",object.getString("projectNumber"));
String prcName = delegateTask.getVariable("listName", String.class) + "-参与外部标准制修订备案-下发工程师";
QueryWrapper queryWrapper2 = new QueryWrapper();
queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
if(one1!=null){
one1.setPrcType("14");
one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
}
if (nextUserList != null && !nextUserList.isEmpty()) {
for (String nextUser : nextUserList) {
BusProcessNew busProcessNewNext = new BusProcessNew();
busProcessNewNext.setMsgType("clause");
busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
busProcessNewNext.setMesg(object.toJSONString());
busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey());
busProcessNewNext.setFinishFlag("0");
busProcessNewNext.setTaskInfo(delegateTask.getName());
busProcessNewNext.setUserId(nextUser);
busProcessNewNext.setPrcName(prcName);
busBean.save(busProcessNewNext);
}
}
}
}
src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFIssuedBefore.java
-34
View File
@@ -1,34 +0,0 @@
package com.ydw.bat.wkflow.listener.ParticipateRevisionFiling;
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 PRFIssuedBefore implements TaskListener {
@Override
public void notify(DelegateTask delegateTask) {
IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
QueryWrapper queryWrapper1 = new QueryWrapper();
queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());
queryWrapper1.eq("USER_ID",delegateTask.getAssignee());
queryWrapper1.isNull("TASK_ID");
List<BusProcessNew> list = busBean.list(queryWrapper1);
if(!list.isEmpty()){
BusProcessNew one1 = list.get(0);
one1.setTaskId(delegateTask.getId());
busBean.saveOrUpdate(one1);
CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class);
// 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
one1.setLink("bzqdfbStep2?prcType=14");
one1.setTaskInfo(delegateTask.getName());
oaService.sendTodoMq(one1);
}
}
}
src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFReviewdockBefore.java
+1 -1
View File
@@ -26,7 +26,7 @@ public class PRFReviewdockBefore implements TaskListener {
CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class);
// 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
one1.setLink("bzqdfbStep5?prcType=14");
one1.setLink("bzqdfbStep4?prcType=14");
one1.setTaskInfo(delegateTask.getName());
oaService.sendTodoMq(one1);
}
src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFUnderengineerBefore.java
+1 -1
View File
@@ -26,7 +26,7 @@ public class PRFUnderengineerBefore implements TaskListener {
CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class);
// 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
one1.setLink("bzqdfbStep3?prcType=14");
one1.setLink("bzqdfbStep2?prcType=14");
one1.setTaskInfo(delegateTask.getName());
oaService.sendTodoMq(one1);
}