diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/MeetingReservationController.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/MeetingReservationController.java index e77b15f..ee3664e 100644 --- a/shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/MeetingReservationController.java +++ b/shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/MeetingReservationController.java @@ -216,10 +216,10 @@ public class MeetingReservationController extends BaseController { /* 预定时间的转换 */ private Date convert(String date, Integer timeFormat, boolean start) { String time = ""; - if (timeFormat == 1) time = start ? " 08:30:00" : " 12:00:00";//1 上午 - if (timeFormat == 2) time = start ? " 12:00:01" : " 17:30:00";//2 下午 + if (timeFormat == 1) time = start ? " 09:00:00" : " 12:00:00";//1 上午 + if (timeFormat == 2) time = start ? " 13:30:00" : " 17:30:00";//2 下午 if (timeFormat == 3) time = start ? " 17:30:01" : " 23:59:59";//3 晚上 - if (timeFormat == 4) time = start ? " 08:30:00" : " 23:59:59";//4 全天 + if (timeFormat == 4) time = start ? " 09:00:00" : " 23:59:59";//4 全天 try { return DateUtils.dateTime(DateUtils.YYYY_MM_DD_HH_MM_SS, date + time); } catch (Exception e) { diff --git a/shoot-hand/ics-system/src/main/resources/mapper/system/UserMapper.xml b/shoot-hand/ics-system/src/main/resources/mapper/system/UserMapper.xml index 6b4758f..192846d 100644 --- a/shoot-hand/ics-system/src/main/resources/mapper/system/UserMapper.xml +++ b/shoot-hand/ics-system/src/main/resources/mapper/system/UserMapper.xml @@ -290,7 +290,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where id = #{customerId}