抢险任务提交update

王富生
1 parent d82fd0e7
Showing 3 changed files with 7 additions and 3 deletions
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/emergencytask/vo/EmergencyTaskPageReqVO.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/emergencytask/EmergencyTaskMapper.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/emergencytask/EmergencyTaskServiceImpl.java
@@ -46,4 +46,7 @@ public class EmergencyTaskPageReqVO extends PageParam {
     @Schema(description = "归属(一级部门id)", example = "6353")
     private Long companyId;
+
+    private List<Integer> busiStatusList;
+
 }
 \ No newline at end of file
@@ -40,6 +40,7 @@ public interface EmergencyTaskMapper extends BaseMapperX&lt;EmergencyTaskDO&gt; {
                 .eqIfPresent(EmergencyTaskDO::getBusiStatus, reqVO.getBusiStatus())
                 .eqIfPresent(EmergencyTaskDO::getCompanyId, reqVO.getCompanyId())
                 .betweenIfPresent(EmergencyTaskDO::getDiscoveryTime, startDateTime, endDateTime)
+                .inIfPresent(EmergencyTaskDO::getBusiStatus, reqVO.getBusiStatusList())
                 .orderByDesc(EmergencyTaskDO::getId));
     }
@@ -195,9 +195,9 @@ public class EmergencyTaskServiceImpl implements EmergencyTaskService {
     public PageResult<EmergencyTaskRespVO> 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<EmergencyTaskDO> page = emergencyTaskMapper.selectPage(pageReqVO);
         List<EmergencyTaskDO> list = page.getList();