From c521e5311c523d29b3f96c45376e643df3d1940e Mon Sep 17 00:00:00 2001 From: "JinLu.Yin" <411641505@qq.com> Date: Sat, 11 Jun 2022 23:10:59 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E6=8E=92=E7=8F=AD=E6=97=A5?= =?UTF-8?q?=E5=8E=86=E6=9F=A5=E8=AF=A2=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/CalCalendarServiceImpl.java | 28 ++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/ktg-mes/src/main/java/com/ktg/mes/cal/service/impl/CalCalendarServiceImpl.java b/ktg-mes/src/main/java/com/ktg/mes/cal/service/impl/CalCalendarServiceImpl.java index 36a34fc..149ac01 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/cal/service/impl/CalCalendarServiceImpl.java +++ b/ktg-mes/src/main/java/com/ktg/mes/cal/service/impl/CalCalendarServiceImpl.java @@ -2,10 +2,12 @@ package com.ktg.mes.cal.service.impl; import cn.hutool.core.collection.CollUtil; import com.ktg.mes.cal.domain.CalCalendar; +import com.ktg.mes.cal.domain.CalTeamMember; import com.ktg.mes.cal.domain.CalTeamshift; import com.ktg.mes.cal.mapper.CalPlanMapper; import com.ktg.mes.cal.mapper.CalTeamshiftMapper; import com.ktg.mes.cal.service.ICalCalendarService; +import com.ktg.mes.cal.service.ICalTeamMemberService; import com.ktg.mes.cal.utils.CalendarUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -22,6 +24,9 @@ public class CalCalendarServiceImpl implements ICalCalendarService { @Autowired private CalTeamshiftMapper calTeamshiftMapper; + @Autowired + private ICalTeamMemberService calTeamMemberService; + /** * 1.循环生成当前月份每一天的CalCalendar @@ -70,7 +75,28 @@ public class CalCalendarServiceImpl implements ICalCalendarService { @Override public List getCalendarByUser(Date day, Long userId) { - return null; + List calendars = null; + + CalTeamMember param = new CalTeamMember(); + param.setUserId(userId); + List members = calTeamMemberService.selectCalTeamMemberList(param); + if(CollUtil.isNotEmpty(members)){ + Long teamId = members.get(0).getTeamId(); + calendars = CalendarUtil.getDays(day); + for (CalCalendar cal:calendars + ) { + CalTeamshift param2 = new CalTeamshift(); + param2.setTheDay(cal.getTheDay()); + param2.setTeamId(teamId); + List teamshifts = calTeamshiftMapper.selectCalTeamshiftList(param2); + cal.setTeamShifts(teamshifts); + if(CollUtil.isNotEmpty(teamshifts)){ + cal.setShiftType(teamshifts.get(0).getShiftType()); + } + } + } + + return calendars; }