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:
yuezhihang
2022-02-14 15:09:55 +08:00
parent f2364f4502
commit 8ed8c15496
3 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/PEPstartAfter.java
+1 -1
View File
@@ -80,7 +80,7 @@ public class PEPstartAfter implements TaskListener {
delegateTask.setVariable("prcCreateUser", user); delegateTask.setVariable("prcCreateUser", user);
delegateTask.setVariable("prcCreateUserName", username); delegateTask.setVariable("prcCreateUserName", username);
delegateTask.setVariable("stands",object.getString("standNumber")); delegateTask.setVariable("stands",object.getString("standNumber"));
String prcName = String.valueOf(object.getString("standNumber"))+"-标准项目合规评估流程-审核(标准法规业务经理)"; String prcName = String.valueOf(object.getString("standNumber"))+"-"+object.getString("standName")+"-合规评估";
QueryWrapper queryWrapper2 = new QueryWrapper(); QueryWrapper 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/projectEvaluationNewProcess/Step6After.java
+6 -2
View File
@@ -40,7 +40,7 @@ public class Step6After implements TaskListener {
delegateTask.setVariable("objectJson", object); delegateTask.setVariable("objectJson", object);
List<String> nextUserList=new ArrayList<>(); List<String> nextUserList=new ArrayList<>();
if (null!=delegateTask.getVariable("SDIdList")){ if (null!=delegateTask.getVariable("SDIdList") && "0".equals(object.getString("passFlag"))){
nextUserList=delegateTask.getVariable("SDIdList",List.class); nextUserList=delegateTask.getVariable("SDIdList",List.class);
} }
Map<String,JSONObject> map=new HashMap<>(); Map<String,JSONObject> map=new HashMap<>();
@@ -77,12 +77,16 @@ public class Step6After implements TaskListener {
delegateTask.setVariable("passFlag","0"); delegateTask.setVariable("passFlag","0");
delegateTask.setVariable("res6",map); delegateTask.setVariable("res6",map);
}else { }else {
if (null == delegateTask.getVariable("count6")) {
delegateTask.setVariable("count6", 0);
}
nextUserList.add(s[1]); nextUserList.add(s[1]);
delegateTask.setVariable("passFlag","1"); delegateTask.setVariable("passFlag","1");
} }
//截止时间 流程描述 创建人 //截止时间 流程描述 创建人
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);
String prcName = delegateTask.getVariable("stands",String.class)+"-标准项目合规评估-审定（项目群负责人）"; String prcName = delegateTask.getVariable("stands",String.class)+"-标准项目合规评估-审定（项目群负责人）";
src/main/java/com/ydw/bat/wkflow/listener/standardRegulatoryProcess/SRPstartAfter.java
+1 -6
View File
@@ -91,12 +91,7 @@ public class SRPstartAfter implements TaskListener {
delegateTask.setVariable("createUserName",username); delegateTask.setVariable("createUserName",username);
String standName = object.getString("listName"); String standName = object.getString("listName");
delegateTask.setVariable("listName",standName); delegateTask.setVariable("listName",standName);
String prcName=""; String prcName=object.getString("listName")+"-清单确认";
if(object.getString("signFlag").equals("1")) {
prcName = standName + "-标准法规清单申请-会签";
}else {
prcName = standName + "-标准法规清单申请-经理审批";
}
QueryWrapper queryWrapper2 = new QueryWrapper(); QueryWrapper 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);