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:
gaojiabao
2023-06-08 11:46:23 +08:00
parent 5ec5ee0c03
commit 080bea86f3
3 changed files with 91 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/ydw/bat/wkflow/listener/lawsLibrary/LCLApplicantAfter.java
+27 -3
View File
@@ -35,8 +35,22 @@ public class LCLApplicantAfter implements TaskListener{
queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId());
Datas datas = datasService.getOne(queryWrapper);
JSONObject objectNew = JSONObject.parseObject(datas.getFormValsJson());
delegateTask.setVariable("objectJson",objectNew);
JSONObject objectNew = null;
if(datas != null){
objectNew = JSONObject.parseObject(datas.getFormValsJson());
delegateTask.setVariable("objectJson",objectNew);
}else {
QueryWrapper<BusProcessNew> queryWrapperPid = new QueryWrapper<>();
queryWrapperPid.eq("P_ID", delegateTask.getProcessInstanceId());
queryWrapperPid.like("PRC_NAME", "政策入库流程");
List<BusProcessNew> list = busBean.list(queryWrapperPid);
if(!list.isEmpty()) {
JSONObject jsonObject = JSONObject.parseObject(list.get(0).getMesg());
jsonObject.put("commentText","");
objectNew = jsonObject;
}
}
QueryWrapper queryWrapper1 = new QueryWrapper();
queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());
@@ -63,7 +77,17 @@ public class LCLApplicantAfter implements TaskListener{
String username = objectNew.getString("prcCreateUserName");
// object.getString("standName")
String standName = "";
String prcName = "政策入库流程";
Object lawsName = object.get("lawsName");
Object lawsNumber = object.get("lawsNumber");
String lawsInfoName = "";
if(lawsName != null && lawsNumber != null){
String name = lawsName.toString()+"-";
String number = lawsNumber.toString()+"-";
if(StringUtils.isNotBlank(name) && StringUtils.isNotBlank(number)){
lawsInfoName = number+name;
}
}
String prcName = lawsInfoName+"政策入库流程";
QueryWrapper queryWrapper2 = new QueryWrapper();
queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
src/main/java/com/ydw/bat/wkflow/listener/lawsLibrary/LLApplicantAfter.java
+11 -1
View File
@@ -79,7 +79,17 @@ public class LLApplicantAfter implements TaskListener{
String username = object.getString("prcCreateUserName");
// object.getString("standName")
String standName = "";
String prcName = "政策入库流程";
Object lawsName = object.get("lawsName");
Object lawsNumber = object.get("lawsNumber");
String lawsInfoName = "";
if(lawsName != null && lawsNumber != null){
String name = lawsName.toString()+"-";
String number = lawsNumber.toString()+"-";
if(StringUtils.isNotBlank(name) && StringUtils.isNotBlank(number)){
lawsInfoName = number+name;
}
}
String prcName = lawsInfoName+"政策入库流程";
QueryWrapper queryWrapper2 = new QueryWrapper();
queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
src/main/java/com/ydw/bat/wkflow/listener/lawsLibrary/LawsManagerApproveAfter.java
+53 -1
View File
@@ -12,9 +12,11 @@ import com.ydw.bat.wkflow.listener.bussLibrary.BussUtils;
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.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
/**
* 经理人审批后
@@ -33,9 +35,36 @@ public class LawsManagerApproveAfter implements TaskListener {
JSONObject object = JSONObject.parseObject(datas.getFormValsJson());
String approvalOpinion = object.get("approvalOpinion") == null ? "" : object.get("approvalOpinion").toString();
String prcName = "政策入库流程";
Object lawsName = object.get("lawsName");
Object lawsNumber = object.get("lawsNumber");
String lawsInfoName = "";
if(lawsName != null && lawsNumber != null){
String name = lawsName.toString()+"-";
String number = lawsNumber.toString()+"-";
if(StringUtils.isNotBlank(name) && StringUtils.isNotBlank(number)){
lawsInfoName = number+name;
}
}
String prcName = lawsInfoName+"政策入库流程";
//截止时间 流程描述 创建人
String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
String user = delegateTask.getVariable("prcCreateUser", String.class);
String username = delegateTask.getVariable("prcCreateUserName", String.class);
if ("1".equalsIgnoreCase(approvalOpinion)) {
//截止时间 流程描述 创建人
QueryWrapper queryWrapper2 = new QueryWrapper();
queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
if (one1 != null) {
one1.setOverTime(OVERTIME);
one1.setPrcType("laws1");
one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
}
BusProcessNew busProcessNew = new BusProcessNew();
busProcessNew.setMsgType("clause");
busProcessNew.setPId(delegateTask.getProcessInstanceId());
@@ -51,6 +80,29 @@ public class LawsManagerApproveAfter implements TaskListener {
delegateTask.setVariable("applyUserId", object.getString("applyUpdUserId"));
delegateTask.setVariable("jlFlag", 1);
} else {
//截止时间 流程描述 创建人
QueryWrapper queryWrapper2 = new QueryWrapper();
queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
if (one1 != null) {
one1.setOverTime(OVERTIME);
one1.setPrcType("laws1");
one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
}
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(object.getString("applyUpdUserId"));
busProcessNew.setPrcName(prcName);
busBean.save(busProcessNew);
delegateTask.setVariable("jlFlag", 0);
func2(delegateTask, busBean, object, "0", busProcessNameService);
}