Commit 17581c57 by huluobin

update

parent f535c970
...@@ -774,7 +774,8 @@ public class ScheduleManageServiceImpl extends ServiceImpl<ScheduleManageMapper, ...@@ -774,7 +774,8 @@ public class ScheduleManageServiceImpl extends ServiceImpl<ScheduleManageMapper,
scheduleManage.getScheduledUser(), scheduleManage.getScheduledUser(),
scheduleManage.getArriveTime(), scheduleManage.getArriveTime(),
baseServe.getSchTypeId(), baseServe.getSchTypeId(),
scheduleServe.getServeId()); scheduleManage.getId());
if (ListUtil.isNotEmpty(typeConflictScheduleServe)) { if (ListUtil.isNotEmpty(typeConflictScheduleServe)) {
throw new RRException("同类型服务一天只能预约一次"); throw new RRException("同类型服务一天只能预约一次");
} }
......
...@@ -12,5 +12,5 @@ public interface ScheduleServeMapper extends BaseMapper<ScheduleServe> { ...@@ -12,5 +12,5 @@ public interface ScheduleServeMapper extends BaseMapper<ScheduleServe> {
List<ScheduleServe> selectConflictType(@Param("scheduledUser") Integer scheduledUser, List<ScheduleServe> selectConflictType(@Param("scheduledUser") Integer scheduledUser,
@Param("days") Date days, @Param("days") Date days,
@Param("schTypeId") Integer schTypeId, @Param("schTypeId") Integer schTypeId,
@Param("serveId") Integer serveId); @Param("scheduleId") Integer scheduleId);
} }
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
and TO_DAYS(t1.start_time) = TO_DAYS(#{days}) and TO_DAYS(t1.start_time) = TO_DAYS(#{days})
and t1.main_serve_id is null and t1.main_serve_id is null
and t2.`status` = 1 and t2.`status` = 1
<if test="serveId!=null"> <if test="scheduleId!=null">
and t1.serve_id != #{serveId} and t2.id != #{scheduleId}
</if> </if>
</select> </select>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment