BJ_FS / urbanops

Commit 5b739d580a736c2659d25cfa27a705b81d383195

Authored by 王富生
1 parent a38821cc

抢险任务提交update

Inline Side-by-side
Showing 1 changed file with 8 additions and 4 deletions
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/emergencytask/EmergencyTaskMapper.java
  View file @5b739d5
@@ -12,6 +12,7 @@ import com.zteits.urbanops.module.garden.dal.dataobject.emergencytask.EmergencyT @@ -12,6 +12,7 @@ import com.zteits.urbanops.module.garden.dal.dataobject.emergencytask.EmergencyT
12 import org.apache.ibatis.annotations.Mapper; 12 import org.apache.ibatis.annotations.Mapper;
13 import com.zteits.urbanops.module.garden.controller.admin.emergencytask.vo.*; 13 import com.zteits.urbanops.module.garden.controller.admin.emergencytask.vo.*;
14 import org.apache.ibatis.annotations.Param; 14 import org.apache.ibatis.annotations.Param;
  15 +import org.springframework.util.CollectionUtils;
15 16
16 /** 17 /**
17 * 抢险任务主 Mapper 18 * 抢险任务主 Mapper
@@ -31,7 +32,7 @@ public interface EmergencyTaskMapper extends BaseMapperX<EmergencyTaskDO> { @@ -31,7 +32,7 @@ public interface EmergencyTaskMapper extends BaseMapperX<EmergencyTaskDO> {
31 if (reqVO.getEndTime() != null) { 32 if (reqVO.getEndTime() != null) {
32 endDateTime = reqVO.getEndTime().atTime(LocalTime.MAX); 33 endDateTime = reqVO.getEndTime().atTime(LocalTime.MAX);
33 } 34 }
34 - return selectPage(reqVO, new LambdaQueryWrapperX<EmergencyTaskDO>() 35 + LambdaQueryWrapperX<EmergencyTaskDO> sql = new LambdaQueryWrapperX<EmergencyTaskDO>()
35 .likeIfPresent(EmergencyTaskDO::getTaskNo, reqVO.getTaskNo()) 36 .likeIfPresent(EmergencyTaskDO::getTaskNo, reqVO.getTaskNo())
36 .eqIfPresent(EmergencyTaskDO::getEmergencyTypeId, reqVO.getEmergencyTypeId()) 37 .eqIfPresent(EmergencyTaskDO::getEmergencyTypeId, reqVO.getEmergencyTypeId())
37 .eqIfPresent(EmergencyTaskDO::getEmergencyHarmId, reqVO.getEmergencyHarmId()) 38 .eqIfPresent(EmergencyTaskDO::getEmergencyHarmId, reqVO.getEmergencyHarmId())
@@ -39,9 +40,12 @@ public interface EmergencyTaskMapper extends BaseMapperX&lt;EmergencyTaskDO&gt; { @@ -39,9 +40,12 @@ public interface EmergencyTaskMapper extends BaseMapperX&lt;EmergencyTaskDO&gt; {
39 .likeIfPresent(EmergencyTaskDO::getEmergencyLocation, reqVO.getEmergencyLocation()) 40 .likeIfPresent(EmergencyTaskDO::getEmergencyLocation, reqVO.getEmergencyLocation())
40 .eqIfPresent(EmergencyTaskDO::getBusiStatus, reqVO.getBusiStatus()) 41 .eqIfPresent(EmergencyTaskDO::getBusiStatus, reqVO.getBusiStatus())
41 .eqIfPresent(EmergencyTaskDO::getCompanyId, reqVO.getCompanyId()) 42 .eqIfPresent(EmergencyTaskDO::getCompanyId, reqVO.getCompanyId())
42 - .betweenIfPresent(EmergencyTaskDO::getDiscoveryTime, startDateTime, endDateTime)  
43 - .inIfPresent(EmergencyTaskDO::getBusiStatus, reqVO.getBusiStatusList())  
44 - .orderByDesc(EmergencyTaskDO::getId)); 43 + .betweenIfPresent(EmergencyTaskDO::getDiscoveryTime, startDateTime, endDateTime);
  44 + if(!CollectionUtils.isEmpty(reqVO.getBusiStatusList())){
  45 + sql.in(EmergencyTaskDO::getBusiStatus, reqVO.getBusiStatusList());
  46 + }
  47 + sql.orderByDesc(EmergencyTaskDO::getId);
  48 + return selectPage(reqVO, sql);
45 } 49 }
46 50
47 int deleteByTaskNo(@Param("taskNo") String taskNo); 51 int deleteByTaskNo(@Param("taskNo") String taskNo);