diff --git a/src/main/java/com/ydw/bat/wkflow/business_activiti/task/TodoTaskController.java b/src/main/java/com/ydw/bat/wkflow/business_activiti/task/TodoTaskController.java index b9f06098..e31c2976 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_activiti/task/TodoTaskController.java +++ b/src/main/java/com/ydw/bat/wkflow/business_activiti/task/TodoTaskController.java @@ -303,6 +303,7 @@ public class TodoTaskController extends BaseAction { if (busMes.getTaskId().indexOf(",") > -1) { String taskIdsrc = busMes.getTaskId().substring(0, busMes.getTaskId().length() - 1); busMes.setTaskId(taskIdsrc); + } logger.info("taskId--> " + busMes.getTaskId()); Task task = taskService.createTaskQuery().taskId(busMes.getTaskId()).singleResult(); diff --git a/src/main/java/com/ydw/bat/wkflow/business_auth/LawsUserInfoService.java b/src/main/java/com/ydw/bat/wkflow/business_auth/LawsUserInfoService.java index 6ed5c5d2..85b08f85 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_auth/LawsUserInfoService.java +++ b/src/main/java/com/ydw/bat/wkflow/business_auth/LawsUserInfoService.java @@ -19,7 +19,7 @@ import java.util.Map; import java.util.Set; @Component -@FeignClient(value = "FotonLAWSSystem-zqazqazqa",path="/api",url="") +@FeignClient(value = "FotonLAWSSystem",path="/api",url="") @RequestMapping("/") public interface LawsUserInfoService { diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/SelectResponsibleUserAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/SelectResponsibleUserAfter.java index b1a8081e..727381d6 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/SelectResponsibleUserAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/SelectResponsibleUserAfter.java @@ -1,5 +1,6 @@ package com.ydw.bat.wkflow.listener.StandardSurvey; +import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName; @@ -34,11 +35,26 @@ public class SelectResponsibleUserAfter implements TaskListener { List nextUserList = new ArrayList(); String userListString=object.getString("responUserList"); + String userListStringName=object.getString("responUserListName"); List userList = Arrays.asList(userListString.split(",")); for (int i = 0; i < userList.size(); i++) { nextUserList.add(userList.get(i).trim()); } + List userListName=Arrays.asList(userListStringName.split(",")); + List newUserListName = new ArrayList(); + userListName.forEach((String name)->{ + newUserListName.add(name.trim()); + }); + + JSONObject userListJson=new JSONObject(); + for (int i = 0; i < userList.size(); i++) { + JSONObject json=new JSONObject(); + json.put("id",userList.get(i)); + json.put("name",newUserListName.get(i)); + userListJson.put(userList.get(i),json); + } + delegateTask.setVariable("responUserListMap",userListJson.toJSONString()); delegateTask.setVariable("responUserList",nextUserList); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/SummarySurveyAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/SummarySurveyAfter.java index 5ec03358..5f46c5e4 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/SummarySurveyAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/SummarySurveyAfter.java @@ -74,7 +74,11 @@ public class SummarySurveyAfter implements TaskListener { busProcessNew.setCommitText(object.getString("commentText")); busProcessNew.setFinishFlag("0"); busProcessNew.setTaskInfo(delegateTask.getName()); - busBean.save(busProcessNew); + + QueryWrapper updataWapper=new QueryWrapper(); + updataWapper.eq("TASK_ID",delegateTask.getId()); + updataWapper.eq("P_ID",delegateTask.getProcessInstanceId()); + busBean.update(busProcessNew,updataWapper); if(nextUserList != null && !nextUserList.isEmpty()){ for(String nextUser : nextUserList){ diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/SummarySurveyBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/SummarySurveyBefore.java index b95ebada..847cc696 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/SummarySurveyBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/SummarySurveyBefore.java @@ -1,5 +1,7 @@ package com.ydw.bat.wkflow.listener.StandardSurvey; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew; import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService; @@ -19,6 +21,10 @@ public class SummarySurveyBefore implements TaskListener { List list = busBean.list(queryWrapper1); if(!list.isEmpty()){ BusProcessNew one1 = list.get(0); + JSONObject obj= JSON.parseObject(one1.getMesg()); + JSONObject map = JSON.parseObject(delegateTask.getVariable("responUserListMap", String.class)); + obj.put("responUserListMap",map.values()); + one1.setMesg(obj.toJSONString()); one1.setTaskId(delegateTask.getId()); one1.setTaskInfo(delegateTask.getName()); busBean.saveOrUpdate(one1); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/UploadResearchResultAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/UploadResearchResultAfter.java index 1d41e6ba..a3aa819c 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/UploadResearchResultAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/UploadResearchResultAfter.java @@ -1,5 +1,6 @@ package com.ydw.bat.wkflow.listener.StandardSurvey; +import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName; @@ -35,6 +36,12 @@ public class UploadResearchResultAfter implements TaskListener { JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); delegateTask.setVariable("objectJson",object); + JSONObject map = JSON.parseObject(delegateTask.getVariable("responUserListMap", String.class)); + JSONObject jsonObject = map.getJSONObject(delegateTask.getAssignee()); + jsonObject.put("fileId",object.getString("fileId")); + map.put(delegateTask.getAssignee(),jsonObject); + delegateTask.setVariable("responUserListMap",map.toJSONString()); + List nextUserList = new ArrayList(); diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml index 29f8e747..48b57516 100644 --- a/src/main/resources/application-prod.yml +++ b/src/main/resources/application-prod.yml @@ -17,7 +17,7 @@ eureka: defaultZone: http:/192.168.10.47:16000/eureka/ spring: application: - name: bat-wkflow-zqazqazqa + name: bat-wkflow http: encoding: charset: UTF-8 diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index bedc00c5..d452a43f 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -18,7 +18,7 @@ eureka: defaultZone: http://192.168.10.47:8761/eureka/ spring: application: - name: bat-wkflow-zqazqazqa + name: bat-wkflow http: encoding: charset: UTF-8