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

解读流程bug修复

Browse Source
This commit is contained in:
yuezhihang
2021-12-30 10:59:09 +08:00
parent 50e1d94dbf
commit 29d5dfdaea
4 changed files with 34 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/ydw/bat/wkflow/listener/standardRead/DeptApplayAfter.java
+10 -1
View File
@@ -124,10 +124,19 @@ public class DeptApplayAfter implements TaskListener{
lawsUserInfoService.sarStandItemsSaveBatch(sarStandItems); lawsUserInfoService.sarStandItemsSaveBatch(sarStandItems);
lawsUserInfoService.SarInterpretationNationalStandardSaveBatch(standards); lawsUserInfoService.SarInterpretationNationalStandardSaveBatch(standards);
prcName=prcName+"-流程结束"; prcName=prcName+"-流程结束";
if (null==delegateTask.getVariable("lastCount")){
delegateTask.setVariable("lastCount",1);
}else {
delegateTask.setVariable("lastCount",delegateTask.getVariable("lastCount",Integer.class)+1);
}
} else { } else {
delegateTask.setVariable("bzFlag", 2); delegateTask.setVariable("bzFlag", 2);
prcName=prcName+"-填写解读分析"; prcName=prcName+"-填写解读分析";
} }
//截止时间 流程描述 创建人 //截止时间 流程描述 创建人
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");
@@ -137,7 +146,7 @@ public class DeptApplayAfter implements TaskListener{
queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId()); queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
if(one1!=null){ if(one1!=null){
if (!object.getString("gcApplyFlag").equals("1")) { if (delegateTask.getVariable("lastCount",Integer.class)>=delegateTask.getVariable("zxUserList",List.class).size()) {
one1.setOverTime(OVERTIME); one1.setOverTime(OVERTIME);
} }
one1.setPrcType("9"); one1.setPrcType("9");
src/main/java/com/ydw/bat/wkflow/listener/standardRead/DeptZrAfter.java
+2 -16
View File
@@ -50,6 +50,7 @@ public class DeptZrAfter implements TaskListener{
JSONObject jsonObject = new JSONObject(); JSONObject jsonObject = new JSONObject();
jsonObject.put("id",str); jsonObject.put("id",str);
jsonObject.put("applyUserId",delegateTask.getAssignee()); jsonObject.put("applyUserId",delegateTask.getAssignee());
jsonObject.put("KEYS",str+delegateTask.getAssignee());
responUserList.add(jsonObject); responUserList.add(jsonObject);
} }
delegateTask.setVariable("zxUserList",responUserList); delegateTask.setVariable("zxUserList",responUserList);
@@ -73,7 +74,6 @@ public class DeptZrAfter implements TaskListener{
queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId()); queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
if(one1!=null){ if(one1!=null){
// one1.setOverTime(OVERTIME);
one1.setPrcType("9"); one1.setPrcType("9");
one1.setPrcName(prcName); one1.setPrcName(prcName);
one1.setCreatUser(user); one1.setCreatUser(user);
@@ -97,23 +97,9 @@ public class DeptZrAfter implements TaskListener{
busBean.update(busProcessNew,updataWapper); busBean.update(busProcessNew,updataWapper);
if(nextUserList != null && !nextUserList.isEmpty()){ if(nextUserList != null && !nextUserList.isEmpty()){
for(String nextUser : nextUserList){ //2次 for(String nextUser : nextUserList){ //2次
// if (null==delegateTask.getVariable("maps")){
// Map<String,String> stringMap=new HashMap<>();
// String as= String.valueOf(UUID.randomUUID());
// stringMap.put(nextUser,as);
// delegateTask.setVariable("maps",stringMap);
// object.put("wkKey",as);
// }
// else if (null!=delegateTask.getVariable("maps",Map.class).get(nextUser)){
// String as= String.valueOf(UUID.randomUUID());
// object.put("wkKey",as);
// }else {
// String as= String.valueOf(UUID.randomUUID());
// object.put("wkKey",as);
// delegateTask.getVariable("maps",Map.class).put(nextUser,as);
// }
List<JSONArrayVo> listRes = userGroupMap.get(nextUser); List<JSONArrayVo> listRes = userGroupMap.get(nextUser);
object.put("itemList", JSON.toJSONString(listRes)); object.put("itemList", JSON.toJSONString(listRes));
object.put("AOLIGEI",nextUser+delegateTask.getAssignee());
BusProcessNew busProcessNewNext = new BusProcessNew(); BusProcessNew busProcessNewNext = new BusProcessNew();
busProcessNewNext.setMsgType("clause"); busProcessNewNext.setMsgType("clause");
busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
src/main/java/com/ydw/bat/wkflow/listener/standardRead/ExpainAfter.java
+12 -10
View File
@@ -81,16 +81,18 @@ public class ExpainAfter implements TaskListener{
if(responUserList != null){ if(responUserList != null){
for (Object obj:responUserList) { for (Object obj:responUserList) {
JSONObject object1 = (JSONObject)obj; JSONObject object1 = (JSONObject)obj;
BusProcessNew busProcessNewNext = new BusProcessNew(); if (object.getString("AOLIGEI").equals(object1.getString("KEYS"))) {
busProcessNewNext.setMsgType("clause"); BusProcessNew busProcessNewNext = new BusProcessNew();
busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); busProcessNewNext.setMsgType("clause");
busProcessNewNext.setMesg(object.toJSONString()); busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); busProcessNewNext.setMesg(object.toJSONString());
busProcessNewNext.setFinishFlag("0"); busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey());
busProcessNewNext.setTaskInfo(delegateTask.getName()); busProcessNewNext.setFinishFlag("0");
busProcessNewNext.setPrcName(prcName); busProcessNewNext.setTaskInfo(delegateTask.getName());
busProcessNewNext.setUserId(object1.getString("applyUserId")); busProcessNewNext.setPrcName(prcName);
busBean.save(busProcessNewNext); busProcessNewNext.setUserId(object1.getString("applyUserId"));
busBean.save(busProcessNewNext);
}
} }
} }
} }
src/main/java/com/ydw/bat/wkflow/listener/standardRead/ResolveAfter.java
+10 -11
View File
@@ -79,7 +79,6 @@ public class ResolveAfter implements TaskListener{
queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId()); queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
if(one1!=null){ if(one1!=null){
// one1.setOverTime(OVERTIME);
one1.setPrcType("9"); one1.setPrcType("9");
one1.setPrcName(prcName); one1.setPrcName(prcName);
one1.setCreatUser(user); one1.setCreatUser(user);
@@ -87,16 +86,16 @@ public class ResolveAfter implements TaskListener{
busProcessNameService.saveOrUpdate(one1); busProcessNameService.saveOrUpdate(one1);
} }
// // 存储当前节点意见 // // 存储当前节点意见
// BusProcessNew busProcessNew = new BusProcessNew(); BusProcessNew busProcessNew = new BusProcessNew();
// 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.setTaskInfo(delegateTask.getTaskDefinitionKey());
// busProcessNew.setTaskId(delegateTask.getId()); busProcessNew.setTaskId(delegateTask.getId());
// busProcessNew.setCommitText(object.getString("commentText")); busProcessNew.setCommitText(object.getString("commentText"));
// busProcessNew.setFinishFlag("0"); busProcessNew.setFinishFlag("0");
// busProcessNew.setTaskInfo(delegateTask.getName()); busProcessNew.setTaskInfo(delegateTask.getName());
// busBean.save(busProcessNew); busBean.save(busProcessNew);
if(nextUserList != null && !nextUserList.isEmpty()){ if(nextUserList != null && !nextUserList.isEmpty()){
for(String nextUser : nextUserList){ //2次 for(String nextUser : nextUserList){ //2次
List<JSONArrayVo> listRes = userGroupMap.get(nextUser); List<JSONArrayVo> listRes = userGroupMap.get(nextUser);