From 72d49563cb270e1acbccf143783aae1e0bfd6484 Mon Sep 17 00:00:00 2001 From: wangfs <15029758498@163.com> Date: Fri, 13 Mar 2026 23:36:16 +0800 Subject: [PATCH] 抢险任务提交update --- urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/emergencytask/vo/EmergencyTaskPageReqVO.java | 3 +++ urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/emergencytask/EmergencyTaskMapper.java | 1 + urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/emergencytask/EmergencyTaskServiceImpl.java | 6 +++--- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/emergencytask/vo/EmergencyTaskPageReqVO.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/emergencytask/vo/EmergencyTaskPageReqVO.java index 9ce1c48..30a4253 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/emergencytask/vo/EmergencyTaskPageReqVO.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/emergencytask/vo/EmergencyTaskPageReqVO.java @@ -46,4 +46,7 @@ public class EmergencyTaskPageReqVO extends PageParam { @Schema(description = "归属(一级部门id)", example = "6353") private Long companyId; + + private List busiStatusList; + } \ No newline at end of file diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/emergencytask/EmergencyTaskMapper.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/emergencytask/EmergencyTaskMapper.java index 2fa32d6..7e499c8 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/emergencytask/EmergencyTaskMapper.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/emergencytask/EmergencyTaskMapper.java @@ -40,6 +40,7 @@ public interface EmergencyTaskMapper extends BaseMapperX { .eqIfPresent(EmergencyTaskDO::getBusiStatus, reqVO.getBusiStatus()) .eqIfPresent(EmergencyTaskDO::getCompanyId, reqVO.getCompanyId()) .betweenIfPresent(EmergencyTaskDO::getDiscoveryTime, startDateTime, endDateTime) + .inIfPresent(EmergencyTaskDO::getBusiStatus, reqVO.getBusiStatusList()) .orderByDesc(EmergencyTaskDO::getId)); } diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/emergencytask/EmergencyTaskServiceImpl.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/emergencytask/EmergencyTaskServiceImpl.java index 4842002..ecb3582 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/emergencytask/EmergencyTaskServiceImpl.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/emergencytask/EmergencyTaskServiceImpl.java @@ -195,9 +195,9 @@ public class EmergencyTaskServiceImpl implements EmergencyTaskService { public PageResult getEmergencyTaskPage(EmergencyTaskPageReqVO pageReqVO) { Long companyId = SecurityFrameworkUtils.getCompanyId(); //超级管理员全返回 -// if(companyId != null && !companyId.equals(100L)){ -// pageReqVO.setCompanyId(companyId); -// } + if(companyId != null && !companyId.equals(100L)){ + pageReqVO.setBusiStatusList(Arrays.asList(2,3,4,5)); + } PageResult page = emergencyTaskMapper.selectPage(pageReqVO); List list = page.getList(); -- libgit2 0.21.4