优化代码

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

@@ -1,6 +1,7 @@
 package com.java110.dto.scheduleClassesDay;
 
 import com.java110.dto.PageDto;
+
 import java.io.Serializable;
 import java.util.Date;
 
@@ -14,11 +15,13 @@ import java.util.Date;
  **/
 public class ScheduleClassesDayDto extends PageDto implements Serializable {
 
+    public static final String WORKDAY_NORMAL = "1001";
+
     private String workday;
-private String dayId;
-private String day;
-private String scheduleId;
-private String weekFlag;
+    private String dayId;
+    private String day;
+    private String scheduleId;
+    private String weekFlag;
 
 
     private Date createTime;
@@ -29,31 +32,40 @@ private String weekFlag;
     public String getWorkday() {
         return workday;
     }
-public void setWorkday(String workday) {
+
+    public void setWorkday(String workday) {
         this.workday = workday;
     }
-public String getDayId() {
+
+    public String getDayId() {
         return dayId;
     }
-public void setDayId(String dayId) {
+
+    public void setDayId(String dayId) {
         this.dayId = dayId;
     }
-public String getDay() {
+
+    public String getDay() {
         return day;
     }
-public void setDay(String day) {
+
+    public void setDay(String day) {
         this.day = day;
     }
-public String getScheduleId() {
+
+    public String getScheduleId() {
         return scheduleId;
     }
-public void setScheduleId(String scheduleId) {
+
+    public void setScheduleId(String scheduleId) {
         this.scheduleId = scheduleId;
     }
-public String getWeekFlag() {
+
+    public String getWeekFlag() {
         return weekFlag;
     }
-public void setWeekFlag(String weekFlag) {
+
+    public void setWeekFlag(String weekFlag) {
         this.weekFlag = weekFlag;
     }
 

java110-db/src/main/resources/mapper/store/ScheduleClassesV1ServiceDaoImplMapper.xml

@@ -20,7 +20,7 @@
         select t.schedule_type,t.schedule_type scheduleType,t.schedule_cycle,t.schedule_cycle
         scheduleCycle,t.compute_time,t.compute_time computeTime,t.name,t.remark,t.status_cd,t.status_cd
         statusCd,t.state,t.store_id,t.store_id storeId,t.schedule_id,t.schedule_id scheduleId,
-        td.name scheduleTypeName,td1.name stateName
+        td.name scheduleTypeName,td1.name stateName,t.create_time createTime
         from schedule_classes t
         left join t_dict td on t.schedule_type =  td.status_cd and td.table_name = 'schedule_classes' and td.table_columns = 'schedule_type'
         left join t_dict td1 on t.state =  td1.status_cd and td1.table_name = 'schedule_classes' and td1.table_columns = 'state'

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

@@ -24,6 +24,7 @@ import com.java110.core.event.cmd.Cmd;
 import com.java110.core.event.cmd.CmdEvent;
 import com.java110.core.factory.GenerateCodeFactory;
 import com.java110.dto.scheduleClasses.ScheduleClassesDto;
+import com.java110.dto.scheduleClassesDay.ScheduleClassesDayDto;
 import com.java110.intf.store.IScheduleClassesDayV1InnerServiceSMO;
 import com.java110.intf.store.IScheduleClassesTimeV1InnerServiceSMO;
 import com.java110.intf.store.IScheduleClassesV1InnerServiceSMO;
@@ -82,10 +83,15 @@ public class SaveScheduleClassesCmd extends Cmd {
             throw new CmdException("未包含天");
         }
 
+
         JSONObject day = null;
         JSONArray times = null;
         for(int dayIndex = 0 ; dayIndex < days.size(); dayIndex++){
             day = days.getJSONObject(dayIndex);
+
+            if(!ScheduleClassesDayDto.WORKDAY_NORMAL.equals(day.getString("workday"))){
+                continue;
+            }
             if(!day.containsKey("times")){
                 throw new CmdException("未包时间");
             }