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

合并分支 'dev_foton_CD' 到 'FOTON'

Browse Source 
Dev foton cd

查看合并请求 laws-foton-slrs/foton-wkflow-rest!11
This commit is contained in:
高嵩
2023-01-11 15:24:29 +08:00
parent 13c5f56e9f 8d693fc408
commit a4fdad8b30
4 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/ydw/bat/wkflow/listener/bussFs/BussFs5After.java
+2 -2
View File
@@ -30,8 +30,8 @@ public class BussFs5After implements TaskListener {
//截止时间 流程描述 创建人
String prcName = "";
if(StringUtils.isNotBlank(object.getString("standName")) && StringUtils.isNotBlank(object.getString("standCode"))){
prcName = object.getString("standCode")+"-"+object.getString("standName") + "-企标复审";
if(StringUtils.isNotBlank(object.getString("standName")) && StringUtils.isNotBlank(object.getString("standSort"))){
prcName = object.getString("standSort")+"-"+object.getString("standName") + "-企标复审";
}else {
prcName = "企标复审";
}
src/main/java/com/ydw/bat/wkflow/listener/bussFs/BussFsC2After.java
+4 -4
View File
@@ -39,11 +39,11 @@ public class BussFsC2After implements TaskListener{
List<String> nextUserList = new ArrayList();
if(StringUtils.isNotBlank(object.getString("bussFsSubUser2"))){
delegateTask.setVariable("bussFsSubUser2",object.getString("bussFsSubUser2"));
nextUserList.add(object.getString("bussFsSubUser2"));
if(StringUtils.isNotBlank(object.getString("bussFsUser3"))){
delegateTask.setVariable("bussFsUser3",object.getString("bussFsUser3"));
nextUserList.add(object.getString("bussFsUser3"));
}else {
throw new ActivitiException("1#2发起人不存在,请配置相关人员");
throw new ActivitiException("1#2标准法规部高级经理不存在,请配置相关人员");
}
//截止时间 流程描述 创建人
src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct5After.java
+4 -1
View File
@@ -3,6 +3,7 @@ package com.ydw.bat.wkflow.listener.bussLibraryProduct;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName;
import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew;
import com.ydw.bat.wkflow.business_main.datas.entity.Datas;
@@ -43,7 +44,9 @@ public class BussLibraryProduct5After implements TaskListener{
ideaList=new JSONArray();
}
ideaList.addAll(object.getJSONArray("modelData"));
if (ObjectUtils.isNotEmpty(object.getJSONArray("modelData"))) {
ideaList.addAll(object.getJSONArray("modelData"));
}
delegateTask.setVariable("ideaList",ideaList);
if(StringUtils.isNotBlank(object.getString("bussUser6"))){
src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep5After.java
+1
View File
@@ -75,6 +75,7 @@ public class ProcessStep5After implements TaskListener {
// one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
one1.setPrcName(prcName);
busProcessNameService.saveOrUpdate(one1);
}