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

Merge branch 'develop' into 'FOTON'

Browse Source 
Develop

See merge request foton-wkflow-group/foton-wkflow-rest!78
This commit is contained in:
王夏晖
2021-12-27 09:05:13 +08:00
parent 328500bcb4 0c59759427
commit 836e0b6c63
5 changed files with 36 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);
BusProcessNew busProcessNewNext = new BusProcessNew();
busProcessNewNext.setMsgType("clause");
object.put("docUser",jsonObject.getString("dockUser"));
busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
busProcessNewNext.setMesg(object.toJSONString());
busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey());
src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary2After.java
+9
View File
@@ -1,5 +1,6 @@
package com.ydw.bat.wkflow.listener.bussLibrary;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName;
@@ -39,6 +40,14 @@ public class BussLibrary2After implements TaskListener{
List<String> nextUserList = new ArrayList();
JSONArray fileList =delegateTask.getVariable("fileModelList", JSONArray.class);
if (fileList==null) {
fileList=new JSONArray();
}
fileList.addAll(object.getJSONArray("fileModelList"));
delegateTask.setVariable("fileModelList",fileList);
if(StringUtils.isNotBlank(object.getString("hzUserId"))){
delegateTask.setVariable("hzUserId",object.getString("hzUserId"));
nextUserList.add(object.getString("hzUserId"));
src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary3Before.java
+12
View File
@@ -1,5 +1,8 @@
package com.ydw.bat.wkflow.listener.bussLibrary;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew;
import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService;
@@ -25,6 +28,15 @@ public class BussLibrary3Before implements TaskListener{
List<BusProcessNew> list = busBean.list(queryWrapper1);
if(!list.isEmpty()){
BusProcessNew one1 = list.get(0);
/**
* 汇总企标编写文件列表
*/
String msg = one1.getMesg();
JSONObject jsonObject = JSON.parseObject(msg);
JSONArray fileList=delegateTask.getVariable("fileModelList",JSONArray.class);
jsonObject.put("fileModelList",fileList);
one1.setMesg(jsonObject.toJSONString());
one1.setTaskId(delegateTask.getId());
busBean.saveOrUpdate(one1);
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();
if (StringUtils.isNotBlank(object.getString("ministerId"))) {
nextUserList.add(object.getString("ministerId"));
delegateTask.setVariable("ministerConfirm", nextUserList);
// delegateTask.setVariable("ministerConfirm", object.getString("ministerId"));
if (StringUtils.isNotBlank(delegateTask.getVariable("ministerConfirm",String.class))) {
nextUserList.add(delegateTask.getVariable("ministerConfirm",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);
//设置分发负责人
List<String> nextUserList = new ArrayList();
JSONObject object1 = JSONObject.parseObject(ne.getString(0));
if (StringUtils.isNotBlank(object1.getString("distributePersonId"))) {
delegateTask.setVariable("ffUserId", object1.getString("distributePersonId"));
nextUserList.add(delegateTask.getVariable("ffUserId", String.class));
if (null!=ne && ne.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));
}
}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());