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/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/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) 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..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")); @@ -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); }); @@ -89,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(); 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} + +