学生档案信息修改

ruoyi-system/src/main/java/com/ruoyi/system/domain/StudentInfo.java

@@ -122,10 +122,44 @@ public class StudentInfo extends BaseEntity
     /** 紧急联系人手机号 */
     private String emergencyContactTelephone;
 
+
+    /** 名族 */
+    private String familyName;
+    /** 是否远视（1：是，2：否） */
+    private String isFarsightedness;
+    /** 远视度数 */
+    private String farsightedness;
+
+
+
     private String classId;
 
     private Long parentsId;
 
+    public String getFamilyName() {
+        return familyName;
+    }
+
+    public String getIsFarsightedness() {
+        return isFarsightedness;
+    }
+
+    public String getFarsightedness() {
+        return farsightedness;
+    }
+
+    public void setFamilyName(String familyName) {
+        this.familyName = familyName;
+    }
+
+    public void setIsFarsightedness(String isFarsightedness) {
+        this.isFarsightedness = isFarsightedness;
+    }
+
+    public void setFarsightedness(String farsightedness) {
+        this.farsightedness = farsightedness;
+    }
+
     public String getEmergencyContact() {
         return emergencyContact;
     }

ruoyi-system/src/main/java/com/ruoyi/system/domain/StudentInfoOld.java

@@ -131,6 +131,37 @@ public class StudentInfoOld extends BaseEntity
     /** 紧急联系人手机号 */
     private String emergencyContactTelephone;
 
+    /** 名族 */
+    private String familyName;
+    /** 是否远视（1：是，2：否） */
+    private String isFarsightedness;
+    /** 远视度数 */
+    private String farsightedness;
+
+    public String getFamilyName() {
+        return familyName;
+    }
+
+    public String getIsFarsightedness() {
+        return isFarsightedness;
+    }
+
+    public String getFarsightedness() {
+        return farsightedness;
+    }
+
+    public void setFamilyName(String familyName) {
+        this.familyName = familyName;
+    }
+
+    public void setIsFarsightedness(String isFarsightedness) {
+        this.isFarsightedness = isFarsightedness;
+    }
+
+    public void setFarsightedness(String farsightedness) {
+        this.farsightedness = farsightedness;
+    }
+
     public String getEmergencyContact() {
         return emergencyContact;
     }

ruoyi-system/src/main/java/com/ruoyi/system/domain/score/ScoreDataDetails.java

@@ -86,6 +86,7 @@ public class ScoreDataDetails extends BaseEntity
     /**
      * 总分
      */
+    @Excel(name = "总分")
     private Integer zongfen;
     /**
      * 是否查看

ruoyi-system/src/main/resources/mapper/system/StudentInfoMapper.xml

@@ -48,6 +48,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="emergencyContact"    column="emergency_contact"    />
         <result property="emergencyContactTelephone"    column="emergency_contact_telephone"    />
 
+        <result property="familyName"    column="family_name"    />
+        <result property="isFarsightedness"    column="is_farsightedness"    />
+        <result property="farsightedness"    column="farsightedness"    />
+
 
         <result property="classId"    column="classId"    />
         <result property="parentsId"    column="parentsId"    />
@@ -58,14 +62,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select id, student_id, name, sex, age, school, student_number, id_card, height, weight, blood_type, political_status, identification_photo,
                entrance_permit, father_name, father_telephone, mother_name, mother_telephone, address, create_by, create_time, update_by, update_time,
                remark,is_nearsightedness,degree_myopia,health,mind,longitude,latitude,is_medical_history,medical_description,psychological_description,
-               is_lset,is_poverty,emergency_contact,emergency_contact_telephone from student_info
+               is_lset,is_poverty,emergency_contact,emergency_contact_telephone,family_name,is_farsightedness,farsightedness from student_info
     </sql>
 
     <select id="selectStudentInfoList" parameterType="StudentInfo" resultMap="StudentInfoResult">
         select s.id, s.student_id, s.name, s.sex, s.age, s.school, s.student_number, s.id_card, s.height, s.weight, s.blood_type, s.political_status, s.identification_photo,
         s.entrance_permit, s.father_name, s.father_telephone, s.mother_name, s.mother_telephone, s.address, s.create_by, s.create_time, s.update_by, s.update_time, s.remark,
         s.is_nearsightedness,s.degree_myopia,s.health,mind,s.longitude,s.latitude,s.is_medical_history,s.medical_description,s.psychological_description, s.is_lset,s.is_poverty,
-        s.emergency_contact,s.emergency_contact_telephone
+        s.emergency_contact,s.emergency_contact_telephone,s.family_name,s.is_farsightedness,s.farsightedness
         from student_info s
         left join formal_parents_student f on s.student_id = f.id
         <where>  
@@ -154,6 +158,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
             <if test="emergencyContact != null">emergency_contact,</if>
             <if test="emergencyContactTelephone != null">emergency_contact_telephone,</if>
+
+            <if test="familyName != null">family_name,</if>
+            <if test="isFarsightedness != null">is_farsightedness,</if>
+            <if test="farsightedness != null">farsightedness,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="studentId != null">#{studentId},</if>
@@ -197,6 +205,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
             <if test="emergencyContact != null">#{emergencyContact},</if>
             <if test="emergencyContactTelephone != null">#{emergencyContactTelephone},</if>
+
+            <if test="familyName != null">#{familyName},</if>
+            <if test="isFarsightedness != null">#{isFarsightedness},</if>
+            <if test="farsightedness != null">#{farsightedness},</if>
          </trim>
     </insert>
 
@@ -244,6 +256,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
             <if test="emergencyContact != null">emergency_contact= #{emergencyContact},</if>
             <if test="emergencyContactTelephone != null">emergency_contact_telephone= #{emergencyContactTelephone},</if>
+
+            <if test="familyName != null">family_name= #{familyName},</if>
+            <if test="isFarsightedness != null">is_farsightedness= #{isFarsightedness},</if>
+            <if test="farsightedness != null">farsightedness= #{farsightedness},</if>
         </trim>
         where id = #{id}
     </update>

ruoyi-system/src/main/resources/mapper/system/StudentInfoOldMapper.xml

@@ -45,10 +45,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
         <result property="emergencyContact"    column="emergency_contact"    />
         <result property="emergencyContactTelephone"    column="emergency_contact_telephone"    />
+
+        <result property="familyName"    column="family_name"    />
+        <result property="isFarsightedness"    column="is_farsightedness"    />
+        <result property="farsightedness"    column="farsightedness"    />
     </resultMap>
 
     <sql id="selectStudentInfoOldVo">
-        select old_id, student_id, name, sex, age, school, student_number, id_card, is_nearsightedness, degree_myopia, height, weight, blood_type, political_status, health, identification_photo, mind, entrance_permit, father_name, father_telephone, mother_name, mother_telephone, address, longitude, latitude, create_by, create_time, update_by, update_time, remark,is_medical_history,medical_description,psychological_description,is_lset,is_poverty,emergency_contact,emergency_contact_telephone from student_info_old
+        select old_id, student_id, name, sex, age, school, student_number, id_card, is_nearsightedness, degree_myopia, height, weight, blood_type, political_status,
+               health, identification_photo, mind, entrance_permit, father_name, father_telephone, mother_name, mother_telephone, address, longitude, latitude,
+               create_by, create_time, update_by, update_time, remark,is_medical_history,medical_description,psychological_description,is_lset,is_poverty,
+               emergency_contact,emergency_contact_telephone,family_name,is_farsightedness,farsightedness from student_info_old
     </sql>
 
     <select id="selectStudentInfoOldList" parameterType="StudentInfoOld" resultMap="StudentInfoOldResult">
@@ -162,6 +169,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
             <if test="emergencyContact != null">emergency_contact,</if>
             <if test="emergencyContactTelephone != null">emergency_contact_telephone,</if>
+
+            <if test="familyName != null">family_name,</if>
+            <if test="isFarsightedness != null">is_farsightedness,</if>
+            <if test="farsightedness != null">farsightedness,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="studentId != null">#{studentId},</if>
@@ -203,6 +214,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
             <if test="emergencyContact != null">#{emergencyContact},</if>
             <if test="emergencyContactTelephone != null">#{emergencyContactTelephone},</if>
+
+            <if test="familyName != null">#{familyName},</if>
+            <if test="isFarsightedness != null">#{isFarsightedness},</if>
+            <if test="farsightedness != null">#{farsightedness},</if>
          </trim>
     </insert>
 
@@ -248,6 +263,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
             <if test="emergencyContact != null">emergency_contact= #{emergencyContact},</if>
             <if test="emergencyContactTelephone != null">emergency_contact_telephone= #{emergencyContactTelephone},</if>
+
+            <if test="familyName != null">family_name= #{familyName},</if>
+            <if test="isFarsightedness != null">is_farsightedness= #{isFarsightedness},</if>
+            <if test="farsightedness != null">farsightedness= #{farsightedness},</if>
         </trim>
         where old_id = #{oldId}
     </update>