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

fix: 外部署名推荐审批流程修改

Browse Source
This commit is contained in:
wxyclub
2024-04-28 11:26:36 +08:00
parent 4c52247cc9
commit 3608c1e5e2
4 changed files with 29 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAAuditAfter.java
+3 -2
View File
@@ -31,6 +31,7 @@ public class RAAuditAfter implements TaskListener {
Datas datas = datasService.getOne(queryWrapper); Datas datas = datasService.getOne(queryWrapper);
JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); JSONObject object = JSONObject.parseObject(datas.getFormValsJson());
JSONObject roleForm = object.getJSONObject("roleForm");
delegateTask.setVariable("objectJson", object); delegateTask.setVariable("objectJson", object);
List<String> nextUserList = new ArrayList(); List<String> nextUserList = new ArrayList();
@@ -46,8 +47,8 @@ public class RAAuditAfter implements TaskListener {
} }
//截止时间 流程描述 创建人 //截止时间 流程描述 创建人
String user = object.getString("prcCreateUser"); String user = roleForm.getString("prcCreateUser");
String username = object.getString("prcCreateUserName"); String username = roleForm.getString("prcCreateUserName");
delegateTask.setVariable("prcCreateUser", user); delegateTask.setVariable("prcCreateUser", user);
delegateTask.setVariable("prcCreateUserName", username); delegateTask.setVariable("prcCreateUserName", username);
String prcName=""; String prcName="";
src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAModifyInformationAfter.java
+17 -7
View File
@@ -12,6 +12,7 @@ import com.ydw.bat.wkflow.util.SpringContextUtil;
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 java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays;
import java.util.List; import java.util.List;
public class RAModifyInformationAfter implements TaskListener { public class RAModifyInformationAfter implements TaskListener {
@@ -31,19 +32,27 @@ public class RAModifyInformationAfter implements TaskListener {
JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); JSONObject object = JSONObject.parseObject(datas.getFormValsJson());
delegateTask.setVariable("objectJson", object); delegateTask.setVariable("objectJson", object);
List<String> nextUserList = new ArrayList(); List<String> nextUserList = new ArrayList<>();
nextUserList.addAll(delegateTask.getVariable("leadershiplist",List.class));
//截止时间 流程描述 创建人 //截止时间 流程描述 创建人
String user = object.getString("prcCreateUser"); JSONObject roleForm = object.getJSONObject("roleForm");
String username = object.getString("prcCreateUserName"); String user = roleForm.getString("prcCreateUser");
String username = roleForm.getString("prcCreateUserName");
String dockUser = roleForm.getString("dockUser");
List<String> dockUserList = Arrays.asList(dockUser.split(","));
delegateTask.setVariable("prcCreateUser", user); delegateTask.setVariable("prcCreateUser", user);
delegateTask.setVariable("prcCreateUserName", username); delegateTask.setVariable("prcCreateUserName", username);
// 赋值
delegateTask.setVariable("leadershiplist", dockUserList);
delegateTask.setVariable("statuteminister1", roleForm.getString("ministerUser"));
delegateTask.setVariable("director1", roleForm.getString("directorUser"));
delegateTask.setVariable("dean1", roleForm.getString("president"));
delegateTask.setVariable("statuteengineer3", roleForm.getString("passUser"));
nextUserList.addAll(dockUserList);
String prcName = "外部署名推荐批准-署名领导会签"; String prcName = "外部署名推荐批准-署名领导会签";
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);
@@ -52,6 +61,7 @@ public class RAModifyInformationAfter implements TaskListener {
// one1.setPrcName(prcName); // one1.setPrcName(prcName);
one1.setCreatUser(user); one1.setCreatUser(user);
one1.setCreatUserName(username); one1.setCreatUserName(username);
one1.setMes(datas.getFormValsJson());
busProcessNameService.saveOrUpdate(one1); busProcessNameService.saveOrUpdate(one1);
} }
src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RASignAfter.java
+4 -3
View File
@@ -31,6 +31,7 @@ public class RASignAfter implements TaskListener {
Datas datas = datasService.getOne(queryWrapper); Datas datas = datasService.getOne(queryWrapper);
JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); JSONObject object = JSONObject.parseObject(datas.getFormValsJson());
JSONObject roleForm = object.getJSONObject("roleForm");
delegateTask.setVariable("objectJson", object); delegateTask.setVariable("objectJson", object);
List<String> nextUserList = new ArrayList(); List<String> nextUserList = new ArrayList();
@@ -46,8 +47,8 @@ public class RASignAfter implements TaskListener {
} }
//截止时间 流程描述 创建人 //截止时间 流程描述 创建人
String user = object.getString("prcCreateUser"); String user = roleForm.getString("prcCreateUser");
String username = object.getString("prcCreateUserName"); String username = roleForm.getString("prcCreateUserName");
delegateTask.setVariable("prcCreateUser", user); delegateTask.setVariable("prcCreateUser", user);
delegateTask.setVariable("prcCreateUserName", username); delegateTask.setVariable("prcCreateUserName", username);
String prcName=""; String prcName="";
@@ -58,7 +59,7 @@ public class RASignAfter implements TaskListener {
} }
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);
src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAValidationAfter.java
+5 -4
View File
@@ -32,9 +32,10 @@ public class RAValidationAfter implements TaskListener {
Datas datas = datasService.getOne(queryWrapper); Datas datas = datasService.getOne(queryWrapper);
JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); JSONObject object = JSONObject.parseObject(datas.getFormValsJson());
JSONObject roleForm = object.getJSONObject("roleForm");
delegateTask.setVariable("objectJson", object); delegateTask.setVariable("objectJson", object);
List<String> nextUserList = new ArrayList(); List<String> nextUserList = new ArrayList<>();
if(object.getString("signFlag").equals("1")) { if(object.getString("signFlag").equals("1")) {
delegateTask.setVariable("zrFlag", 1); delegateTask.setVariable("zrFlag", 1);
@@ -47,8 +48,8 @@ public class RAValidationAfter implements TaskListener {
} }
//截止时间 流程描述 创建人 //截止时间 流程描述 创建人
String user = object.getString("prcCreateUser"); String user = roleForm.getString("prcCreateUser");
String username = object.getString("prcCreateUserName"); String username = roleForm.getString("prcCreateUserName");
delegateTask.setVariable("prcCreateUser", user); delegateTask.setVariable("prcCreateUser", user);
delegateTask.setVariable("prcCreateUserName", username); delegateTask.setVariable("prcCreateUserName", username);
@@ -59,7 +60,7 @@ public class RAValidationAfter implements TaskListener {
prcName = "外部署名推荐批准-修改信息"; prcName = "外部署名推荐批准-修改信息";
} }
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);