Browse Source

出入校记录字段添加

zhaoy 7 years ago
parent
commit
92edd93022

+ 53 - 13
applications/school/school-server/src/main/java/com/usoftchina/smartschool/school/po/OutInRecord.java

@@ -4,31 +4,39 @@ import java.io.Serializable;
 import java.util.Date;
 
 public class OutInRecord implements Serializable{
-    private Long record_id;
+    private Long record_id;         //编号
 
-    private String record_name;
+    private String record_name;     //记录名
 
-    private Date out_date;
+    private Date out_date;          //出校时间
 
-    private Date in_date;
+    private Date in_date;           //入校时间
 
-    private String record_details;
+    private String record_details;  //详情
 
-    private String record_remarks;
+    private String record_remarks;  //备注
 
-    private String device_id;
+    private String device_id;       //设备标识
 
-    private Long stu_id;
+    private Long stu_id;            //学生编号
 
-    private Long school_id;
+    private Long school_id;         //学校编号
 
-    private String stu_name;
+    private Integer stu_sex;        //学生性别
 
-    private Integer stu_sex;
+    private String stu_number;      //学号
 
-    private String stu_number;
+    private String stu_name;	    //学生姓名
 
-    private String clazz_name;
+    private Long grade_id;	        //年级编号
+
+    private String grade_name;	    //年级名
+
+    private Long clazz_id;	        //班级编号
+
+    private String clazz_name;	    //班级名
+
+    private String grade_clazz;	    //年级加班级名
 
     public String getStu_name() {
         return stu_name;
@@ -133,4 +141,36 @@ public class OutInRecord implements Serializable{
     public void setSchool_id(Long school_id) {
         this.school_id = school_id;
     }
+
+    public Long getGrade_id() {
+        return grade_id;
+    }
+
+    public void setGrade_id(Long grade_id) {
+        this.grade_id = grade_id;
+    }
+
+    public String getGrade_name() {
+        return grade_name;
+    }
+
+    public void setGrade_name(String grade_name) {
+        this.grade_name = grade_name;
+    }
+
+    public Long getClazz_id() {
+        return clazz_id;
+    }
+
+    public void setClazz_id(Long clazz_id) {
+        this.clazz_id = clazz_id;
+    }
+
+    public String getGrade_clazz() {
+        return grade_clazz;
+    }
+
+    public void setGrade_clazz(String grade_clazz) {
+        this.grade_clazz = grade_clazz;
+    }
 }

+ 21 - 1
applications/school/school-server/src/main/resources/mapper/HomeWorkMapper.xml

@@ -82,6 +82,12 @@
       <if test="task_notifier != null" >
         task_notifier,
       </if>
+      <if test="classz_name != null" >
+        classz_name,
+      </if>
+      <if test="grade_name != null" >
+        grade_name,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides="," >
       <if test="subject_id != null" >
@@ -117,6 +123,12 @@
       <if test="task_notifier != null" >
         #{task_notifier,jdbcType=LONGVARCHAR},
       </if>
+      <if test="classz_name != null" >
+        #{classz_name,jdbcType=VARCHAR},
+      </if>
+      <if test="grade_name != null" >
+        #{grade_name,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.usoftchina.smartschool.school.po.HomeWork" >
@@ -155,6 +167,12 @@
       <if test="task_notifier != null" >
         task_notifier = #{task_notifier,jdbcType=LONGVARCHAR},
       </if>
+      <if test="classz_name != null" >
+        classz_name = #{classz_name,jdbcType=VARCHAR},
+      </if>
+      <if test="grade_name != null" >
+        grade_name = #{grade_name,jdbcType=VARCHAR},
+      </if>
     </set>
     where task_id = #{task_id,jdbcType=BIGINT}
   </update>
@@ -170,7 +188,9 @@
       school_id = #{school_id,jdbcType=BIGINT},
       task_context = #{task_context,jdbcType=LONGVARCHAR},
       task_files = #{task_files,jdbcType=LONGVARCHAR},
-      task_notifier = #{task_notifier,jdbcType=LONGVARCHAR}
+      task_notifier = #{task_notifier,jdbcType=LONGVARCHAR},
+      classz_name = #{classz_name,jdbcType=VARCHAR},
+      grade_name = #{grade_name,jdbcType=VARCHAR}
     where task_id = #{task_id,jdbcType=BIGINT}
   </update>
   <update id="updateByPrimaryKey" parameterType="com.usoftchina.smartschool.school.po.HomeWork" >