wuxw лет назад: 3
Родитель
Сommit
cb5209c44e

+ 11 - 0
java110-bean/src/main/java/com/java110/dto/scheduleClassesStaff/ScheduleClassesStaffDto.java

@@ -2,6 +2,7 @@ package com.java110.dto.scheduleClassesStaff;
 
 import com.java110.dto.PageDto;
 import com.java110.dto.scheduleClassesDay.ScheduleClassesDayDto;
+import com.java110.dto.scheduleClassesTime.ScheduleClassesTimeDto;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -35,6 +36,8 @@ public class ScheduleClassesStaffDto extends PageDto implements Serializable {
 
     List<ScheduleClassesDayDto> days;
 
+    List<ScheduleClassesTimeDto> times;
+
 
     private Date createTime;
 
@@ -153,4 +156,12 @@ public class ScheduleClassesStaffDto extends PageDto implements Serializable {
     public void setCurDate(String curDate) {
         this.curDate = curDate;
     }
+
+    public List<ScheduleClassesTimeDto> getTimes() {
+        return times;
+    }
+
+    public void setTimes(List<ScheduleClassesTimeDto> times) {
+        this.times = times;
+    }
 }

+ 8 - 2
service-store/src/main/java/com/java110/store/smo/impl/ScheduleClassesStaffV1InnerServiceSMOImpl.java

@@ -169,6 +169,10 @@ public class ScheduleClassesStaffV1InnerServiceSMOImpl extends BaseServiceSMO im
      * 员工是否上班 按月 排班
      * @param scheduleClassesDto
      * @param scheduleClassesStaffDto
+     * {
+     *     work:true // 表名 员工 此刻 在线
+     *     times:[] // 当日 上班下班时间点 ,这个节点 不一定存在
+     * }
      */
     private void staffIsWorkMonth( ScheduleClassesDto scheduleClassesDto, ScheduleClassesStaffDto scheduleClassesStaffDto) {
         Calendar today = Calendar.getInstance();
@@ -192,7 +196,7 @@ public class ScheduleClassesStaffV1InnerServiceSMOImpl extends BaseServiceSMO im
 
         List<ScheduleClassesTimeDto> times = scheduleClassesDayDtos.get(0).getTimes();
 
-
+        scheduleClassesStaffDto.setTimes(times);
         String startTime = null;
         String endTime = null;
         for (ScheduleClassesTimeDto time : times) {
@@ -256,7 +260,7 @@ public class ScheduleClassesStaffV1InnerServiceSMOImpl extends BaseServiceSMO im
 
         List<ScheduleClassesTimeDto> times = scheduleClassesDayDtos.get(0).getTimes();
 
-
+        scheduleClassesStaffDto.setTimes(times);
         String startTime = null;
         String endTime = null;
         for (ScheduleClassesTimeDto time : times) {
@@ -307,8 +311,10 @@ public class ScheduleClassesStaffV1InnerServiceSMOImpl extends BaseServiceSMO im
             return ;
         }
 
+
         List<ScheduleClassesTimeDto> times = scheduleClassesDayDtos.get(0).getTimes();
 
+        scheduleClassesStaffDto.setTimes(times);
 
         String startTime = null;
         String endTime = null;