档案信息1

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

@@ -103,12 +103,41 @@ public class StudentInfo extends BaseEntity
     /** 纬度 */
     private String latitude;
 
-
+    /** 有无过往病史（1：有，2：无） */
+    private String isMedicalHistory;
+    /** 病史描述 */
+    private String medicalDescription;
+    /** 心理健康描述 */
+    private String psychologicalDescription;
 
 
 
     private String classId;
 
+    public void setIsMedicalHistory(String isMedicalHistory) {
+        this.isMedicalHistory = isMedicalHistory;
+    }
+
+    public void setMedicalDescription(String medicalDescription) {
+        this.medicalDescription = medicalDescription;
+    }
+
+    public void setPsychologicalDescription(String psychologicalDescription) {
+        this.psychologicalDescription = psychologicalDescription;
+    }
+
+    public String getIsMedicalHistory() {
+        return isMedicalHistory;
+    }
+
+    public String getMedicalDescription() {
+        return medicalDescription;
+    }
+
+    public String getPsychologicalDescription() {
+        return psychologicalDescription;
+    }
+
     public String getIsNearsightedness() {
         return isNearsightedness;
     }

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

@@ -114,6 +114,37 @@ public class StudentInfoOld extends BaseEntity
     @Excel(name = "纬度")
     private String latitude;
 
+    /** 有无过往病史（1：有，2：无） */
+    private String isMedicalHistory;
+    /** 病史描述 */
+    private String medicalDescription;
+    /** 心理健康描述 */
+    private String psychologicalDescription;
+
+    public String getIsMedicalHistory() {
+        return isMedicalHistory;
+    }
+
+    public String getMedicalDescription() {
+        return medicalDescription;
+    }
+
+    public String getPsychologicalDescription() {
+        return psychologicalDescription;
+    }
+
+    public void setIsMedicalHistory(String isMedicalHistory) {
+        this.isMedicalHistory = isMedicalHistory;
+    }
+
+    public void setMedicalDescription(String medicalDescription) {
+        this.medicalDescription = medicalDescription;
+    }
+
+    public void setPsychologicalDescription(String psychologicalDescription) {
+        this.psychologicalDescription = psychologicalDescription;
+    }
+
     public Long getOldId() {
         return oldId;
     }

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

@@ -1,10 +1,13 @@
 package com.ruoyi.system.domain;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
 
+import java.util.Date;
+
 /**
  * 老师档案信息对象 teacher_info
  * 
@@ -90,7 +93,31 @@ public class TeacherInfo extends BaseEntity
     @Excel(name = "居住地址")
     private String address;
 
-    public void setId(Long id) 
+    /** 入职时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date onBoardTime;
+
+    /** 参加工作时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date jobTime;
+
+    public Date getOnBoardTime() {
+        return onBoardTime;
+    }
+
+    public Date getJobTime() {
+        return jobTime;
+    }
+
+    public void setOnBoardTime(Date onBoardTime) {
+        this.onBoardTime = onBoardTime;
+    }
+
+    public void setJobTime(Date jobTime) {
+        this.jobTime = jobTime;
+    }
+
+    public void setId(Long id)
     {
         this.id = id;
     }

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/StudentInfoOldServiceImpl.java

@@ -1,9 +1,6 @@
 package com.ruoyi.system.service.impl;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.exception.ServiceException;
@@ -115,7 +112,7 @@ public class StudentInfoOldServiceImpl implements IStudentInfoOldService
         List<Object> y1 = new ArrayList<>();
         List<Object> y2 = new ArrayList<>();
         for (StudentInfoOld infoOld : StudentInfoOldList) {
-            x.add(infoOld.getUpdateTime());
+            x.add(DateUtils.dateTime(infoOld.getUpdateTime()));
             y1.add(infoOld.getHeight());
             y2.add(infoOld.getWeight());
         }

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

@@ -37,6 +37,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="longitude"    column="longitude"    />
         <result property="latitude"    column="latitude"    />
 
+        <result property="isMedicalHistory"    column="is_medical_history"    />
+        <result property="medicalDescription"    column="medical_description"    />
+        <result property="psychologicalDescription"    column="psychological_description"    />
+
+
         <result property="classId"    column="classId"    />
 
     </resultMap>
@@ -44,13 +49,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <sql id="selectStudentInfoVo">
         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 from student_info
+               remark,is_nearsightedness,degree_myopia,health,mind,longitude,latitude,is_medical_history,medical_description,psychological_description 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_nearsightedness,s.degree_myopia,s.health,mind,s.longitude,s.latitude,s.is_medical_history,s.medical_description,s.psychological_description
         from student_info s
         left join formal_parents_student f on s.student_id = f.id
         <where>  
@@ -115,6 +120,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="mind != null">mind,</if>
             <if test="longitude != null">longitude,</if>
             <if test="latitude != null">latitude,</if>
+
+            <if test="isMedicalHistory != null">is_medical_history,</if>
+            <if test="medicalDescription != null">medical_description,</if>
+            <if test="psychologicalDescription != null">psychological_description,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="studentId != null">#{studentId},</if>
@@ -148,6 +157,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="longitude != null">#{longitude},</if>
             <if test="latitude != null">#{latitude},</if>
 
+            <if test="isMedicalHistory != null">#{isMedicalHistory},</if>
+            <if test="medicalDescription != null">#{medicalDescription},</if>
+            <if test="psychologicalDescription != null">#{psychologicalDescription},</if>
+
          </trim>
     </insert>
 
@@ -184,6 +197,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="mind != null">mind= #{mind},</if>
             <if test="longitude != null">longitude= #{longitude},</if>
             <if test="latitude != null">latitude= #{latitude},</if>
+
+            <if test="isMedicalHistory != null">is_medical_history = #{isMedicalHistory},</if>
+            <if test="medicalDescription != null">medical_description = #{medicalDescription},</if>
+            <if test="psychologicalDescription != null">psychological_description = #{psychologicalDescription},</if>
         </trim>
         where id = #{id}
     </update>

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

@@ -35,10 +35,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateBy"    column="update_by"    />
         <result property="updateTime"    column="update_time"    />
         <result property="remark"    column="remark"    />
+
+        <result property="isMedicalHistory"    column="is_medical_history"    />
+        <result property="medicalDescription"    column="medical_description"    />
+        <result property="psychologicalDescription"    column="psychological_description"    />
     </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 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 from student_info_old
     </sql>
 
     <select id="selectStudentInfoOldList" parameterType="StudentInfoOld" resultMap="StudentInfoOldResult">
@@ -139,6 +143,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateBy != null">update_by,</if>
             <if test="updateTime != null">update_time,</if>
             <if test="remark != null">remark,</if>
+
+            <if test="isMedicalHistory != null">is_medical_history,</if>
+            <if test="medicalDescription != null">medical_description,</if>
+            <if test="psychologicalDescription != null">psychological_description,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="studentId != null">#{studentId},</if>
@@ -170,6 +178,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateBy != null">#{updateBy},</if>
             <if test="updateTime != null">#{updateTime},</if>
             <if test="remark != null">#{remark},</if>
+
+            <if test="isMedicalHistory != null">#{isMedicalHistory},</if>
+            <if test="medicalDescription != null">#{medicalDescription},</if>
+            <if test="psychologicalDescription != null">#{psychologicalDescription},</if>
          </trim>
     </insert>
 
@@ -205,6 +217,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateBy != null">update_by = #{updateBy},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
             <if test="remark != null">remark = #{remark},</if>
+
+            <if test="isMedicalHistory != null">is_medical_history = #{isMedicalHistory},</if>
+            <if test="medicalDescription != null">medical_description = #{medicalDescription},</if>
+            <if test="psychologicalDescription != null">psychological_description = #{psychologicalDescription},</if>
         </trim>
         where old_id = #{oldId}
     </update>

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

@@ -24,6 +24,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="identificationPhoto"    column="identification_photo"    />
         <result property="entrancePermit"    column="entrance_permit"    />
         <result property="address"    column="address"    />
+
+        <result property="onBoardTime"    column="on_board_time"    />
+        <result property="jobTime"    column="job_time"    />
+
         <result property="createBy"    column="create_by"    />
         <result property="createTime"    column="create_time"    />
         <result property="updateBy"    column="update_by"    />
@@ -32,7 +36,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectTeacherInfoVo">
-        select id, teacher_id, name, sex, age, phone, professional, id_card, height, weight, blood_type, political_status, graduation_photo, degree_photo, teaching_photo, professional_photo, identification_photo, entrance_permit, address, create_by, create_time, update_by, update_time, remark from teacher_info
+        select id, teacher_id, name, sex, age, phone, professional, id_card, height, weight, blood_type, political_status, graduation_photo, degree_photo, teaching_photo, professional_photo, identification_photo, entrance_permit, address,on_board_time,job_time, create_by, create_time, update_by, update_time, remark from teacher_info
     </sql>
 
     <select id="selectTeacherInfoList" parameterType="TeacherInfo" resultMap="TeacherInfoResult">
@@ -85,6 +89,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="identificationPhoto != null">identification_photo,</if>
             <if test="entrancePermit != null">entrance_permit,</if>
             <if test="address != null">address,</if>
+
+            <if test="onBoardTime != null">on_board_time,</if>
+            <if test="jobTime != null">job_time,</if>
+
             <if test="createBy != null">create_by,</if>
             <if test="createTime != null">create_time,</if>
             <if test="updateBy != null">update_by,</if>
@@ -110,6 +118,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="identificationPhoto != null">#{identificationPhoto},</if>
             <if test="entrancePermit != null">#{entrancePermit},</if>
             <if test="address != null">#{address},</if>
+
+            <if test="onBoardTime != null">#{onBoardTime},</if>
+            <if test="jobTime != null">#{jobTime},</if>
+
             <if test="createBy != null">#{createBy},</if>
             <if test="createTime != null">#{createTime},</if>
             <if test="updateBy != null">#{updateBy},</if>
@@ -139,6 +151,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="identificationPhoto != null">identification_photo = #{identificationPhoto},</if>
             <if test="entrancePermit != null">entrance_permit = #{entrancePermit},</if>
             <if test="address != null">address = #{address},</if>
+
+            <if test="onBoardTime != null">on_board_time = #{onBoardTime},</if>
+            <if test="jobTime != null">job_time = #{jobTime},</if>
+
             <if test="createBy != null">create_by = #{createBy},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="updateBy != null">update_by = #{updateBy},</if>