审批查询字段补充，审批申请添加判断

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

@@ -2,10 +2,12 @@ package com.template.controller;
 
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.template.api.ApplicationProcedureTemporaryControllerAPI;
+import com.template.common.utils.TimeExchange;
 import com.template.model.dto.AppletApprovalProcessDto;
 import com.template.model.dto.ApplicationProcedureTemporaryDto;
 import com.template.model.dto.ApprovalProcessDto;
@@ -24,6 +26,7 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.text.ParseException;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
@@ -59,9 +62,26 @@ public class ApplicationProcedureTemporaryController implements ApplicationProce
         }
         Integer usersId = applicationProcedureDto.getUsersId();
 //        一个人只能有一个待审批的
-
-
-
+        List<ApplicationProcedureTemporary> list=applicationProcedureTemporaryService.list(new QueryWrapper<ApplicationProcedureTemporary>()
+                .eq("users_id",usersId)
+                .eq("status","1"));
+        if(!list.isEmpty()){
+            for(ApplicationProcedureTemporary apt:list){
+                if(apt.getEndTime().equals(applicationProcedureDto.getEndTime())
+                        ||apt.getStartTime().equals(applicationProcedureDto.getStartTime())){
+                    return CommonResult.fail("相同日期已有待审批申请");
+                }
+                try {
+                    boolean a=TimeExchange.CompareDate(apt.getEndTime(),applicationProcedureDto.getStartTime(),"yyyy-MM-dd HH:mm:ss");
+                    boolean b=TimeExchange.CompareDate(applicationProcedureDto.getEndTime(),apt.getStartTime(),"yyyy-MM-dd HH:mm:ss");
+               if(!(a||b)){
+                   return CommonResult.fail("日期范围内已有待审批申请");
+               }
+                } catch (ParseException e) {
+                    throw new RuntimeException(e);
+                }
+            }
+        }
         ApplicationProcedureTemporary applicationProcedure = new ApplicationProcedureTemporary();
 
         BeanUtils.copyProperties(applicationProcedureDto, applicationProcedure);

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

@@ -505,7 +505,7 @@ public class HouseOrderController implements HouseOrderAPI {
         HouseLock houseLock = houseLockService.getHouseNumberId(houseNumberId);
 //        如果没有房锁则需要去前台
         if (ObjectUtils.isEmpty(houseLock)) {
-            return CommonResult.fail("请前往前台办理入住");
+            return CommonResult.fail("请前往前台办理入住,领取钥匙");
         }
 
         try {

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

@@ -6,6 +6,7 @@
         SELECT
         apu.id,
         apu.users_id as usersId,
+        (select user_name from users a where a.id = apu.users_id) usersName,
         apu.start_time as startTime,
         apu.end_time as endTime,
         apu.department,