Procházet zdrojové kódy

优化班次功能

wuxw před 3 roky
rodič
revize
3c73b95ea0

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

@@ -20,6 +20,7 @@ public class ScheduleClassesDayDto extends PageDto implements Serializable {
     public static final String WORKDAY_NORMAL = "1001";
 
     private String workday;
+    private String workdayName;
     private String dayId;
     private String day;
     private String scheduleId;
@@ -97,4 +98,12 @@ public class ScheduleClassesDayDto extends PageDto implements Serializable {
     public void setTimes(List<ScheduleClassesTimeDto> times) {
         this.times = times;
     }
+
+    public String getWorkdayName() {
+        return workdayName;
+    }
+
+    public void setWorkdayName(String workdayName) {
+        this.workdayName = workdayName;
+    }
 }

+ 2 - 1
java110-db/src/main/resources/mapper/store/ScheduleClassesDayV1ServiceDaoImplMapper.xml

@@ -18,8 +18,9 @@
     <!-- 查询排班天信息 add by wuxw 2018-07-03 -->
     <select id="getScheduleClassesDayInfo" parameterType="Map" resultType="Map">
         select t.workday,t.day_id,t.day_id dayId,t.status_cd,t.status_cd statusCd,t.day,t.schedule_id,t.schedule_id
-        scheduleId,t.week_flag,t.week_flag weekFlag
+        scheduleId,t.week_flag,t.week_flag weekFlag,c.`name` workdayName
         from schedule_classes_day t
+        left join classes c on  t.workday =c.classes_id and c.status_cd =  '0'
         where 1 =1
         <if test="workday !=null and workday != ''">
             and t.workday= #{workday}