会议室预约,开票管理调整

jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/meetingRoom/service/MeetingRoomService.java

@@ -165,33 +165,18 @@ public class MeetingRoomService {
         //格式化输入的开始时间
         SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
         Date date = simpleDateFormat.parse(startDate);
-
+        //获取审核中的会议时间
         List<MeetingRoom> meetingRooms=meetingRoomMapper.checkTime(date);
-        ArrayList<Map<String, String>> strings = new ArrayList<>();
 
         DateTimeFormatter formatter = DateTimeFormatter.ofPattern("HH:mm:ss");
 
         LocalDate curDate = LocalDate.now();//当前日期
-
-
         //限制会议选择的时间 并转为time类型
         LocalTime time1 = LocalTime.of(9, 0, 0); // 9:00:00
-        String date1 = time1.format(formatter);
-        Time am1 = Time.valueOf(date1);
-        LocalTime time2 = LocalTime.of(11, 30, 0); // 11:30:00
-        String date2 = time2.format(formatter);
-        Time am2 = Time.valueOf(date2);
-        LocalTime time3 = LocalTime.of(14, 0, 0); // 14:00:00
-        String date3 = time3.format(formatter);
-        Time pm1 = Time.valueOf(date3);
-        LocalTime time4 = LocalTime.of(17, 0, 0); // 17:00:00
-        String date4 = time4.format(formatter);
-        Time pm2 = Time.valueOf(date4);
 
         Map<String, String> mergedMap = new HashMap<>();
 
         if (ObjectUtil.isNotEmpty(meetingRooms)){
-            List<Map<String, String>> meetingRoomMaps = new ArrayList<>();
             for (MeetingRoom meetingRoom : meetingRooms) {
                 //将获取到的开始时间和结束时间转为LocalDateTime格式,用以比较
                 LocalTime startTimeLocal  = meetingRoom.getStartTime().toLocalTime();
@@ -202,7 +187,7 @@ public class MeetingRoomService {
 
                 LocalDateTime current = startDateTime;
                 //确保开始时间在结束时间之前
-                while (!current.isAfter(endDateTime)) {
+                while (!current.isAfter(endDateTime) || current.isEqual(endDateTime)) {
                     String start = current.format(formatter);
                     mergedMap.put(start,start);
                     //计算半小时之后的时间
@@ -219,7 +204,7 @@ public class MeetingRoomService {
             //获取会议预约日期
             DateTimeFormatter formatte = DateTimeFormatter.ofPattern("yyyy-MM-dd");
             LocalDate startDate1 = LocalDate.parse(startDate, formatte);
-        //比较两个日期,
+        //比较两个日期是否为当天,
         if (curDate.equals(startDate1)){
             //获取当前时间
             LocalTime now = LocalTime.now();
@@ -227,7 +212,7 @@ public class MeetingRoomService {
             ArrayList<LocalTime> dateList = new ArrayList<>();
             LocalDateTime morning=LocalDateTime.of(curDate, time1); //上午九点
             //将上午九点开始,截止到当前时间,中间的每半个小时存放到集合中
-            while (nowDate.isAfter(morning) || nowDate.isEqual(morning)){
+            if (nowDate.isAfter(morning) || nowDate.isEqual(morning)){
                 LocalTime currentTime = time1;
                 dateList.add(currentTime);
                 // 循环直到当前时间或者下一个半点的开始时间
@@ -241,10 +226,6 @@ public class MeetingRoomService {
                 mergedMap.put(localTime.format(formatter),localTime.format(formatter));
             }
         }
-
-
-
-
         return mergedMap;
     }
 

jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/monthly/mapper/xml/JyProcessMapper.xml

@@ -17,6 +17,7 @@
         from
             jy_process
         where monthly_id = #{id}
+        order by process_time desc
     </select>
 
 </mapper>