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

add: 政策入库流程的驳回修改

Browse Source
This commit is contained in:
wxyclub
2023-10-13 09:53:55 +08:00
parent fffab0eae1
commit 9c80f74630
3 changed files with 56 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/ydw/bat/wkflow/listener/lawsLibrary/LCLApplicantAfter.java
+13 -13
View File
@@ -52,7 +52,7 @@ public class LCLApplicantAfter implements TaskListener{
} }
QueryWrapper queryWrapper1 = new QueryWrapper(); QueryWrapper<BusProcessNew> queryWrapper1 = new QueryWrapper<>();
queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId()); queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());
queryWrapper1.eq("USER_ID",delegateTask.getAssignee()); queryWrapper1.eq("USER_ID",delegateTask.getAssignee());
queryWrapper1.eq("TASK_ID",delegateTask.getId()); queryWrapper1.eq("TASK_ID",delegateTask.getId());
@@ -60,7 +60,7 @@ public class LCLApplicantAfter implements TaskListener{
if(!list.isEmpty()){ if(!list.isEmpty()){
BusProcessNew one = list.get(0); BusProcessNew one = list.get(0);
JSONObject object = JSONObject.parseObject(one.getMesg()); JSONObject object = JSONObject.parseObject(one.getMesg());
List<String> nextUserList = new ArrayList(); List<String> nextUserList = new ArrayList<>();
if(StringUtils.isNotBlank(objectNew.getString("jlUserId"))){ if(StringUtils.isNotBlank(objectNew.getString("jlUserId"))){
delegateTask.setVariable("managerUserId",objectNew.getString("jlUserId")); delegateTask.setVariable("managerUserId",objectNew.getString("jlUserId"));
@@ -78,17 +78,17 @@ public class LCLApplicantAfter implements TaskListener{
// object.getString("standName") // object.getString("standName")
String standName = ""; String standName = "";
Object lawsName = object.get("lawsName"); Object lawsName = object.get("lawsName");
Object lawsNumber = object.get("lawsNumber"); // Object lawsNumber = object.get("lawsNumber");
String lawsInfoName = ""; // String lawsInfoName = "";
if(lawsName != null && lawsNumber != null){ // if(lawsName != null && lawsNumber != null){
String name = lawsName.toString()+"-"; // String name = lawsName.toString()+"-";
String number = lawsNumber.toString()+"-"; // String number = lawsNumber.toString()+"-";
if(StringUtils.isNotBlank(name) && StringUtils.isNotBlank(number)){ // if(StringUtils.isNotBlank(name) && StringUtils.isNotBlank(number)){
lawsInfoName = number+name; // lawsInfoName = number+name;
} // }
} // }
String prcName = lawsInfoName+"政策入库流程"; String prcName = lawsName+"-政策入库流程";
QueryWrapper queryWrapper2 = new QueryWrapper(); QueryWrapper<BusProcessName> queryWrapper2 = new QueryWrapper<>();
queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId()); queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
if(one1!=null){ if(one1!=null){
src/main/java/com/ydw/bat/wkflow/listener/lawsLibrary/LCLApplicantBefore.java
+1 -1
View File
@@ -20,7 +20,7 @@ public class LCLApplicantBefore implements TaskListener{
IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class); CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class);
QueryWrapper queryWrapper1 = new QueryWrapper(); QueryWrapper<BusProcessNew> queryWrapper1 = new QueryWrapper<>();
queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId()); queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());
queryWrapper1.eq("USER_ID",delegateTask.getAssignee()); queryWrapper1.eq("USER_ID",delegateTask.getAssignee());
queryWrapper1.isNull("TASK_ID"); queryWrapper1.isNull("TASK_ID");
src/main/java/com/ydw/bat/wkflow/listener/lawsLibrary/LawsManagerApproveAfter.java
+42 -41
View File
@@ -36,34 +36,34 @@ public class LawsManagerApproveAfter implements TaskListener {
String approvalOpinion = object.get("approvalOpinion") == null ? "" : object.get("approvalOpinion").toString(); String approvalOpinion = object.get("approvalOpinion") == null ? "" : object.get("approvalOpinion").toString();
Object lawsName = object.get("lawsName"); Object lawsName = object.get("lawsName");
Object lawsNumber = object.get("lawsNumber"); // Object lawsNumber = object.get("lawsNumber");
String lawsInfoName = ""; // String lawsInfoName = "";
if(lawsName != null && lawsNumber != null){ // if(lawsName != null && lawsNumber != null){
String name = lawsName.toString()+"-"; // String name = lawsName.toString()+"-";
String number = lawsNumber.toString()+"-"; // String number = lawsNumber.toString()+"-";
if(StringUtils.isNotBlank(name) && StringUtils.isNotBlank(number)){ // if(StringUtils.isNotBlank(name) && StringUtils.isNotBlank(number)){
lawsInfoName = number+name; // lawsInfoName = number+name;
} // }
} // }
String prcName = lawsInfoName+"政策入库流程"; String prcName = lawsName+"-政策入库流程";
//截止时间 流程描述 创建人 //截止时间 流程描述 创建人
String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); // String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
String user = delegateTask.getVariable("prcCreateUser", String.class); // String user = delegateTask.getVariable("prcCreateUser", String.class);
String username = delegateTask.getVariable("prcCreateUserName", String.class); // String username = delegateTask.getVariable("prcCreateUserName", String.class);
// 驳回
if ("1".equalsIgnoreCase(approvalOpinion)) { if ("1".equalsIgnoreCase(approvalOpinion)) {
//截止时间 流程描述 创建人 // 流程描述 创建人
QueryWrapper queryWrapper2 = new QueryWrapper(); // QueryWrapper<BusProcessName> queryWrapper2 = new QueryWrapper<>();
queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); // queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); // BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
if (one1 != null) { // if (one1 != null) {
one1.setOverTime(OVERTIME); // one1.setPrcType("laws1");
one1.setPrcType("laws1"); // one1.setPrcName(prcName);
one1.setPrcName(prcName); // one1.setCreatUser(user);
one1.setCreatUser(user); // one1.setCreatUserName(username);
one1.setCreatUserName(username); // busProcessNameService.saveOrUpdate(one1);
busProcessNameService.saveOrUpdate(one1); // }
}
BusProcessNew busProcessNew = new BusProcessNew(); BusProcessNew busProcessNew = new BusProcessNew();
busProcessNew.setMsgType("clause"); busProcessNew.setMsgType("clause");
@@ -72,26 +72,27 @@ public class LawsManagerApproveAfter implements TaskListener {
busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey()); busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey());
busProcessNew.setFinishFlag("0"); busProcessNew.setFinishFlag("0");
busProcessNew.setTaskInfo(delegateTask.getName()); busProcessNew.setTaskInfo(delegateTask.getName());
busProcessNew.setUserId(object.getString("applyUpdUserId")); busProcessNew.setUserId(object.getString("jlUserId"));
busProcessNew.setPrcName(prcName); busProcessNew.setPrcName(prcName);
busBean.save(busProcessNew); busBean.save(busProcessNew);
BussUtils.approvalFunc1(delegateTask, busBean, object, prcName,"1"); func1(delegateTask, busBean, object, "1");
delegateTask.setVariable("applyUserId", object.getString("applyUpdUserId")); delegateTask.setVariable("applyUserId", object.getString("prcCreateUser"));
delegateTask.setVariable("jlFlag", 1); delegateTask.setVariable("jlFlag", 1);
} else { } else {
// 通过
//截止时间 流程描述 创建人 //截止时间 流程描述 创建人
QueryWrapper queryWrapper2 = new QueryWrapper(); QueryWrapper<BusProcessName> queryWrapper2 = new QueryWrapper<>();
queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
if (one1 != null) { // if (one1 != null) {
one1.setOverTime(OVERTIME); // one1.setOverTime(OVERTIME);
one1.setPrcType("laws1"); // one1.setPrcType("laws1");
one1.setPrcName(prcName); // one1.setPrcName(prcName);
one1.setCreatUser(user); // one1.setCreatUser(user);
one1.setCreatUserName(username); // one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1); // busProcessNameService.saveOrUpdate(one1);
} // }
BusProcessNew busProcessNew = new BusProcessNew(); BusProcessNew busProcessNew = new BusProcessNew();
busProcessNew.setMsgType("clause"); busProcessNew.setMsgType("clause");
@@ -100,7 +101,7 @@ public class LawsManagerApproveAfter implements TaskListener {
busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey()); busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey());
busProcessNew.setFinishFlag("0"); busProcessNew.setFinishFlag("0");
busProcessNew.setTaskInfo(delegateTask.getName()); busProcessNew.setTaskInfo(delegateTask.getName());
busProcessNew.setUserId(object.getString("applyUpdUserId")); busProcessNew.setUserId(object.getString("jlUserId"));
busProcessNew.setPrcName(prcName); busProcessNew.setPrcName(prcName);
busBean.save(busProcessNew); busBean.save(busProcessNew);
delegateTask.setVariable("jlFlag", 0); delegateTask.setVariable("jlFlag", 0);
@@ -109,7 +110,7 @@ public class LawsManagerApproveAfter implements TaskListener {
} }
private void func1(DelegateTask delegateTask, IBusProcessNewService busBean, JSONObject object, String commitFlag) { private void func1(DelegateTask delegateTask, IBusProcessNewService busBean, JSONObject object, String commitFlag) {
QueryWrapper queryWrapper1 = new QueryWrapper(); QueryWrapper<BusProcessNew> queryWrapper1 = new QueryWrapper<>();
queryWrapper1.eq("TASK_ID", delegateTask.getId()); queryWrapper1.eq("TASK_ID", delegateTask.getId());
BusProcessNew one1 = busBean.getOne(queryWrapper1); BusProcessNew one1 = busBean.getOne(queryWrapper1);
if (one1 != null) { if (one1 != null) {
@@ -120,7 +121,7 @@ public class LawsManagerApproveAfter implements TaskListener {
} }
private void func2(DelegateTask delegateTask, IBusProcessNewService busBean, JSONObject object, String commitFlag, IBusProcessNameService busProcessNameService) { private void func2(DelegateTask delegateTask, IBusProcessNewService busBean, JSONObject object, String commitFlag, IBusProcessNameService busProcessNameService) {
QueryWrapper queryWrapper2 = new QueryWrapper(); QueryWrapper<BusProcessName> queryWrapper2 = new QueryWrapper<>();
queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
BusProcessName one2 = busProcessNameService.getOne(queryWrapper2); BusProcessName one2 = busProcessNameService.getOne(queryWrapper2);
String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
@@ -131,7 +132,7 @@ public class LawsManagerApproveAfter implements TaskListener {
busProcessNameService.saveOrUpdate(one2); busProcessNameService.saveOrUpdate(one2);
} }
QueryWrapper queryWrapper1 = new QueryWrapper(); QueryWrapper<BusProcessNew> queryWrapper1 = new QueryWrapper<>();
queryWrapper1.eq("TASK_ID", delegateTask.getId()); queryWrapper1.eq("TASK_ID", delegateTask.getId());
BusProcessNew one1 = busBean.getOne(queryWrapper1); BusProcessNew one1 = busBean.getOne(queryWrapper1);
if (one1 != null) { if (one1 != null) {