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

改名子 调研流程部分bug修复

Browse Source
This commit is contained in:
yuezhihang
2021-08-05 16:35:37 +08:00
parent 88ccc0d3ec
commit ecf9f00ddc
10 changed files with 37 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/ydw/bat/wkflow/listener/NonConformanceRectification/DockingApprovalAfter.java
+3
View File
@@ -10,6 +10,7 @@ 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.IBusProcessNewService;
import com.ydw.bat.wkflow.business_main.datas.service.IDatasService; import com.ydw.bat.wkflow.business_main.datas.service.IDatasService;
import com.ydw.bat.wkflow.util.SpringContextUtil; import com.ydw.bat.wkflow.util.SpringContextUtil;
import org.activiti.engine.ActivitiException;
import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.DelegateTask;
import org.activiti.engine.delegate.TaskListener; import org.activiti.engine.delegate.TaskListener;
@@ -35,6 +36,8 @@ public class DockingApprovalAfter implements TaskListener {
List<String> nextUserList = new ArrayList(); List<String> nextUserList = new ArrayList();
if ("1".equals(object.getString("actionFlag"))) { if ("1".equals(object.getString("actionFlag"))) {
delegateTask.setVariable("actionFlag", 1); delegateTask.setVariable("actionFlag", 1);
JSONObject object1=JSONObject.parseObject(String.valueOf(delegateTask.getVariable("responUser")));
nextUserList.add(object1.getString("id"));
} else { } else {
delegateTask.setVariable("actionFlag", 0); delegateTask.setVariable("actionFlag", 0);
} }
src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/DirectorSignAfter.java
+2 -2
View File
@@ -42,8 +42,8 @@ public class DirectorSignAfter 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 = delegateTask.getVariable("startId",String.class);
String username = object.getString("prcCreateUserName"); String username = delegateTask.getVariable("startName",String.class);
String standName = object.getString("title"); String standName = object.getString("title");
String prcName = standName+"-标准调研流程"; String prcName = standName+"-标准调研流程";
QueryWrapper queryWrapper2 = new QueryWrapper(); QueryWrapper queryWrapper2 = new QueryWrapper();
src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/DockingApprovalAfter.java
+2 -2
View File
@@ -41,8 +41,8 @@ public class DockingApprovalAfter 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 = delegateTask.getVariable("startId",String.class);
String username = object.getString("prcCreateUserName"); String username = delegateTask.getVariable("startName",String.class);
String standName = object.getString("title"); String standName = object.getString("title");
String prcName = standName+"-标准调研流程"; String prcName = standName+"-标准调研流程";
QueryWrapper queryWrapper2 = new QueryWrapper(); QueryWrapper queryWrapper2 = new QueryWrapper();
src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/MinisterAndDockerSignAfter.java
+2 -2
View File
@@ -44,8 +44,8 @@ public class MinisterAndDockerSignAfter 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 = delegateTask.getVariable("startId",String.class);
String username = object.getString("prcCreateUserName"); String username = delegateTask.getVariable("startName",String.class);
String standName = object.getString("title"); String standName = object.getString("title");
String prcName = standName+"-标准调研流程"; String prcName = standName+"-标准调研流程";
QueryWrapper queryWrapper2 = new QueryWrapper(); QueryWrapper queryWrapper2 = new QueryWrapper();
src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/PresidentSignAfter.java
+2 -2
View File
@@ -41,8 +41,8 @@ public class PresidentSignAfter 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 = delegateTask.getVariable("startId",String.class);
String username = object.getString("prcCreateUserName"); String username = delegateTask.getVariable("startName",String.class);
String standName = object.getString("title"); String standName = object.getString("title");
String prcName = standName+"-标准调研流程"; String prcName = standName+"-标准调研流程";
QueryWrapper queryWrapper2 = new QueryWrapper(); QueryWrapper queryWrapper2 = new QueryWrapper();
src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/ResponUserSignAfter.java
+2 -2
View File
@@ -51,8 +51,8 @@ public class ResponUserSignAfter 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 = delegateTask.getVariable("startId",String.class);
String username = object.getString("prcCreateUserName"); String username = delegateTask.getVariable("startName",String.class);
String standName = object.getString("title"); String standName = object.getString("title");
String prcName = standName+"-标准调研流程"; String prcName = standName+"-标准调研流程";
QueryWrapper queryWrapper2 = new QueryWrapper(); QueryWrapper queryWrapper2 = new QueryWrapper();
src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/SelectResponsibleUserAfter.java
+8 -6
View File
@@ -16,10 +16,7 @@ import org.activiti.engine.delegate.TaskListener;
import java.rmi.activation.ActivationException; import java.rmi.activation.ActivationException;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.ArrayList; import java.util.*;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
public class SelectResponsibleUserAfter implements TaskListener { public class SelectResponsibleUserAfter implements TaskListener {
@Override @Override
@@ -47,6 +44,8 @@ public class SelectResponsibleUserAfter implements TaskListener {
List<String> userListName=Arrays.asList(userListStringName.split(",")); List<String> userListName=Arrays.asList(userListStringName.split(","));
List<String> userList = Arrays.asList(userListString.split(",")); List<String> userList = Arrays.asList(userListString.split(","));
List<String> strings=new ArrayList<>();
Map<String,JSONObject> map=new HashMap<>();
for (int i = 0; i < userList.size(); i++) { for (int i = 0; i < userList.size(); i++) {
JSONObject json=new JSONObject(); JSONObject json=new JSONObject();
@@ -54,10 +53,13 @@ public class SelectResponsibleUserAfter implements TaskListener {
json.put("name",userListName.get(i)); json.put("name",userListName.get(i));
json.put("dockUser",delegateTask.getAssignee()); json.put("dockUser",delegateTask.getAssignee());
responUserList.add(json); responUserList.add(json);
strings.add(userList.get(i));
map.put(userList.get(i),json);
} }
//1个Lsit 存id 两个Map key=id dockUser
delegateTask.setVariable("responUserList",responUserList);
delegateTask.setVariable("responUserList",responUserList);
delegateTask.setVariable("responUserLists",strings);
delegateTask.setVariable("datas",map);
//截止时间 流程描述 创建人 //截止时间 流程描述 创建人
src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/StartSurveyAfter.java
+4 -2
View File
@@ -64,8 +64,10 @@ 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("startUser");
String username = object.getString("prcCreateUserName"); String username = object.getString("startUserName");
delegateTask.setVariable("startId",user);
delegateTask.setVariable("startName",username);
String standName = object.getString("title"); String standName = object.getString("title");
String prcName = standName+"-标准调研流程"; String prcName = standName+"-标准调研流程";
QueryWrapper queryWrapper2 = new QueryWrapper(); QueryWrapper queryWrapper2 = new QueryWrapper();
src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/SummarySurveyAfter.java
+2 -2
View File
@@ -48,8 +48,8 @@ public class SummarySurveyAfter 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 = delegateTask.getVariable("startId",String.class);
String username = object.getString("prcCreateUserName"); String username = delegateTask.getVariable("startName",String.class);
String standName = object.getString("title"); String standName = object.getString("title");
String prcName = standName+"-标准调研流程"; String prcName = standName+"-标准调研流程";
QueryWrapper queryWrapper2 = new QueryWrapper(); QueryWrapper queryWrapper2 = new QueryWrapper();
src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/UploadResearchResultAfter.java
+10 -12
View File
@@ -17,10 +17,7 @@ import org.activiti.engine.delegate.TaskListener;
import org.activiti.engine.impl.task.TaskDefinition; import org.activiti.engine.impl.task.TaskDefinition;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.ArrayList; import java.util.*;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
@Slf4j @Slf4j
public class UploadResearchResultAfter implements TaskListener { public class UploadResearchResultAfter implements TaskListener {
@@ -38,12 +35,13 @@ public class UploadResearchResultAfter implements TaskListener {
JSONArray responUserList = delegateTask.getVariable("responUserList", JSONArray.class); JSONArray responUserList = delegateTask.getVariable("responUserList", JSONArray.class);
JSONObject responUser = delegateTask.getVariable("responUser", JSONObject.class); String responUser = delegateTask.getVariable("responUser",String.class);
Map map=delegateTask.getVariable("datas",Map.class);
JSONObject os=JSONObject.parseObject(String.valueOf(map.get(responUser)));
for (int i = 0; i < responUserList.size(); i++) { for (int i = 0; i < responUserList.size(); i++) {
JSONObject obj=responUserList.getJSONObject(i); JSONObject obj=responUserList.getJSONObject(i);
if(obj.getString("id").equals(responUser.getString("id")) if(obj.getString("id").equals(responUser)
&&obj.getString("dockUser").equals(responUser.getString("dockUser")) &&obj.getString("dockUser").equals(os.getString("dockUser"))
){ ){
object.put("responUser",obj.getString("id")); object.put("responUser",obj.getString("id"));
@@ -58,7 +56,7 @@ public class UploadResearchResultAfter implements TaskListener {
} }
} }
delegateTask.setVariable("dockUsers",os.getString("dockUser"));
delegateTask.setVariable("responUserList",responUserList); delegateTask.setVariable("responUserList",responUserList);
@@ -67,8 +65,8 @@ public class UploadResearchResultAfter 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 = delegateTask.getVariable("startId",String.class);
String username = object.getString("prcCreateUserName"); String username = delegateTask.getVariable("startName",String.class);
String standName = object.getString("title"); String standName = object.getString("title");
String prcName = standName+"-标准调研流程"; String prcName = standName+"-标准调研流程";
QueryWrapper queryWrapper2 = new QueryWrapper(); QueryWrapper queryWrapper2 = new QueryWrapper();
@@ -105,7 +103,7 @@ public class UploadResearchResultAfter implements TaskListener {
busProcessNewNext.setMesg(object.toJSONString()); busProcessNewNext.setMesg(object.toJSONString());
busProcessNewNext.setFinishFlag("0"); busProcessNewNext.setFinishFlag("0");
busProcessNewNext.setTaskInfo("责任对接人审批"); busProcessNewNext.setTaskInfo("责任对接人审批");
busProcessNewNext.setUserId(delegateTask.getVariable("responUser",JSONObject.class).getString("dockUser")); busProcessNewNext.setUserId(os.getString("dockUser"));
busBean.save(busProcessNewNext); busBean.save(busProcessNewNext);
} }
} }