更新订单导出，报表导出接口

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

@@ -28,6 +28,8 @@ import java.util.List;
  * @since 2024-03-27
  */
 @RestController
+//加密
+//@DESRespondSecret
 public class ApartmentSettingController implements ApartmentSettingControllerAPI {
 
     @Autowired

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

@@ -10,7 +10,6 @@ import com.template.model.dto.ApprovalProcessDto;
 import com.template.model.pojo.*;
 import com.template.model.result.CommonResult;
 import com.template.model.result.PageUtils;
-import com.template.model.vo.ApplicationProcedureRecordVo;
 import com.template.model.vo.ApplicationProcedureTemporaryRecordVo;
 import com.template.model.vo.ApplicationProcedureTemporaryVo;
 import com.template.model.vo.ApplicationProcedureVo;
@@ -33,6 +32,8 @@ import java.util.List;
  * @since 2024-02-27
  */
 @RestController
+//加密
+//@DESRespondSecret
 public class ApplicationProcedureController implements ApplicationProcedureControllerAPI {
 
     @Autowired

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

@@ -24,6 +24,8 @@ import java.util.List;
  * @since 2024-02-28
  */
 @RestController
+//加密
+//@DESRespondSecret
 public class ApplicationProcedureSettingController implements ApplicationProcedureSettingControllerApi {
 
     @Autowired

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

@@ -37,6 +37,8 @@ import java.util.stream.Collectors;
  * @since 2024-03-05
  */
 @RestController
+//加密
+//@DESRespondSecret
 public class ApplicationProcedureTemporaryController implements ApplicationProcedureTemporaryControllerAPI {
 
     @Autowired

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

@@ -29,6 +29,8 @@ import java.util.List;
  * @since 2024-08-23
  */
 @RestController
+//加密
+//@DESRespondSecret
 public class BlacklistController implements BlacklistControllerAPI {
 
     @Autowired

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

@@ -29,6 +29,8 @@ import java.util.List;
  * @since 2024-08-26
  */
 @RestController
+//加密
+//@DESRespondSecret
 public class BlacklistOrderController implements BlacklistOrderControllerAPI {
 
     @Autowired

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

@@ -30,6 +30,8 @@ import java.util.List;
  * @since 2024-08-26
  */
 @RestController
+//加密
+//@DESRespondSecret
 public class BlacklistSettingController implements BlacklistSettingControllerAPI {
 
     @Autowired

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

@@ -28,6 +28,8 @@ import java.util.stream.Collectors;
  * @since 2024-08-08
  */
 @RestController
+//加密
+//@DESRespondSecret
 public class BuildingController implements BuildingControllerAPI {
 
     @Autowired

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

@@ -24,6 +24,8 @@ import java.util.List;
  * @since 2024-03-28
  */
 @RestController
+//加密
+//@DESRespondSecret
 public class CallSystemController implements CallSystemControllerAPI {
 
     @Autowired

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

@@ -25,6 +25,8 @@ import java.util.List;
  * @since 2024-03-27
  */
 @RestController
+//加密
+//@DESRespondSecret
 public class CheckOutSettingController implements CheckOutSettingControllerAPI {
 
     @Autowired

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

@@ -41,6 +41,8 @@ import java.util.*;
  * @since 2023-11-06
  */
 @RestController
+//加密
+//@DESRespondSecret
 public class ClassScheduleController implements ClassScheduleAPI {
 
     @Autowired

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

@@ -1,7 +1,6 @@
 package com.template.controller;
 
 
-import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -10,26 +9,15 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.template.api.EmployeeUsersControllerAPI;
 import com.template.model.dto.EmployeeUsersDetailsDto;
 import com.template.model.dto.EmployeeUsersDto;
-import com.template.model.dto.UsersDetailsDto;
-import com.template.model.dto.UsersDto;
 import com.template.model.pojo.EmployeeUsers;
 import com.template.model.pojo.PermissionSetting;
-import com.template.model.pojo.Users;
 import com.template.model.result.CommonResult;
-import com.template.model.vo.UsersPageVo;
 import com.template.services.EmployeeUsersService;
 import com.template.services.PermissionSettingService;
-import com.template.services.UsersService;
-import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.RequestMapping;
-
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.ArrayList;
-import java.util.List;
-
 /**
  * <p>
  * 员工表 前端控制器
@@ -39,6 +27,8 @@ import java.util.List;
  * @since 2024-08-09
  */
 @RestController
+//加密
+//@DESRespondSecret
 public class EmployeeUsersController implements EmployeeUsersControllerAPI {
 
     @Autowired

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

@@ -29,6 +29,8 @@ import java.util.List;
  * @since 2024-03-27
  */
 @RestController
+//加密
+//@DESRespondSecret
 public class FacilityServicesController implements FacilityServicesControllerAPI {
 
     @Autowired

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

@@ -37,6 +37,8 @@ import java.util.List;
  * @since 2023-11-06
  */
 @RestController
+//加密
+//@DESRespondSecret
 public class HouseController implements HouseAPI {
     @Autowired
     HouseService houseService;

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

@@ -1539,22 +1539,23 @@ public class HouseOrderController implements HouseOrderAPI {
         headerRow.createCell(4).setCellValue("是否归还");
         headerRow.createCell(5).setCellValue("预定人");
         headerRow.createCell(6).setCellValue("手机号码");
-        headerRow.createCell(7).setCellValue("预定人部门");
-        headerRow.createCell(8).setCellValue("职工卡号");
         headerRow.createCell(7).setCellValue("入住人");
-        headerRow.createCell(8).setCellValue("身份证");
-        headerRow.createCell(9).setCellValue("订单号");
-        headerRow.createCell(10).setCellValue("入住时间");
-        headerRow.createCell(11).setCellValue("离店时间");
-        headerRow.createCell(12).setCellValue("订单金额(元)");
-        headerRow.createCell(13).setCellValue("订单状态");
-        headerRow.createCell(14).setCellValue("备注");
-        headerRow.createCell(15).setCellValue("支付类型");
-        headerRow.createCell(16).setCellValue("来源渠道");
-        headerRow.createCell(17).setCellValue("支付时间");
-        headerRow.createCell(18).setCellValue("退款时间");
-        headerRow.createCell(19).setCellValue("取消时间");
-
+        headerRow.createCell(8).setCellValue("身份证号");
+        headerRow.createCell(9).setCellValue("部门");
+        headerRow.createCell(10).setCellValue("部门职工号");
+        headerRow.createCell(11).setCellValue("订单号");
+        headerRow.createCell(12).setCellValue("入住时间");
+        headerRow.createCell(13).setCellValue("离店时间");
+        headerRow.createCell(14).setCellValue("订单金额(元)");
+        headerRow.createCell(15).setCellValue("订单状态");
+        headerRow.createCell(16).setCellValue("备注");
+        headerRow.createCell(17).setCellValue("支付类型");
+        headerRow.createCell(18).setCellValue("来源渠道");
+        headerRow.createCell(19).setCellValue("支付时间");
+        headerRow.createCell(20).setCellValue("退款时间");
+        headerRow.createCell(21).setCellValue("取消时间");
+
+        SimpleDateFormat sdf =new SimpleDateFormat("yyyy-MM-dd HH:mm:ss" );
         if (ObjectUtils.isNotEmpty(vos) && vos.size() > 0) {
             for (int i = 0; i < vos.size(); i++) {
                 QueryExportVo vo = vos.get(i);
@@ -1602,8 +1603,10 @@ public class HouseOrderController implements HouseOrderAPI {
                 dataRow1.createCell(4).setCellValue(back);
                 dataRow1.createCell(5).setCellValue(vo.getReserveName());
                 dataRow1.createCell(6).setCellValue(vo.getPhone());
-                dataRow1.createCell(9).setCellValue(vo.getLiveName());
-                dataRow1.createCell(10).setCellValue(vo.getIdCard());
+                dataRow1.createCell(7).setCellValue(vo.getLiveName());
+                dataRow1.createCell(8).setCellValue(vo.getIdCard());
+                dataRow1.createCell(9).setCellValue(vo.getOrgName());
+                dataRow1.createCell(10).setCellValue(vo.getCardNumber());
                 dataRow1.createCell(11).setCellValue(vo.getOrderNumber());
                 dataRow1.createCell(12).setCellValue(vo.getLiveTime());
                 dataRow1.createCell(13).setCellValue(vo.getLeaveTime());
@@ -1661,10 +1664,18 @@ public class HouseOrderController implements HouseOrderAPI {
                 dataRow1.createCell(18).setCellValue(orderChannelName);
 
                 dataRow1.createCell(19).setCellValue(vo.getPayTime());
-                dataRow1.createCell(20).setCellValue(vo.getRefundTime());
-                dataRow1.createCell(21).setCellValue(vo.getCancelTime());
-                dataRow1.createCell(7).setCellValue(vo.getOrgName());
-                dataRow1.createCell(8).setCellValue(vo.getCardNumber());
+                Date refundTime = vo.getRefundTime();
+                if (ObjectUtils.isEmpty(refundTime)) {
+                    dataRow1.createCell(20).setCellValue(refundTime);
+                }else {
+                    dataRow1.createCell(20).setCellValue(sdf.format(vo.getRefundTime()));
+                }
+                Date cancelTime = vo.getCancelTime();
+                if (ObjectUtils.isEmpty(cancelTime)) {
+                    dataRow1.createCell(21).setCellValue(cancelTime);
+                }else {
+                    dataRow1.createCell(21).setCellValue(sdf.format(cancelTime));
+                }
             }
         }
         // 将工作簿写入文件
@@ -1765,7 +1776,11 @@ public class HouseOrderController implements HouseOrderAPI {
                 }
                 dataRow1.createCell(3).setCellValue(vo.getOrgName());
                 dataRow1.createCell(4).setCellValue(vo.getCardNumber());
-                dataRow1.createCell(5).setCellValue(roomName + "(" + type + ")");
+                if (ObjectUtils.isEmpty(roomName)) {
+                    dataRow1.createCell(5).setCellValue(roomName);
+                }else {
+                    dataRow1.createCell(5).setCellValue(roomName + "(" + type + ")");
+                }
                 dataRow1.createCell(6).setCellValue(vo.getRoomNumber());
                 dataRow1.createCell(7).setCellValue(vo.getPayPrice().doubleValue());
                 dataRow1.createCell(8).setCellValue(vo.getPayTime());
@@ -3356,12 +3371,19 @@ public class HouseOrderController implements HouseOrderAPI {
 
     @Override
     public CommonResult remainFree(String userId, String liveTime, String leaveTime) {
-
+        log.info("查询该用户是否能免费订房,userId: "+userId+" liveTime: "+liveTime+" leaveTime: "+leaveTime);
         Users users = usersService.getById(userId);
         if (ObjectUtils.isEmpty(users)) {
             return CommonResult.fail("参数异常");
         }
         DateTimeFormatter dateTimeFormatter1 = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+        //        判断传过来的时间和当前时间比较
+        LocalDateTime now = LocalDateTime.now();
+        LocalDateTime date = LocalDateTime.parse(liveTime, dateTimeFormatter1);
+        if (now.isAfter(date)) {
+            liveTime = now.format(dateTimeFormatter1);
+//            establishOrderDto.setReserveLiveTime(reserveLeaveTime);
+        }
 
         LocalDateTime stateTime = LocalDateTime.parse(liveTime, dateTimeFormatter1);
         LocalDateTime endTime = LocalDateTime.parse(leaveTime, dateTimeFormatter1);
@@ -3508,6 +3530,7 @@ public class HouseOrderController implements HouseOrderAPI {
             vos.add(vo1);
         }
 
+        log.info("最终免费结果："+vos);
 
         return CommonResult.ok(vos);
     }