课表调整

applications/school/school-dto/src/main/java/com/usoftchina/smartschool/school/dto/CurriculumDTO.java

@@ -29,11 +29,8 @@ public class CurriculumDTO implements Serializable {
     /**
      * 学期开始日期
      */
-    private Date termStart;
-    /**
-     * 学期结束日期
-     */
-    private Date termEnd;
+    private String termPart;
+
     /**
      * 周 数
      */
@@ -149,20 +146,12 @@ public class CurriculumDTO implements Serializable {
         this.name = name;
     }
 
-    public Date getTermStart() {
-        return termStart;
-    }
-
-    public void setTermStart(Date termStart) {
-        this.termStart = termStart;
-    }
-
-    public Date getTermEnd() {
-        return termEnd;
+    public String getTermPart() {
+        return termPart;
     }
 
-    public void setTermEnd(Date termEnd) {
-        this.termEnd = termEnd;
+    public void setTermPart(String termPart) {
+        this.termPart = termPart;
     }
 
     public Long getWeekNum() {

applications/school/school-dto/src/main/java/com/usoftchina/smartschool/school/dto/CurriculumListDTO.java

@@ -47,13 +47,9 @@ public class CurriculumListDTO implements Serializable {
      */
     private String name;
     /**
-     * 学期开始
+     * 学年
      */
-    private String termStart;
-    /**
-     * 学期结束
-     */
-    private String termEnd;
+    private String termPart;
 
     public String getId() {
         return id;
@@ -79,20 +75,12 @@ public class CurriculumListDTO implements Serializable {
         this.name = name;
     }
 
-    public String getTermStart() {
-        return termStart;
-    }
-
-    public void setTermStart(String termStart) {
-        this.termStart = termStart;
-    }
-
-    public String getTermEnd() {
-        return termEnd;
+    public String getTermPart() {
+        return termPart;
     }
 
-    public void setTermEnd(String termEnd) {
-        this.termEnd = termEnd;
+    public void setTermPart(String termPart) {
+        this.termPart = termPart;
     }
 
     public String getSchoolName() {

applications/school/school-server/src/main/resources/mapper/CurriculumMapper.xml

@@ -24,8 +24,7 @@
     <result column="mcur_code" property="code" jdbcType="VARCHAR" />
     <result column="mcur_term_name" property="termName" jdbcType="VARCHAR" />
     <result column="mcur_name" property="name" jdbcType="VARCHAR" />
-    <result column="mcur_term_start" property="termStart" jdbcType="TIMESTAMP" />
-    <result column="mcur_term_end" property="termEnd" jdbcType="TIMESTAMP" />
+    <result column="mcur_term_part" property="termPart" jdbcType="VARCHAR" />
     <result column="mcur_weeknum" property="weekNum" jdbcType="INTEGER" />
     <result column="creatorName" property="creatorName" jdbcType="VARCHAR" />
     <result column="createTime" property="createTime" jdbcType="TIMESTAMP" />
@@ -39,7 +38,7 @@
 
   <select id="selectByCondition" resultType="com.usoftchina.smartschool.school.dto.CurriculumListDTO">
     select mcur.id id, school.school_name schoolName, grade.grade_name gradeName, clazz.clazz_name clazzName, mcur_status status, mcur.school_id schoolId, mcur.clazz_id clazzId, clazz.grade_id gradeId,
-    mcur.mcur_term_name termName, mcur.mcur_name name, mcur.mcur_term_start termStart, mcur.mcur_term_end termEnd
+    mcur.mcur_term_name termName, mcur.mcur_name name, mcur.mcur_term_part termPart
     from clazz_main_curriculum mcur
     left join sys_clazz clazz on mcur.clazz_id = clazz.clazz_id
     left join sys_grade grade on clazz.grade_id = grade.grade_id
@@ -96,11 +95,8 @@
       <if test="name != null">
         mcur_name,
       </if>
-      <if test="termStart != null">
-        mcur_term_start,
-      </if>
-      <if test="termEnd != null">
-        mcur_term_end,
+      <if test="termPart != null">
+        mcur_term_part,
       </if>
       <if test="weekNum != null">
         mcur_weeknum,
@@ -134,11 +130,8 @@
       <if test="name != null">
         #{name, jdbcType=VARCHAR},
       </if>
-      <if test="termStart != null">
-        #{termStart, jdbcType=TIMESTAMP},
-      </if>
-      <if test="termEnd != null">
-        #{termEnd, jdbcType=TIMESTAMP},
+      <if test="termPart != null">
+        #{termPart, jdbcType=VARCHAR},
       </if>
       <if test="weekNum != null">
         #{weekNum, jdbcType=INTEGER},
@@ -192,11 +185,8 @@
       <if test="name != null" >
         mcur_name = #{name,jdbcType=VARCHAR},
       </if>
-      <if test="termStart != null" >
-        mcur_term_start = #{termStart,jdbcType=VARCHAR},
-      </if>
-      <if test="termEnd != null" >
-        mcur_term_end = #{termEnd,jdbcType=VARCHAR},
+      <if test="termPart != null" >
+        mcur_term_part = #{termPart,jdbcType=VARCHAR},
       </if>
       <if test="weekNum != null" >
         mcur_weeknum = #{weekNum,jdbcType=INTEGER},