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!88
This commit is contained in:
王夏晖
2021-12-31 16:13:22 +08:00
parent 2e47c39f61 82fb2cb733
commit 217def1be8
10 changed files with 20 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step3After.java
+1
View File
@@ -75,6 +75,7 @@ public class Step3After implements TaskListener {
if(nextUserList != null && !nextUserList.isEmpty()){
for(String nextUser : nextUserList){
BusProcessNew busProcessNewNext = new BusProcessNew();
object.put("SKS",delegateTask.getAssignee());
busProcessNewNext.setMsgType("clause");
busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
busProcessNewNext.setMesg(object.toJSONString());
src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step4After.java
+2 -1
View File
@@ -45,7 +45,8 @@ public class Step4After implements TaskListener {
prcName = delegateTask.getVariable("cid")+"-标准征求意见流程-标准法规工程师分线审核";
delegateTask.setVariable("spFlag","0");
}else {
nextUserList.add(delegateTask.getVariable("zrUserId1",String.class));
delegateTask.setVariable("zrUserId1",object.getString("SKS"));
nextUserList.add(object.getString("SKS"));
prcName = delegateTask.getVariable("cid")+"-标准征求意见流程-责任部门对接人汇总并选择审批人";
delegateTask.setVariable("spFlag","1");
}
src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step5After.java
+2 -1
View File
@@ -69,7 +69,8 @@ public class Step5After implements TaskListener {
delegateTask.setVariable("bzFlag","0");
prcName = delegateTask.getVariable("cid")+"-标准征求意见流程-标准法规工程师汇总";
}else {
nextUserList.add(delegateTask.getVariable("zrUserId1",String.class));
delegateTask.setVariable("zrUserId1",object.getString("SKS"));
nextUserList.add(object.getString("SKS"));
prcName = delegateTask.getVariable("cid")+"-标准征求意见流程-责任部门对接人汇总并选择审批人";
delegateTask.setVariable("bzFlag","1");
}
src/main/java/com/ydw/bat/wkflow/listener/standardRead/ChooseZrAfter.java
+2 -11
View File
@@ -45,17 +45,8 @@ public class ChooseZrAfter implements TaskListener{
String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
String user = object.getString("applyUserId");
String username = object.getString("applyUserIdName");
String standName = "";
if (null == object.getString("standInData")){
standName = "未知";
}else {
if(object.getString("standInData").equals("INLAND")){
standName = "国内";
}else {
standName = "海外";
}
}
String prcName = standName+"-标准解读流程";
String prcName = delegateTask.getVariable("titles",String.class)+"-标准解读流程";
QueryWrapper queryWrapper2 = new QueryWrapper();
queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
src/main/java/com/ydw/bat/wkflow/listener/standardRead/DeptApplayAfter.java
+2 -11
View File
@@ -44,17 +44,8 @@ public class DeptApplayAfter implements TaskListener{
List<String> nextUserList = new ArrayList();
String standName = "";
if (null == object.getString("standInData")){
standName = "未知";
}else {
if(object.getString("standInData").equals("INLAND")){
standName = "国内";
}else {
standName = "海外";
}
}
String prcName = standName+"-标准解读流程";
String prcName = delegateTask.getVariable("titles",String.class)+"-标准解读流程";
//部长进行审批（1：通过）
if (object.getString("gcApplyFlag").equals("1")) {
src/main/java/com/ydw/bat/wkflow/listener/standardRead/DeptZrAfter.java
+2 -11
View File
@@ -59,17 +59,8 @@ public class DeptZrAfter implements TaskListener{
String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
String user = object.getString("applyUserId");
String username = object.getString("applyUserIdName");
String standName = "";
if (null == object.getString("standInData")){
standName = "未知";
}else {
if(object.getString("standInData").equals("INLAND")){
standName = "国内";
}else {
standName = "海外";
}
}
String prcName = standName+"-标准解读流程-填写解读分析";
String prcName = delegateTask.getVariable("titles",String.class)+"-标准解读流程-填写解读分析";
QueryWrapper queryWrapper2 = new QueryWrapper();
queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
src/main/java/com/ydw/bat/wkflow/listener/standardRead/EngineerApplayAfter.java
+2 -11
View File
@@ -37,17 +37,8 @@ public class EngineerApplayAfter implements TaskListener{
List<String> nextUserList = new ArrayList();
String standName = "";
if (null == object.getString("standInData")){
standName = "未知";
}else {
if(object.getString("standInData").equals("INLAND")){
standName = "国内";
}else {
standName = "海外";
}
}
String prcName = standName + "-标准解读流程";
String prcName = delegateTask.getVariable("titles",String.class) + "-标准解读流程";
//工程师是否要进行审核
if (object.getString("zrApplyFlag").equals("1")) {
src/main/java/com/ydw/bat/wkflow/listener/standardRead/ExpainAfter.java
+2 -11
View File
@@ -41,17 +41,8 @@ public class ExpainAfter implements TaskListener{
String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
String user = object.getString("applyUserId");
String username = object.getString("applyUserIdName");
String standName = "";
if (null == object.getString("standInData")){
standName = "未知";
}else {
if(object.getString("standInData").equals("INLAND")){
standName = "国内";
}else {
standName = "海外";
}
}
String prcName = standName+"-标准解读流程-责任人审核";
String prcName = delegateTask.getVariable("titles",String.class)+"-标准解读流程-责任人审核";
QueryWrapper queryWrapper2 = new QueryWrapper();
queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
src/main/java/com/ydw/bat/wkflow/listener/standardRead/ResolveAfter.java
+3 -11
View File
@@ -64,17 +64,9 @@ public class ResolveAfter implements TaskListener{
String user = object.getString("applyUserId");
String username = object.getString("applyUserIdName");
delegateTask.setVariable("createDate",new Date());
String standName = "";
if (null == object.getString("standInData")){
standName = "未知";
}else {
if(object.getString("standInData").equals("INLAND")){
standName = "国内";
}else {
standName = "海外";
}
}
String prcName = standName+"-标准解读流程-选择执行人";
String title=object.getString("itemsNum1")+"-"+object.getString("itemsName1");
delegateTask.setVariable("titles",title);
String prcName = title+"-标准解读流程-选择执行人";
QueryWrapper queryWrapper2 = new QueryWrapper();
queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
src/main/java/com/ydw/bat/wkflow/listener/standardRead/ZrApplayAfter.java
+2 -11
View File
@@ -38,17 +38,8 @@ public class ZrApplayAfter implements TaskListener{
delegateTask.setVariable("objectJson",object);
List<String> nextUserList = new ArrayList();
String standName = "";
if (null == object.getString("standInData")){
standName = "未知";
}else {
if(object.getString("standInData").equals("INLAND")){
standName = "国内";
}else {
standName = "海外";
}
}
String prcName = standName+"-标准解读流程";
String prcName = delegateTask.getVariable("titles",String.class)+"-标准解读流程";
//责任人是否要进行审核
if(object.getString("resolveFlag").equals("1")){
delegateTask.setVariable("zrFlag",1);