Accept Merge Request #19: (develop-wxl -> master)

Merge Request: 提交

Created By: @万新亮
Accepted By: @万新亮
URL: https://chuanghaikeji.coding.net/p/smarCampus/d/iHotel_student_houtai/git/merge/19?initial=true

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

@@ -3,6 +3,7 @@ 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.toolkit.ObjectUtils;
 import com.template.api.HouseLockControllerAPI;
 import com.template.common.utils.ExcelUtils;
@@ -70,6 +71,9 @@ public class HouseLockController implements HouseLockControllerAPI {
     @Autowired
     UnlockingCustomService unlockingCustomService;
 
+    @Autowired
+    UnlockingEmployeeService unlockingEmployeeService;
+
     @Override
     public CommonResult list(String permissionSettingId, String roomNumber, String roomName) {
         PermissionSetting permissionSetting = permissionSettingService.getById(permissionSettingId);
@@ -182,10 +186,17 @@ public class HouseLockController implements HouseLockControllerAPI {
         List<UnlockingAdmin> unlockingAdmins = unlockingAdminService.key(houseNumberId,date);
         List<UnlockingCustom> unlockingCustoms = unlockingCustomService.key(houseNumberId,date);
 
+        List<UnlockingEmployee> unlockingEmployees= unlockingEmployeeService.list(
+                new QueryWrapper<UnlockingEmployee>()
+                        .eq("house_number_id",houseNumberId)
+                        .gt("end_time",date)
+                        .lt("start_time",date));
+
         HashMap<String, Object> map = new HashMap<>();
         map.put("order", unlockingKeyDtos);
         map.put("system", unlockingAdmins);
         map.put("custom", unlockingCustoms);
+        map.put("employee", unlockingEmployees);
 
 
         return CommonResult.ok(map);