判断处理完成

java110-bean/src/main/java/com/java110/dto/scheduleClassesDay/ScheduleClassesDayDto.java

@@ -17,7 +17,7 @@ import java.util.List;
  **/
 public class ScheduleClassesDayDto extends PageDto implements Serializable {
 
-    public static final String WORKDAY_NORMAL = "1001";
+    public static final String WORKDAY_NO = "2002";
 
     private String workday;
     private String workdayName;

service-job/src/main/java/com/java110/job/export/adapt/ReportStaffMonthScheduleClassesAdapt.java

@@ -111,10 +111,10 @@ public class ReportStaffMonthScheduleClassesAdapt implements IExportDataAdapt {
             row.createCell(0).setCellValue(scheduleClassesStaffDto.getStaffName());
             for (int dayIndex = 1; dayIndex <= scheduleClassesStaffDto.getDays().size(); dayIndex++) {
                 day = scheduleClassesStaffDto.getDays().get(dayIndex-1);
-                if (!ScheduleClassesDayDto.WORKDAY_NORMAL.equals(day.getWorkday())) {
+                if (ScheduleClassesDayDto.WORKDAY_NO.equals(day.getWorkday())) {
                     cellValue = "休息";
                 } else {
-                    cellValue = "正常上下班\r\n";
+                    cellValue = day.getWorkdayName()+"\r\n";
                     for (ScheduleClassesTimeDto time : day.getTimes()) {
                         cellValue += (time.getStartTime() + "-" + time.getEndTime());
                     }

service-store/src/main/java/com/java110/store/cmd/scheduleClasses/SaveScheduleClassesCmd.java

@@ -89,7 +89,7 @@ public class SaveScheduleClassesCmd extends Cmd {
         for(int dayIndex = 0 ; dayIndex < days.size(); dayIndex++){
             day = days.getJSONObject(dayIndex);
 
-            if(!ScheduleClassesDayDto.WORKDAY_NORMAL.equals(day.getString("workday"))){
+            if(ScheduleClassesDayDto.WORKDAY_NO.equals(day.getString("workday"))){
                 continue;
             }
             if(!day.containsKey("times")){

service-store/src/main/java/com/java110/store/cmd/scheduleClasses/UpdateScheduleClassesCmd.java

@@ -88,7 +88,7 @@ public class UpdateScheduleClassesCmd extends Cmd {
         for(int dayIndex = 0 ; dayIndex < days.size(); dayIndex++){
             day = days.getJSONObject(dayIndex);
 
-            if(!ScheduleClassesDayDto.WORKDAY_NORMAL.equals(day.getString("workday"))){
+            if(ScheduleClassesDayDto.WORKDAY_NO.equals(day.getString("workday"))){
                 continue;
             }
             if(!day.containsKey("times")){

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

@@ -183,6 +183,11 @@ public class ScheduleClassesStaffV1InnerServiceSMOImpl extends BaseServiceSMO im
             return;
         }
 
+        if(ScheduleClassesDayDto.WORKDAY_NO.equals(scheduleClassesDayDtos.get(0).getWorkday())){
+            scheduleClassesStaffDto.setWork(false);
+            return ;
+        }
+
         List<ScheduleClassesTimeDto> times = scheduleClassesDayDtos.get(0).getTimes();
 
 
@@ -242,6 +247,11 @@ public class ScheduleClassesStaffV1InnerServiceSMOImpl extends BaseServiceSMO im
             return;
         }
 
+        if(ScheduleClassesDayDto.WORKDAY_NO.equals(scheduleClassesDayDtos.get(0).getWorkday())){
+            scheduleClassesStaffDto.setWork(false);
+            return ;
+        }
+
         List<ScheduleClassesTimeDto> times = scheduleClassesDayDtos.get(0).getTimes();
 
 
@@ -290,6 +300,11 @@ public class ScheduleClassesStaffV1InnerServiceSMOImpl extends BaseServiceSMO im
             return;
         }
 
+        if(ScheduleClassesDayDto.WORKDAY_NO.equals(scheduleClassesDayDtos.get(0).getWorkday())){
+            scheduleClassesStaffDto.setWork(false);
+            return ;
+        }
+
         List<ScheduleClassesTimeDto> times = scheduleClassesDayDtos.get(0).getTimes();