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

feat: buss3

Browse Source
This commit is contained in:
super_liu
2022-02-16 18:00:56 +08:00
parent 8957b37bc7
commit 15ab163b6e
5 changed files with 30 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/ydw/bat/wkflow/listener/bussFs/BussFs2After.java
+2 -2
View File
@@ -54,7 +54,7 @@ public class BussFs2After implements TaskListener{
String username = object.getString("prcCreateUserName");
// object.getString("standName")
String standName = "";
String prcName = "企标复审流程-发起人汇总结果";
String prcName = "企标复审流程-标准法规部高级经理批准";
QueryWrapper queryWrapper2 = new QueryWrapper();
queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
@@ -62,7 +62,7 @@ public class BussFs2After implements TaskListener{
if(one1!=null){
// one1.setOverTime(OVERTIME);
one1.setPrcType("buss3");
// one1.setPrcName(prcName);
one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
src/main/java/com/ydw/bat/wkflow/listener/bussFs/BussFs2Before.java
+8 -5
View File
@@ -1,5 +1,8 @@
package com.ydw.bat.wkflow.listener.bussFs;
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;
@@ -28,11 +31,11 @@ public class BussFs2Before implements TaskListener{
/**
* 汇总企标编写文件列表
*/
// String msg = one1.getMesg();
// JSONObject jsonObject = JSON.parseObject(msg);
// JSONArray fileList=delegateTask.getVariable("fileModelList",JSONArray.class);
// jsonObject.put("fileModelList",fileList);
// one1.setMesg(jsonObject.toJSONString());
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/bussFs/BussFs3After.java
+3 -3
View File
@@ -63,7 +63,7 @@ public class BussFs3After implements TaskListener{
if(one1!=null){
// one1.setOverTime(OVERTIME);
one1.setPrcType("buss3");
// one1.setPrcName(prcName);
one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
@@ -81,8 +81,8 @@ public class BussFs3After implements TaskListener{
busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey());
busProcessNew.setFinishFlag("0");
busProcessNew.setTaskInfo(delegateTask.getName());
busProcessNew.setUserId(object.getString("xdUserId"));
busProcessNew.setPrcName(prcName);
busProcessNew.setUserId(object.getString("bussFsUserC2"));
busProcessNew.setPrcName("企标复审流程-重新发起人汇总结果");
busBean.save(busProcessNew);
BussUtils.approvalFunc1(delegateTask, busBean, object, prcName,"1");
src/main/java/com/ydw/bat/wkflow/listener/bussFs/BussFsSub1After.java
+1 -1
View File
@@ -61,7 +61,7 @@ public class BussFsSub1After implements TaskListener{
if(one1!=null){
// one1.setOverTime(OVERTIME);
one1.setPrcType("buss3");
// one1.setPrcName(prcName);
one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
src/main/java/com/ydw/bat/wkflow/listener/bussFs/BussFsSub2After.java
+16 -5
View File
@@ -1,5 +1,6 @@
package com.ydw.bat.wkflow.listener.bussFs;
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;
@@ -54,7 +55,7 @@ public class BussFsSub2After implements TaskListener{
String username = object.getString("prcCreateUserName");
// object.getString("standName")
String standName = "";
String prcName = "企标复审流程-复审人选择复审结果";
String prcName = "企标复审流程-发起人汇总结果";
QueryWrapper queryWrapper2 = new QueryWrapper();
queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
@@ -62,7 +63,7 @@ public class BussFsSub2After implements TaskListener{
if(one1!=null){
// one1.setOverTime(OVERTIME);
one1.setPrcType("buss3");
// one1.setPrcName(prcName);
one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
@@ -71,7 +72,15 @@ public class BussFsSub2After implements TaskListener{
/**
* 当子任务结束时存储
*/
Integer commentCount=delegateTask.getVariable("commentCount",Integer.class);
JSONArray fileList =delegateTask.getVariable("fileModelList", JSONArray.class);
if (fileList==null) {
fileList=new JSONArray();
}
fileList.addAll(object.getJSONArray("fileModelList"));
delegateTask.setVariable("fileModelList",fileList);
Integer commentCount=delegateTask.getVariable("count",Integer.class);
if(commentCount==null)commentCount=0;
commentCount++;
delegateTask.setVariable("count",commentCount);
@@ -108,8 +117,10 @@ public class BussFsSub2After implements TaskListener{
}else {
QueryWrapper queryWrapper1 = new QueryWrapper();
queryWrapper1.eq("TASK_ID", delegateTask.getId());
BusProcessNew one2 = busBean.getOne(queryWrapper1);
if (one1 != null) {
queryWrapper.isNotNull("PRC_NAME");
List<BusProcessNew> list = busBean.list(queryWrapper1);
if (!list.isEmpty()) {
BusProcessNew one2 = list.get(0);
one2.setMsgType("clause");
one2.setPId(delegateTask.getProcessInstanceId());
one2.setMesg(object.toJSONString());