feat: bug #52125
This commit is contained in:
@@ -33,7 +33,7 @@ public class BussLibraryC6After 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 BussLibraryC6After 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 = "企标制修订";
|
||||||
}
|
}
|
||||||
@@ -84,10 +84,9 @@ public class BussLibraryC6After implements TaskListener{
|
|||||||
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.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);
|
||||||
@@ -97,8 +96,7 @@ public class BussLibraryC6After implements TaskListener{
|
|||||||
BusProcessNew busProcessNewNext = new BusProcessNew();
|
BusProcessNew busProcessNewNext = new BusProcessNew();
|
||||||
busProcessNewNext.setMsgType("clause");
|
busProcessNewNext.setMsgType("clause");
|
||||||
busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
|
busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
|
||||||
busProcessNewNext.setMesg(object.toJSONString());
|
busProcessNewNext.setMesg(objectNew.toJSONString());
|
||||||
busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey());
|
|
||||||
busProcessNewNext.setFinishFlag("0");
|
busProcessNewNext.setFinishFlag("0");
|
||||||
busProcessNewNext.setTaskInfo(delegateTask.getName());
|
busProcessNewNext.setTaskInfo(delegateTask.getName());
|
||||||
busProcessNewNext.setUserId(nextUser);
|
busProcessNewNext.setUserId(nextUser);
|
||||||
@@ -106,8 +104,8 @@ public class BussLibraryC6After implements TaskListener{
|
|||||||
busBean.save(busProcessNewNext);
|
busBean.save(busProcessNewNext);
|
||||||
}
|
}
|
||||||
// 评分存储
|
// 评分存储
|
||||||
if(StringUtils.isBlank(object.getString("fsRejectStatus")) || object.getString("fsRejectStatus").equalsIgnoreCase("2")) {
|
if(StringUtils.isBlank(objectNew.getString("fsRejectStatus")) || objectNew.getString("fsRejectStatus").equalsIgnoreCase("2")) {
|
||||||
BussUtils.evalSave(delegateTask, object, prcName, delegateTask.getAssignee());
|
BussUtils.evalSave(delegateTask, objectNew, prcName, delegateTask.getAssignee());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user