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
2022-04-24 11:09:02 +08:00
parent 2b1dcc37bd 948ecd3988
commit cbb623eee3
4 changed files with 150 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/ydw/bat/wkflow/listener/NonConformanceRectification/UploadCommentBefore.java
+13 -13
View File
@@ -41,19 +41,19 @@ public class UploadCommentBefore implements TaskListener {
one1.setTaskInfo(delegateTask.getName());
// 干活节点流程
one1.setTaskStatus(2);
JSONObject object = JSONObject.parseObject(one1.getMesg());
JSONArray array = object.getJSONArray("responUserList");
String endTime = "";
if(array != null && !array.isEmpty()){
endTime = array.getJSONObject(0).getString("planCloseTime");
}
// 如果整改时间没有，默认流程发起日期+30天
if(StringUtils.isNotBlank(endTime)){
one1.setEndTime(Utils.interceptTime(endTime));
}else {
one1.setEndTime(Utils.interceptTime(Utils.addDay(30)));
}
// one1.setTaskStatus(2);
// JSONObject object = JSONObject.parseObject(one1.getMesg());
// JSONArray array = object.getJSONArray("responUserList");
// String endTime = "";
// if(array != null && !array.isEmpty()){
// endTime = array.getJSONObject(0).getString("planCloseTime");
// }
// // 如果整改时间没有，默认流程发起日期+30天
// if(StringUtils.isNotBlank(endTime)){
// one1.setEndTime(Utils.interceptTime(endTime));
// }else {
// one1.setEndTime(Utils.interceptTime(Utils.addDay(30)));
// }
oaService.sendTodoMq(one1);
}
}
src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep1After.java
+2
View File
@@ -39,6 +39,8 @@ public class ProcessStep1After implements TaskListener {
List<String> nextUserList = new ArrayList();
if ("1".equals(object.getString("passFlag"))){
delegateTask.setVariable("passFlag","1");
delegateTask.setVariable("createUser",delegateTask.getVariable("prcCreateUser",String.class));
nextUserList.add(delegateTask.getVariable("prcCreateUser",String.class));
}else {
if(delegateTask.getVariable("Step1",String.class).contains(",")){
nextUserList = new ArrayList<>(Arrays.asList(delegateTask.getVariable("Step1",String.class).split(",")));
src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep7After.java
+99
View File
@@ -0,0 +1,99 @@
package com.ydw.bat.wkflow.listener.aboliish;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName;
import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew;
import com.ydw.bat.wkflow.business_main.datas.entity.Datas;
import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNameService;
import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService;
import com.ydw.bat.wkflow.business_main.datas.service.IDatasService;
import com.ydw.bat.wkflow.util.SpringContextUtil;
import org.activiti.engine.delegate.DelegateTask;
import org.activiti.engine.delegate.TaskListener;
import org.apache.commons.lang.StringUtils;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
public class ProcessStep7After 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);
//根据流程id找到流程信息
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();
nextUserList.add(object.getString("dockUser"));
delegateTask.setVariable("bzfgLeaderId",object.getString("dockUser"));
delegateTask.setVariable("Step1",object.getString("countersigner"));
delegateTask.setVariable("Step4",object.getString("examine"));
delegateTask.setVariable("Step5",object.getString("approver"));
//截止时间 流程描述 创建人
String user = delegateTask.getVariable("prcCreateUser",String.class);
String username = delegateTask.getVariable("prcCreateUserName", String.class);
String prcName = "";
if(StringUtils.isNotBlank(object.getString("standName")) && StringUtils.isNotBlank(object.getString("entCategory"))){
prcName = object.getString("entCategory")+"-"+object.getString("standName") + "-企标废止";
}else {
prcName = "企标废止";
}
QueryWrapper queryWrapper2 = new QueryWrapper();
queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
if (one1 != null) {
one1.setPrcType("24");
one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
}
// 存储当前节点意见
if (null != object.getString("commentText")) {
BusProcessNew busProcessNews = new BusProcessNew();
busProcessNews.setMsgType("clause");
busProcessNews.setPId(delegateTask.getProcessInstanceId());
busProcessNews.setMesg(object.toJSONString());
busProcessNews.setTaskInfo(delegateTask.getTaskDefinitionKey());
busProcessNews.setFinishFlag("0");
busProcessNews.setTaskInfo(delegateTask.getName());
busProcessNews.setTaskId(delegateTask.getId());
busProcessNews.setUserId("start");
busProcessNews.setPrcName(prcName);
busProcessNews.setCommitText(object.getString("commentText"));
busBean.save(busProcessNews);
}
// 存储当前节点意见
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/aboliish/ProcessStep7Before.java
+36
View File
@@ -0,0 +1,36 @@
package com.ydw.bat.wkflow.listener.aboliish;
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 ProcessStep7Before 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("qbfzStep7?prcType=24");
one1.setTaskInfo(delegateTask.getName());
oaService.sendTodoMq(one1);
}
}
}