diff --git a/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary4After.java b/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary4After.java index fcbf541f..ee4801a4 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary4After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary4After.java @@ -82,9 +82,7 @@ public class BussLibrary4After implements TaskListener{ busProcessNew.setMsgType("clause"); busProcessNew.setPId(delegateTask.getProcessInstanceId()); busProcessNew.setMesg(object.toJSONString()); - busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey()); busProcessNew.setFinishFlag("0"); - busProcessNew.setTaskInfo(delegateTask.getName()); busProcessNew.setUserId(object.getString("hzUserId")); busProcessNew.setPrcName(prcName); busBean.save(busProcessNew); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibraryC3After.java b/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibraryC3After.java index ceda5ba2..baedbd45 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibraryC3After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibraryC3After.java @@ -33,7 +33,7 @@ public class BussLibraryC3After implements TaskListener{ queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId()); Datas datas = datasService.getOne(queryWrapper); -// JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); + JSONObject objectNew = JSONObject.parseObject(datas.getFormValsJson()); // delegateTask.setVariable("objectJson",object); 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 user = object.getString("prcCreateUser"); - String username = object.getString("prcCreateUserName"); + String user = objectNew.getString("prcCreateUser"); + String username = objectNew.getString("prcCreateUserName"); // object.getString("standName") String standName = ""; String prcName = ""; - if(StringUtils.isNotBlank(object.getString("standName")) && StringUtils.isNotBlank(object.getString("standSort"))){ - prcName = object.getString("standSort")+"-"+object.getString("standName") + "-企标制修订"; + if(StringUtils.isNotBlank(objectNew.getString("standName")) && StringUtils.isNotBlank(objectNew.getString("standSort"))){ + prcName = objectNew.getString("standSort")+"-"+objectNew.getString("standName") + "-企标制修订"; }else { prcName = "企标制修订"; } @@ -80,14 +80,15 @@ public class BussLibraryC3After implements TaskListener{ } // 存储当前节点意见 + BusProcessNew busProcessNew = new BusProcessNew(); busProcessNew.setId(one.getId()); busProcessNew.setMsgType("clause"); busProcessNew.setPId(delegateTask.getProcessInstanceId()); - busProcessNew.setMesg(object.toJSONString()); + busProcessNew.setMesg(objectNew.toJSONString()); busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey()); busProcessNew.setTaskId(delegateTask.getId()); - busProcessNew.setCommitText(object.getString("commentText")); + busProcessNew.setCommitText(objectNew.getString("commentText")); busProcessNew.setFinishFlag("0"); busProcessNew.setTaskInfo(delegateTask.getName()); busBean.saveOrUpdate(busProcessNew); @@ -98,9 +99,7 @@ public class BussLibraryC3After implements TaskListener{ busProcessNewNext.setMsgType("clause"); busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); busProcessNewNext.setMesg(object.toJSONString()); - busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); busProcessNewNext.setFinishFlag("0"); - busProcessNewNext.setTaskInfo(delegateTask.getName()); busProcessNewNext.setUserId(nextUser); busProcessNewNext.setPrcName(prcName); busBean.save(busProcessNewNext); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussUtils.java b/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussUtils.java index b8ef5126..234ba155 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussUtils.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussUtils.java @@ -129,6 +129,7 @@ public class BussUtils { queryWrapper1.eq("TASK_ID", delegateTask.getId()); BusProcessNew one1 = busBean.getOne(queryWrapper1); if (one1 != null) { + one1.setTaskInfo(delegateTask.getName()); one1.setCommitFlag(commitFlag); one1.setCommitText(object.getString("commentText")); busBean.saveOrUpdate(one1);