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:
zj
2021-07-30 17:36:53 +08:00
parent 134e552d4e 53e05290c8
commit f6cd582510
9 changed files with 55 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/ydw/bat/wkflow/listener/standardRead/ChooseZrAfter.java
+7 -3
View File
@@ -46,10 +46,14 @@ public class ChooseZrAfter implements TaskListener{
String user = object.getString("applyUserId");
String username = object.getString("applyUserIdName");
String standName = "";
if(object.getString("standInData").equals("0")){
standName = "国内";
if (null == object.getString("standInData")){
standName = "未知";
}else {
standName = "国外";
if(object.getString("standInData").equals("INLAND")){
standName = "国内";
}else {
standName = "国外";
}
}
String prcName = standName+"-标准解读流程";
QueryWrapper queryWrapper2 = new QueryWrapper();
src/main/java/com/ydw/bat/wkflow/listener/standardRead/DeptApplayAfter.java
+7 -3
View File
@@ -47,10 +47,14 @@ public class DeptApplayAfter implements TaskListener{
String user = object.getString("applyUserId");
String username = object.getString("applyUserIdName");
String standName = "";
if(object.getString("standInData").equals("INLAND")){
standName = "国内";
if (null == object.getString("standInData")){
standName = "未知";
}else {
standName = "国外";
if(object.getString("standInData").equals("INLAND")){
standName = "国内";
}else {
standName = "国外";
}
}
String prcName = standName+"-标准解读流程";
QueryWrapper queryWrapper2 = new QueryWrapper();
src/main/java/com/ydw/bat/wkflow/listener/standardRead/DeptZrAfter.java
+7 -3
View File
@@ -58,10 +58,14 @@ public class DeptZrAfter implements TaskListener{
String user = object.getString("applyUserId");
String username = object.getString("applyUserIdName");
String standName = "";
if(object.getString("standInData").equals("INLAND")){
standName = "国内";
if (null == object.getString("standInData")){
standName = "未知";
}else {
standName = "国外";
if(object.getString("standInData").equals("INLAND")){
standName = "国内";
}else {
standName = "国外";
}
}
String prcName = standName+"-标准解读流程";
QueryWrapper queryWrapper2 = new QueryWrapper();
src/main/java/com/ydw/bat/wkflow/listener/standardRead/EngineerApplayAfter.java
+8 -4
View File
@@ -51,10 +51,14 @@ public class EngineerApplayAfter implements TaskListener{
String user = object.getString("applyUserId");
String username = object.getString("applyUserIdName");
String standName = "";
if (object.getString("standInData").equals("INLAND")) {
standName = "国内";
} else {
standName = "国外";
if (null == object.getString("standInData")){
standName = "未知";
}else {
if(object.getString("standInData").equals("INLAND")){
standName = "国内";
}else {
standName = "国外";
}
}
String prcName = standName + "-标准解读流程";
QueryWrapper queryWrapper2 = new QueryWrapper();
src/main/java/com/ydw/bat/wkflow/listener/standardRead/ExpainAfter.java
+7 -3
View File
@@ -42,10 +42,14 @@ public class ExpainAfter implements TaskListener{
String user = object.getString("applyUserId");
String username = object.getString("applyUserIdName");
String standName = "";
if(object.getString("standInData").equals("INLAND")){
standName = "国内";
if (null == object.getString("standInData")){
standName = "未知";
}else {
standName = "国外";
if(object.getString("standInData").equals("INLAND")){
standName = "国内";
}else {
standName = "国外";
}
}
String prcName = standName+"-标准解读流程";
QueryWrapper queryWrapper2 = new QueryWrapper();
src/main/java/com/ydw/bat/wkflow/listener/standardRead/ResolveAfter.java
+7 -3
View File
@@ -52,10 +52,14 @@ public class ResolveAfter implements TaskListener{
String user = object.getString("applyUserId");
String username = object.getString("applyUserIdName");
String standName = "";
if(object.getString("standInData").equals("INLAND")){
standName = "国内";
if (null == object.getString("standInData")){
standName = "未知";
}else {
standName = "国外";
if(object.getString("standInData").equals("INLAND")){
standName = "国内";
}else {
standName = "国外";
}
}
String prcName = standName+"-标准解读流程";
QueryWrapper queryWrapper2 = new QueryWrapper();
src/main/java/com/ydw/bat/wkflow/listener/standardRead/ZrApplayAfter.java
+7 -3
View File
@@ -50,10 +50,14 @@ public class ZrApplayAfter implements TaskListener{
String user = object.getString("applyUserId");
String username = object.getString("applyUserIdName");
String standName = "";
if(object.getString("standInData").equals("INLAND")){
standName = "国内";
if (null == object.getString("standInData")){
standName = "未知";
}else {
standName = "国外";
if(object.getString("standInData").equals("INLAND")){
standName = "国内";
}else {
standName = "国外";
}
}
String prcName = standName+"-标准解读流程";
QueryWrapper queryWrapper2 = new QueryWrapper();
src/main/java/com/ydw/bat/wkflow/listener/standardRegulatoryProcess/CountersignSRPAfter.java
+3 -3
View File
@@ -40,9 +40,9 @@ public class CountersignSRPAfter implements TaskListener{
// JSONObject array = object.getJSONObject("hqsqForm");
if(StringUtils.isNotBlank(object.getString("applyUpdUserId"))){
delegateTask.setVariable("applyUserId",object.getString("applyUpdUserId"));
nextUserList.add(object.getString("applyUpdUserId"));
if(StringUtils.isNotBlank(delegateTask.getVariable("createUser",String.class))){
delegateTask.setVariable("applyUserId",delegateTask.getVariable("createUser",String.class));
nextUserList.add(delegateTask.getVariable("createUser",String.class));
}else {
throw new ActivitiException("1#2申请人修订用户不存在,请配置相关人员");
}
src/main/java/com/ydw/bat/wkflow/listener/standardRegulatoryProcess/SRPstartAfter.java
+2
View File
@@ -85,7 +85,9 @@ public class SRPstartAfter implements TaskListener {
//截止时间 流程描述 创建人
String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
String user = object.getString("prcCreateUser");
delegateTask.setVariable("createUser",user);
String username = object.getString("prcCreateUserName");
delegateTask.setVariable("createUserName",username);
String standName = object.getString("standName");
String prcName="";
if(object.getString("signFlag").equals("1")) {