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

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
super_liu
2021-12-26 18:11:37 +08:00
parent a02539dd25 453660c638
commit 0c59759427
3 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/SelectResponsibleUserAfter.java
+1
View File
@@ -117,6 +117,7 @@ public class SelectResponsibleUserAfter implements TaskListener {
JSONObject jsonObject = responUserList.getJSONObject(i); JSONObject jsonObject = responUserList.getJSONObject(i);
BusProcessNew busProcessNewNext = new BusProcessNew(); BusProcessNew busProcessNewNext = new BusProcessNew();
busProcessNewNext.setMsgType("clause"); busProcessNewNext.setMsgType("clause");
object.put("docUser",jsonObject.getString("dockUser"));
busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
busProcessNewNext.setMesg(object.toJSONString()); busProcessNewNext.setMesg(object.toJSONString());
busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey());
src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/RevisonInformationAfter.java
+2 -4
View File
@@ -44,10 +44,8 @@ public class RevisonInformationAfter implements TaskListener {
List<String> nextUserList = new ArrayList(); List<String> nextUserList = new ArrayList();
if (StringUtils.isNotBlank(object.getString("ministerId"))) { if (StringUtils.isNotBlank(delegateTask.getVariable("ministerConfirm",String.class))) {
nextUserList.add(object.getString("ministerId")); nextUserList.add(delegateTask.getVariable("ministerConfirm",String.class));
delegateTask.setVariable("ministerConfirm", nextUserList);
// delegateTask.setVariable("ministerConfirm", object.getString("ministerId"));
} }
String user = delegateTask.getVariable("createUser", String.class); String user = delegateTask.getVariable("createUser", String.class);
src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationProcess/PEPtaskEstimateAfter.java
+12 -4
View File
@@ -63,10 +63,18 @@ public class PEPtaskEstimateAfter implements TaskListener {
object.put("key", uuid); object.put("key", uuid);
//设置分发负责人 //设置分发负责人
List<String> nextUserList = new ArrayList(); List<String> nextUserList = new ArrayList();
JSONObject object1 = JSONObject.parseObject(ne.getString(0)); if (null!=ne && ne.size()>0) {
if (StringUtils.isNotBlank(object1.getString("distributePersonId"))) { JSONObject object1 = JSONObject.parseObject(remove.getString(0));
delegateTask.setVariable("ffUserId", object1.getString("distributePersonId")); if (StringUtils.isNotBlank(object1.getString("distributePersonId"))) {
nextUserList.add(delegateTask.getVariable("ffUserId", String.class)); delegateTask.setVariable("ffUserId", object1.getString("distributePersonId"));
nextUserList.add(delegateTask.getVariable("ffUserId", String.class));
}
}else if (null!=remove && remove.size()>0){
JSONObject object1 = JSONObject.parseObject(remove.getString(0));
if (StringUtils.isNotBlank(object1.getString("distributePersonId"))) {
delegateTask.setVariable("ffUserId", object1.getString("distributePersonId"));
nextUserList.add(delegateTask.getVariable("ffUserId", String.class));
}
} }
//截止时间 流程描述 创建人 //截止时间 流程描述 创建人
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());