会议申请会议室选取

会议申请规则节点

src/main/java/com/xjrsoft/module/oa/dto/MeetingRoomListDto.java

@@ -25,12 +25,12 @@ public class MeetingRoomListDto {
      * 会议开始时间
      */
     @ApiModelProperty("会议开始时间")
-    private LocalTime meetingApplyS;
+    private String meetingApplyS;
     /**
      * 会议结束时间
      */
     @ApiModelProperty("会议结束时间")
-    private LocalTime meetingApplyE;
+    private String meetingApplyE;
     /**
      * 会议室名称
      */

src/main/java/com/xjrsoft/module/oa/service/impl/WfMeetingApplyServiceImpl.java

@@ -36,6 +36,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.time.LocalDateTime;
+import java.time.LocalTime;
 import java.time.format.DateTimeFormatter;
 import java.util.Arrays;
 import java.util.LinkedHashMap;
@@ -67,6 +68,11 @@ public class WfMeetingApplyServiceImpl extends MPJBaseServiceImpl<WfMeetingApply
 
     @Override
     public List<MeetingRoomListVo> meetingRoomList(MeetingRoomListDto dto) {
+        // 处理时间
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("HH:mm:ss");
+        LocalTime startTime =  LocalTime.parse(dto.getMeetingApplyS());
+        LocalTime endTime =  LocalTime.parse(dto.getMeetingApplyE());
+
         // 获取所有的教室
         MPJLambdaWrapper<MeetingRoom> meetingRoomMPJLambdaWrapper = new MPJLambdaWrapper<>();
         meetingRoomMPJLambdaWrapper
@@ -102,7 +108,7 @@ public class WfMeetingApplyServiceImpl extends MPJBaseServiceImpl<WfMeetingApply
             meetingRoomListVo = new MeetingRoomListVo();
             for (WfMeetingApply wfMeetingApply : value) {
                 // 会议时间是否重叠
-                if(!(dto.getMeetingApplyS().isBefore(wfMeetingApply.getMeetingApplyS()) || dto.getMeetingApplyE().isAfter(wfMeetingApply.getMeetingApplyE()))){
+                if(!(startTime.isBefore(wfMeetingApply.getMeetingApplyS()) || endTime.isAfter(wfMeetingApply.getMeetingApplyE()))){
                     isReservation = true;
                 }
                 reservationDetail.append(wfMeetingApply.getMeetingApplyS()).append("-").append(wfMeetingApply.getMeetingApplyE()).append("\r\n");

src/main/resources/application.yml

@@ -5,7 +5,7 @@ server:
 spring:
   # 环 io境 dev|pre|prod
   profiles:
-    active: pre
+    active: dev
   # jackson时间格式化
   jackson:
     time-zone: GMT+8