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-26 18:06:14 +08:00
parent 6f5df46976
commit 88880a3f96
4 changed files with 21 additions and 15 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 -2
View File
@@ -41,7 +41,7 @@ public class PGREPresidentApprovalAfter implements TaskListener {
delegateTask.setVariable("objectJson", object); delegateTask.setVariable("objectJson", object);
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 = delegateTask.getVariable("topicName", String.class); String topicName = object.getString("topicName");
String prcName= topicName + "-政策课题入会流程"; String prcName= topicName + "-政策课题入会流程";
List<String> nextUserList = new ArrayList<>(); List<String> nextUserList = new ArrayList<>();
@@ -101,7 +101,8 @@ public class PGREPresidentApprovalAfter implements TaskListener {
busProcessNewNext.setMesg(object.toJSONString()); busProcessNewNext.setMesg(object.toJSONString());
// busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); // busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey());
busProcessNewNext.setFinishFlag("0"); busProcessNewNext.setFinishFlag("0");
busProcessNewNext.setTaskInfo(delegateTask.getName()); // 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
+6 -2
View File
@@ -39,8 +39,9 @@ public class PRGEInspectorApprovalAfter 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 = delegateTask.getVariable("topicName", String.class); String topicName = object.getString("topicName");
String prcName= topicName + "-政策课题入会流程"; String prcName= topicName + "-政策课题入会流程";
String taskInfo = "";
List<String> nextUserList = new ArrayList<>(); List<String> nextUserList = new ArrayList<>();
if (object.getInteger("approvalOpinion") == 0) { if (object.getInteger("approvalOpinion") == 0) {
@@ -49,6 +50,7 @@ public class PRGEInspectorApprovalAfter implements TaskListener {
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公司副总不存在,请配置相关人员");
} }
@@ -58,6 +60,7 @@ public class PRGEInspectorApprovalAfter implements TaskListener {
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起草人不存在,请配置相关人员");
} }
@@ -96,7 +99,8 @@ public class PRGEInspectorApprovalAfter implements TaskListener {
busProcessNewNext.setMesg(object.toJSONString()); busProcessNewNext.setMesg(object.toJSONString());
// busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); // busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey());
busProcessNewNext.setFinishFlag("0"); busProcessNewNext.setFinishFlag("0");
busProcessNewNext.setTaskInfo(delegateTask.getName()); // busProcessNewNext.setTaskInfo(delegateTask.getName());
busProcessNewNext.setTaskInfo(taskInfo);
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/PRGEMinisterConfirmAfter.java
+9 -6
View File
@@ -42,8 +42,9 @@ public class PRGEMinisterConfirmAfter 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 = delegateTask.getVariable("topicName", String.class); String topicName = object.getString("topicName");
String prcName= topicName + "-政策课题组入会流程"; String prcName= topicName + "-政策课题组入会流程";
String taskInfo = "";
List<String> nextUserList = new ArrayList<>(); List<String> nextUserList = new ArrayList<>();
@@ -54,6 +55,7 @@ public class PRGEMinisterConfirmAfter implements TaskListener {
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);
nextUserList.addAll(inspectorIdList); nextUserList.addAll(inspectorIdList);
taskInfo = "审定";
} else { } else {
throw new ActivitiException("1#2法规认证部副总监不存在,请配置相关人员"); throw new ActivitiException("1#2法规认证部副总监不存在,请配置相关人员");
} }
@@ -63,11 +65,11 @@ public class PRGEMinisterConfirmAfter implements TaskListener {
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 {
throw new ActivitiException("1#2起草人不存在,请配置相关人员");
} }
// 删除其他该节点的代办数据
// LambdaQueryWrapper<BusProcessNew> wrapper = new LambdaQueryWrapper<>();
// wrapper.eq(BusProcessNew::getTaskId, delegateTask.getId());
// busBean.remove(wrapper);
} }
// 存储当前节点意见 // 存储当前节点意见
@@ -103,7 +105,8 @@ public class PRGEMinisterConfirmAfter implements TaskListener {
busProcessNewNext.setMesg(object.toJSONString()); busProcessNewNext.setMesg(object.toJSONString());
// busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); // busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey());
busProcessNewNext.setFinishFlag("0"); busProcessNewNext.setFinishFlag("0");
busProcessNewNext.setTaskInfo(delegateTask.getName()); // busProcessNewNext.setTaskInfo(delegateTask.getName());
busProcessNewNext.setTaskInfo(taskInfo);
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/PRGEStartAfter.java
+3 -5
View File
@@ -44,8 +44,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("ministerConfirm", object.getString("ministerId"));
// nextUserList.add(object.getString("ministerId"));
} else { } else {
throw new ActivitiException("1#2法规认证部部长不存在,请配置相关人员"); throw new ActivitiException("1#2法规认证部部长不存在,请配置相关人员");
} }
@@ -54,8 +52,7 @@ public class PRGEStartAfter implements TaskListener {
String user = object.getString("applyUserId"); String user = object.getString("applyUserId");
String username = object.getString("applyUserName"); String username = object.getString("applyUserName");
String topicName = object.getString("topicName"); String topicName = object.getString("topicName");
String prcName=""; String prcName = topicName + "-政策课题入会流程";
prcName = topicName + "-政策课题入会流程";
QueryWrapper<BusProcessName> queryWrapper2 = new QueryWrapper<>(); QueryWrapper<BusProcessName> queryWrapper2 = new QueryWrapper<>();
queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
@@ -92,7 +89,8 @@ public class PRGEStartAfter implements TaskListener {
busProcessNewNext.setMesg(object.toJSONString()); busProcessNewNext.setMesg(object.toJSONString());
// busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); // busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey());
busProcessNewNext.setFinishFlag("0"); busProcessNewNext.setFinishFlag("0");
busProcessNewNext.setTaskInfo(delegateTask.getName()); // busProcessNewNext.setTaskInfo(delegateTask.getName());
busProcessNewNext.setTaskInfo("审核");
busProcessNewNext.setUserId(nextUser); busProcessNewNext.setUserId(nextUser);
busProcessNewNext.setPrcName(prcName); busProcessNewNext.setPrcName(prcName);
busBean.save(busProcessNewNext); busBean.save(busProcessNewNext);