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
This commit is contained in:
396572590@qq.com
2022-07-18 11:08:55 +08:00
parent 7f0345bdc4 fdbf523fab
commit 2b8e5f3e45
13 changed files with 99 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep1After.java
+21 -10
View File
@@ -9,6 +9,8 @@ import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNameService;
import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService;
import com.ydw.bat.wkflow.business_main.datas.service.IDatasService;
import com.ydw.bat.wkflow.util.SpringContextUtil;
import net.sf.json.JSONArray;
import net.sf.json.util.JSONTokener;
import org.activiti.engine.delegate.DelegateTask;
import org.activiti.engine.delegate.TaskListener;
@@ -55,17 +57,26 @@ public class ProcessStep1After implements TaskListener {
String username = delegateTask.getVariable("prcCreateUserName", String.class);
String prcName = "";
String type=object.getString("type");
if ("5".equals(type)){
prcName=object.getString("bussSort")+"-"+object.getString("esName")+"-计划立项";
}else if ("2".equals(type)){
prcName=object.getJSONArray("bussSort").get(0).toString()+"-"+object.getString("esName")+"-计划延期";
}else if ("1".equals(type)){
prcName=object.getString("bussSort")+"-"+object.getString("esName")+"-计划合并";
}else if ("3".equals(type)){
prcName=object.getJSONArray("bussSort").get(0).toString()+"-"+object.getString("esName")+"-计划取消";
}else {
prcName=object.getJSONArray("bussSort").get(0).toString()+"-"+object.getString("renameEs")+"-计划更名";
String bussSort = "";
Object json = new JSONTokener(object.getString("bussSort")).nextValue();
if(json instanceof JSONArray) {
bussSort = object.getJSONArray("bussSort").get(0).toString();
}else{
bussSort = object.getString("bussSort");
}
if ("5".equals(type)){
prcName=bussSort+"-"+object.getString("esName")+"-计划立项";
}else if ("2".equals(type)){
prcName=bussSort+"-"+object.getString("esName")+"-计划延期";
}else if ("1".equals(type)){
prcName=bussSort+"-"+object.getString("esName")+"-计划合并";
}else if ("3".equals(type)){
prcName=bussSort+"-"+object.getString("esName")+"-计划取消";
}else {
prcName=bussSort+"-"+object.getString("renameEs")+"-计划更名";
}
QueryWrapper queryWrapper2 = new QueryWrapper();
queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep2After.java
+24 -5
View File
@@ -9,10 +9,13 @@ import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNameService;
import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService;
import com.ydw.bat.wkflow.business_main.datas.service.IDatasService;
import com.ydw.bat.wkflow.util.SpringContextUtil;
import net.sf.json.JSONArray;
import net.sf.json.util.JSONTokener;
import org.activiti.engine.delegate.DelegateTask;
import org.activiti.engine.delegate.TaskListener;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
public class ProcessStep2After implements TaskListener {
@@ -60,16 +63,24 @@ public class ProcessStep2After implements TaskListener {
}
}
String type=object.getString("type");
String bussSort = "";
Object json = new JSONTokener(object.getString("bussSort")).nextValue();
if(json instanceof JSONArray) {
bussSort = object.getJSONArray("bussSort").get(0).toString();
}else{
bussSort = object.getString("bussSort");
}
if ("5".equals(type)){
prcName=object.getString("bussSort")+"-"+object.getString("esName")+"-计划立项";
prcName=bussSort+"-"+object.getString("esName")+"-计划立项";
}else if ("2".equals(type)){
prcName=object.getJSONArray("bussSort").get(0).toString()+"-"+object.getString("esName")+"-计划延期";
prcName=bussSort+"-"+object.getString("esName")+"-计划延期";
}else if ("1".equals(type)){
prcName=object.getString("bussSort")+"-"+object.getString("esName")+"-计划合并";
prcName=bussSort+"-"+object.getString("esName")+"-计划合并";
}else if ("3".equals(type)){
prcName=object.getJSONArray("bussSort").get(0).toString()+"-"+object.getString("esName")+"-计划取消";
prcName=bussSort+"-"+object.getString("esName")+"-计划取消";
}else {
prcName=object.getJSONArray("bussSort").get(0).toString()+"-"+object.getString("renameEs")+"-计划更名";
prcName=bussSort+"-"+object.getString("renameEs")+"-计划更名";
}
//截止时间 流程描述 创建人
String user = delegateTask.getVariable("prcCreateUser", String.class);
@@ -114,4 +125,12 @@ public class ProcessStep2After implements TaskListener {
}
}
}
public static boolean isJson(String string) {
try {
JSONObject.parseObject(string);
return true;
} catch (Exception e) {
return false;
}
}
}
src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep3After.java
+15 -5
View File
@@ -9,6 +9,8 @@ import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNameService;
import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService;
import com.ydw.bat.wkflow.business_main.datas.service.IDatasService;
import com.ydw.bat.wkflow.util.SpringContextUtil;
import net.sf.json.JSONArray;
import net.sf.json.util.JSONTokener;
import org.activiti.engine.delegate.DelegateTask;
import org.activiti.engine.delegate.TaskListener;
@@ -51,16 +53,24 @@ public class ProcessStep3After implements TaskListener {
delegateTask.setVariable("count",null);
}
String type=object.getString("type");
String bussSort = "";
Object json = new JSONTokener(object.getString("bussSort")).nextValue();
if(json instanceof JSONArray) {
bussSort = object.getJSONArray("bussSort").get(0).toString();
}else{
bussSort = object.getString("bussSort");
}
if ("5".equals(type)){
prcName=object.getString("bussSort")+"-"+object.getString("esName")+"-计划立项";
prcName=bussSort+"-"+object.getString("esName")+"-计划立项";
}else if ("2".equals(type)){
prcName=object.getJSONArray("bussSort").get(0).toString()+"-"+object.getString("esName")+"-计划延期";
prcName=bussSort+"-"+object.getString("esName")+"-计划延期";
}else if ("1".equals(type)){
prcName=object.getString("bussSort")+"-"+object.getString("esName")+"-计划合并";
prcName=bussSort+"-"+object.getString("esName")+"-计划合并";
}else if ("3".equals(type)){
prcName=object.getJSONArray("bussSort").get(0).toString()+"-"+object.getString("esName")+"-计划取消";
prcName=bussSort+"-"+object.getString("esName")+"-计划取消";
}else {
prcName=object.getJSONArray("bussSort").get(0).toString()+"-"+object.getString("renameEs")+"-计划更名";
prcName=bussSort+"-"+object.getString("renameEs")+"-计划更名";
}
//截止时间 流程描述 创建人
String user = delegateTask.getVariable("prcCreateUser",String.class);
src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep4After.java
+15 -5
View File
@@ -11,6 +11,8 @@ import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNameService;
import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService;
import com.ydw.bat.wkflow.business_main.datas.service.IDatasService;
import com.ydw.bat.wkflow.util.SpringContextUtil;
import net.sf.json.JSONArray;
import net.sf.json.util.JSONTokener;
import org.activiti.engine.ActivitiException;
import org.activiti.engine.delegate.DelegateTask;
import org.activiti.engine.delegate.TaskListener;
@@ -146,16 +148,24 @@ public class ProcessStep4After implements TaskListener {
delegateTask.setVariable("count",null);
}
String type=object.getString("type");
String bussSort = "";
Object json = new JSONTokener(object.getString("bussSort")).nextValue();
if(json instanceof JSONArray) {
bussSort = object.getJSONArray("bussSort").get(0).toString();
}else{
bussSort = object.getString("bussSort");
}
if ("5".equals(type)){
prcName=object.getString("bussSort")+"-"+object.getString("esName")+"-计划立项";
prcName=bussSort+"-"+object.getString("esName")+"-计划立项";
}else if ("2".equals(type)){
prcName=object.getJSONArray("bussSort").get(0).toString()+"-"+object.getString("esName")+"-计划延期";
prcName=bussSort+"-"+object.getString("esName")+"-计划延期";
}else if ("1".equals(type)){
prcName=object.getString("bussSort")+"-"+object.getString("esName")+"-计划合并";
prcName=bussSort+"-"+object.getString("esName")+"-计划合并";
}else if ("3".equals(type)){
prcName=object.getJSONArray("bussSort").get(0).toString()+"-"+object.getString("esName")+"-计划取消";
prcName=bussSort+"-"+object.getString("esName")+"-计划取消";
}else {
prcName=object.getJSONArray("bussSort").get(0).toString()+"-"+object.getString("renameEs")+"-计划更名";
prcName=bussSort+"-"+object.getString("renameEs")+"-计划更名";
}
//截止时间 流程描述 创建人
src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep5After.java
+15 -5
View File
@@ -9,6 +9,8 @@ import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNameService;
import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService;
import com.ydw.bat.wkflow.business_main.datas.service.IDatasService;
import com.ydw.bat.wkflow.util.SpringContextUtil;
import net.sf.json.JSONArray;
import net.sf.json.util.JSONTokener;
import org.activiti.engine.delegate.DelegateTask;
import org.activiti.engine.delegate.TaskListener;
@@ -37,16 +39,24 @@ public class ProcessStep5After implements TaskListener {
List<String> nextUserList = new ArrayList();
String prcName = "";
String type=object.getString("type");
String bussSort = "";
Object json = new JSONTokener(object.getString("bussSort")).nextValue();
if(json instanceof JSONArray) {
bussSort = object.getJSONArray("bussSort").get(0).toString();
}else{
bussSort = object.getString("bussSort");
}
if ("5".equals(type)){
prcName=object.getString("bussSort")+"-"+object.getString("esName")+"-计划立项";
prcName=bussSort+"-"+object.getString("esName")+"-计划立项";
}else if ("2".equals(type)){
prcName=object.getJSONArray("bussSort").get(0).toString()+"-"+object.getString("esName")+"-计划延期";
prcName=bussSort+"-"+object.getString("esName")+"-计划延期";
}else if ("1".equals(type)){
prcName=object.getString("bussSort")+"-"+object.getString("esName")+"-计划合并";
prcName=bussSort+"-"+object.getString("esName")+"-计划合并";
}else if ("3".equals(type)){
prcName=object.getJSONArray("bussSort").get(0).toString()+"-"+object.getString("esName")+"-计划取消";
prcName=bussSort+"-"+object.getString("esName")+"-计划取消";
}else {
prcName=object.getJSONArray("bussSort").get(0).toString()+"-"+object.getString("renameEs")+"-计划更名";
prcName=bussSort+"-"+object.getString("renameEs")+"-计划更名";
}
//根据意见选择 企标状态并对企标信息进行修改 bzfgId
nextUserList.add(delegateTask.getVariable("topmanagerId",String.class));
src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step2After.java
+2 -2
View File
@@ -74,9 +74,9 @@ public class Step2After implements TaskListener {
String username = delegateTask.getVariable("prcCreateUserName", String.class);
String prcName = "";
if ("0".equals(object.getString("stepFlag"))) {
prcName = object.getString("standNumber")+"-"+object.getString("standName") + "-合规标准";
prcName = object.getString("standNumber")+"-"+object.getString("standName") + "-合规评估";
}else {
prcName = object.getString("standNumber")+"-"+object.getString("standName") + "-合规标准";
prcName = object.getString("standNumber")+"-"+object.getString("standName") + "-合规评估";
}
QueryWrapper queryWrapper2 = new QueryWrapper();
queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step3After.java
+1 -1
View File
@@ -89,7 +89,7 @@ public class Step3After implements TaskListener {
String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
String user = delegateTask.getVariable("prcCreateUser", String.class);
String username = delegateTask.getVariable("prcCreateUserName", String.class);
String prcName = object.getString("standNumber")+"-"+object.getString("standName") + "-合规标准";
String prcName = object.getString("standNumber")+"-"+object.getString("standName") + "-合规评估";
QueryWrapper queryWrapper2 = new QueryWrapper();
queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step4After.java
+1 -1
View File
@@ -111,7 +111,7 @@ public class Step4After implements TaskListener {
String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
String user = delegateTask.getVariable("prcCreateUser", String.class);
String username = delegateTask.getVariable("prcCreateUserName", String.class);
String prcName = object.getString("standNumber")+"-"+object.getString("standName") + "-合规标准";
String prcName = object.getString("standNumber")+"-"+object.getString("standName") + "-合规评估";
QueryWrapper queryWrapper2 = new QueryWrapper();
queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step5After.java
+1 -1
View File
@@ -50,7 +50,7 @@ public class Step5After implements TaskListener {
String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
String user = delegateTask.getVariable("prcCreateUser", String.class);
String username = delegateTask.getVariable("prcCreateUserName", String.class);
String prcName = object.getString("standNumber")+"-"+object.getString("standName") + "-合规标准";
String prcName = object.getString("standNumber")+"-"+object.getString("standName") + "-合规评估";
QueryWrapper queryWrapper2 = new QueryWrapper();
queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step6After.java
+1 -1
View File
@@ -89,7 +89,7 @@ public class Step6After implements TaskListener {
String user = delegateTask.getVariable("prcCreateUser", String.class);
String username = delegateTask.getVariable("prcCreateUserName", String.class);
String prcName = object.getString("standNumber")+"-"+object.getString("standName") + "-合规标准";
String prcName = object.getString("standNumber")+"-"+object.getString("standName") + "-合规评估";
QueryWrapper queryWrapper2 = new QueryWrapper();
queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step7After.java
+1 -1
View File
@@ -59,7 +59,7 @@ public class Step7After implements TaskListener {
//截止时间 流程描述 创建人
String user = delegateTask.getVariable("prcCreateUser", String.class);
String username = delegateTask.getVariable("prcCreateUserName", String.class);
String prcName = object.getString("standNumber")+"-"+object.getString("standName") + "-合规标准";
String prcName = object.getString("standNumber")+"-"+object.getString("standName") + "-合规评估";
QueryWrapper queryWrapper2 = new QueryWrapper();
queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step8After.java
+1 -1
View File
@@ -126,7 +126,7 @@ public class Step8After implements TaskListener {
String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
String user = delegateTask.getVariable("prcCreateUser", String.class);
String username = delegateTask.getVariable("prcCreateUserName", String.class);
String prcName = object.getString("standNumber")+"-"+object.getString("standName") + "-合规标准";
String prcName = object.getString("standNumber")+"-"+object.getString("standName") + "-合规评估";
QueryWrapper queryWrapper2 = new QueryWrapper();
queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step9After.java
+1 -1
View File
@@ -61,7 +61,7 @@ public class Step9After implements TaskListener {
delegateTask.setVariable("prcCreateUser", user);
delegateTask.setVariable("prcCreateUserName", username);
delegateTask.setVariable("stands",object.getString("standNumber"));
String prcName = object.getString("standNumber")+"-"+object.getString("standName") + "-合规标准";
String prcName = object.getString("standNumber")+"-"+object.getString("standName") + "-合规评估";
QueryWrapper queryWrapper2 = new QueryWrapper();
queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);