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

feat: bug #52117

Browse Source
This commit is contained in:
super_liu
2022-03-27 20:39:21 +08:00
parent c0a295d5ee
commit 792c1e1fe2
3 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary4After.java
-2
View File
@@ -82,9 +82,7 @@ public class BussLibrary4After implements TaskListener{
busProcessNew.setMsgType("clause"); busProcessNew.setMsgType("clause");
busProcessNew.setPId(delegateTask.getProcessInstanceId()); busProcessNew.setPId(delegateTask.getProcessInstanceId());
busProcessNew.setMesg(object.toJSONString()); busProcessNew.setMesg(object.toJSONString());
busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey());
busProcessNew.setFinishFlag("0"); busProcessNew.setFinishFlag("0");
busProcessNew.setTaskInfo(delegateTask.getName());
busProcessNew.setUserId(object.getString("hzUserId")); busProcessNew.setUserId(object.getString("hzUserId"));
busProcessNew.setPrcName(prcName); busProcessNew.setPrcName(prcName);
busBean.save(busProcessNew); busBean.save(busProcessNew);
src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibraryC3After.java
+8 -9
View File
@@ -33,7 +33,7 @@ public class BussLibraryC3After implements TaskListener{
queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId()); queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId());
Datas datas = datasService.getOne(queryWrapper); Datas datas = datasService.getOne(queryWrapper);
// JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); JSONObject objectNew = JSONObject.parseObject(datas.getFormValsJson());
// delegateTask.setVariable("objectJson",object); // delegateTask.setVariable("objectJson",object);
QueryWrapper queryWrapper1 = new QueryWrapper(); QueryWrapper queryWrapper1 = new QueryWrapper();
@@ -57,13 +57,13 @@ public class BussLibraryC3After 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("prcCreateUser"); String user = objectNew.getString("prcCreateUser");
String username = object.getString("prcCreateUserName"); String username = objectNew.getString("prcCreateUserName");
// object.getString("standName") // object.getString("standName")
String standName = ""; String standName = "";
String prcName = ""; String prcName = "";
if(StringUtils.isNotBlank(object.getString("standName")) && StringUtils.isNotBlank(object.getString("standSort"))){ if(StringUtils.isNotBlank(objectNew.getString("standName")) && StringUtils.isNotBlank(objectNew.getString("standSort"))){
prcName = object.getString("standSort")+"-"+object.getString("standName") + "-企标制修订"; prcName = objectNew.getString("standSort")+"-"+objectNew.getString("standName") + "-企标制修订";
}else { }else {
prcName = "企标制修订"; prcName = "企标制修订";
} }
@@ -80,14 +80,15 @@ public class BussLibraryC3After implements TaskListener{
} }
// 存储当前节点意见 // 存储当前节点意见
BusProcessNew busProcessNew = new BusProcessNew(); BusProcessNew busProcessNew = new BusProcessNew();
busProcessNew.setId(one.getId()); busProcessNew.setId(one.getId());
busProcessNew.setMsgType("clause"); busProcessNew.setMsgType("clause");
busProcessNew.setPId(delegateTask.getProcessInstanceId()); busProcessNew.setPId(delegateTask.getProcessInstanceId());
busProcessNew.setMesg(object.toJSONString()); busProcessNew.setMesg(objectNew.toJSONString());
busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey()); busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey());
busProcessNew.setTaskId(delegateTask.getId()); busProcessNew.setTaskId(delegateTask.getId());
busProcessNew.setCommitText(object.getString("commentText")); busProcessNew.setCommitText(objectNew.getString("commentText"));
busProcessNew.setFinishFlag("0"); busProcessNew.setFinishFlag("0");
busProcessNew.setTaskInfo(delegateTask.getName()); busProcessNew.setTaskInfo(delegateTask.getName());
busBean.saveOrUpdate(busProcessNew); busBean.saveOrUpdate(busProcessNew);
@@ -98,9 +99,7 @@ public class BussLibraryC3After 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.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/bussLibrary/BussUtils.java
+1
View File
@@ -129,6 +129,7 @@ public class BussUtils {
queryWrapper1.eq("TASK_ID", delegateTask.getId()); queryWrapper1.eq("TASK_ID", delegateTask.getId());
BusProcessNew one1 = busBean.getOne(queryWrapper1); BusProcessNew one1 = busBean.getOne(queryWrapper1);
if (one1 != null) { if (one1 != null) {
one1.setTaskInfo(delegateTask.getName());
one1.setCommitFlag(commitFlag); one1.setCommitFlag(commitFlag);
one1.setCommitText(object.getString("commentText")); one1.setCommitText(object.getString("commentText"));
busBean.saveOrUpdate(one1); busBean.saveOrUpdate(one1);