From dd99bc3b833df0898a2a6022431254bd7db37b76 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Mon, 22 Nov 2021 11:27:06 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E8=B0=83=E7=A0=94=E6=B5=81=E7=A8=8B=20?= =?UTF-8?q?=E7=8E=B0=E5=9C=A8=E5=8F=AF=E4=BB=A5=E4=B8=8B=E5=8F=91=E8=87=B3?= =?UTF-8?q?=E5=90=8C=E4=B8=80=E4=BA=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../listener/StandardSurvey/SelectResponsibleUserAfter.java | 6 ++++-- .../listener/StandardSurvey/UploadResearchResultAfter.java | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) 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 8ae4d975..36877c46 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 @@ -34,6 +34,8 @@ public class SelectResponsibleUserAfter implements TaskListener { List nextUserList = new ArrayList(); + object.put("docUser",delegateTask.getAssignee()); + String userListString=object.getString("responUserList"); String userListStringName=object.getString("responUserListName"); @@ -54,9 +56,9 @@ public class SelectResponsibleUserAfter implements TaskListener { json.put("dockUser",delegateTask.getAssignee()); responUserList.add(json); strings.add(userList.get(i)); - map.put(userList.get(i),json); + map.put(delegateTask.getAssignee()+userList.get(i),json); } - +/// delegateTask.setVariable("responUserList",responUserList); if (null == delegateTask.getVariable("responUserLists",List.class)){ delegateTask.setVariable("responUserLists",strings); 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 856ee5f9..373b0c13 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 @@ -37,7 +37,7 @@ public class UploadResearchResultAfter implements TaskListener { JSONArray responUserList = delegateTask.getVariable("responUserList", JSONArray.class); String responUser = delegateTask.getVariable("responUser",String.class); Map map=delegateTask.getVariable("datas",Map.class); - JSONObject os=JSONObject.parseObject(String.valueOf(map.get(responUser))); + JSONObject os=JSONObject.parseObject(String.valueOf(map.get(object.getString("docUser")+responUser))); for (int i = 0; i < responUserList.size(); i++) { JSONObject obj=responUserList.getJSONObject(i); if (obj.getString("id").equals(responUser) From 1a9f0cdf1f9078315a5d682667798b73ef08d7ee Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Tue, 23 Nov 2021 13:40:43 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E6=96=B0=E5=8A=A0=E9=A3=8E=E9=99=A9?= =?UTF-8?q?=E7=A8=8B=E5=BA=A6=20=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../business_slrs/dao/SarInterpretationNationalStandard.java | 4 ++++ src/main/resources/application.yml | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/ydw/bat/wkflow/business_slrs/dao/SarInterpretationNationalStandard.java b/src/main/java/com/ydw/bat/wkflow/business_slrs/dao/SarInterpretationNationalStandard.java index 4f3bfb2d..111bfc02 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_slrs/dao/SarInterpretationNationalStandard.java +++ b/src/main/java/com/ydw/bat/wkflow/business_slrs/dao/SarInterpretationNationalStandard.java @@ -86,4 +86,8 @@ public class SarInterpretationNationalStandard { private Date interpretationTime; + @ApiModelProperty(value = "风险程度") + private String riskDegree; + + } diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index e0d2bdf9..8ea4d190 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -18,7 +18,7 @@ eureka: defaultZone: http://62.234.136.153:8761/eureka/ spring: application: - name: bat-wkflow + name: shan6 http: encoding: charset: UTF-8 From 9dbe0acdb06ac649822a652d62ac37d034c7de97 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Tue, 23 Nov 2021 13:41:06 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E6=A0=87=E5=87=86=E5=BE=81=E6=B1=82?= =?UTF-8?q?=E6=84=8F=E8=A7=81=20-=20=E6=B5=81=E7=A8=8B=E9=80=BB=E8=BE=91?= =?UTF-8?q?=20bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ydw/bat/wkflow/business_auth/LawsUserInfoService.java | 2 +- .../ydw/bat/wkflow/listener/standardRead/DeptApplayAfter.java | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) 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 fb88fef0..3b93b07a 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 @@ -15,7 +15,7 @@ import java.util.Map; import java.util.Set; @Component -@FeignClient(value = "FotonLAWSSystem",path="/api",url="") +@FeignClient(value = "FotonLAWSSystem556",path="/api",url="") @RequestMapping("/") public interface LawsUserInfoService { diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardRead/DeptApplayAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardRead/DeptApplayAfter.java index 3804f42c..a961463e 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardRead/DeptApplayAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardRead/DeptApplayAfter.java @@ -82,6 +82,7 @@ public class DeptApplayAfter implements TaskListener{ standard.setSpecificItem(os.getString("itemsNum")); standard.setStandNumber(object.getString("itemsNum")); standard.setInterpretationTime(delegateTask.getCreateTime()); + standard.setRiskDegree("0"); standards.add(standard); }); From f91d6d83540b1f43c2b59f09563ac6364a047058 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Tue, 23 Nov 2021 13:41:57 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E6=A0=87=E5=87=86=E5=BE=81=E6=B1=82?= =?UTF-8?q?=E6=84=8F=E8=A7=81=20-=20=E6=B5=81=E7=A8=8B=E9=80=BB=E8=BE=91?= =?UTF-8?q?=20bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ydw/bat/wkflow/business_auth/LawsUserInfoService.java | 2 +- src/main/resources/application.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 3b93b07a..fb88fef0 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 @@ -15,7 +15,7 @@ import java.util.Map; import java.util.Set; @Component -@FeignClient(value = "FotonLAWSSystem556",path="/api",url="") +@FeignClient(value = "FotonLAWSSystem",path="/api",url="") @RequestMapping("/") public interface LawsUserInfoService { diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 8ea4d190..e0d2bdf9 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -18,7 +18,7 @@ eureka: defaultZone: http://62.234.136.153:8761/eureka/ spring: application: - name: shan6 + name: bat-wkflow http: encoding: charset: UTF-8 From b77393151d1f97b5ed175dae0cff4d04c80044a4 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Tue, 23 Nov 2021 18:35:14 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E6=96=B0=E4=BB=A3=E5=8A=9E=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../task/TodoTaskController.java | 14 ++++++++++++ .../datas/mapper/BusProcessNameMapper.java | 3 +++ .../datas/service/IBusProcessNameService.java | 4 ++++ .../impl/BusProcessNameServiceImpl.java | 6 +++++ .../mapper/datas/BusProcessNameMapper.xml | 22 +++++++++++++++++++ 5 files changed, 49 insertions(+) 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 9ab88979..91f3d3a0 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 @@ -190,6 +190,20 @@ public class TodoTaskController extends BaseAction { return todoList; } + + @ApiOperation(value = "我的待办任务列表速度优化项") + @ApiImplicitParams({@ApiImplicitParam(name = "name", value = "名称"), + @ApiImplicitParam(name = "current", value = "当前页"), + @ApiImplicitParam(name = "size", value = "每页条数"), + @ApiImplicitParam(name = "userId", value = "用户Id")}) + @PostMapping("/todoTaskListNew") + public List todoTaskListByUserIdNew(@RequestBody TaskCommonQuery taskCommonQuery) { + // 创建查询对象 + List busProcessNames=new ArrayList<>(); + busProcessNames=iBusProcessNameService.todoTask(taskCommonQuery); + return busProcessNames; + } + @ApiOperation(value = "改派任务") @ApiImplicitParams({@ApiImplicitParam(name = "taskId", value = "任务id"), @ApiImplicitParam(name = "assignee", value = "改派人员")}) diff --git a/src/main/java/com/ydw/bat/wkflow/business_main/datas/mapper/BusProcessNameMapper.java b/src/main/java/com/ydw/bat/wkflow/business_main/datas/mapper/BusProcessNameMapper.java index 9abffa86..eda674e8 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_main/datas/mapper/BusProcessNameMapper.java +++ b/src/main/java/com/ydw/bat/wkflow/business_main/datas/mapper/BusProcessNameMapper.java @@ -1,5 +1,6 @@ package com.ydw.bat.wkflow.business_main.datas.mapper; +import com.ydw.bat.wkflow.business_activiti.dto.TaskCommonQuery; import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; @@ -19,4 +20,6 @@ public interface BusProcessNameMapper extends BaseMapper { //查询符合要求的 name 信息 List findBusProcessNameForEnd(String taskId); + List todoTask(@Param("task") TaskCommonQuery taskCommonQuery); + } diff --git a/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/IBusProcessNameService.java b/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/IBusProcessNameService.java index ef1a600f..2f931d6c 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/IBusProcessNameService.java +++ b/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/IBusProcessNameService.java @@ -1,5 +1,6 @@ package com.ydw.bat.wkflow.business_main.datas.service; +import com.ydw.bat.wkflow.business_activiti.dto.TaskCommonQuery; import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName; import com.baomidou.mybatisplus.extension.service.IService; import org.springframework.beans.factory.annotation.Autowired; @@ -17,4 +18,7 @@ import java.util.List; public interface IBusProcessNameService extends IService { List findBusProcessNameForEnd(String prcNum); + + //新查询代办接口 初步测试中 + List todoTask(TaskCommonQuery taskCommonQuery); } diff --git a/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/impl/BusProcessNameServiceImpl.java b/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/impl/BusProcessNameServiceImpl.java index 6b082b8a..cc8ee279 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/impl/BusProcessNameServiceImpl.java +++ b/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/impl/BusProcessNameServiceImpl.java @@ -1,5 +1,6 @@ package com.ydw.bat.wkflow.business_main.datas.service.impl; +import com.ydw.bat.wkflow.business_activiti.dto.TaskCommonQuery; import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName; import com.ydw.bat.wkflow.business_main.datas.mapper.BusProcessNameMapper; import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNameService; @@ -28,4 +29,9 @@ public class BusProcessNameServiceImpl extends ServiceImpl todoTask(TaskCommonQuery taskCommonQuery) { + return busProcessNameMapper.todoTask(taskCommonQuery); + } + } diff --git a/src/main/resources/mapper/datas/BusProcessNameMapper.xml b/src/main/resources/mapper/datas/BusProcessNameMapper.xml index 492b07f8..a81c520d 100644 --- a/src/main/resources/mapper/datas/BusProcessNameMapper.xml +++ b/src/main/resources/mapper/datas/BusProcessNameMapper.xml @@ -29,4 +29,26 @@ AND BUS_PROCESS_NEW.TASK_ID = #{taskId} + + From df6b9b7df71f291f4079f0c5603bc29e54f13488 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Fri, 26 Nov 2021 16:40:20 +0800 Subject: [PATCH 6/6] =?UTF-8?q?11.26=20=E8=A7=A3=E8=AF=BB=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=E6=96=87=E4=BB=B6=E7=B1=BB=E5=9E=8B=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ydw/bat/wkflow/listener/standardRead/DeptApplayAfter.java | 4 ++-- .../ydw/bat/wkflow/listener/standardRead/ResolveAfter.java | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardRead/DeptApplayAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardRead/DeptApplayAfter.java index a961463e..afb8c201 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardRead/DeptApplayAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardRead/DeptApplayAfter.java @@ -53,7 +53,7 @@ public class DeptApplayAfter implements TaskListener{ JSONObject os=JSONObject.parseObject(o.toString()); //分解单数据 SarStandItems sarStandItems1=new SarStandItems(); - sarStandItems1.setFileType("FBGBJBD"); + sarStandItems1.setFileType(delegateTask.getVariable("fileTypeOnly",String.class)); sarStandItems1.setStandId(object.getString("standId")); sarStandItems1.setItemsNum(os.getString("itemsNum")); sarStandItems1.setItemsName(os.getString("itemsName")); @@ -90,7 +90,7 @@ public class DeptApplayAfter implements TaskListener{ jsonArray1.forEach(obj ->{ JSONObject object1 = JSONObject.parseObject(obj.toString()); SarStandItems sarStandItems1=new SarStandItems(); - sarStandItems1.setFileType("FBGBJBD"); + sarStandItems1.setFileType(delegateTask.getVariable("fileTypeOnly",String.class)); sarStandItems1.setStandId(object.getString("standId")); sarStandItems1.setItemsNum(object1.getString("itemsNum")); sarStandItems1.setItemsName(object1.getString("itemsName")); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardRead/ResolveAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardRead/ResolveAfter.java index 67958b60..45f33539 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardRead/ResolveAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardRead/ResolveAfter.java @@ -48,6 +48,7 @@ public class ResolveAfter implements TaskListener{ nextUserList.add(str); } // 配置多实例 + delegateTask.setVariable("fileTypeOnly",object.getString("fileType")); delegateTask.setVariable("zrUserList", nextUserList); //拆分标准 解读中情况下 也展示数据 SarFileSplitInfoEO sarFileSplitInfoEO=new SarFileSplitInfoEO();