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

feat: 标准入库流程提交

Browse Source
This commit is contained in:
super_liu
2021-06-22 18:08:36 +08:00
parent bb1504db56
commit b8ec9d4082
7 changed files with 205 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/ydw/bat/wkflow/listener/standardLibrary/ApplyApplicantAfter.java
+55 -36
View File
@@ -2,16 +2,23 @@ package com.ydw.bat.wkflow.listener.standardLibrary;
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;
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.BusProcessNew;
import com.ydw.bat.wkflow.business_main.datas.entity.Datas; 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.IBusProcessNameService;
import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService; 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.business_main.datas.service.IDatasService;
import com.ydw.bat.wkflow.util.SpringContextUtil; import com.ydw.bat.wkflow.util.SpringContextUtil;
import org.activiti.engine.ActivitiException;
import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.DelegateTask;
import org.activiti.engine.delegate.TaskListener; 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.Date;
import java.util.List;
/** /**
* 标准入库申请人修订后manager * 标准入库申请人修订后manager
@@ -28,44 +35,56 @@ public class ApplyApplicantAfter implements TaskListener{
Datas datas = datasService.getOne(queryWrapper); Datas datas = datasService.getOne(queryWrapper);
JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); JSONObject object = JSONObject.parseObject(datas.getFormValsJson());
delegateTask.setVariable("objectJson",object);
JSONObject array = object.getJSONObject("hqsqForm"); List<String> nextUserList = new ArrayList();
boolean flag = true;
if(array.getString("opinion").equals("1")){ // JSONObject array = object.getJSONObject("hqsqForm");
flag=false;
if(StringUtils.isNotBlank(object.getString("jlUserId"))){
delegateTask.setVariable("managerUserId",object.getString("jlUserId"));
nextUserList.add(object.getString("jlUserId"));
}else {
throw new ActivitiException("1#2经理人不存在,请配置相关人员");
}
//截止时间 流程描述 创建人
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 = "";
if(object.getString("standInData").equals("0")){
standName = "国内";
}else {
standName = "国外";
}
String prcName = standName+"-标准入库";
QueryWrapper queryWrapper2 = new QueryWrapper();
queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
if(one1!=null){
one1.setOverTime(OVERTIME);
one1.setPrcType("1");
one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
}
if(nextUserList != null && !nextUserList.isEmpty()){
for(String nextUser : nextUserList){
BusProcessNew busProcessNew = new BusProcessNew();
busProcessNew.setMsgType("clause");
busProcessNew.setPId(delegateTask.getProcessInstanceId());
busProcessNew.setMesg(object.toJSONString());
busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey());
busProcessNew.setFinishFlag("0");
busProcessNew.setTaskInfo(delegateTask.getName());
busProcessNew.setUserId(nextUser);
busBean.save(busProcessNew);
}
} }
// if(!flag){
delegateTask.setVariable("jlspFlag",1);
BusProcessNew busProcessNew = new BusProcessNew();
busProcessNew.setUserId(delegateTask.getVariable("fqr").toString());
busProcessNew.setPId(delegateTask.getProcessInstanceId());
busProcessNew.setFinishFlag("0");
busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey());
busProcessNew.setMsgType("10");
array.put("opinionTime",new Date());
busProcessNew.setMesg(object.toJSONString());
busBean.save(busProcessNew);
//
// QueryWrapper queryWrapper1 = new QueryWrapper();
// queryWrapper1.eq("TASK_ID",delegateTask.getId());
// BusProcessNew one1 = busBean.getOne(queryWrapper1);
// if(one1!=null){
// one1.setCommitFlag("1");
//// one1.setCommitText(array.getString("opinionContent"));
// busBean.saveOrUpdate(one1);
// }
// }else{
// delegateTask.setVariable("jlspFlag",0);
//
// QueryWrapper queryWrapper1 = new QueryWrapper();
// queryWrapper1.eq("TASK_ID",delegateTask.getId());
// BusProcessNew one1 = busBean.getOne(queryWrapper1);
// if(one1!=null){
// one1.setCommitFlag("0");
//// one1.setCommitText(array.getString("opinionContent"));
// busBean.saveOrUpdate(one1);
// }
// }
} }
} }
src/main/java/com/ydw/bat/wkflow/listener/standardLibrary/CountersignAfter.java
+89
View File
@@ -0,0 +1,89 @@
package com.ydw.bat.wkflow.listener.standardLibrary;
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.Date;
import java.util.List;
/**
* 标准入库申请人会签后manager
*/
public class CountersignAfter 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();
// JSONObject array = object.getJSONObject("hqsqForm");
if(StringUtils.isNotBlank(object.getString("jlUserId"))){
delegateTask.setVariable("managerUserId",object.getString("jlUserId"));
nextUserList.add(object.getString("jlUserId"));
}else {
throw new ActivitiException("1#2经理人不存在,请配置相关人员");
}
//截止时间 流程描述 创建人
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 = "";
if(object.getString("standInData").equals("0")){
standName = "国内";
}else {
standName = "国外";
}
String prcName = standName+"-标准入库";
QueryWrapper queryWrapper2 = new QueryWrapper();
queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
if(one1!=null){
one1.setOverTime(OVERTIME);
one1.setPrcType("1");
one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
}
if(nextUserList != null && !nextUserList.isEmpty()){
for(String nextUser : nextUserList){
BusProcessNew busProcessNew = new BusProcessNew();
busProcessNew.setMsgType("clause");
busProcessNew.setPId(delegateTask.getProcessInstanceId());
busProcessNew.setMesg(object.toJSONString());
busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey());
busProcessNew.setFinishFlag("0");
busProcessNew.setTaskInfo(delegateTask.getName());
busProcessNew.setUserId(nextUser);
busBean.save(busProcessNew);
}
}
}
}
src/main/java/com/ydw/bat/wkflow/listener/standardLibrary/CountersignBefore.java
+28
View File
@@ -0,0 +1,28 @@
package com.ydw.bat.wkflow.listener.standardLibrary;
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.util.SpringContextUtil;
import org.activiti.engine.delegate.DelegateTask;
import org.activiti.engine.delegate.TaskListener;
import java.util.List;
/**
* 标准入库会签前
*/
public class CountersignBefore implements TaskListener{
@Override
public void notify(DelegateTask delegateTask) {
IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
QueryWrapper queryWrapper1 = new QueryWrapper();
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);
}
}
}
src/main/java/com/ydw/bat/wkflow/listener/standardLibrary/ManagerApplicantAfter.java → src/main/java/com/ydw/bat/wkflow/listener/standardLibrary/ManagerApproveAfter.java
+2 -1
View File
@@ -18,7 +18,7 @@ import java.util.Date;
/** /**
* 经理人审批后 * 经理人审批后
*/ */
public class ManagerApplicantAfter implements TaskListener{ public class ManagerApproveAfter 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);
@@ -60,6 +60,7 @@ public class ManagerApplicantAfter implements TaskListener{
BusProcessNew one1 = busBean.getOne(queryWrapper1); BusProcessNew one1 = busBean.getOne(queryWrapper1);
if(one1!=null){ if(one1!=null){
one1.setCommitFlag(commitFlag); one1.setCommitFlag(commitFlag);
one1.setCommitText(object.getString("commentText"));
busBean.saveOrUpdate(one1); busBean.saveOrUpdate(one1);
} }
} }
src/main/java/com/ydw/bat/wkflow/listener/standardLibrary/ManagerApplicantBefore.java → src/main/java/com/ydw/bat/wkflow/listener/standardLibrary/ManagerApproveBefore.java
+1 -1
View File
@@ -15,7 +15,7 @@ import java.util.List;
/** /**
* 经理人审批前 * 经理人审批前
*/ */
public class ManagerApplicantBefore implements TaskListener{ public class ManagerApproveBefore implements TaskListener{
@Override @Override
public void notify(DelegateTask delegateTask) { public void notify(DelegateTask delegateTask) {
IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
src/main/java/com/ydw/bat/wkflow/listener/standardLibrary/SLApplicantAfter.java
+21 -9
View File
@@ -94,17 +94,29 @@ public class SLApplicantAfter implements TaskListener{
busProcessNameService.saveOrUpdate(one1); 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()){ if(nextUserList != null && !nextUserList.isEmpty()){
for(String nextUser : nextUserList){ for(String nextUser : nextUserList){
BusProcessNew busProcessNew = new BusProcessNew(); BusProcessNew busProcessNewNext = new BusProcessNew();
busProcessNew.setMsgType("clause"); busProcessNewNext.setMsgType("clause");
busProcessNew.setPId(delegateTask.getProcessInstanceId()); busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
busProcessNew.setMesg(object.toJSONString()); busProcessNewNext.setMesg(object.toJSONString());
busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey()); busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey());
busProcessNew.setFinishFlag("0"); busProcessNewNext.setFinishFlag("0");
busProcessNew.setTaskInfo(delegateTask.getName()); busProcessNewNext.setTaskInfo(delegateTask.getName());
busProcessNew.setUserId(nextUser); busProcessNewNext.setUserId(nextUser);
busBean.save(busProcessNew); busBean.save(busProcessNewNext);
} }
} }
} }
src/main/java/com/ydw/bat/wkflow/listener/standardLibrary/SLApplicantBefore.java
+9 -9
View File
@@ -20,15 +20,15 @@ public class SLApplicantBefore implements TaskListener{
@Override @Override
public void notify(DelegateTask delegateTask) { public void notify(DelegateTask delegateTask) {
IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); // IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
QueryWrapper queryWrapper1 = new QueryWrapper(); // QueryWrapper queryWrapper1 = new QueryWrapper();
queryWrapper1.isNull("TASK_ID"); // queryWrapper1.isNull("TASK_ID");
List<BusProcessNew> list = busBean.list(queryWrapper1); // List<BusProcessNew> list = busBean.list(queryWrapper1);
if(!list.isEmpty()){ // if(!list.isEmpty()){
BusProcessNew one1 = list.get(0); // BusProcessNew one1 = list.get(0);
one1.setTaskId(delegateTask.getId()); // one1.setTaskId(delegateTask.getId());
busBean.saveOrUpdate(one1); // busBean.saveOrUpdate(one1);
} // }
// //
// WkFlowSendEmail.sendEmailTodo(delegateTask,"会前申请流程"); // WkFlowSendEmail.sendEmailTodo(delegateTask,"会前申请流程");