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:
yuezhihang
2021-11-18 10:21:12 +08:00
parent 9ffca259c1
commit a55f2834f5
15 changed files with 207 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAdlApproveAfter.java
-1
View File
@@ -68,7 +68,6 @@ public class PCAdlApproveAfter implements TaskListener {
sarStandUnqualified.setCloseState(1);
sarStandUnqualified.setCreateTime(new Date());
sarStandUnqualified.setProductName(res.getProjectName());
// sarStandUnqualified.setProductLine(res.getProductLine());
sarStandUnqualified.setResponsibleUnit(pcAdataList.getZrbm());
sarStandUnqualified.setProductType("research");
sarStandUnqualified.setReason(pcAdataList.getNoCompliance());
src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep1After.java
+9 -4
View File
@@ -39,10 +39,10 @@ public class ProcessStep1After implements TaskListener {
if ("1".equals(object.getString("passFlag"))){
delegateTask.setVariable("passFlag","1");
}else {
if (object.getString("workPeopleList").contains(",")){
nextUserList = new ArrayList<>(Arrays.asList(object.getString("workPeopleList").split(",")));
if(delegateTask.getVariable("Step1",String.class).contains(",")){
nextUserList = new ArrayList<>(Arrays.asList(delegateTask.getVariable("Step1",String.class).split(",")));
}else {
nextUserList.add(object.getString("workPeopleList"));
nextUserList.add(delegateTask.getVariable("Step1",String.class));
}
delegateTask.setVariable("workPeopleList",nextUserList);
delegateTask.setVariable("passFlag","0");
@@ -51,7 +51,12 @@ public class ProcessStep1After implements TaskListener {
//截止时间 流程描述 创建人
String user = delegateTask.getVariable("prcCreateUser",String.class);
String username = delegateTask.getVariable("prcCreateUserName", String.class);
String prcName = "企标复审流程-工作组成员标准复审";
String prcName = "";
if ("1".equals(object.getString("passFlag"))) {
prcName = "企标废止流程-流程结束";
}else {
prcName = "企标废止流程-会签";
}
QueryWrapper queryWrapper2 = new QueryWrapper();
queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep2After.java
+17 -5
View File
@@ -1,5 +1,6 @@
package com.ydw.bat.wkflow.listener.aboliish;
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.BusProcessName;
@@ -34,19 +35,27 @@ public class ProcessStep2After implements TaskListener {
Datas datas = datasService.getOne(queryWrapper);
JSONObject object = JSONObject.parseObject(datas.getFormValsJson());
delegateTask.setVariable("objectJson", object);
//标准法规部业务经理Id ${passFlag==1}
//标准法规部业务经理Id
List<String> nextUserList = new ArrayList();
if (null == delegateTask.getVariable("count")){
delegateTask.setVariable("count",delegateTask.getVariable("workPeopleList",List.class).size());
}
if (delegateTask.getVariable("count",Integer.class)==1){
//对数据进行处理 需要等到调试的时候才能编写 bzfgLeaderId
//对数据进行处理 现阶段是数据貌似是只需要人和意见就可以了！！！！
List<BusProcessNew> busProcessNews = busBean.findLastworkPeople2("企标复审流程-起草人修改标准状态",delegateTask.getProcessInstanceId());
List<String> stings=new ArrayList<>();
stings.add(object.getString("presentPeople")+"-"+object.getString("reviewComments"));
busProcessNews.forEach(busProcessNew -> {
JSONObject object1=JSONObject.parseObject(busProcessNew.getMesg());
stings.add(object1.getString("presentPeople")+"-"+object1.getString("reviewComments"));
});
object.put("res", JSONArray.toJSON(stings.toString()));
delegateTask.setVariable("count",delegateTask.getVariable("count",Integer.class)-1);
}else {
delegateTask.setVariable("count",delegateTask.getVariable("count",Integer.class)-1);
}
nextUserList.add(object.getString("qcId"));
delegateTask.setVariable("qcId",object.getString("qcId"));
nextUserList.add(delegateTask.getVariable("prcCreateUser",String.class));
delegateTask.setVariable("qcId",delegateTask.getVariable("prcCreateUser",String.class));
//截止时间 流程描述 创建人
String user = delegateTask.getVariable("prcCreateUser",String.class);
@@ -75,6 +84,9 @@ public class ProcessStep2After implements TaskListener {
busProcessNewNext.setTaskInfo(delegateTask.getName());
busProcessNewNext.setUserId(nextUser);
busProcessNewNext.setPrcName(prcName);
if (delegateTask.getVariable("count",Integer.class)!=0){
busProcessNewNext.setTaskId("6969696969696969");
}
busBean.save(busProcessNewNext);
}
}
src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep3After.java
+2 -2
View File
@@ -35,8 +35,8 @@ public class ProcessStep3After implements TaskListener {
delegateTask.setVariable("objectJson", object);
//标准法规部业务经理Id ${passFlag==1}
List<String> nextUserList = new ArrayList();
nextUserList.add(object.getString("bzfgLeaderId"));
delegateTask.setVariable("bzfgLeaderId",object.getString("bzfgLeaderId"));
nextUserList.add(delegateTask.getVariable("bzfgLeaderId",String.class));
delegateTask.setVariable("bzfgLeaderId1",delegateTask.getVariable("bzfgLeaderId",String.class));
//截止时间 流程描述 创建人
String user = delegateTask.getVariable("prcCreateUser",String.class);
src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep4After.java
+2 -2
View File
@@ -36,8 +36,8 @@ public class ProcessStep4After implements TaskListener {
//标准法规部业务经理Id ${passFlag==1}
List<String> nextUserList = new ArrayList();
if ("0".equals(object.getString("bzFlag"))){
nextUserList.add(object.getString("sdId"));
delegateTask.setVariable("sdId",object.getString("sdId"));
nextUserList.add(delegateTask.getVariable("Step4",String.class));
delegateTask.setVariable("sdId",delegateTask.getVariable("Step4",String.class));
delegateTask.setVariable("bzFlag","0");
}else {
delegateTask.setVariable("bzFlag","1");
src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep5After.java
+2 -2
View File
@@ -36,9 +36,9 @@ public class ProcessStep5After implements TaskListener {
//标准法规部业务经理Id ${sdFlag==0} bafzFlag
List<String> nextUserList = new ArrayList();
if ("0".equals(object.getString("sdFlag"))){
delegateTask.setVariable("bzfzId",object.getString("bzfzId"));
delegateTask.setVariable("bzfzId",delegateTask.getVariable("Step5",String.class));
delegateTask.setVariable("sdFlag","0");
nextUserList.add(delegateTask.getVariable("bzfzId",String.class));
nextUserList.add(delegateTask.getVariable("Step5",String.class));
}else {
delegateTask.setVariable("sdFlag","1");
nextUserList.add(delegateTask.getVariable("qcId",String.class));
src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep6After.java
+23 -3
View File
@@ -12,7 +12,9 @@ import com.ydw.bat.wkflow.util.SpringContextUtil;
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;
public class ProcessStep6After implements TaskListener {
@@ -35,10 +37,10 @@ public class ProcessStep6After implements TaskListener {
delegateTask.setVariable("objectJson", object);
//标准法规部业务经理Id ${sdFlag==0} bafzFlag
List<String> nextUserList = new ArrayList();
if ("0".equals(object.getString("sdFlag"))){
delegateTask.setVariable("sdFlag","0");
if ("0".equals(object.getString("bafzFlag"))){
delegateTask.setVariable("bafzFlag","0");
}else {
delegateTask.setVariable("sdFlag","1");
delegateTask.setVariable("bafzFlag","1");
nextUserList.add(delegateTask.getVariable("qcId",String.class));
}
@@ -51,10 +53,14 @@ public class ProcessStep6After implements TaskListener {
}else {
prcName = "企标复审流程-起草人修改标准状态";
}
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 ("0".equals(object.getString("bafzFlag"))){
one1.setOverTime(OVERTIME);
}
one1.setPrcType("24");
one1.setPrcName(prcName);
one1.setCreatUser(user);
@@ -62,6 +68,20 @@ public class ProcessStep6After implements TaskListener {
busProcessNameService.saveOrUpdate(one1);
}
// 存储当前节点意见1
if (null!=object.getString("commentText")) {
QueryWrapper queryWrapper3 = new QueryWrapper();
queryWrapper3.eq("TASK_ID", delegateTask.getId());
queryWrapper3.eq("USER_ID",delegateTask.getAssignee());
List<BusProcessNew> list = busBean.list(queryWrapper3);
if(!list.isEmpty()){
BusProcessNew busProcessNews = list.get(0);
busProcessNews.setTaskId(delegateTask.getId());
busProcessNews.setCommitText(object.getString("commentText"));
busBean.saveOrUpdate(busProcessNews);
}
}
// 存储当前节点意见
if (nextUserList != null && !nextUserList.isEmpty()) {
for (String nextUser : nextUserList) {
src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessstartAfter.java
+11 -3
View File
@@ -33,10 +33,18 @@ public class ProcessstartAfter implements TaskListener {
Datas datas = datasService.getOne(queryWrapper);
JSONObject object = JSONObject.parseObject(datas.getFormValsJson());
delegateTask.setVariable("objectJson", object);
//标准法规部业务经理Id
//标准法规部业务经理Id Ay:
//dockUser', '选择标准法规部部长
//countersigner" placeholder="选择会签人员
//examine', '选择审定责任人
//approver', '选择批准负责人
List<String> nextUserList = new ArrayList();
nextUserList.add(object.getString("bzfgLeaderId"));
delegateTask.setVariable("bzfgLeaderId",object.getString("bzfgLeaderId"));
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"));
//截止时间 流程描述 创建人
src/main/java/com/ydw/bat/wkflow/listener/enterpriseBidReviewProcess/ProcessStep3After.java
-23
View File
@@ -92,27 +92,4 @@ public class ProcessStep3After implements TaskListener {
}
private void func2(DelegateTask delegateTask, IBusProcessNewService busBean, JSONObject object,String commitFlag ,IBusProcessNameService busProcessNameService) {
QueryWrapper queryWrapper2 = new QueryWrapper();
queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
BusProcessName one2 = busProcessNameService.getOne(queryWrapper2);
String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
if(one2!=null){
one2.setOverTime(OVERTIME);
one2.setPrcType("23");
busProcessNameService.saveOrUpdate(one2);
}
QueryWrapper queryWrapper1 = new QueryWrapper();
queryWrapper1.eq("TASK_ID",delegateTask.getId());
BusProcessNew one1 = busBean.getOne(queryWrapper1);
if(one1!=null){
one1.setCommitFlag(commitFlag);
one1.setCommitText(object.getString("commentText"));
one1.setPrcName("流程结束");
busBean.saveOrUpdate(one1);
}
}
}
src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep1After.java
+3 -3
View File
@@ -37,10 +37,10 @@ public class ProcessStep1After implements TaskListener {
//标准法规部业务经理Id
List<String> nextUserList = new ArrayList();
if ("0".equals(object.getString("passFlag"))) {
if (object.getString("deptCenterId").contains(",")) {
nextUserList = new ArrayList<>(Arrays.asList(object.getString("deptCenterId").split(",")));
if (delegateTask.getVariable("Step1",String.class).contains(",")) {
nextUserList = new ArrayList<>(Arrays.asList(delegateTask.getVariable("Step1",String.class).split(",")));
} else {
nextUserList.add(object.getString("deptCenterId"));
nextUserList.add(delegateTask.getVariable("Step1",String.class));
}
delegateTask.setVariable("deptCenterId", nextUserList);
delegateTask.setVariable("deptLeaderFlag",0);
src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep2After.java
+14 -16
View File
@@ -39,26 +39,24 @@ public class ProcessStep2After implements TaskListener {
String prcName ="";
if (null == delegateTask.getVariable("deptCenterFlag")) {
delegateTask.setVariable("deptCenterFlag", object.getInteger("deptCenterFlag"));
delegateTask.setVariable("count",1);
} else {
delegateTask.setVariable("deptCenterFlag", object.getInteger("deptCenterFlag") & delegateTask.getVariable("deptCenterFlag", Integer.class));
delegateTask.setVariable("deptCenterFlag", object.getInteger("deptCenterFlag") + delegateTask.getVariable("deptCenterFlag", Integer.class));
delegateTask.setVariable("count",delegateTask.getVariable("count",Integer.class)+1);
}
delegateTask.setVariable("bzfgLeaderId", object.getString("bzfgLeaderId"));
if (delegateTask.getVariable("count", Integer.class) == 1) {
//合并前面数据中的意见 该部分需要在调试中进行编写
if ("0".equals(delegateTask.getVariable("deptCenterFlag"))){
nextUserList.add(object.getString("bzfgLeaderId"));
prcName="企标制修订计划-标准法规工作组组长审定";
}else {
nextUserList.add(delegateTask.getVariable("prcCreateUser",String.class));
delegateTask.setVariable("createUser",delegateTask.getVariable("prcCreateUser",String.class));
prcName="企标制修订计划整改";
}
} else {
delegateTask.setVariable("count", delegateTask.getVariable("count", Integer.class) - 1);
delegateTask.setVariable("bzfgLeaderId", delegateTask.getVariable("Step2",String.class));
//合并前面数据中的意见 该部分需要在调试中进行编写
if (delegateTask.getVariable("count",Integer.class)==delegateTask.getVariable("deptCenterId",List.class).size()) {
if ("0".equals(String.valueOf(delegateTask.getVariable("deptCenterFlag")))) {
nextUserList.add(delegateTask.getVariable("Step2", String.class));
prcName = "企标制修订计划-标准法规工作组组长审定";
} else {
nextUserList.add(delegateTask.getVariable("prcCreateUser", String.class));
delegateTask.setVariable("createUser", delegateTask.getVariable("prcCreateUser", String.class));
prcName = "企标制修订计划整改";
}
}
//截止时间 流程描述 创建人
String user = delegateTask.getVariable("prcCreateUser", String.class);
String username = delegateTask.getVariable("prcCreateUserName", String.class);
src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep3After.java
+2 -2
View File
@@ -39,9 +39,9 @@ public class ProcessStep3After implements TaskListener {
//根据意见选择 企标状态并对企标信息进行修改 bzfgId
if ("0".equals(object.getString("bzFlag"))){
prcName = "企标制修订计划-标准法规部部长审批";
nextUserList.add(object.getString("bzfgId"));
nextUserList.add(delegateTask.getVariable("Step3",String.class));
delegateTask.setVariable("bzFlag",0);
delegateTask.setVariable("bzfgId",object.getString("bzfgId"));
delegateTask.setVariable("bzfgId",delegateTask.getVariable("Step3",String.class));
}else {
prcName="企标制修订计划整改";
delegateTask.setVariable("bzFlag",1);
src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep5After.java
+82
View File
@@ -0,0 +1,82 @@
package com.ydw.bat.wkflow.listener.enterpriseStandardSystemRevisionPlan;
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 ProcessStep5After 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);
//标准法规部业务经理Id
List<String> nextUserList = new ArrayList();
String prcName = "";
//根据意见选择 企标状态并对企标信息进行修改 bzfgId
nextUserList.add(delegateTask.getVariable("topmanagerId",String.class));
//截止时间 流程描述 创建人
String user = delegateTask.getVariable("prcCreateUser",String.class);
String username = delegateTask.getVariable("prcCreateUserName", String.class);
QueryWrapper queryWrapper2 = new QueryWrapper();
queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
if (one1 != null) {
one1.setPrcType("25");
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);
}
}else {
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.setPrcName(prcName);
busBean.save(busProcessNewNext);
}
}
}
src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep5Before.java
+36
View File
@@ -0,0 +1,36 @@
package com.ydw.bat.wkflow.listener.enterpriseStandardSystemRevisionPlan;
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 ProcessStep5Before 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("xmpg2Step11?prcType=6");
one1.setTaskInfo(delegateTask.getName());
oaService.sendTodoMq(one1);
}
}
}
src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessstartAfter.java
+4 -1
View File
@@ -38,7 +38,10 @@ public class ProcessstartAfter implements TaskListener {
nextUserList.add(object.getString("dockUser"));
delegateTask.setVariable("topmanagerId",object.getString("dockUser"));
//存储后续需要的人员
delegateTask.setVariable("Step1",object.getString("countersigner"));
delegateTask.setVariable("Step2",object.getString("examine"));
delegateTask.setVariable("Step3",object.getString("approver"));
//截止时间 流程描述 创建人
String user = object.getString("prcCreateUser");