From f9b8c6d28a8271039359b4a0f4e00041d4febdeb Mon Sep 17 00:00:00 2001 From: hongawen <83944980@qq.com> Date: Sat, 14 Sep 2024 10:22:55 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E9=A2=84=E5=91=8A=E8=AD=A6=E5=8D=95?= =?UTF-8?q?=E5=BE=85=E5=A4=84=E7=90=86=202=E3=80=81=E7=BB=88=E7=AB=AF?= =?UTF-8?q?=E5=91=A8=E6=9C=9F=E6=A3=80=E6=B5=8B=E5=BE=85=E6=A3=80=E6=B5=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../njcn/bpm/controller/BpmTaskController.java | 15 +++++++++------ .../supervision/enums/SupervisionKeyEnum.java | 3 ++- .../device/impl/CheckDeviceServiceImpl.java | 13 ++++++++++++- .../leaflet/impl/WarningLeafletServiceImpl.java | 8 +++++++- 4 files changed, 30 insertions(+), 9 deletions(-) diff --git a/pqs-bpm/bpm-boot/src/main/java/com/njcn/bpm/controller/BpmTaskController.java b/pqs-bpm/bpm-boot/src/main/java/com/njcn/bpm/controller/BpmTaskController.java index ffdcfdd87..d76e067ea 100644 --- a/pqs-bpm/bpm-boot/src/main/java/com/njcn/bpm/controller/BpmTaskController.java +++ b/pqs-bpm/bpm-boot/src/main/java/com/njcn/bpm/controller/BpmTaskController.java @@ -151,18 +151,21 @@ public class BpmTaskController extends BaseController { public HttpResult> allTodoList() { String methodDescribe = getMethodDescribe("allTodoList"); List result = new ArrayList<>(); - // 获取当前用户所有待办工作流程 - HttpResult> todoAllList = this.todoAllList(); - if(CollectionUtil.isNotEmpty(todoAllList.getData())){ - // 转为统一的todoVO3 - result.addAll(TodoVOConvert.convertByBpmTaskVO(todoAllList.getData())); - } + // 获取当前用户所有不通过的工作流程 List rejectProcessInstanceList = getRejectProcessInstanceList(); if(CollectionUtil.isNotEmpty(rejectProcessInstanceList)){ // 转为统一的todoVO3 result.addAll(TodoVOConvert.convertByBpmProcessInstance(rejectProcessInstanceList)); } + + // 获取当前用户所有待办工作流程 + HttpResult> todoAllList = this.todoAllList(); + if(CollectionUtil.isNotEmpty(todoAllList.getData())){ + // 转为统一的todoVO3 + result.addAll(TodoVOConvert.convertByBpmTaskVO(todoAllList.getData())); + } + // 获取没有流程的一些待办信息 result.addAll(businessCommonFeignClient.getTodoBusiness().getData()); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe); diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/enums/SupervisionKeyEnum.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/enums/SupervisionKeyEnum.java index f20843013..f587cb1a2 100644 --- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/enums/SupervisionKeyEnum.java +++ b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/enums/SupervisionKeyEnum.java @@ -19,6 +19,8 @@ public enum SupervisionKeyEnum { TIMING_CHECK_DEVICE("timing_check_device", "device", "终端周期检测", "CheckDeviceServiceImpl","terminalNetwotk"), // 试运行评估 LINE_RUN_TEST("line_run_test", "device", "监测点试运行评估流程", "SupervisionTempLineRunTestServiceImpl","testRun"), + // 台账管理 干扰源用户台账 + BUILD_USER_INFO_ARCHIVIST("build_user_info_archivist","user","干扰源用户台账归档流程","UserReportPOServiceImpl",""), // 技术监督计划 SUP_PLAN_ADD("sup_plan_add", "plan", "技术监督计划流程（计划和测试）", "SupervisionPlanPOServiceImpl","supervision/harmonicmanagement"), SURVEY_PLAN("survey_plan", "survey", "监督计划流程", "SurveyPlanServiceImpl","supervision/harmonicmanagement"), @@ -28,7 +30,6 @@ public enum SupervisionKeyEnum { // 终端状态管理 QUIT_RUNNING_DEVICE("quit_running_device", "device", "终端状态变更流程", "QuitRunningDeviceServiceImpl","supervision/retire"), - BUILD_USER_INFO_ARCHIVIST("build_user_info_archivist","user","干扰源用户台账归档流程","UserReportPOServiceImpl",""), // 弃用 USER_REPORT_DELETE("user_report_delete", "user", "干扰源常态化信息删除流程", "UserReportDeleteServiceImpl",""); diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/CheckDeviceServiceImpl.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/CheckDeviceServiceImpl.java index 7d0acb157..88e5b9afb 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/CheckDeviceServiceImpl.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/CheckDeviceServiceImpl.java @@ -35,13 +35,16 @@ import com.njcn.supervision.pojo.vo.device.CheckDeviceVo; import com.njcn.supervision.service.device.ICheckDeviceService; import com.njcn.supervision.utils.InstanceUtil; import com.njcn.user.api.DeptFeignClient; +import com.njcn.user.api.UserFeignClient; import com.njcn.user.pojo.po.Dept; +import com.njcn.user.pojo.vo.UserVO; import com.njcn.web.factory.PageFactory; import com.njcn.web.utils.RequestUtil; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import javax.annotation.Resource; import java.time.LocalDate; import java.time.format.DateTimeFormatter; import java.time.temporal.ChronoUnit; @@ -70,6 +73,8 @@ public class CheckDeviceServiceImpl extends MppServiceImpl getTodoBusiness() { List todoVOList = new ArrayList<>(); + //如果用户为管理员则不查 + UserVO userVO = userFeignClient.getUserById(RequestUtil.getUserIndex()).getData(); + if(Objects.nonNull(userVO) && userVO.getType() == 1){ + return todoVOList; + } QueryWrapper queryWrapper = new QueryWrapper<>(); DeptGetLineParam deptGetLineParam = new DeptGetLineParam(); deptGetLineParam.setDeptId(RequestUtil.getDeptIndex()); @@ -239,7 +249,8 @@ public class CheckDeviceServiceImpl extends MppServiceImpl getTodoBusiness() { List todoVOList = new ArrayList<>(); + //如果用户为管理员则不查 + UserVO userVO = userFeignClient.getUserById(RequestUtil.getUserIndex()).getData(); + if(Objects.nonNull(userVO) && userVO.getType() == 1){ + return todoVOList; + } QueryWrapper queryWrapper = new QueryWrapper<>(); List deptIds = deptFeignClient.getDepSonIdtByDeptId(RequestUtil.getDeptIndex()).getData(); if(CollectionUtil.isEmpty(deptIds)){ @@ -465,7 +471,7 @@ public class WarningLeafletServiceImpl extends ServiceImpl