Merge branch 'master' of https://e.coding.net/chuanghaikeji/smarCampus/iHotel_student_houtai into develop-wxl

src/main/java/com/template/api/HouseLockControllerAPI.java

@@ -14,7 +14,7 @@ public interface HouseLockControllerAPI {
 
     @GetMapping("/list")
     @ApiOperation(value = "门锁管理页面展示", notes = "门锁管理页面展示", httpMethod = "GET")
-    CommonResult list(String permissionSettingId,String roomNumber,String roomName);
+    CommonResult list(String permissionSettingId,String roomNumber,String roomName,Integer houseType,Integer buildingId);
 
     @GetMapping("/particular")
     @ApiOperation(value = "门锁详情展示", notes = "门锁详情展示", httpMethod = "GET")

src/main/java/com/template/api/HouseNumberControllerAPI.java

@@ -24,7 +24,7 @@ public interface HouseNumberControllerAPI {
 
     @GetMapping("/list")
     @ApiOperation(value = "房间页面展示——水电管理", notes = "房间页面展示——水电管理", httpMethod = "GET")
-    CommonResult list(String permissionSettingId,int page, int size,String keyWord,String startTime,String endTime);
+    CommonResult list(String permissionSettingId,int page, int size,String keyWord,String startTime,String endTime,String houseId,Integer buildingId);
 
     @PostMapping("/update")
     @ApiOperation(value = "水电表编辑", notes = "水电表编辑", httpMethod = "POST")
@@ -36,7 +36,7 @@ public interface HouseNumberControllerAPI {
 
     @GetMapping("/listExport")
     @ApiOperation(value = "房间水电编码导出", notes = "房间水电编码导出", httpMethod = "GET")
-    void listExport(HttpServletResponse response, String permissionSettingId, String keyWord, String startTime, String endTime);
+    void listExport(HttpServletResponse response, String permissionSettingId, String keyWord, String startTime, String endTime,String houseId,Integer buildingId);
 
     @PostMapping("/importList")
     @ApiOperation(value = "房间水电编码导入", notes = "房间水电编码导入", httpMethod = "POST")

src/main/java/com/template/controller/HouseLockController.java

@@ -75,7 +75,7 @@ public class HouseLockController implements HouseLockControllerAPI {
     UnlockingEmployeeService unlockingEmployeeService;
 
     @Override
-    public CommonResult list(String permissionSettingId, String roomNumber, String roomName) {
+    public CommonResult list(String permissionSettingId, String roomNumber, String roomName,Integer houseType,Integer buildingId) {
         PermissionSetting permissionSetting = permissionSettingService.getById(permissionSettingId);
         if (ObjectUtils.isEmpty(permissionSetting)) {
             return CommonResult.fail("非法进入");
@@ -89,7 +89,7 @@ public class HouseLockController implements HouseLockControllerAPI {
 
         LambdaQueryWrapper<House> hWrapper = new LambdaQueryWrapper<>();
         hWrapper.eq(ObjectUtils.isNotEmpty(roomName), House::getRoomName, roomName);
-
+        hWrapper.eq(ObjectUtils.isNotEmpty(houseType),House::getRoomType,houseType);
         List<House> list = houseService.list(hWrapper);
         String houseIds = "";
         for (int i = 0; i < list.size(); i++) {
@@ -103,7 +103,7 @@ public class HouseLockController implements HouseLockControllerAPI {
             }
         }
 
-        List<houseLockListVo> voList = houseNumberService.houseLockPage(roomNumber, houseIds);
+        List<houseLockListVo> voList = houseNumberService.houseLockPage(roomNumber, houseIds,buildingId);
 
         ArrayList<HouseLockVo> vos = new ArrayList<>();
         for (House house : list) {

src/main/java/com/template/controller/HouseNumberController.java

@@ -70,6 +70,8 @@ public class HouseNumberController implements HouseNumberControllerAPI {
     @Autowired
     HouseLockService houseLockService;
 
+    @Autowired
+    HouseNumberStateService houseNumberStateService;
     @Override
     public CommonResult pullDownList(String permissionSettingId, int page, int size, String keyWord) {
         PermissionSetting permissionSetting = permissionSettingService.getById(permissionSettingId);
@@ -169,7 +171,7 @@ public class HouseNumberController implements HouseNumberControllerAPI {
     }
 
     @Override
-    public CommonResult list(String permissionSettingId, int page, int size, String keyWord, String startTime, String endTime) {
+    public CommonResult list(String permissionSettingId, int page, int size, String keyWord, String startTime, String endTime,String houseId,Integer buildingId) {
         PermissionSetting permissionSetting = permissionSettingService.getById(permissionSettingId);
         if (ObjectUtils.isEmpty(permissionSetting)) {
             return CommonResult.fail("非法进入");
@@ -186,9 +188,9 @@ public class HouseNumberController implements HouseNumberControllerAPI {
         if (ObjectUtils.isEmpty(size) && size <= 0) {
             size = 10;
         }
+        System.out.println("houseId = " + houseId);
 
-
-        PageUtils<HouseNumberPageVo> pageList = houseNumberService.pageList(page, size, keyWord, startTime, endTime);
+        PageUtils<HouseNumberPageVo> pageList = houseNumberService.pageList(page, size, keyWord, startTime, endTime,houseId,buildingId);
 
 
         return CommonResult.ok(pageList);
@@ -301,7 +303,7 @@ public class HouseNumberController implements HouseNumberControllerAPI {
     }
 
     @Override
-    public void listExport(HttpServletResponse response, String permissionSettingId, String keyWord, String startTime, String endTime) {
+    public void listExport(HttpServletResponse response, String permissionSettingId, String keyWord, String startTime, String endTime,String houseId,Integer buildingId) {
 //        PermissionSetting permissionSetting = permissionSettingService.getById(permissionSettingId);
 //        if (ObjectUtils.isEmpty(permissionSetting)) {
 //            return CommonResult.fail("非法进入");
@@ -312,7 +314,7 @@ public class HouseNumberController implements HouseNumberControllerAPI {
 //            return CommonResult.fail("此账号暂无该权限");
 //        }
 
-        List<HouseNumberPageVo> vos = houseNumberService.listExport(keyWord, startTime, endTime);
+        List<HouseNumberPageVo> vos = houseNumberService.listExport(keyWord, startTime, endTime,houseId,buildingId);
 
 
 //        导出
@@ -645,7 +647,10 @@ public class HouseNumberController implements HouseNumberControllerAPI {
         }
 //        判断当前时间是否还订单
         Date date = new Date();
-
+        List<HouseNumberState> list = houseNumberStateService.getDate(date, houseNumberId);
+        if (ObjectUtils.isNotEmpty(list)) {
+            return CommonResult.fail("已有房态，暂时无法删除");
+        }
 
         LambdaQueryWrapper<HouseLock> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(HouseLock::getHouseNumberId, houseNumberId);

src/main/java/com/template/mapper/HouseNumberMapper.java

@@ -28,7 +28,7 @@ public interface HouseNumberMapper extends BaseMapper<HouseNumber> {
     IPage<CalendarPageVo> houseStateCalendarPage(Page<CalendarPageVo> pageVo, @Param("keyWord") String keyWord, @Param("houseType") String houseType,@Param("houseId") Integer houseId,@Param("buildingId")Integer buildingId);
 
 
-    List<houseLockListVo> houseLockListDto(@Param("roomNumber") String roomNumber, @Param("houseIds") String houseIds);
+    List<houseLockListVo> houseLockListDto(@Param("roomNumber") String roomNumber, @Param("houseIds") String houseIds,@Param("buildingId") Integer buildingId);
 
     List<Integer> getNumberState(@Param("date") Date date);
 
@@ -44,9 +44,9 @@ public interface HouseNumberMapper extends BaseMapper<HouseNumber> {
 
     List<HouseNumberVo> roomChangePage(@Param("houseId") String houseId);
 
-    IPage<HouseNumberPageVo> pageList(Page<HouseNumberPageVo> pageVo, @Param("keyWord") String keyWord, @Param("startTime") String startTime, @Param("endTime") String endTime);
+    IPage<HouseNumberPageVo> pageList(Page<HouseNumberPageVo> pageVo, @Param("keyWord") String keyWord, @Param("startTime") String startTime, @Param("endTime") String endTime,@Param("houseId") String houseId,@Param("buildingId") Integer buildingId);
 
-    List<HouseNumberPageVo> listExport(@Param("keyWord") String keyWord, @Param("startTime") String startTime, @Param("endTime") String endTime);
+    List<HouseNumberPageVo> listExport(@Param("keyWord") String keyWord, @Param("startTime") String startTime, @Param("endTime") String endTime,@Param("houseId") String houseId,@Param("buildingId") Integer buildingId);
 
 
     IPage<HouseNumberListVo> getpage(Page<HouseNumberListVo> pageVo,@Param("keyWord") String keyWord,@Param("buildingId") Integer buildingId,@Param("houseId") Integer houseId);

src/main/java/com/template/mapper/HouseNumberStateMapper.java

@@ -30,4 +30,6 @@ public interface HouseNumberStateMapper extends BaseMapper<HouseNumberState> {
     HouseNumberState getLockHouseNumberState(@Param("houseNumberId")String houseNumberId,@Param("now") LocalDateTime now);
 
     HouseNumberState getMaintainHouseNumberState(@Param("houseNumberId")String houseNumberId,@Param("date") LocalDateTime date);
+
+    List<HouseNumberState> getDate(@Param("date") Date date,@Param("houseNumberId") Integer houseNumberId);
 }

src/main/java/com/template/services/HouseNumberService.java

@@ -23,7 +23,7 @@ public interface HouseNumberService extends IService<HouseNumber> {
 
     PageUtils<CalendarPageVo> houseStateCalendarPage(String keyWord, String houseType, int page, int size,Integer houseId,Integer buildingId);
 
-    List<houseLockListVo>  houseLockPage(String roomNumber, String houseIds);
+    List<houseLockListVo>  houseLockPage(String roomNumber, String houseIds,Integer buildingId);
 
     List<Integer> getNumberState(Date date);
 
@@ -41,9 +41,9 @@ public interface HouseNumberService extends IService<HouseNumber> {
 
     HouseNumber getRoomNumber(Integer houseId, String roomNumber);
 
-    PageUtils<HouseNumberPageVo> pageList(int page, int size, String keyWord, String startTime, String endTime);
+    PageUtils<HouseNumberPageVo> pageList(int page, int size, String keyWord, String startTime, String endTime,String houseId,Integer buildingId);
 
-    List<HouseNumberPageVo> listExport(String keyWord, String startTime, String endTime);
+    List<HouseNumberPageVo> listExport(String keyWord, String startTime, String endTime,String houseId,Integer buildingId);
 
     PageUtils<HouseNumberListVo> getpage(int page, int size, String keyWord, Integer buildingId, Integer houseId);
 

src/main/java/com/template/services/HouseNumberStateService.java

@@ -26,4 +26,7 @@ public interface HouseNumberStateService extends IService<HouseNumberState> {
     HouseNumberState getLockHouseNumberState(String houseNumberId, LocalDateTime now);
 
     HouseNumberState getMaintainHouseNumberState(String houseNumberId, LocalDateTime date);
+
+    List<HouseNumberState> getDate(Date date, Integer houseNumberId);
+
 }

src/main/java/com/template/services/impl/HouseNumberServiceImpl.java

@@ -45,11 +45,11 @@ public class HouseNumberServiceImpl extends ServiceImpl<HouseNumberMapper, House
     }
 
     @Override
-    public  List<houseLockListVo> houseLockPage(String roomNumber, String houseIds) {
+    public  List<houseLockListVo> houseLockPage(String roomNumber, String houseIds,Integer buildingId) {
 //        Page<houseLockListVo> pageVo = new Page<>(page,size);
 //        IPage<houseLockListVo> result=houseNumberMapper.houseLockListDto(pageVo,roomNumber,houseIds);
 //        return new  PageUtils(result);
-        List<houseLockListVo> result=houseNumberMapper.houseLockListDto(roomNumber,houseIds);
+        List<houseLockListVo> result=houseNumberMapper.houseLockListDto(roomNumber,houseIds,buildingId);
         return result;
     }
 
@@ -98,15 +98,15 @@ public class HouseNumberServiceImpl extends ServiceImpl<HouseNumberMapper, House
     }
 
     @Override
-    public PageUtils<HouseNumberPageVo> pageList(int page, int size, String keyWord, String startTime, String endTime) {
+    public PageUtils<HouseNumberPageVo> pageList(int page, int size, String keyWord, String startTime, String endTime,String houseId,Integer buildingId) {
         Page<HouseNumberPageVo> pageVo = new Page<>(page,size);
-        IPage<HouseNumberPageVo> result=houseNumberMapper.pageList(pageVo,keyWord,startTime,endTime);
+        IPage<HouseNumberPageVo> result=houseNumberMapper.pageList(pageVo,keyWord,startTime,endTime,houseId,buildingId);
         return new PageUtils(result);
     }
 
     @Override
-    public List<HouseNumberPageVo> listExport(String keyWord, String startTime, String endTime) {
-        return houseNumberMapper.listExport(keyWord,startTime,endTime);
+    public List<HouseNumberPageVo> listExport(String keyWord, String startTime, String endTime,String houseId,Integer buildingId) {
+        return houseNumberMapper.listExport(keyWord,startTime,endTime,houseId,buildingId);
     }
 
     @Override

src/main/java/com/template/services/impl/HouseNumberStateServiceImpl.java

@@ -52,7 +52,9 @@ public class HouseNumberStateServiceImpl extends ServiceImpl<HouseNumberStateMap
         return houseNumberStateMapper.getMaintainHouseNumberState(houseNumberId,date);
     }
 
-
-
+    @Override
+    public List<HouseNumberState> getDate(Date date, Integer houseNumberId) {
+        return houseNumberStateMapper.getDate(date, houseNumberId);
+    }
 
 }

src/main/java/com/template/services/impl/HouseOrderServiceImpl.java

@@ -112,11 +112,6 @@ public class HouseOrderServiceImpl extends ServiceImpl<HouseOrderMapper, HouseOr
         String department = users.getDepartment();
 
 
-        LambdaQueryWrapper<ClassSchedule> wrapperCS = new LambdaQueryWrapper<>();
-        wrapperCS.eq(ClassSchedule::getJsgh, users.getCardNumber())
-                .between(ClassSchedule::getDateTime, state, end);
-        List<ClassSchedule> scheduleList = classScheduleService.list(wrapperCS);
-
         BigDecimal totalPrice = new BigDecimal(0);
         for (int i = 0; i < until; i++) {
             LocalDate localDate1 = state.plusDays(i);
@@ -125,20 +120,36 @@ public class HouseOrderServiceImpl extends ServiceImpl<HouseOrderMapper, HouseOr
             List<HousePrice> housePrices1 = housePriceService.getDatePrice(localDate1, houseId);
 
             if ("4".equals(department)) {
-                if (ObjectUtils.isNotEmpty(scheduleList)) {
-                    for (ClassSchedule classSchedule : scheduleList) {
-                        String dateTime = classSchedule.getDateTime();
-                        String[] s = dateTime.split(" ");
-                        dateTime = s[0];
-                        LocalDate parse = LocalDate.parse(dateTime, dateTimeFormatter2);
-                        if (!localDate1.equals(parse)) {
-                            if (ObjectUtils.isNotEmpty(housePrices1)) {
-                                HousePrice housePrice = housePrices1.get(housePrices1.size() - 1);
-                                BigDecimal price = housePrice.getPrice();
-                                totalPrice = totalPrice.add(price);
-                            } else {
-                                totalPrice = totalPrice.add(roomPrice);
-                            }
+                LocalDateTime endS = dateTime1.plusDays(i + 1);
+                LambdaQueryWrapper<ClassSchedule> wrapperCS = new LambdaQueryWrapper<>();
+                wrapperCS.eq(ClassSchedule::getJsgh, users.getCardNumber())
+                        .between(ClassSchedule::getDateTime, dateTime1, endS);
+                List<ClassSchedule> scheduleList = classScheduleService.list(wrapperCS);
+
+                if (ObjectUtils.isEmpty(scheduleList)) {
+                    if (ObjectUtils.isNotEmpty(housePrices1)) {
+                        HousePrice housePrice = housePrices1.get(housePrices1.size() - 1);
+                        BigDecimal price = housePrice.getPrice();
+                        totalPrice = totalPrice.add(price);
+                    } else {
+                        totalPrice = totalPrice.add(roomPrice);
+                    }
+                }else {
+//                    需要先判断当前时间是否已经有过订单,有的话则不免费
+//                        dateTime1
+                    List<HouseOrder> list = houseOrderMapper.getDate(dateTime1, userId);
+                    if (list.size() > 0) {
+                        if (ObjectUtils.isNotEmpty(housePrices1)) {
+                            HousePrice housePrice = housePrices1.get(housePrices1.size() - 1);
+                            BigDecimal price = housePrice.getPrice();
+                            totalPrice = totalPrice.add(price);
+                        } else {
+                            totalPrice = totalPrice.add(roomPrice);
+                        }
+                    }
+                }
+
+
 //                            for (HousePrice housePrice : housePrices1) {
 //                                String setDate = housePrice.getSetDate();
 //                                String[] split = setDate.split(",");
@@ -157,49 +168,13 @@ public class HouseOrderServiceImpl extends ServiceImpl<HouseOrderMapper, HouseOr
 //                            }
 
 
-                        } else {
-//                        需要先判断当前时间是否已经有过订单,有的话则不免费
-//                        dateTime1
-                            List<HouseOrder> list = houseOrderMapper.getDate(dateTime1, userId);
-                            if (list.size() > 0) {
-                                if (ObjectUtils.isNotEmpty(housePrices1)) {
-                                    HousePrice housePrice = housePrices1.get(housePrices1.size() - 1);
-                                    BigDecimal price = housePrice.getPrice();
-                                    totalPrice = totalPrice.add(price);
-                                } else {
-                                    totalPrice = totalPrice.add(roomPrice);
-                                }
-                            }
 
-                        }
-                    }
-                }else {
-                    if (ObjectUtils.isNotEmpty(housePrices1)) {
-                        if (ObjectUtils.isNotEmpty(housePrices1)) {
-                            HousePrice housePrice = housePrices1.get(housePrices1.size() - 1);
-                            BigDecimal price = housePrice.getPrice();
-                            totalPrice = totalPrice.add(price);
-                        }
-                    } else {
-                        totalPrice = totalPrice.add(roomPrice);
-                    }
-                }
-
-            }else if ("7".equals(department)){
-                List<ApplicationProcedureTemporary> list=apts.getDate(dateTime1,userId);
-                if (ObjectUtils.isNotEmpty(list)) {
+        }else if ("7".equals(department)) {
+            List<ApplicationProcedureTemporary> list = apts.getDate(dateTime1, userId);
+            if (ObjectUtils.isNotEmpty(list)) {
 //                    当有临时表时需要判断是否已经有订单，有的话则原价
-                    List<HouseOrder> list2 = houseOrderMapper.getDate(dateTime1, userId);
-                    if (ObjectUtils.isNotEmpty(list2)) {
-                        if (ObjectUtils.isNotEmpty(housePrices1)) {
-                            HousePrice housePrice = housePrices1.get(housePrices1.size() - 1);
-                            BigDecimal price = housePrice.getPrice();
-                            totalPrice = totalPrice.add(price);
-                        } else {
-                            totalPrice = totalPrice.add(roomPrice);
-                        }
-                    }
-                }else {
+                List<HouseOrder> list2 = houseOrderMapper.getDate(dateTime1, userId);
+                if (ObjectUtils.isNotEmpty(list2)) {
                     if (ObjectUtils.isNotEmpty(housePrices1)) {
                         HousePrice housePrice = housePrices1.get(housePrices1.size() - 1);
                         BigDecimal price = housePrice.getPrice();
@@ -208,14 +183,23 @@ public class HouseOrderServiceImpl extends ServiceImpl<HouseOrderMapper, HouseOr
                         totalPrice = totalPrice.add(roomPrice);
                     }
                 }
-
             } else {
                 if (ObjectUtils.isNotEmpty(housePrices1)) {
-                    if (ObjectUtils.isNotEmpty(housePrices1)) {
-                        HousePrice housePrice = housePrices1.get(housePrices1.size() - 1);
-                        BigDecimal price = housePrice.getPrice();
-                        totalPrice = totalPrice.add(price);
-                    }
+                    HousePrice housePrice = housePrices1.get(housePrices1.size() - 1);
+                    BigDecimal price = housePrice.getPrice();
+                    totalPrice = totalPrice.add(price);
+                } else {
+                    totalPrice = totalPrice.add(roomPrice);
+                }
+            }
+
+        } else {
+            if (ObjectUtils.isNotEmpty(housePrices1)) {
+                if (ObjectUtils.isNotEmpty(housePrices1)) {
+                    HousePrice housePrice = housePrices1.get(housePrices1.size() - 1);
+                    BigDecimal price = housePrice.getPrice();
+                    totalPrice = totalPrice.add(price);
+                }
 //                    for (HousePrice housePrice : housePrices1) {
 //                        String setDate = housePrice.getSetDate();
 //                        String[] split = setDate.split(",");
@@ -232,18 +216,20 @@ public class HouseOrderServiceImpl extends ServiceImpl<HouseOrderMapper, HouseOr
 //                            totalPrice = totalPrice.add(roomPrice);
 //                        }
 //                    }
-                } else {
-                    totalPrice = totalPrice.add(roomPrice);
-                }
+            } else {
+                totalPrice = totalPrice.add(roomPrice);
             }
-
-
         }
 
 
-        return totalPrice.multiply(new BigDecimal(houseOrderNumber));
     }
 
+
+        return totalPrice.multiply(new
+
+    BigDecimal(houseOrderNumber));
+}
+
     @Override
     public PriceVo reservePrice(String houseId, String cardNumber, String liveTime, String leaveTime) {
         PriceVo priceVo = new PriceVo();

src/main/resources/mapper/template/HouseNumberMapper.xml

@@ -131,158 +131,163 @@
         FROM
         `house_number` hn
         LEFT JOIN house_lock hl ON hl.house_number_id = hn.id and hl.deleted=0
+        LEFT JOIN building b ON b.id = hn.building_id AND b.deleted = 0
         <where>
             FIND_IN_SET( hn.house_id, #{houseIds})
             and hn.deleted = 0
             <if test="roomNumber != null and roomNumber != ''">
                 AND hn.room_number LIKE '%' #{roomNumber} '%'
             </if>
+
+            <if test="buildingId != null and buildingId != ''">
+                AND hn.building_id = #{buildingId}
+            </if>
+
         </where>
         ORDER BY
         hn.room_number
     </select>
     <select id="getNumberState" resultType="java.lang.Integer">
-        SELECT
-            hn.id
-        FROM
-            `house_number` hn
-                LEFT JOIN house_number_state hns on  hns.house_number_id=hn.id AND hns.deleted=0
-        WHERE hns.end_time> #{date}
-          AND hn.deleted=0
+        SELECT hn.id
+        FROM `house_number` hn
+                 LEFT JOIN house_number_state hns on hns.house_number_id = hn.id AND hns.deleted = 0
+        WHERE hns.end_time > #{date}
+          AND hn.deleted = 0
         GROUP BY hn.id
     </select>
 
     <select id="freeDropDownShow" resultType="com.template.model.vo.FreeVo">
-        SELECT
-            hn.id ,
-            hn.house_id as houseId,
-            hn.room_number as roomNumber,
-            hn.house_status as houseStatus,
-            h.room_type as roomType
-        FROM
-            `house_number` hn
-        LEFT JOIN house h ON h.id = hn.house_id
-        AND h.deleted = 0
-        WHERE hn.deleted=0
-          AND FIND_IN_SET(hn.id,#{houseNumberIds})
-          AND hn.house_status=1
+        SELECT hn.id,
+               hn.house_id     as houseId,
+               hn.room_number  as roomNumber,
+               hn.house_status as houseStatus,
+               h.room_type     as roomType
+        FROM `house_number` hn
+                 LEFT JOIN house h ON h.id = hn.house_id
+            AND h.deleted = 0
+        WHERE hn.deleted = 0
+          AND FIND_IN_SET(hn.id, #{houseNumberIds})
+          AND hn.house_status = 1
     </select>
     <select id="dirtyDropDownShow" resultType="com.template.model.vo.FreeVo">
-        SELECT
-            hn.id ,
-            hn.house_id as houseId,
-            hn.room_number as roomNumber,
-            hn.house_status as houseStatus,
-            h.room_type as roomType
-        FROM
-            `house_number` hn
-                LEFT JOIN house h ON h.id = hn.house_id
-                AND h.deleted = 0
-        WHERE hn.deleted=0
-          AND hn.house_status=2
+        SELECT hn.id,
+               hn.house_id     as houseId,
+               hn.room_number  as roomNumber,
+               hn.house_status as houseStatus,
+               h.room_type     as roomType
+        FROM `house_number` hn
+                 LEFT JOIN house h ON h.id = hn.house_id
+            AND h.deleted = 0
+        WHERE hn.deleted = 0
+          AND hn.house_status = 2
     </select>
 
     <select id="lockDropDownShow" resultType="com.template.model.vo.FreeVo">
-        SELECT
-            hn.id ,
-            hn.house_id as houseId,
-            hn.room_number as roomNumber,
-            hn.house_status as houseStatus,
-            h.room_type as roomType
-        FROM
-            `house_number` hn
-                LEFT JOIN house_number_state hns ON hns.house_number_id = hn.id
-                AND hns.deleted = 0
-                LEFT JOIN house h ON h.id = hn.house_id
-                AND h.deleted = 0
-        WHERE
-            #{date} >= hns.start_time
+        SELECT hn.id,
+               hn.house_id     as houseId,
+               hn.room_number  as roomNumber,
+               hn.house_status as houseStatus,
+               h.room_type     as roomType
+        FROM `house_number` hn
+                 LEFT JOIN house_number_state hns ON hns.house_number_id = hn.id
+            AND hns.deleted = 0
+                 LEFT JOIN house h ON h.id = hn.house_id
+            AND h.deleted = 0
+        WHERE #{date} >= hns.start_time
           AND hns.end_time > #{date}
-          AND hns.status=5
+          AND hns.status = 5
           AND hn.deleted = 0
 
     </select>
 
     <select id="shutDropDownShow" resultType="com.template.model.vo.FreeVo">
-        SELECT
-            hn.id ,
-            hn.house_id as houseId,
-            hn.room_number as roomNumber,
-            hn.house_status as houseStatus,
-            h.room_type as roomType
-        FROM
-            `house_number` hn
-                LEFT JOIN house h ON h.id = hn.house_id
-                AND h.deleted = 0
-        WHERE hn.deleted=0
-          AND FIND_IN_SET(hn.id,#{houseNumberIds})
-          AND hn.house_status=1
-          AND hn.electric_type=1
+        SELECT hn.id,
+               hn.house_id     as houseId,
+               hn.room_number  as roomNumber,
+               hn.house_status as houseStatus,
+               h.room_type     as roomType
+        FROM `house_number` hn
+                 LEFT JOIN house h ON h.id = hn.house_id
+            AND h.deleted = 0
+        WHERE hn.deleted = 0
+          AND FIND_IN_SET(hn.id, #{houseNumberIds})
+          AND hn.house_status = 1
+          AND hn.electric_type = 1
 
     </select>
     <select id="openDropDownShow" resultType="com.template.model.vo.FreeVo">
-        SELECT
-            hn.id ,
-            hn.house_id as houseId,
-            hn.room_number as roomNumber,
-            hn.house_status as houseStatus,
-            h.room_type as roomType
-        FROM
-            `house_number` hn
-                LEFT JOIN house h ON h.id = hn.house_id
-                AND h.deleted = 0
-        WHERE hn.deleted=0
-          AND FIND_IN_SET(hn.id,#{houseNumberIds})
-          AND hn.house_status=1
-          AND hn.electric_type=2
+        SELECT hn.id,
+               hn.house_id     as houseId,
+               hn.room_number  as roomNumber,
+               hn.house_status as houseStatus,
+               h.room_type     as roomType
+        FROM `house_number` hn
+                 LEFT JOIN house h ON h.id = hn.house_id
+            AND h.deleted = 0
+        WHERE hn.deleted = 0
+          AND FIND_IN_SET(hn.id, #{houseNumberIds})
+          AND hn.house_status = 1
+          AND hn.electric_type = 2
     </select>
     <select id="roomChangePage" resultType="com.template.model.vo.HouseNumberVo">
-        SELECT
-            hn.id,
-            hn.house_id as houseId,
-            hn.room_number as roomNumber,
-            hn.house_status as houseStatus,
-            hn.electric_type as electricType,
-            hn.electric_equipment_id as electricEquipmentId,
-            hn.electric_equipment_meter_name as electricEquipmentMeterName,
-            hn.water_equipment_id as waterEquipmentId,
-            hn.water_equipment_meter_name as waterEquipmentMeterName,
-            h.room_name as roomName,
-            h.room_type as roomType,
-            h.room_price as roomPrice
-        FROM
-            `house_number` hn
-                LEFT JOIN house h on h.id=hn.house_id and hn.deleted=0
-        WHERE hn.house_id=#{houseId} AND hn.deleted=0 and hn.house_status=1
+        SELECT hn.id,
+               hn.house_id                      as houseId,
+               hn.room_number                   as roomNumber,
+               hn.house_status                  as houseStatus,
+               hn.electric_type                 as electricType,
+               hn.electric_equipment_id         as electricEquipmentId,
+               hn.electric_equipment_meter_name as electricEquipmentMeterName,
+               hn.water_equipment_id            as waterEquipmentId,
+               hn.water_equipment_meter_name    as waterEquipmentMeterName,
+               h.room_name                      as roomName,
+               h.room_type                      as roomType,
+               h.room_price                     as roomPrice
+        FROM `house_number` hn
+                 LEFT JOIN house h on h.id = hn.house_id and hn.deleted = 0
+        WHERE hn.house_id = #{houseId}
+          AND hn.deleted = 0
+          and hn.house_status = 1
     </select>
 
     <select id="pageList" resultType="com.template.model.vo.HouseNumberPageVo">
         SELECT
-            hn.id,
-            hn.house_id as houseId,
-            hn.room_number as roomNumber,
-            hn.house_status as houseStatus,
-            hn.electric_type as electricType,
-            hn.electric_equipment_id as electricEquipmentId,
-            hn.electric_equipment_meter_name as electricEquipmentMeterName,
-            hn.water_equipment_id as waterEquipmentId,
-            hn.water_equipment_meter_name as waterEquipmentMeterName,
-            hn.create_time as createTime,
-            h.room_name as houseName,
-            h.room_type as roomType
+        hn.id,
+        hn.house_id as houseId,
+        hn.room_number as roomNumber,
+        hn.house_status as houseStatus,
+        hn.electric_type as electricType,
+        hn.electric_equipment_id as electricEquipmentId,
+        hn.electric_equipment_meter_name as electricEquipmentMeterName,
+        hn.water_equipment_id as waterEquipmentId,
+        hn.water_equipment_meter_name as waterEquipmentMeterName,
+        hn.create_time as createTime,
+        h.room_name as houseName,
+        h.room_type as roomType
         FROM
-            `house_number` hn
-                LEFT JOIN house h on h.id=hn.house_id AND h.deleted=0
+        `house_number` hn
+        LEFT JOIN house h on h.id=hn.house_id AND h.deleted=0
+        LEFT JOIN building b ON b.id = hn.building_id
+        AND b.deleted = 0
         WHERE
-            hn.deleted=0
+        hn.deleted=0
         <if test="keyWord != null and keyWord != ''">
-            AND (hn.room_number LIKE '%' #{keyWord} '%' OR hn.electric_equipment_meter_name LIKE '%' #{keyWord} '%'  OR hn.water_equipment_meter_name LIKE '%' #{keyWord} '%')
+            AND (hn.room_number LIKE '%' #{keyWord} '%' OR hn.electric_equipment_meter_name LIKE '%' #{keyWord} '%' OR
+            hn.water_equipment_meter_name LIKE '%' #{keyWord} '%')
         </if>
 
         <if test="startTime != null and startTime != '' and endTime != null and endTime != ''  ">
             AND #{endTime} >= hn.create_time
             AND hn.create_time >= #{startTime}
         </if>
+
+        <if test="houseId != null and houseId != ''">
+            AND h.id = #{houseId}
+        </if>
+
+        <if test="buildingId != null and buildingId != ''">
+            AND hn.building_id=#{buildingId}
+        </if>
+
         ORDER BY h.id
     </select>
 
@@ -303,44 +308,56 @@
         FROM
         `house_number` hn
         LEFT JOIN house h on h.id=hn.house_id AND h.deleted=0
+        LEFT JOIN building b ON b.id = hn.building_id
+        AND b.deleted = 0
         WHERE
         hn.deleted=0
         <if test="keyWord != null and keyWord != ''">
-            AND (hn.room_number LIKE '%' #{keyWord} '%' OR hn.electric_equipment_meter_name LIKE '%' #{keyWord} '%'  OR hn.water_equipment_meter_name LIKE '%' #{keyWord} '%')
+            AND (hn.room_number LIKE '%' #{keyWord} '%' OR hn.electric_equipment_meter_name LIKE '%' #{keyWord} '%' OR
+            hn.water_equipment_meter_name LIKE '%' #{keyWord} '%')
         </if>
 
         <if test="startTime != null and startTime != '' and endTime != null and endTime != ''  ">
             AND #{endTime} >= hn.create_time
             AND hn.create_time >= #{startTime}
         </if>
+
+        <if test="houseId != null and houseId != ''">
+            AND h.id = #{houseId}
+        </if>
+
+        <if test="buildingId != null and buildingId != ''">
+            AND hn.building_id=#{buildingId}
+        </if>
+
         ORDER BY h.id
     </select>
     <select id="getpage" resultType="com.template.model.vo.HouseNumberListVo">
         SELECT
-            b.building as building,
-            b.element,
-            hl.equipment_type as doorLock,
-            h.room_name as roomName,
-            h.room_type as roomType,
-            hn.id,
-            hn.room_number AS roomNumber,
-            hn.house_status AS houseStatus,
-            hn.electric_type AS electricType,
-            hn.electric_equipment_id AS electricEquipmentId,
-            hn.electric_equipment_meter_name AS electricEquipmentMeterName,
-            hn.water_equipment_id AS waterEquipmentId,
-            hn.water_equipment_meter_name AS waterEquipmentMeterName,
-            b.id as buildingId,
-            h.id as houseId
+        b.building as building,
+        b.element,
+        hl.equipment_type as doorLock,
+        h.room_name as roomName,
+        h.room_type as roomType,
+        hn.id,
+        hn.room_number AS roomNumber,
+        hn.house_status AS houseStatus,
+        hn.electric_type AS electricType,
+        hn.electric_equipment_id AS electricEquipmentId,
+        hn.electric_equipment_meter_name AS electricEquipmentMeterName,
+        hn.water_equipment_id AS waterEquipmentId,
+        hn.water_equipment_meter_name AS waterEquipmentMeterName,
+        b.id as buildingId,
+        h.id as houseId
         FROM
-            `house_number` hn
-                LEFT JOIN building b ON b.id = hn.building_id
-                LEFT JOIN house_lock hl ON hl.house_number_id = hn.id
-                LEFT JOIN house h ON h.id = hn.house_id
+        `house_number` hn
+        LEFT JOIN building b ON b.id = hn.building_id
+        LEFT JOIN house_lock hl ON hl.house_number_id = hn.id
+        LEFT JOIN house h ON h.id = hn.house_id
         WHERE
-            hn.deleted=0
+        hn.deleted=0
         <if test="keyWord != null and keyWord != ''">
-          AND hn.room_number LIKE '%' #{keyWord} '%'
+            AND hn.room_number LIKE '%' #{keyWord} '%'
         </if>
         <if test="buildingId != null and buildingId != ''">
             AND b.id= #{buildingId}

src/main/resources/mapper/template/HouseNumberStateMapper.xml

@@ -44,4 +44,14 @@
           AND hns.deleted=0 AND #{date}>=  hns.start_time AND hns.end_time>=#{date}
           AND hns.house_number_id=#{houseNumberId}
     </select>
+
+    <select id="getDate" resultType="com.template.model.pojo.HouseNumberState">
+        SELECT
+            *
+        FROM
+            `house_number_state` hns
+        WHERE hns.deleted=0
+          AND #{date}>=  hns.start_time AND hns.end_time>=#{date}
+          AND hns.house_number_id=#{houseNumberId}
+    </select>
 </mapper>