Commit f215a2b6 by huluobin

update

parent 11fde605
...@@ -233,7 +233,10 @@ public class ScheduleManageServiceImpl extends ServiceImpl<ScheduleManageMapper, ...@@ -233,7 +233,10 @@ public class ScheduleManageServiceImpl extends ServiceImpl<ScheduleManageMapper,
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
//美甲师不可用日期列表 //美甲师不可用日期列表
List<StoreTechnicianPeriod> storeTechnicianDTOList = this.queryStoreTechnicianPeriod(qry.getId(), qry.getDepartmentId(), qry.getScheduleDate(), qry.getListScheduleServer().stream().map(ScheduleServeQuery::getServeId).collect(Collectors.toList())); List<StoreTechnicianPeriod> storeTechnicianDTOList = this.queryStoreTechnicianPeriod(qry.getId(),
qry.getDepartmentId(),
qry.getScheduleDate(),
qry.getListScheduleServer().stream().map(ScheduleServeQuery::getServeId).collect(Collectors.toList()));
//查询时段 //查询时段
if (ListUtil.isEmpty(qry.getDateTimeList())) { if (ListUtil.isEmpty(qry.getDateTimeList())) {
...@@ -808,6 +811,8 @@ public class ScheduleManageServiceImpl extends ServiceImpl<ScheduleManageMapper, ...@@ -808,6 +811,8 @@ public class ScheduleManageServiceImpl extends ServiceImpl<ScheduleManageMapper,
query.setShowNodeDetail(true); query.setShowNodeDetail(true);
//查询时间节点 //查询时间节点
query.setDateTimeList(Lists.newArrayList(scheduleManage.getArriveTime().getTime())); query.setDateTimeList(Lists.newArrayList(scheduleManage.getArriveTime().getTime()));
//
query.setId(scheduleManage.getId());
//查询方案树 //查询方案树
List<IdleTimeDTO> idleTimeDTOList = this.queryIdleTime(query); List<IdleTimeDTO> idleTimeDTOList = this.queryIdleTime(query);
//如果时间节点不可用返回false //如果时间节点不可用返回false
......
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