This commit is contained in:
super_liu
2022-03-26 16:27:01 +08:00
parent 6b4e21edc3
commit ecce0ec1c9
@@ -33,7 +33,7 @@ public class BussLibraryC6After 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 BussLibraryC6After 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 = "企标制修订";
}
@@ -84,10 +84,9 @@ public class BussLibraryC6After implements TaskListener{
busProcessNew.setId(one.getId());
busProcessNew.setMsgType("clause");
busProcessNew.setPId(delegateTask.getProcessInstanceId());
busProcessNew.setMesg(object.toJSONString());
busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey());
busProcessNew.setMesg(objectNew.toJSONString());
busProcessNew.setTaskId(delegateTask.getId());
busProcessNew.setCommitText(object.getString("commentText"));
busProcessNew.setCommitText(objectNew.getString("commentText"));
busProcessNew.setFinishFlag("0");
busProcessNew.setTaskInfo(delegateTask.getName());
busBean.saveOrUpdate(busProcessNew);
@@ -97,8 +96,7 @@ public class BussLibraryC6After implements TaskListener{
BusProcessNew busProcessNewNext = new BusProcessNew();
busProcessNewNext.setMsgType("clause");
busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
busProcessNewNext.setMesg(object.toJSONString());
busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey());
busProcessNewNext.setMesg(objectNew.toJSONString());
busProcessNewNext.setFinishFlag("0");
busProcessNewNext.setTaskInfo(delegateTask.getName());
busProcessNewNext.setUserId(nextUser);
@@ -106,8 +104,8 @@ public class BussLibraryC6After implements TaskListener{
busBean.save(busProcessNewNext);
}
// 评分存储
if(StringUtils.isBlank(object.getString("fsRejectStatus")) || object.getString("fsRejectStatus").equalsIgnoreCase("2")) {
BussUtils.evalSave(delegateTask, object, prcName, delegateTask.getAssignee());
if(StringUtils.isBlank(objectNew.getString("fsRejectStatus")) || objectNew.getString("fsRejectStatus").equalsIgnoreCase("2")) {
BussUtils.evalSave(delegateTask, objectNew, prcName, delegateTask.getAssignee());
}
}
}