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

bug: 政策课题入会流程修改

Browse Source
This commit is contained in:
wxyclub
2023-11-15 10:37:39 +08:00
parent 9a9f1fe7b2
commit d28a95e26f
5 changed files with 12 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PGREPresidentApprovalAfter.java
+3 -8
View File
@@ -46,10 +46,9 @@ public class PGREPresidentApprovalAfter implements TaskListener {
List<String> nextUserList = new ArrayList<>(); List<String> nextUserList = new ArrayList<>();
if (delegateTask.getVariable("approvalStatus",Boolean.class)) { if (object.getInteger("approvalOpinion") == 0) {
// 批准通过 // 批准通过
// delegateTask.setVariable("approvalOpinion", 0); delegateTask.setVariable("approvalOpinion", 0);
delegateTask.setVariable("approvalStatus", true);
LambdaQueryWrapper<BusProcessName> queryWrapper2 = new LambdaQueryWrapper<>(); LambdaQueryWrapper<BusProcessName> queryWrapper2 = new LambdaQueryWrapper<>();
queryWrapper2.eq(BusProcessName::getPrcId, delegateTask.getProcessInstanceId()); queryWrapper2.eq(BusProcessName::getPrcId, delegateTask.getProcessInstanceId());
BusProcessName one2 = busProcessNameService.getOne(queryWrapper2); BusProcessName one2 = busProcessNameService.getOne(queryWrapper2);
@@ -60,8 +59,7 @@ public class PGREPresidentApprovalAfter implements TaskListener {
} }
} else { } else {
// 批准驳回 // 批准驳回
// delegateTask.setVariable("approvalOpinion", 1); delegateTask.setVariable("approvalOpinion", 1);
delegateTask.setVariable("approvalStatus", false);
if (StringUtils.isNotBlank(object.getString("applyUserId"))) { if (StringUtils.isNotBlank(object.getString("applyUserId"))) {
delegateTask.setVariable("applyUserId", object.getString("applyUserId")); delegateTask.setVariable("applyUserId", object.getString("applyUserId"));
nextUserList.add(object.getString("applyUserId")); nextUserList.add(object.getString("applyUserId"));
@@ -101,10 +99,7 @@ public class PGREPresidentApprovalAfter implements TaskListener {
busProcessNewNext.setMsgType("clause"); busProcessNewNext.setMsgType("clause");
busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
busProcessNewNext.setMesg(object.toJSONString()); busProcessNewNext.setMesg(object.toJSONString());
// busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey());
busProcessNewNext.setFinishFlag("0"); busProcessNewNext.setFinishFlag("0");
// busProcessNewNext.setTaskInfo(delegateTask.getName());
busProcessNewNext.setTaskInfo("重新起草");
busProcessNewNext.setUserId(nextUser); busProcessNewNext.setUserId(nextUser);
busProcessNewNext.setPrcName(prcName); busProcessNewNext.setPrcName(prcName);
busBean.save(busProcessNewNext); busBean.save(busProcessNewNext);
src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PRGEInspectorApprovalAfter.java
+3 -8
View File
@@ -41,28 +41,23 @@ public class PRGEInspectorApprovalAfter implements TaskListener {
String username = delegateTask.getVariable("applyUserName", String.class); String username = delegateTask.getVariable("applyUserName", String.class);
String topicName = object.getString("topicName"); String topicName = object.getString("topicName");
String prcName= topicName + "-政策课题入会流程"; String prcName= topicName + "-政策课题入会流程";
String taskInfo = "";
List<String> nextUserList = new ArrayList<>(); List<String> nextUserList = new ArrayList<>();
if (delegateTask.getVariable("approvalStatus",Boolean.class)) { if (object.getInteger("approvalOpinion") == 0) {
// 审定通过 // 审定通过
// delegateTask.setVariable("approvalOpinion", 0); delegateTask.setVariable("approvalOpinion", 0);
delegateTask.setVariable("approvalStatus", true);
if (StringUtils.isNotBlank(object.getString("presidentId"))) { if (StringUtils.isNotBlank(object.getString("presidentId"))) {
delegateTask.setVariable("presidentId", object.getString("presidentId")); delegateTask.setVariable("presidentId", object.getString("presidentId"));
nextUserList.add(object.getString("presidentId")); nextUserList.add(object.getString("presidentId"));
taskInfo = "批准";
} else { } else {
throw new ActivitiException("1#2公司副总不存在,请配置相关人员"); throw new ActivitiException("1#2公司副总不存在,请配置相关人员");
} }
} else { } else {
// 审定驳回 // 审定驳回
delegateTask.setVariable("approvalOpinion", 1); delegateTask.setVariable("approvalOpinion", 1);
// delegateTask.setVariable("approvalStatus", false);
if (StringUtils.isNotBlank(object.getString("applyUserId"))){ if (StringUtils.isNotBlank(object.getString("applyUserId"))){
delegateTask.setVariable("applyUserId", object.getString("applyUserId")); delegateTask.setVariable("applyUserId", object.getString("applyUserId"));
nextUserList.add(object.getString("applyUserId")); nextUserList.add(object.getString("applyUserId"));
taskInfo = "重新起草";
} else { } else {
throw new ActivitiException("1#2起草人不存在,请配置相关人员"); throw new ActivitiException("1#2起草人不存在,请配置相关人员");
} }
@@ -93,7 +88,7 @@ public class PRGEInspectorApprovalAfter implements TaskListener {
busProcessNameService.saveOrUpdate(one1); busProcessNameService.saveOrUpdate(one1);
} }
if (!nextUserList.isEmpty() && delegateTask.getVariable("nrOfCompletedInstances", Integer.class) <= 1) { if (!nextUserList.isEmpty() && delegateTask.getVariable("nrOfCompletedInstances", Integer.class) == 0) {
for (String nextUser : nextUserList) { for (String nextUser : nextUserList) {
BusProcessNew busProcessNewNext = new BusProcessNew(); BusProcessNew busProcessNewNext = new BusProcessNew();
busProcessNewNext.setMsgType("clause"); busProcessNewNext.setMsgType("clause");
src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PRGEMinisterConfirmAfter.java
+4 -6
View File
@@ -48,10 +48,9 @@ public class PRGEMinisterConfirmAfter implements TaskListener {
List<String> nextUserList = new ArrayList<>(); List<String> nextUserList = new ArrayList<>();
if(delegateTask.getVariable("approvalStatus",Boolean.class)){ if(object.getInteger("approvalOpinion") == 0){
// 审核通过 // 审核通过
// delegateTask.setVariable("approvalOpinion", 0); delegateTask.setVariable("approvalOpinion", 0);
delegateTask.setVariable("approvalStatus",true);
if (StringUtils.isNotBlank(object.getString("inspectorId"))){ if (StringUtils.isNotBlank(object.getString("inspectorId"))){
List<String> inspectorIdList = Arrays.asList(object.getString("inspectorId").split(",")); List<String> inspectorIdList = Arrays.asList(object.getString("inspectorId").split(","));
delegateTask.setVariable("inspectorIdList",inspectorIdList); delegateTask.setVariable("inspectorIdList",inspectorIdList);
@@ -62,8 +61,7 @@ public class PRGEMinisterConfirmAfter implements TaskListener {
} }
}else{ }else{
// 审核驳回 // 审核驳回
// delegateTask.setVariable("approvalOpinion",1); delegateTask.setVariable("approvalOpinion",1);
delegateTask.setVariable("approvalOpinion",false);
if (StringUtils.isNotBlank(object.getString("applyUserId"))){ if (StringUtils.isNotBlank(object.getString("applyUserId"))){
delegateTask.setVariable("applyUserId", object.getString("applyUserId")); delegateTask.setVariable("applyUserId", object.getString("applyUserId"));
nextUserList.add(object.getString("applyUserId")); nextUserList.add(object.getString("applyUserId"));
@@ -99,7 +97,7 @@ public class PRGEMinisterConfirmAfter implements TaskListener {
busProcessNameService.saveOrUpdate(one1); busProcessNameService.saveOrUpdate(one1);
} }
if (!nextUserList.isEmpty() && delegateTask.getVariable("nrOfCompletedInstances", Integer.class) <= 1) { if (!nextUserList.isEmpty() && delegateTask.getVariable("nrOfCompletedInstances", Integer.class) ==0) {
for (String nextUser : nextUserList) { for (String nextUser : nextUserList) {
BusProcessNew busProcessNewNext = new BusProcessNew(); BusProcessNew busProcessNewNext = new BusProcessNew();
busProcessNewNext.setMsgType("clause"); busProcessNewNext.setMsgType("clause");
src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PRGEStartAfter.java
-1
View File
@@ -45,7 +45,6 @@ public class PRGEStartAfter implements TaskListener {
List<String> ministerIdList = Arrays.asList(object.getString("ministerId").split(",")); List<String> ministerIdList = Arrays.asList(object.getString("ministerId").split(","));
delegateTask.setVariable("ministerIdList",ministerIdList); delegateTask.setVariable("ministerIdList",ministerIdList);
nextUserList.addAll(ministerIdList); nextUserList.addAll(ministerIdList);
delegateTask.setVariable("approvalStatus",true);
} else { } else {
throw new ActivitiException("1#2法规认证部部长不存在,请配置相关人员"); throw new ActivitiException("1#2法规认证部部长不存在,请配置相关人员");
} }
src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/RevisionInformationAfter.java
+2 -2
View File
@@ -41,7 +41,7 @@ public class RevisionInformationAfter implements TaskListener {
List<String> nextUserList = new ArrayList<>(); List<String> nextUserList = new ArrayList<>();
if (StringUtils.isNotBlank(object.getString("ministerId"))) { if (StringUtils.isNotBlank(object.getString("ministerId"))) {
delegateTask.setVariable("approvalStatus", true); delegateTask.setVariable("approvalOpinion", 0);
List<String> ministerIdList = Arrays.asList(object.getString("ministerId").split(",")); List<String> ministerIdList = Arrays.asList(object.getString("ministerId").split(","));
delegateTask.setVariable("ministerIdList",ministerIdList); delegateTask.setVariable("ministerIdList",ministerIdList);
nextUserList.addAll(ministerIdList); nextUserList.addAll(ministerIdList);
@@ -52,7 +52,7 @@ public class RevisionInformationAfter implements TaskListener {
String user = delegateTask.getVariable("applyUserId", String.class); String user = delegateTask.getVariable("applyUserId", String.class);
String username = delegateTask.getVariable("applyUserName", String.class); String username = delegateTask.getVariable("applyUserName", String.class);
String topicName = object.getString("topicName"); String topicName = object.getString("topicName");
String prcName= topicName + "-政策课题组入会流程"; String prcName= topicName + "-政策课题入会流程";
QueryWrapper<BusProcessName> queryWrapper2 = new QueryWrapper<>(); QueryWrapper<BusProcessName> queryWrapper2 = new QueryWrapper<>();
queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());