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

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

@@ -131,7 +131,7 @@ public class AdminController implements AdminAPI {
         }
         String userNumber = saveAdminDto.getUserNumber();
         Admin result = adminService.getAdminByAccount(userNumber);
-        if (result == null) {
+        if (ObjectUtils.isNotEmpty(result)) {
             return CommonResult.fail("该账号已存在");
         }
 
@@ -189,10 +189,18 @@ public class AdminController implements AdminAPI {
         }
 
         Admin admin = updateAdminDto.getAdmin();
+        Admin byId = adminService.getById(admin.getId());
+        if (ObjectUtils.isEmpty(byId)) {
+            return CommonResult.fail("该管理员不存在");
+        }
+
         String userNumber = admin.getUserNumber();
-        Admin result = adminService.getAdminByAccount(userNumber);
-        if (result == null) {
-            return CommonResult.fail("该账号已存在");
+        String userNumber1 = byId.getUserNumber();
+        if (!userNumber.equals(userNumber1)) {
+            Admin result = adminService.getAdminByAccount(userNumber);
+            if (ObjectUtils.isNotEmpty(result)) {
+                return CommonResult.fail("该账号已存在");
+            }
         }
 
         try {

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

@@ -57,6 +57,10 @@ public class ApplicationProcedureTemporaryController implements ApplicationProce
         if (ObjectUtils.isEmpty(applicationProcedureDto)) {
             return CommonResult.fail();
         }
+        Integer usersId = applicationProcedureDto.getUsersId();
+//        一个人只能有一个待审批的
+
+
 
         ApplicationProcedureTemporary applicationProcedure = new ApplicationProcedureTemporary();
 
@@ -361,7 +365,9 @@ public class ApplicationProcedureTemporaryController implements ApplicationProce
             }else {
                 LambdaQueryWrapper<ApplicationProcedureTemporary> wrapper=new LambdaQueryWrapper<>();
                 wrapper.eq(ObjectUtils.isNotEmpty(status),ApplicationProcedureTemporary::getStatus,status)
-                        .between(ObjectUtils.isNotEmpty(startTime)&&ObjectUtils.isNotEmpty(endTime),ApplicationProcedureTemporary::getSubmissionTime,startTime,endTime);
+                        .between(ObjectUtils.isNotEmpty(startTime)&&ObjectUtils.isNotEmpty(endTime),ApplicationProcedureTemporary::getSubmissionTime,startTime,endTime)
+                        .orderByDesc(ApplicationProcedureTemporary::getSubmissionTime);
+
                 pageList=applicationProcedureTemporaryService.page(new Page<>(page,size),wrapper);
                 return CommonResult.ok(pageList);
             }
@@ -382,14 +388,16 @@ public class ApplicationProcedureTemporaryController implements ApplicationProce
                 wrapper.eq(ApplicationProcedureTemporary::getStatus,status);
             }
 
-            wrapper.between(ObjectUtils.isNotEmpty(startTime)&&ObjectUtils.isNotEmpty(endTime),ApplicationProcedureTemporary::getSubmissionTime,startTime,endTime);
+            wrapper.between(ObjectUtils.isNotEmpty(startTime)&&ObjectUtils.isNotEmpty(endTime),ApplicationProcedureTemporary::getSubmissionTime,startTime,endTime)
+                    .orderByDesc(ApplicationProcedureTemporary::getSubmissionTime);
             pageList=applicationProcedureTemporaryService.page(new Page<>(page,size),wrapper);
             return CommonResult.ok(pageList);
 
         }
         LambdaQueryWrapper<ApplicationProcedureTemporary> wrapper=new LambdaQueryWrapper<>();
         wrapper.eq(ObjectUtils.isNotEmpty(status),ApplicationProcedureTemporary::getStatus,status)
-                .between(ObjectUtils.isNotEmpty(startTime)&&ObjectUtils.isNotEmpty(endTime),ApplicationProcedureTemporary::getSubmissionTime,startTime,endTime);
+                .between(ObjectUtils.isNotEmpty(startTime)&&ObjectUtils.isNotEmpty(endTime),ApplicationProcedureTemporary::getSubmissionTime,startTime,endTime)
+                .orderByDesc(ApplicationProcedureTemporary::getSubmissionTime);
         pageList=applicationProcedureTemporaryService.page(new Page<>(page,size),wrapper);
         return CommonResult.ok(pageList);
 

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

@@ -449,12 +449,14 @@ public class HouseController implements HouseAPI {
             }
 
 
-            LocalDateTime localDateTime = LocalDateTime.parse(startTime, dateTimeFormatter1);
-            LocalDateTime endLocalDateTime = LocalDateTime.parse(endTime, dateTimeFormatter1);
-            List<HouseNumberState> houseNumberStates = houseNumberStateService.houseNumberStateList(localDateTime, endLocalDateTime, houseNumberIds);
-
-            wrapperHN.eq(HouseNumber::getHouseStatus,2);
-            List<HouseNumber> list = houseNumberService.list(wrapperHN);
+//            LocalDateTime localDateTime = LocalDateTime.parse(startTime, dateTimeFormatter1);
+//            LocalDateTime endLocalDateTime = LocalDateTime.parse(endTime, dateTimeFormatter1);
+            List<String> houseNumberStates = houseNumberStateService.getHouseNumber(startTime, endTime, houseNumberIds);
+
+            LambdaQueryWrapper<HouseNumber> wrapperHN2 = new LambdaQueryWrapper<>();
+            wrapperHN2.eq(HouseNumber::getHouseId, id);
+            wrapperHN2.eq(HouseNumber::getHouseStatus,2);
+            List<HouseNumber> list = houseNumberService.list(wrapperHN2);
 
             if (houseNumberList.size()-houseNumberStates.size()-list.size()>0) {
                 houseAppletPageVo.setHouseStatus("1");

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

@@ -74,6 +74,9 @@ public class HouseLockController implements HouseLockControllerAPI {
     @Autowired
     UnlockingEmployeeService unlockingEmployeeService;
 
+    @Autowired
+    BuildingService buildingService;
+
     @Override
     public CommonResult list(String permissionSettingId, String roomNumber, String roomName,Integer houseType,Integer buildingId) {
         PermissionSetting permissionSetting = permissionSettingService.getById(permissionSettingId);
@@ -408,11 +411,15 @@ public class HouseLockController implements HouseLockControllerAPI {
         List<Object> head = Arrays.asList("房型类型","房型名称","房间号","门锁设备型号");
         // 用户1数据
         List<Object> user1 = new ArrayList<>();
+        user1.add("17栋");
+        user1.add("1单元");
         user1.add("全日房");
         user1.add("标准房");
         user1.add("19-101");
         user1.add("047863CA78E0");
         List<Object> user2 = new ArrayList<>();
+        user1.add("17栋");
+        user1.add("2单元");
         user2.add("钟点房");
         user2.add("标准房");
         user2.add("19-201");
@@ -437,6 +444,19 @@ public class HouseLockController implements HouseLockControllerAPI {
         for (int i = 0; i < dtos.size(); i++) {
             HouseLockListImportDto houseLockListImportDto = dtos.get(i);
 
+
+            //            判断是否存在该楼栋单元
+            String building = houseLockListImportDto.getBuilding();
+            String element = houseLockListImportDto.getElement();
+
+            LambdaQueryWrapper<Building> wrapperB = new LambdaQueryWrapper<>();
+            wrapperB.eq(Building::getBuilding, building)
+                    .eq(Building::getElement, element);
+            Building one = buildingService.getOne(wrapperB);
+            if (ObjectUtils.isEmpty(one)) {
+                return CommonResult.fail("第" + (i + 2) + "行," + "不存在" + building+"/"+element + "该楼栋单元");
+            }
+
             Integer roomType = houseLockListImportDto.getRoomType();
 //            房间号
             String roomNumber = houseLockListImportDto.getRoomNumber();

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

@@ -105,6 +105,23 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
 //        if (ObjectUtils.isEmpty(size) && size <= 0) {
 //            size = 10;
 //        }
+        Integer houseNumberStatus=null;
+        Integer houseStatus=null;
+        if (ObjectUtils.isNotEmpty(status)) {
+            if (status==1) {
+                houseNumberStatus=1;
+            }else if (status==2){
+                houseNumberStatus=2;
+            } else if (status==3){
+                houseStatus=3;
+            } else if (status==4){
+                houseStatus=4;
+            } else if (status==5){
+                houseStatus=5;
+            } else if (status==6){
+                houseStatus=6;
+            }
+        }
 
 //        当时时间
 //        Date date = new Date();
@@ -112,7 +129,7 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
         List<House> list = houseService.list(new LambdaQueryWrapper<>());
         LocalDateTime start = LocalDateTime.now();
         LocalDateTime end = start.withHour(23).withMinute(59).withSecond(59);
-        List<HouseStateVo> pageVo1 = houseNumberService.houseStatePage(keyWord, houseType, start, end,houseId,buildingId,status);
+        List<HouseStateVo> pageVo1 = houseNumberService.houseStatePage(keyWord, houseType, start, end,houseId,buildingId,houseStatus,houseNumberStatus);
         HashMap<Integer, HouseStateVo> map = new HashMap<>();
         for (HouseStateVo houseStateVo : pageVo1) {
             Integer houseNumberId = houseStateVo.getHouseNumberId();

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

@@ -155,6 +155,15 @@ public class HouseOrderController implements HouseOrderAPI {
         if (house == null) {
             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);
+        }
 //        计算总金额
         BigDecimal totalPrice = houseOrderService.getHouseOrderPrice(houseOrderNumber, userId, houseId, liveTime, leaveTime);
 
@@ -3220,6 +3229,7 @@ public class HouseOrderController implements HouseOrderAPI {
                     houseOrder.setLeaveTime(new Date());
                     String houseNumberId = houseOrder.getHouseNumberId();
                     HouseNumber houseNumber = houseNumberService.getById(houseNumberId);
+                    if (ObjectUtils.isNotEmpty(houseNumber)) {
 //             获取水电能耗
                     //      获取水电消费金额和额度
                     String electricEquipmentId = houseNumber.getElectricEquipmentId();
@@ -3274,7 +3284,7 @@ public class HouseOrderController implements HouseOrderAPI {
                 houseOrderService.updateBatchById(houseOrders);
                 houseNumberService.updateBatchById(houseNumbers);
             }
-
+        }
 
         } catch (Exception e) {
             e.printStackTrace();

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

@@ -264,6 +264,16 @@ public class LoginController implements LoginControllerAPI {
                 functionPointVo18.setStatus(1);
                 strings.add(functionPointVo18);
 
+                FunctionPointVo functionPointVo19 = new FunctionPointVo();
+                functionPointVo19.setFunctionPoint("查看密码");
+                functionPointVo19.setStatus(1);
+                strings.add(functionPointVo19);
+
+                FunctionPointVo functionPointVo20 = new FunctionPointVo();
+                functionPointVo20.setFunctionPoint("退款");
+                functionPointVo20.setStatus(1);
+                strings.add(functionPointVo20);
+
 
             } else {
 
@@ -333,6 +343,13 @@ public class LoginController implements LoginControllerAPI {
                 functionPointVo18.setFunctionPoint("取消维修");
                 strings.add(functionPointVo18);
 
+                FunctionPointVo functionPointVo19 = ifContains(houseStatusManagement, "19");
+                functionPointVo19.setFunctionPoint("查看密码");
+                strings.add(functionPointVo19);
+
+                FunctionPointVo functionPointVo20 = ifContains(houseStatusManagement, "20");
+                functionPointVo20.setFunctionPoint("退款");
+                strings.add(functionPointVo20);
             }
 
             menuBarVo.setFunctionPoints(strings);
@@ -670,6 +687,16 @@ public class LoginController implements LoginControllerAPI {
                 functionPointVo3.setStatus(1);
                 vos5.add(functionPointVo3);
 
+                FunctionPointVo functionPointVo4 = new FunctionPointVo();
+                functionPointVo4.setFunctionPoint("删除");
+                functionPointVo4.setStatus(1);
+                vos5.add(functionPointVo4);
+
+                FunctionPointVo functionPointVo5 = new FunctionPointVo();
+                functionPointVo5.setFunctionPoint("添加");
+                functionPointVo5.setStatus(1);
+                vos5.add(functionPointVo5);
+
             } else {
                 FunctionPointVo functionPointVo = ifContains(dutyManagement, "1");
                 functionPointVo.setFunctionPoint("导入值班");
@@ -682,6 +709,14 @@ public class LoginController implements LoginControllerAPI {
                 FunctionPointVo functionPointVo3 = ifContains(dutyManagement, "3");
                 functionPointVo3.setFunctionPoint("查看界面");
                 vos5.add(functionPointVo3);
+
+                FunctionPointVo functionPointVo4 = ifContains(dutyManagement, "4");
+                functionPointVo4.setFunctionPoint("删除");
+                vos5.add(functionPointVo4);
+
+                FunctionPointVo functionPointVo5 = ifContains(dutyManagement, "5");
+                functionPointVo5.setFunctionPoint("添加");
+                vos5.add(functionPointVo5);
             }
             menuBarVo5.setFunctionPoints(vos5);
             menuBarVos.add(menuBarVo5);

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

@@ -23,7 +23,7 @@ import java.util.List;
 @Mapper
 public interface HouseNumberMapper extends BaseMapper<HouseNumber> {
 
-    List<HouseStateVo> houseStatePage(@Param("keyWord") String keyWord, @Param("houseType") String houseType, @Param("start") LocalDateTime start, @Param("end") LocalDateTime end,@Param("houseId") Integer houseId,@Param("buildingId") Integer buildingId,@Param("status") Integer status);
+    List<HouseStateVo> houseStatePage(@Param("keyWord") String keyWord, @Param("houseType") String houseType, @Param("start") LocalDateTime start, @Param("end") LocalDateTime end,@Param("houseId") Integer houseId,@Param("buildingId") Integer buildingId,@Param("houseStatus") Integer houseStatus,@Param("houseNumberStatus") Integer houseNumberStatus);
 
     IPage<CalendarPageVo> houseStateCalendarPage(Page<CalendarPageVo> pageVo, @Param("keyWord") String keyWord, @Param("houseType") String houseType,@Param("houseId") Integer houseId,@Param("buildingId")Integer buildingId);
 

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

@@ -32,4 +32,6 @@ public interface HouseNumberStateMapper extends BaseMapper<HouseNumberState> {
     HouseNumberState getMaintainHouseNumberState(@Param("houseNumberId")String houseNumberId,@Param("date") LocalDateTime date);
 
     List<HouseNumberState> getDate(@Param("date") Date date,@Param("houseNumberId") Integer houseNumberId);
+
+    List<String> getHouseNumber(@Param("startTime") String startTime,@Param("endTime") String endTime,@Param("houseNumberIds") String houseNumberIds);
 }

src/main/java/com/template/model/dto/HouseLockListImportDto.java

@@ -6,6 +6,12 @@ import lombok.Data;
 @Data
 public class HouseLockListImportDto {
 
+    @ExcelImport(value = "楼栋")
+    private String building;
+
+    @ExcelImport(value = "单元")
+    private String element;
+
     @ExcelImport(value = "房型类型",kv = "1-全日房;2-钟点房")
     private Integer roomType;
 

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

@@ -42,4 +42,6 @@ public class HouseStateVo {
     private String element;
     private Integer lockStatus;
     private String passWord;
+    private Integer orderStatus;
+    private Integer houseOrderId;
 }

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

@@ -19,7 +19,7 @@ import java.util.List;
  */
 public interface HouseNumberService extends IService<HouseNumber> {
 
-    List<HouseStateVo> houseStatePage(String keyWord, String houseType, LocalDateTime start,LocalDateTime end,Integer houseId,Integer buildingId,Integer status);
+    List<HouseStateVo> houseStatePage(String keyWord, String houseType, LocalDateTime start,LocalDateTime end,Integer houseId,Integer buildingId,Integer houseStatus,Integer houseNumberStatus);
 
     PageUtils<CalendarPageVo> houseStateCalendarPage(String keyWord, String houseType, int page, int size,Integer houseId,Integer buildingId);
 

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

@@ -29,4 +29,6 @@ public interface HouseNumberStateService extends IService<HouseNumberState> {
 
     List<HouseNumberState> getDate(Date date, Integer houseNumberId);
 
+    List<String> getHouseNumber(String startTime, String endTime, String houseNumberIds);
+
 }

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

@@ -31,9 +31,9 @@ public class HouseNumberServiceImpl extends ServiceImpl<HouseNumberMapper, House
     HouseNumberMapper houseNumberMapper;
 
     @Override
-    public List<HouseStateVo> houseStatePage(String keyWord, String houseType, LocalDateTime start, LocalDateTime end,Integer houseId,Integer buildingId,Integer status) {
+    public List<HouseStateVo> houseStatePage(String keyWord, String houseType, LocalDateTime start, LocalDateTime end,Integer houseId,Integer buildingId,Integer houseStatus,Integer houseNumberStatus) {
 
-        List<HouseStateVo> result=houseNumberMapper.houseStatePage(keyWord,houseType,start,end,houseId,buildingId,status);
+        List<HouseStateVo> result=houseNumberMapper.houseStatePage(keyWord,houseType,start,end,houseId,buildingId,houseStatus,houseNumberStatus);
         return result;
     }
 

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

@@ -57,4 +57,9 @@ public class HouseNumberStateServiceImpl extends ServiceImpl<HouseNumberStateMap
         return houseNumberStateMapper.getDate(date, houseNumberId);
     }
 
+    @Override
+    public List<String> getHouseNumber(String startTime, String endTime, String houseNumberIds) {
+        return houseNumberStateMapper.getHouseNumber(startTime, endTime,houseNumberIds);
+    }
+
 }

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

@@ -21,7 +21,9 @@
         b.building,
         b.element,
         ho.key_type as lockStatus,
-        ho.key_pass_word as passWord
+        ho.key_pass_word as passWord,
+        ho.order_status as orderStatus,
+        ho.id as houseOrderId
         FROM
         `house_number` hn
         LEFT JOIN house h ON h.id = hn.house_id
@@ -54,8 +56,12 @@
                 AND hn.building_id = #{buildingId}
             </if>
 
-            <if test="status != null and status != ''">
-                AND hns.status = #{status}
+            <if test="houseStatus != null and houseStatus != ''">
+                AND hns.status = #{houseStatus}
+            </if>
+
+            <if test="houseNumberStatus != null and houseNumberStatus != ''">
+                AND hn.house_status = #{houseNumberStatus}
             </if>
 
         </where>

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

@@ -54,4 +54,13 @@
           AND #{date}>=  hns.start_time AND hns.end_time>=#{date}
           AND hns.house_number_id=#{houseNumberId}
     </select>
+    <select id="getHouseNumber" resultType="java.lang.String">
+        SELECT house_number_id
+        FROM `house_number_state`
+        WHERE FIND_IN_SET(house_number_id, #{houseNumberIds})
+          AND #{endTime} > start_time
+          AND end_time > #{startTime}
+          and deleted = 0
+        GROUP BY house_number_id
+    </select>
 </mapper>