酒店订单导出功能实现

ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/controller/OrderHotelController.java

@@ -8,7 +8,6 @@ import lombok.RequiredArgsConstructor;
 import org.dromara.common.core.domain.R;
 import org.dromara.common.core.validate.AddGroup;
 import org.dromara.common.core.validate.EditGroup;
-import org.dromara.common.excel.utils.ExcelUtil;
 import org.dromara.common.idempotent.annotation.RepeatSubmit;
 import org.dromara.common.log.annotation.Log;
 import org.dromara.common.log.enums.BusinessType;
@@ -53,9 +52,9 @@ public class OrderHotelController extends BaseController {
     @SaCheckPermission("server:orderHotel:export")
     @Log(title = "酒店订单", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(OrderHotelBo bo, HttpServletResponse response) {
-        List<OrderHotelVo> list = orderHotelService.queryList(bo);
-        ExcelUtil.exportExcel(list, "酒店订单", OrderHotelVo.class, response);
+    public R<List<OrderHotelVo>> export(OrderHotelBo bo, HttpServletResponse response) {
+        bo.setProcessData(true);
+        return R.ok(orderHotelService.queryList(bo));
     }
 
     /**

ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/service/impl/OrderHotelServiceImpl.java

@@ -86,11 +86,12 @@ public class OrderHotelServiceImpl extends AbstractBaseService<OrderHotelVo, Ord
         lqw.eq(StringUtils.isNotBlank(bo.getBookingRule()), OrderHotel::getBookingRule, bo.getBookingRule());
         lqw.eq(StringUtils.isNotBlank(bo.getCheckInDate()), OrderHotel::getCheckInDate, bo.getCheckInDate());
         if (params != null) {
+            //预定人
             String nickName = params.getOrDefault("personCodeNickName", StringUtils.EMPTY).toString();
             if (org.apache.commons.lang3.StringUtils.isNotBlank(nickName)) {
                 lqw.in(OrderHotel::getPersonCode, bizUserService.getPersonCodeListByNickName(nickName));
             }
-
+            //入住日期
             String startTime = params.getOrDefault("startTime", StringUtils.EMPTY).toString();
             if (StringUtils.isNotEmpty(startTime)) {
                 lqw.ge(OrderHotel::getBookDate, startTime);
@@ -99,6 +100,15 @@ public class OrderHotelServiceImpl extends AbstractBaseService<OrderHotelVo, Ord
             if (StringUtils.isNotEmpty(endTime)) {
                 lqw.le(OrderHotel::getBookDate, endTime);
             }
+            //入住日期
+            String checkInDateStart = params.getOrDefault("checkInDateStart", StringUtils.EMPTY).toString();
+            if (StringUtils.isNotEmpty(checkInDateStart)) {
+                lqw.ge(OrderHotel::getCheckInDate, checkInDateStart);
+            }
+            String checkInDateEnd = params.getOrDefault("checkInDateEnd", StringUtils.EMPTY).toString();
+            if (StringUtils.isNotEmpty(checkInDateEnd)) {
+                lqw.le(OrderHotel::getCheckInDate, checkInDateEnd);
+            }
         }
         return lqw;
     }