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

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

@@ -34,7 +34,7 @@ public interface HouseOrderAPI {
 
     @GetMapping("/pageList")
     @ApiOperation(value = "订单管理-订单页面展示", notes = "订单管理-订单页面展示", httpMethod = "GET")
-    CommonResult pageList(int adminId, int page, int size, String keyWord, String houseType, String orderStatus, String payPriceStartTime, String payPriceEndTime, String refundStartTime, String refundEndTime, String cancelStartTime, String cancelEndTime, String liveStartTime, String liveEndTime, String leaveStartTime, String leaveEndTime,String houseId,Integer keyType,Integer giveBack);
+    CommonResult pageList(int adminId, int page, int size, String keyWord, String houseType, String orderStatus, String payPriceStartTime, String payPriceEndTime, String refundStartTime, String refundEndTime, String cancelStartTime, String cancelEndTime, String liveStartTime, String liveEndTime, String leaveStartTime, String leaveEndTime,String houseId,Integer keyType,Integer giveBack,Integer buildingId);
 
     @PostMapping("/cancel")
     @ApiOperation(value = "订单管理-订单取消", notes = "订单管理-订单取消", httpMethod = "POST")
@@ -58,7 +58,7 @@ public interface HouseOrderAPI {
 
     @GetMapping("/queryExport")
     @ApiOperation(value = "订单管理-订单导出", notes = "订单管理-订单导出", httpMethod = "GET")
-    void queryExport(HttpServletResponse response, int adminId, String keyWord, String houseType, String orderStatus, String payPriceStartTime, String payPriceEndTime, String refundStartTime, String refundEndTime, String cancelStartTime, String cancelEndTime, String liveStartTime, String liveEndTime, String leaveStartTime, String leaveEndTime,String houseId,Integer keyType,Integer giveBack);
+    void queryExport(HttpServletResponse response, int adminId, String keyWord, String houseType, String orderStatus, String payPriceStartTime, String payPriceEndTime, String refundStartTime, String refundEndTime, String cancelStartTime, String cancelEndTime, String liveStartTime, String liveEndTime, String leaveStartTime, String leaveEndTime,String houseId,Integer keyType,Integer giveBack,Integer buildingId);
 
     @GetMapping("/reportStatistics")
     @ApiOperation(value = "统计报表", notes = "统计报表", httpMethod = "GET")
@@ -133,7 +133,7 @@ public interface HouseOrderAPI {
 
     @GetMapping("/ifGiveBack")
     @ApiOperation(value = "是否归还钥匙房卡", notes = "小程序-钟点房当天占用状态", httpMethod = "GET")
-    CommonResult ifGiveBack(@RequestParam Integer houseOrderId,@RequestParam Integer giveBack);
+    CommonResult ifGiveBack(@RequestParam String houseOrderId,@RequestParam Integer giveBack);
 
     @GetMapping("/saveRemark")
     @ApiOperation(value = "备注", notes = "备注", httpMethod = "GET")

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

@@ -643,6 +643,9 @@ public class HouseNumberController implements HouseNumberControllerAPI {
         if (ObjectUtils.isEmpty(houseNumber)) {
             return CommonResult.fail("参数异常");
         }
+//        判断当前时间是否还订单
+        Date date = new Date();
+
 
         LambdaQueryWrapper<HouseLock> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(HouseLock::getHouseNumberId, houseNumberId);

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

@@ -1190,7 +1190,7 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
             one.setEndTime(sdf.format(new Date()));
 
             houseNumberStateService.updateById(one);
-            houseNumberStateService.removeById(one);
+            houseNumberStateService.removeById(one.getId());
 
 //        修改换的房间
             HouseNumber houseNumber = houseNumberService.getById(houseNumberId);
@@ -1503,7 +1503,7 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
 
             houseOrderService.updateById(houseOrder);
             houseNumberStateService.updateById(houseNumberState);
-            houseNumberStateService.removeById(houseNumberState);
+            houseNumberStateService.removeById(houseNumberState.getId());
             houseNumberService.updateById(houseNumber);
 
             return CommonResult.ok();
@@ -2094,7 +2094,7 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
         }
         houseNumberState.setEndTime(format);
         houseNumberStateService.updateById(houseNumberState);
-        houseNumberStateService.removeById(houseNumberState);
+        houseNumberStateService.removeById(houseNumberState.getId());
 
         houseNumber.setHouseStatus(1);
 //        关电

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

@@ -591,7 +591,7 @@ public class HouseOrderController implements HouseOrderAPI {
     }
 
     @Override
-    public CommonResult pageList(int adminId, int page, int size, String keyWord, String houseType, String orderStatus, String payPriceStartTime, String payPriceEndTime, String refundStartTime, String refundEndTime, String cancelStartTime, String cancelEndTime, String liveStartTime, String liveEndTime, String leaveStartTime, String leaveEndTime,String houseId,Integer keyType,Integer giveBack) {
+    public CommonResult pageList(int adminId, int page, int size, String keyWord, String houseType, String orderStatus, String payPriceStartTime, String payPriceEndTime, String refundStartTime, String refundEndTime, String cancelStartTime, String cancelEndTime, String liveStartTime, String liveEndTime, String leaveStartTime, String leaveEndTime,String houseId,Integer keyType,Integer giveBack,Integer buildingId) {
 //        PermissionSetting permissionSetting = permissionSettingService.getById(adminId);
 //        if (ObjectUtils.isEmpty(permissionSetting)) {
 //            return CommonResult.fail("非法进入");
@@ -610,7 +610,7 @@ public class HouseOrderController implements HouseOrderAPI {
             size = 10;
         }
 
-        PageUtils<HouseOrderPageListVo> pageList = houseOrderService.pageList(page, size, keyWord, houseType, orderStatus, payPriceStartTime, payPriceEndTime, refundStartTime, refundEndTime, cancelStartTime, cancelEndTime, liveStartTime, liveEndTime, leaveStartTime, leaveEndTime,houseId,keyType,giveBack);
+        PageUtils<HouseOrderPageListVo> pageList = houseOrderService.pageList(page, size, keyWord, houseType, orderStatus, payPriceStartTime, payPriceEndTime, refundStartTime, refundEndTime, cancelStartTime, cancelEndTime, liveStartTime, liveEndTime, leaveStartTime, leaveEndTime,houseId,keyType,giveBack,buildingId);
         List<HouseOrderPageListVo> list = pageList.getList();
         for (int i = 0; i < list.size(); i++) {
             HouseOrderPageListVo houseOrderPageListVo = list.get(i);
@@ -686,7 +686,7 @@ public class HouseOrderController implements HouseOrderAPI {
 
             houseOrderService.updateById(houseOrder);
             houseNumberStateService.updateById(houseNumberState);
-            houseNumberStateService.removeById(houseNumberState);
+            houseNumberStateService.removeById(houseNumberState.getId());
             return CommonResult.ok();
 
         } catch (Exception e) {
@@ -1178,7 +1178,7 @@ public class HouseOrderController implements HouseOrderAPI {
 
             houseOrderService.updateById(houseOrder);
             houseNumberStateService.updateById(houseNumberState);
-            houseNumberStateService.removeById(houseNumberState);
+            houseNumberStateService.removeById(houseNumberState.getId());
             houseNumberService.updateById(houseNumber);
 
             return CommonResult.ok();
@@ -1301,7 +1301,7 @@ public class HouseOrderController implements HouseOrderAPI {
             one.setEndTime(sdf.format(new Date()));
 
             houseNumberStateService.updateById(one);
-            houseNumberStateService.removeById(one);
+            houseNumberStateService.removeById(one.getId());
 
 //        修改换的房间
             HouseNumber houseNumber = houseNumberService.getById(houseNumberId);
@@ -1432,7 +1432,7 @@ public class HouseOrderController implements HouseOrderAPI {
     }
 
     @Override
-    public void queryExport(HttpServletResponse response, int adminId, String keyWord, String houseType, String orderStatus, String payPriceStartTime, String payPriceEndTime, String refundStartTime, String refundEndTime, String cancelStartTime, String cancelEndTime, String liveStartTime, String liveEndTime, String leaveStartTime, String leaveEndTime,String houseId,Integer keyType,Integer giveBack) {
+    public void queryExport(HttpServletResponse response, int adminId, String keyWord, String houseType, String orderStatus, String payPriceStartTime, String payPriceEndTime, String refundStartTime, String refundEndTime, String cancelStartTime, String cancelEndTime, String liveStartTime, String liveEndTime, String leaveStartTime, String leaveEndTime,String houseId,Integer keyType,Integer giveBack,Integer buildingId) {
 //        PermissionSetting permissionSetting = permissionSettingService.getById(adminId);
 //        if (ObjectUtils.isEmpty(permissionSetting)) {
 //            return CommonResult.fail("非法进入");
@@ -1443,7 +1443,7 @@ public class HouseOrderController implements HouseOrderAPI {
 //            return CommonResult.fail("此账号暂无该权限");
 //        }
 
-        List<QueryExportVo> vos = houseOrderService.queryExport(keyWord, houseType, orderStatus, payPriceStartTime, payPriceEndTime, refundStartTime, refundEndTime, cancelStartTime, cancelEndTime, liveStartTime, liveEndTime, leaveStartTime, leaveEndTime,houseId,keyType,giveBack);
+        List<QueryExportVo> vos = houseOrderService.queryExport(keyWord, houseType, orderStatus, payPriceStartTime, payPriceEndTime, refundStartTime, refundEndTime, cancelStartTime, cancelEndTime, liveStartTime, liveEndTime, leaveStartTime, leaveEndTime,houseId,keyType,giveBack,buildingId);
 
         //        导出
         Workbook workbook = new XSSFWorkbook();
@@ -2501,7 +2501,7 @@ public class HouseOrderController implements HouseOrderAPI {
 
             houseOrderService.updateById(houseOrder);
             houseNumberStateService.updateById(houseNumberState);
-            houseNumberStateService.removeById(houseNumberState);
+            houseNumberStateService.removeById(houseNumberState.getId());
             houseNumberService.updateById(houseNumber);
 
             return CommonResult.ok();
@@ -2665,7 +2665,7 @@ public class HouseOrderController implements HouseOrderAPI {
             houseOrder.setOrderStatus("9");
             houseOrderService.updateById(houseOrder);
 //            houseNumberStateService.updateById(houseNumberState);
-            houseNumberStateService.removeById(houseNumberState);
+            houseNumberStateService.removeById(houseNumberState.getId());
             return CommonResult.ok();
 
         } catch (Exception e) {
@@ -3145,14 +3145,16 @@ public class HouseOrderController implements HouseOrderAPI {
     }
 
     @Override
-    public CommonResult ifGiveBack(Integer houseOrderId, Integer giveBack) {
-        HouseOrder byId = houseOrderService.getById(houseOrderId);
-        if (ObjectUtils.isEmpty(byId)) {
+    public CommonResult ifGiveBack(String houseOrderId, Integer giveBack) {
+        LambdaQueryWrapper<HouseOrder> wrapper=new LambdaQueryWrapper<>();
+        wrapper.eq(HouseOrder::getOrderNumber,houseOrderId);
+        HouseOrder houseOrder = houseOrderService.getOne(wrapper);
+        if (ObjectUtils.isEmpty(houseOrder)) {
             return  CommonResult.fail("订单异常");
         }
-        byId.setGiveBack(giveBack);
+        houseOrder.setGiveBack(giveBack);
 
-        houseOrderService.updateById(byId);
+        houseOrderService.updateById(houseOrder);
 
         return CommonResult.ok();
     }

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

@@ -10,6 +10,9 @@ import com.template.model.vo.ApplicationProcedureVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.time.LocalDateTime;
+import java.util.List;
+
 /**
  * <p>
  *  Mapper 接口
@@ -29,4 +32,6 @@ public interface ApplicationProcedureTemporaryMapper extends BaseMapper<Applicat
     IPage<ApplicationProcedureTemporaryRecordVo> appletRecordPage(Page<ApplicationProcedureTemporaryRecordVo> pageVo, @Param("userId") Integer userId,@Param("startTime")  String startTime,@Param("endTime")  String endTime,@Param("status")  String status);
 
     ApplicationProcedureTemporaryVo appletDetail(@Param("id") Integer id);
+
+    List<ApplicationProcedureTemporary> getDate(@Param("dateTime") LocalDateTime dateTime,@Param("userId") String userId);
 }

src/main/java/com/template/model/vo/HouseAppletPageVo.java

@@ -20,8 +20,8 @@ public class HouseAppletPageVo {
     @ApiModelProperty(value = "房间单价")
     private BigDecimal roomPrice;
 
-    @ApiModelProperty(value = "房间数量")
-    private Integer number;
+//    @ApiModelProperty(value = "房间数量")
+//    private Integer number;
 
     @ApiModelProperty(value = "房间面积")
     private String roomArea;

src/main/java/com/template/model/vo/HouseOrderPageListVo.java

@@ -15,10 +15,10 @@ public class HouseOrderPageListVo {
     private String liveTime;
 //  离店时间
     private String leaveTime;
-////    预入住时间
-//    private String reserveLiveTime;
-////    预离店时间
-//    private String reserveLeaveTime;
+//    预入住时间
+    private String reserveLiveTime;
+//    预离店时间
+    private String reserveLeaveTime;
 
 //  预定人名称
     private String reserveName;

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

@@ -6,6 +6,9 @@ import com.template.model.result.PageUtils;
 import com.template.model.vo.ApplicationProcedureTemporaryRecordVo;
 import com.template.model.vo.ApplicationProcedureTemporaryVo;
 
+import java.time.LocalDateTime;
+import java.util.List;
+
 /**
  * <p>
  *  服务类
@@ -24,4 +27,6 @@ public interface ApplicationProcedureTemporaryService extends IService<Applicati
     PageUtils<ApplicationProcedureTemporaryRecordVo> appletRecordPage(Integer userId, String startTime, String endTime, String status, int page, int size);
 
     ApplicationProcedureTemporaryVo appletDetail(Integer id);
+
+    List<ApplicationProcedureTemporary> getDate(LocalDateTime dateTime, String userId);
 }

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

@@ -39,9 +39,9 @@ public interface HouseOrderService extends IService<HouseOrder> {
      */
     PriceVo reservePrice(String houseId, String cardNumber, String liveTime, String leaveTime);
 
-    PageUtils<HouseOrderPageListVo> pageList(int page, int size, String keyWord, String houseType, String orderStatus, String payPriceStartTime, String payPriceEndTime, String refundStartTime, String refundEndTime, String cancelStartTime, String cancelEndTime, String liveStartTime, String liveEndTime, String leaveStartTime, String leaveEndTime,String houseId,Integer keyType,Integer giveBack);
+    PageUtils<HouseOrderPageListVo> pageList(int page, int size, String keyWord, String houseType, String orderStatus, String payPriceStartTime, String payPriceEndTime, String refundStartTime, String refundEndTime, String cancelStartTime, String cancelEndTime, String liveStartTime, String liveEndTime, String leaveStartTime, String leaveEndTime,String houseId,Integer keyType,Integer giveBack,Integer buildingId);
 
-    List<QueryExportVo> queryExport(String keyWord, String houseType, String orderStatus, String payPriceStartTime, String payPriceEndTime, String refundStartTime, String refundEndTime, String cancelStartTime, String cancelEndTime, String liveStartTime, String liveEndTime, String leaveStartTime, String leaveEndTime,String houseId,Integer keyType,Integer giveBack);
+    List<QueryExportVo> queryExport(String keyWord, String houseType, String orderStatus, String payPriceStartTime, String payPriceEndTime, String refundStartTime, String refundEndTime, String cancelStartTime, String cancelEndTime, String liveStartTime, String liveEndTime, String leaveStartTime, String leaveEndTime,String houseId,Integer keyType,Integer giveBack,Integer buildingId);
 
 
     HouseOrderCheckInShowVo getOrderNumbre(String orderNumber);

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

@@ -13,6 +13,9 @@ import com.template.services.ApplicationProcedureTemporaryService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDateTime;
+import java.util.List;
+
 /**
  * <p>
  *  服务实现类
@@ -53,5 +56,10 @@ public class ApplicationProcedureTemporaryServiceImpl extends ServiceImpl<Applic
         return applicationProcedureTemporaryMapper.appletDetail(id);
     }
 
+    @Override
+    public List<ApplicationProcedureTemporary> getDate(LocalDateTime dateTime, String userId) {
+        return applicationProcedureTemporaryMapper.getDate(dateTime,userId);
+    }
+
 
 }

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

@@ -50,6 +50,9 @@ public class HouseOrderServiceImpl extends ServiceImpl<HouseOrderMapper, HouseOr
     @Autowired
     HouseOrderMapper houseOrderMapper;
 
+    @Autowired
+    ApplicationProcedureTemporaryService apts;
+
     @Override
     public BigDecimal getHouseOrderPrice(int houseOrderNumber, String userId, String houseId, String liveTime, String leaveTime) {
 
@@ -105,6 +108,10 @@ public class HouseOrderServiceImpl extends ServiceImpl<HouseOrderMapper, HouseOr
 //        获取这断时间内的上 8 9节课的老师
         Users users = usersService.getById(userId);
 
+//        判断你是老师还是临时人员
+        String department = users.getDepartment();
+
+
         LambdaQueryWrapper<ClassSchedule> wrapperCS = new LambdaQueryWrapper<>();
         wrapperCS.eq(ClassSchedule::getJsgh, users.getCardNumber())
                 .between(ClassSchedule::getDateTime, state, end);
@@ -113,23 +120,25 @@ public class HouseOrderServiceImpl extends ServiceImpl<HouseOrderMapper, HouseOr
         BigDecimal totalPrice = new BigDecimal(0);
         for (int i = 0; i < until; i++) {
             LocalDate localDate1 = state.plusDays(i);
+
+            LocalDateTime dateTime1 = stateTime.plusDays(i);
             List<HousePrice> housePrices1 = housePriceService.getDatePrice(localDate1, houseId);
-//            LocalDate localDate2 = state.plusDays(i+1);
-//            List<HousePrice> housePrices = housePriceService.housePrice(localDate1, localDate2, houseId);
-            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);
-                        }
+
+            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);
+                            }
 //                            for (HousePrice housePrice : housePrices1) {
 //                                String setDate = housePrice.getSetDate();
 //                                String[] split = setDate.split(",");
@@ -148,8 +157,58 @@ 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)) {
+//                    当有临时表时需要判断是否已经有订单，有的话则原价
+                    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 {
+                    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)) {
@@ -257,7 +316,7 @@ public class HouseOrderServiceImpl extends ServiceImpl<HouseOrderMapper, HouseOr
                 for (ClassSchedule classSchedule : scheduleList) {
                     String dateTime = classSchedule.getDateTime();
                     String[] s = dateTime.split(" ");
-                    dateTime=s[0];
+                    dateTime = s[0];
                     LocalDate parse = LocalDate.parse(dateTime, dateTimeFormatter2);
                     if (!localDate1.equals(parse)) {
                         if (ObjectUtils.isNotEmpty(housePrices1)) {
@@ -323,15 +382,15 @@ public class HouseOrderServiceImpl extends ServiceImpl<HouseOrderMapper, HouseOr
     }
 
     @Override
-    public PageUtils<HouseOrderPageListVo> pageList(int page, int size, String keyWord, String houseType, String orderStatus, String payPriceStartTime, String payPriceEndTime, String refundStartTime, String refundEndTime, String cancelStartTime, String cancelEndTime, String liveStartTime, String liveEndTime, String leaveStartTime, String leaveEndTime,String houseId,Integer keyType,Integer giveBack) {
+    public PageUtils<HouseOrderPageListVo> pageList(int page, int size, String keyWord, String houseType, String orderStatus, String payPriceStartTime, String payPriceEndTime, String refundStartTime, String refundEndTime, String cancelStartTime, String cancelEndTime, String liveStartTime, String liveEndTime, String leaveStartTime, String leaveEndTime, String houseId, Integer keyType, Integer giveBack, Integer buildingId) {
         Page<HouseOrderPageListVo> pageVo = new Page<>(page, size);
-        IPage<HouseOrderPageListVo> result = houseOrderMapper.pageList(pageVo, keyWord, houseType, orderStatus, payPriceStartTime, payPriceEndTime, refundStartTime, refundEndTime, cancelStartTime, cancelEndTime, liveStartTime, liveEndTime, leaveStartTime, leaveEndTime,houseId,keyType,giveBack);
+        IPage<HouseOrderPageListVo> result = houseOrderMapper.pageList(pageVo, keyWord, houseType, orderStatus, payPriceStartTime, payPriceEndTime, refundStartTime, refundEndTime, cancelStartTime, cancelEndTime, liveStartTime, liveEndTime, leaveStartTime, leaveEndTime, houseId, keyType, giveBack, buildingId);
         return new PageUtils(result);
     }
 
     @Override
-    public List<QueryExportVo> queryExport(String keyWord, String houseType, String orderStatus, String payPriceStartTime, String payPriceEndTime, String refundStartTime, String refundEndTime, String cancelStartTime, String cancelEndTime, String liveStartTime, String liveEndTime, String leaveStartTime, String leaveEndTime,String houseId,Integer keyType,Integer giveBack) {
-        return houseOrderMapper.queryExport(keyWord, houseType, orderStatus, payPriceStartTime, payPriceEndTime, refundStartTime, refundEndTime, cancelStartTime, cancelEndTime, liveStartTime, liveEndTime, leaveStartTime, leaveEndTime,houseId,keyType,giveBack);
+    public List<QueryExportVo> queryExport(String keyWord, String houseType, String orderStatus, String payPriceStartTime, String payPriceEndTime, String refundStartTime, String refundEndTime, String cancelStartTime, String cancelEndTime, String liveStartTime, String liveEndTime, String leaveStartTime, String leaveEndTime, String houseId, Integer keyType, Integer giveBack, Integer buildingId) {
+        return houseOrderMapper.queryExport(keyWord, houseType, orderStatus, payPriceStartTime, payPriceEndTime, refundStartTime, refundEndTime, cancelStartTime, cancelEndTime, liveStartTime, liveEndTime, leaveStartTime, leaveEndTime, houseId, keyType, giveBack, buildingId);
 
     }
 

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

@@ -68,7 +68,7 @@
             </if>
 
         </where>
-        ORDER BY apu.submission_time
+        ORDER BY apu.submission_time DESC
     </select>
     <select id="parentPageList" resultType="com.template.model.vo.ApplicationProcedureTemporaryVo">
         SELECT
@@ -136,7 +136,7 @@
             </if>
 
         </where>
-        ORDER BY apu.submission_time
+        ORDER BY apu.submission_time DESC
     </select>
     <select id="appletRecordPage" resultType="com.template.model.vo.ApplicationProcedureTemporaryRecordVo">
         SELECT
@@ -200,4 +200,17 @@
             ap.deleted=0
           AND ap.id=#{id}
     </select>
+
+    <select id="getDate" resultType="com.template.model.pojo.ApplicationProcedureTemporary">
+        SELECT
+            *
+        FROM
+            `application_procedure_temporary`
+        WHERE
+            deleted = 0
+          AND users_id = #{userId}
+          AND `status` = 3
+          AND #{dateTime} >= start_time
+          AND end_time >= #{dateTime}
+    </select>
 </mapper>

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

@@ -6,8 +6,8 @@
         SELECT
         ho.id,
         ho.order_number as orderNumber,
+        ho.reserve_live_time as reserveLiveTime,
+        ho.reserve_leave_time as reserveLeaveTime,
         ho.live_time as liveTime,
         ho.leave_time as LeaveTime,
         ho.reserve_name as reserveName,
@@ -39,7 +39,9 @@
         AND hn.deleted = 0
         LEFT JOIN users u ON u.id = ho.live_users_id
         AND u.deleted = 0
-        <where>
+        LEFT JOIN building b ON b.id = hn.building_id
+        AND b.deleted = 0
+        where
             ho.deleted=0
             <if test="orderStatus != null and orderStatus != ''">
                 AND ho.order_status = #{orderStatus}
@@ -79,7 +81,7 @@
             </if>
 
             <if test="houseId != null and houseId != ''">
-                AND ho.house_id = #{houseId}
+                AND h.id = #{houseId}
             </if>
 
             <if test="keyType != null and keyType != ''">
@@ -90,7 +92,11 @@
                 AND ho.give_back = #{giveBack}
             </if>
 
-        </where>
+            <if test="buildingId != null and buildingId != ''">
+                AND hn.building_id=#{buildingId}
+            </if>
+
+
         ORDER BY
         ho.create_time DESC
 
@@ -125,7 +131,9 @@
         AND hn.deleted = 0
         LEFT JOIN users u ON u.id = ho.live_users_id
         AND u.deleted = 0
-        <where>
+        LEFT JOIN building b ON b.id = hn.building_id
+        AND b.deleted = 0
+        where
             ho.deleted=0
             <if test="orderStatus != null and orderStatus != ''">
                 AND ho.order_status = #{orderStatus}
@@ -165,7 +173,7 @@
             </if>
 
             <if test="houseId != null and houseId != ''">
-                AND ho.house_id = #{houseId}
+                AND h.id = #{houseId}
             </if>
 
             <if test="keyType != null and keyType != ''">
@@ -176,7 +184,11 @@
                 AND ho.give_back = #{giveBack}
             </if>
 
-        </where>
+            <if test="buildingId != null and buildingId != ''">
+                AND hn.building_id=#{buildingId}
+            </if>
+
+
         ORDER BY
         ho.create_time DESC
     </select>
@@ -290,5 +302,17 @@
           AND  #{end}> leave_time
         GROUP BY reserve_user_id
     </select>
+    <select id="getDate" resultType="com.template.model.pojo.HouseOrder">
+        SELECT
+            *
+        FROM
+            `house_order`
+        WHERE
+            deleted=0
+          AND FIND_IN_SET(order_status,'1,2,3,4')
+          AND reserve_user_id=#{userId}
+          AND #{dateTime} >= reserve_live_time
+          AND reserve_leave_time >= #{dateTime}
+    </select>
 
 </mapper>