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

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
super_liu
2022-03-22 17:42:52 +08:00
parent 78b0651f0c 2345efa428
commit a37918b7f2
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/ydw/bat/wkflow/listener/standardRead/ResolveAfter.java
+1
View File
@@ -62,6 +62,7 @@ public class ResolveAfter implements TaskListener{
//截止时间 流程描述 创建人 //截止时间 流程描述 创建人
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 = object.getString("applyUserId"); String user = object.getString("applyUserId");
delegateTask.setVariable("userId",user);
String username = object.getString("applyUserIdName"); String username = object.getString("applyUserIdName");
delegateTask.setVariable("createDate",new Date()); delegateTask.setVariable("createDate",new Date());
String title=object.getString("itemsNum1")+"-"+object.getString("itemsName1"); String title=object.getString("itemsNum1")+"-"+object.getString("itemsName1");
src/main/java/com/ydw/bat/wkflow/listener/standardRead/ZrApplayAfter.java
+8 -4
View File
@@ -44,10 +44,14 @@ public class ZrApplayAfter implements TaskListener{
if(object.getString("resolveFlag").equals("1")){ if(object.getString("resolveFlag").equals("1")){
delegateTask.setVariable("zrFlag",1); delegateTask.setVariable("zrFlag",1);
prcName=prcName+"-工程师审核"; prcName=prcName+"-工程师审核";
if(StringUtils.isNotBlank(object.getString("applyUserId"))){ // if(StringUtils.isNotBlank(object.getString("applyUserId"))){
delegateTask.setVariable("engineerUserId",object.getString("applyUserId")); // delegateTask.setVariable("engineerUserId",object.getString("applyUserId"));
nextUserList.add(object.getString("applyUserId")); // nextUserList.add(object.getString("applyUserId"));
} // }
// if(StringUtils.isNotBlank(object.getString("applyUserId"))){
delegateTask.setVariable("engineerUserId",delegateTask.getVariable("userId",String.class));
nextUserList.add(delegateTask.getVariable("userId",String.class));
// }
}else { }else {
prcName=prcName+"-填写解读分析"; prcName=prcName+"-填写解读分析";
delegateTask.setVariable("zrFlag",2); delegateTask.setVariable("zrFlag",2);