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

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
yuezhihang
2021-07-29 10:14:19 +08:00
parent c5539aabc1 23718f148e
commit 77a892b924
5 changed files with 34 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/StartSurveyAfter.java
+2 -3
View File
@@ -60,9 +60,8 @@ public class StartSurveyAfter implements TaskListener {
String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
String user = object.getString("prcCreateUser"); String user = object.getString("prcCreateUser");
String username = object.getString("prcCreateUserName"); String username = object.getString("prcCreateUserName");
// object.getString("standName") String standName = object.getString("cid");
String standName = ""; String prcName = standName+"标准-标准征求意见流程";
String prcName = standName+"标准征求意见流程";
QueryWrapper queryWrapper2 = new QueryWrapper(); QueryWrapper queryWrapper2 = new QueryWrapper();
queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId()); queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/StartSurveyAfter.java
+2 -3
View File
@@ -66,9 +66,8 @@ public class StartSurveyAfter implements TaskListener {
String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
String user = object.getString("prcCreateUser"); String user = object.getString("prcCreateUser");
String username = object.getString("prcCreateUserName"); String username = object.getString("prcCreateUserName");
// object.getString("standName") String standName = object.getString("title");
String standName = ""; String prcName = standName+"-标准调研流程";
String prcName = standName+"标准调研流程";
QueryWrapper queryWrapper2 = new QueryWrapper(); QueryWrapper queryWrapper2 = new QueryWrapper();
queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId()); queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
src/main/java/com/ydw/bat/wkflow/listener/standardLibrary/ApplyApplicantAfter.java
+10 -2
View File
@@ -59,7 +59,13 @@ public class ApplyApplicantAfter implements TaskListener{
}else { }else {
standName = "国外"; standName = "国外";
} }
String prcName = "标准名称-"+standName+"标准入库"; String standAllName = "";
if(object.getString("standYear") != null && !object.getString("standYear").equals("")){
standAllName = verifyObj(object.getString("standSortShow")) + " " + verifyObj(object.getString("standNumber")) + "-" + verifyObj(object.getString("standYear"));
}else {
standAllName = verifyObj(object.getString("standSort")) + " " + verifyObj(object.getString("standNumber"));
}
String prcName = standAllName+"-"+standName+"标准入库";
QueryWrapper queryWrapper2 = new QueryWrapper(); QueryWrapper queryWrapper2 = new QueryWrapper();
queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId()); queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
@@ -96,6 +102,8 @@ public class ApplyApplicantAfter implements TaskListener{
busBean.save(busProcessNew); busBean.save(busProcessNew);
} }
} }
}
private String verifyObj(String str){
return (str == null || str.equals("")) ? "" : str;
} }
} }
src/main/java/com/ydw/bat/wkflow/listener/standardLibrary/CountersignAfter.java
+10 -1
View File
@@ -58,7 +58,13 @@ public class CountersignAfter implements TaskListener{
}else { }else {
standName = "国外"; standName = "国外";
} }
String prcName = "标准名称-"+standName+"标准入库"; String standAllName = "";
if(object.getString("standYear") != null && !object.getString("standYear").equals("")){
standAllName = verifyObj(object.getString("standSortShow")) + " " + verifyObj(object.getString("standNumber")) + "-" + verifyObj(object.getString("standYear"));
}else {
standAllName = verifyObj(object.getString("standSort")) + " " + verifyObj(object.getString("standNumber"));
}
String prcName = standAllName+"-"+standName+"标准入库";
QueryWrapper queryWrapper2 = new QueryWrapper(); QueryWrapper queryWrapper2 = new QueryWrapper();
queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId()); queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
@@ -94,6 +100,9 @@ public class CountersignAfter implements TaskListener{
busBean.save(busProcessNew); busBean.save(busProcessNew);
} }
} }
}
private String verifyObj(String str){
return (str == null || str.equals("")) ? "" : str;
} }
} }
src/main/java/com/ydw/bat/wkflow/listener/standardLibrary/SLApplicantAfter.java
+10 -1
View File
@@ -82,7 +82,13 @@ public class SLApplicantAfter implements TaskListener{
}else { }else {
standName = "国外"; standName = "国外";
} }
String prcName = "标准名称-"+standName+"标准入库"; String standAllName = "";
if(object.getString("standYear") != null && !object.getString("standYear").equals("")){
standAllName = verifyObj(object.getString("standSortShow")) + " " + verifyObj(object.getString("standNumber")) + "-" + verifyObj(object.getString("standYear"));
}else {
standAllName = verifyObj(object.getString("standSort")) + " " + verifyObj(object.getString("standNumber"));
}
String prcName = standAllName+"-"+standName+"标准入库";
QueryWrapper queryWrapper2 = new QueryWrapper(); QueryWrapper queryWrapper2 = new QueryWrapper();
queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId()); queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
@@ -121,4 +127,7 @@ public class SLApplicantAfter implements TaskListener{
} }
} }
} }
private String verifyObj(String str){
return (str == null || str.equals("")) ? "" : str;
}
} }