Forráskód Böngészése

学生历史信息

LIVE_YE 1 éve
szülő
commit
80c2ab6c97
17 módosított fájl, 1365 hozzáadás és 21 törlés
  1. 4 2
      ruoyi-admin/src/main/java/com/ruoyi/web/controller/info/StudentInfoOldController.java
  2. 103 0
      ruoyi-admin/src/main/java/com/ruoyi/web/controller/info/StudentLiveOldController.java
  3. 103 0
      ruoyi-admin/src/main/java/com/ruoyi/web/controller/info/StudentMindOldController.java
  4. 179 0
      ruoyi-system/src/main/java/com/ruoyi/system/domain/StudentLiveOld.java
  5. 180 0
      ruoyi-system/src/main/java/com/ruoyi/system/domain/StudentMindOld.java
  6. 63 0
      ruoyi-system/src/main/java/com/ruoyi/system/mapper/StudentLiveOldMapper.java
  7. 61 0
      ruoyi-system/src/main/java/com/ruoyi/system/mapper/StudentMindOldMapper.java
  8. 2 1
      ruoyi-system/src/main/java/com/ruoyi/system/service/IStudentInfoOldService.java
  9. 61 0
      ruoyi-system/src/main/java/com/ruoyi/system/service/IStudentLiveOldService.java
  10. 61 0
      ruoyi-system/src/main/java/com/ruoyi/system/service/IStudentMindOldService.java
  11. 20 16
      ruoyi-system/src/main/java/com/ruoyi/system/service/impl/StudentInfoOldServiceImpl.java
  12. 22 0
      ruoyi-system/src/main/java/com/ruoyi/system/service/impl/StudentInfoServiceImpl.java
  13. 121 0
      ruoyi-system/src/main/java/com/ruoyi/system/service/impl/StudentLiveOldServiceImpl.java
  14. 121 0
      ruoyi-system/src/main/java/com/ruoyi/system/service/impl/StudentMindOldServiceImpl.java
  15. 2 2
      ruoyi-system/src/main/java/com/ruoyi/system/service/impl/notice/XiaoyuanInfoServiceImpl.java
  16. 138 0
      ruoyi-system/src/main/resources/mapper/system/StudentLiveOldMapper.xml
  17. 124 0
      ruoyi-system/src/main/resources/mapper/system/StudentMindOldMapper.xml

+ 4 - 2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/info/StudentInfoOldController.java

@@ -2,6 +2,8 @@ package com.ruoyi.web.controller.info;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+
+import com.ruoyi.system.domain.StudentLiveOld;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -49,9 +51,9 @@ public class StudentInfoOldController extends BaseController
      * 查询学生档案历史信息列表
      */
     @GetMapping("/echarts")
-    public AjaxResult echarts(StudentInfoOld studentInfoOld)
+    public AjaxResult echarts(StudentLiveOld studentLiveOld)
     {
-        return studentInfoOldService.selectStudentInfoOldListEcharts(studentInfoOld);
+        return studentInfoOldService.selectStudentInfoOldListEcharts(studentLiveOld);
     }
 
     /**

+ 103 - 0
ruoyi-admin/src/main/java/com/ruoyi/web/controller/info/StudentLiveOldController.java

@@ -0,0 +1,103 @@
+package com.ruoyi.web.controller.info;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.system.domain.StudentLiveOld;
+import com.ruoyi.system.service.IStudentLiveOldService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 学生生活历史信息Controller
+ * 
+ * @author ruoyi
+ * @date 2023-08-03
+ */
+@RestController
+@RequestMapping("/live/old")
+public class StudentLiveOldController extends BaseController
+{
+    @Autowired
+    private IStudentLiveOldService studentLiveOldService;
+
+    /**
+     * 查询学生生活历史信息列表
+     */
+    @PreAuthorize("@ss.hasPermi('live:old:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(StudentLiveOld studentLiveOld)
+    {
+        List<StudentLiveOld> list = studentLiveOldService.selectStudentLiveOldList(studentLiveOld);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出学生生活历史信息列表
+     */
+    @PreAuthorize("@ss.hasPermi('live:old:export')")
+    @Log(title = "学生生活历史信息", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, StudentLiveOld studentLiveOld)
+    {
+        List<StudentLiveOld> list = studentLiveOldService.selectStudentLiveOldList(studentLiveOld);
+        ExcelUtil<StudentLiveOld> util = new ExcelUtil<StudentLiveOld>(StudentLiveOld.class);
+        util.exportExcel(response, list, "学生生活历史信息数据");
+    }
+
+    /**
+     * 获取学生生活历史信息详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('live:old:query')")
+    @GetMapping(value = "/{liveId}")
+    public AjaxResult getInfo(@PathVariable("liveId") Long liveId)
+    {
+        return success(studentLiveOldService.selectStudentLiveOldByLiveId(liveId));
+    }
+
+    /**
+     * 新增学生生活历史信息
+     */
+    @PreAuthorize("@ss.hasPermi('live:old:add')")
+    @Log(title = "学生生活历史信息", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody StudentLiveOld studentLiveOld)
+    {
+        return toAjax(studentLiveOldService.insertStudentLiveOld(studentLiveOld));
+    }
+
+    /**
+     * 修改学生生活历史信息
+     */
+    @PreAuthorize("@ss.hasPermi('live:old:edit')")
+    @Log(title = "学生生活历史信息", businessType = BusinessType.UPDATE)
+    @PostMapping("/put")
+    public AjaxResult edit(@RequestBody StudentLiveOld studentLiveOld)
+    {
+        return toAjax(studentLiveOldService.updateStudentLiveOld(studentLiveOld));
+    }
+
+    /**
+     * 删除学生生活历史信息
+     */
+    @PreAuthorize("@ss.hasPermi('live:old:remove')")
+    @Log(title = "学生生活历史信息", businessType = BusinessType.DELETE)
+	@GetMapping("/delete/{liveIds}")
+    public AjaxResult remove(@PathVariable Long[] liveIds)
+    {
+        return toAjax(studentLiveOldService.deleteStudentLiveOldByLiveIds(liveIds));
+    }
+}

+ 103 - 0
ruoyi-admin/src/main/java/com/ruoyi/web/controller/info/StudentMindOldController.java

@@ -0,0 +1,103 @@
+package com.ruoyi.web.controller.info;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.system.domain.StudentMindOld;
+import com.ruoyi.system.service.IStudentMindOldService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 学生心理健康历史信息Controller
+ * 
+ * @author ruoyi
+ * @date 2023-08-03
+ */
+@RestController
+@RequestMapping("/mind/old")
+public class StudentMindOldController extends BaseController
+{
+    @Autowired
+    private IStudentMindOldService studentMindOldService;
+
+    /**
+     * 查询学生心理健康历史信息列表
+     */
+    @PreAuthorize("@ss.hasPermi('mind:old:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(StudentMindOld studentMindOld)
+    {
+        List<StudentMindOld> list = studentMindOldService.selectStudentMindOldList(studentMindOld);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出学生心理健康历史信息列表
+     */
+    @PreAuthorize("@ss.hasPermi('mind:old:export')")
+    @Log(title = "学生心理健康历史信息", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, StudentMindOld studentMindOld)
+    {
+        List<StudentMindOld> list = studentMindOldService.selectStudentMindOldList(studentMindOld);
+        ExcelUtil<StudentMindOld> util = new ExcelUtil<StudentMindOld>(StudentMindOld.class);
+        util.exportExcel(response, list, "学生心理健康历史信息数据");
+    }
+
+    /**
+     * 获取学生心理健康历史信息详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('mind:old:query')")
+    @GetMapping(value = "/{mindId}")
+    public AjaxResult getInfo(@PathVariable("mindId") Long mindId)
+    {
+        return success(studentMindOldService.selectStudentMindOldByMindId(mindId));
+    }
+
+    /**
+     * 新增学生心理健康历史信息
+     */
+    @PreAuthorize("@ss.hasPermi('mind:old:add')")
+    @Log(title = "学生心理健康历史信息", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody StudentMindOld studentMindOld)
+    {
+        return toAjax(studentMindOldService.insertStudentMindOld(studentMindOld));
+    }
+
+    /**
+     * 修改学生心理健康历史信息
+     */
+    @PreAuthorize("@ss.hasPermi('mind:old:edit')")
+    @Log(title = "学生心理健康历史信息", businessType = BusinessType.UPDATE)
+    @PostMapping("/put")
+    public AjaxResult edit(@RequestBody StudentMindOld studentMindOld)
+    {
+        return toAjax(studentMindOldService.updateStudentMindOld(studentMindOld));
+    }
+
+    /**
+     * 删除学生心理健康历史信息
+     */
+    @PreAuthorize("@ss.hasPermi('mind:old:remove')")
+    @Log(title = "学生心理健康历史信息", businessType = BusinessType.DELETE)
+	@GetMapping("/delete/{mindIds}")
+    public AjaxResult remove(@PathVariable Long[] mindIds)
+    {
+        return toAjax(studentMindOldService.deleteStudentMindOldByMindIds(mindIds));
+    }
+}

+ 179 - 0
ruoyi-system/src/main/java/com/ruoyi/system/domain/StudentLiveOld.java

@@ -0,0 +1,179 @@
+package com.ruoyi.system.domain;
+
+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;
+
+/**
+ * 学生生活历史信息对象 student_live_old
+ * 
+ * @author ruoyi
+ * @date 2023-08-03
+ */
+public class StudentLiveOld extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** ID */
+    private Long liveId;
+
+    /** 学生id(家长-学生(审核通过之后数据)表id) */
+    @Excel(name = "学生id", readConverterExp = "家=长-学生(审核通过之后数据)表id")
+    private Long studentId;
+
+    /** 姓名 */
+    @Excel(name = "姓名")
+    private String name;
+
+    /** 性别(1:男,2:女) */
+    @Excel(name = "性别(1:男,2:女)")
+    private String sex;
+
+    /** 年龄 */
+    @Excel(name = "年龄")
+    private String age;
+
+    /** 学校 */
+    @Excel(name = "学校")
+    private String school;
+
+    /** 学号 */
+    @Excel(name = "学号")
+    private String studentNumber;
+
+    /** 身份证号 */
+    @Excel(name = "身份证号")
+    private String idCard;
+
+    /** 身高 */
+    @Excel(name = "身高")
+    private String height;
+
+    /** 体重 */
+    @Excel(name = "体重")
+    private String weight;
+
+    /** 1:家长,2:老师 */
+    private String createType;
+
+    public String getCreateType() {
+        return createType;
+    }
+
+    public void setCreateType(String createType) {
+        this.createType = createType;
+    }
+
+    public void setLiveId(Long liveId) 
+    {
+        this.liveId = liveId;
+    }
+
+    public Long getLiveId() 
+    {
+        return liveId;
+    }
+    public void setStudentId(Long studentId) 
+    {
+        this.studentId = studentId;
+    }
+
+    public Long getStudentId() 
+    {
+        return studentId;
+    }
+    public void setName(String name) 
+    {
+        this.name = name;
+    }
+
+    public String getName() 
+    {
+        return name;
+    }
+    public void setSex(String sex) 
+    {
+        this.sex = sex;
+    }
+
+    public String getSex() 
+    {
+        return sex;
+    }
+    public void setAge(String age) 
+    {
+        this.age = age;
+    }
+
+    public String getAge() 
+    {
+        return age;
+    }
+    public void setSchool(String school) 
+    {
+        this.school = school;
+    }
+
+    public String getSchool() 
+    {
+        return school;
+    }
+    public void setStudentNumber(String studentNumber) 
+    {
+        this.studentNumber = studentNumber;
+    }
+
+    public String getStudentNumber() 
+    {
+        return studentNumber;
+    }
+    public void setIdCard(String idCard) 
+    {
+        this.idCard = idCard;
+    }
+
+    public String getIdCard() 
+    {
+        return idCard;
+    }
+    public void setHeight(String height) 
+    {
+        this.height = height;
+    }
+
+    public String getHeight() 
+    {
+        return height;
+    }
+    public void setWeight(String weight) 
+    {
+        this.weight = weight;
+    }
+
+    public String getWeight() 
+    {
+        return weight;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("liveId", getLiveId())
+            .append("studentId", getStudentId())
+            .append("name", getName())
+            .append("sex", getSex())
+            .append("age", getAge())
+            .append("school", getSchool())
+            .append("studentNumber", getStudentNumber())
+            .append("idCard", getIdCard())
+            .append("height", getHeight())
+            .append("weight", getWeight())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("remark", getRemark())
+            .toString();
+    }
+}

+ 180 - 0
ruoyi-system/src/main/java/com/ruoyi/system/domain/StudentMindOld.java

@@ -0,0 +1,180 @@
+package com.ruoyi.system.domain;
+
+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;
+
+/**
+ * 学生心理健康历史信息对象 student_mind_old
+ * 
+ * @author ruoyi
+ * @date 2023-08-03
+ */
+public class StudentMindOld extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** ID */
+    private Long mindId;
+
+    /** 学生id(家长-学生(审核通过之后数据)表id) */
+    @Excel(name = "学生id", readConverterExp = "家=长-学生(审核通过之后数据)表id")
+    private Long studentId;
+
+    /** 姓名 */
+    @Excel(name = "姓名")
+    private String name;
+
+    /** 性别(1:男,2:女) */
+    @Excel(name = "性别(1:男,2:女)")
+    private String sex;
+
+    /** 年龄 */
+    @Excel(name = "年龄")
+    private String age;
+
+    /** 学校 */
+    @Excel(name = "学校")
+    private String school;
+
+    /** 学号 */
+    @Excel(name = "学号")
+    private String studentNumber;
+
+    /** 身份证号 */
+    @Excel(name = "身份证号")
+    private String idCard;
+
+    /** 心理状况 */
+    @Excel(name = "心理状况")
+    private String mind;
+
+    /** 心理健康描述 */
+    @Excel(name = "心理健康描述")
+    private String psychologicalDescription;
+
+
+    /** 1:家长,2:老师 */
+    private String createType;
+
+    public String getCreateType() {
+        return createType;
+    }
+
+    public void setCreateType(String createType) {
+        this.createType = createType;
+    }
+
+    public void setMindId(Long mindId)
+    {
+        this.mindId = mindId;
+    }
+
+    public Long getMindId() 
+    {
+        return mindId;
+    }
+    public void setStudentId(Long studentId) 
+    {
+        this.studentId = studentId;
+    }
+
+    public Long getStudentId() 
+    {
+        return studentId;
+    }
+    public void setName(String name) 
+    {
+        this.name = name;
+    }
+
+    public String getName() 
+    {
+        return name;
+    }
+    public void setSex(String sex) 
+    {
+        this.sex = sex;
+    }
+
+    public String getSex() 
+    {
+        return sex;
+    }
+    public void setAge(String age) 
+    {
+        this.age = age;
+    }
+
+    public String getAge() 
+    {
+        return age;
+    }
+    public void setSchool(String school) 
+    {
+        this.school = school;
+    }
+
+    public String getSchool() 
+    {
+        return school;
+    }
+    public void setStudentNumber(String studentNumber) 
+    {
+        this.studentNumber = studentNumber;
+    }
+
+    public String getStudentNumber() 
+    {
+        return studentNumber;
+    }
+    public void setIdCard(String idCard) 
+    {
+        this.idCard = idCard;
+    }
+
+    public String getIdCard() 
+    {
+        return idCard;
+    }
+    public void setMind(String mind) 
+    {
+        this.mind = mind;
+    }
+
+    public String getMind() 
+    {
+        return mind;
+    }
+    public void setPsychologicalDescription(String psychologicalDescription) 
+    {
+        this.psychologicalDescription = psychologicalDescription;
+    }
+
+    public String getPsychologicalDescription() 
+    {
+        return psychologicalDescription;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("mindId", getMindId())
+            .append("studentId", getStudentId())
+            .append("name", getName())
+            .append("sex", getSex())
+            .append("age", getAge())
+            .append("school", getSchool())
+            .append("studentNumber", getStudentNumber())
+            .append("idCard", getIdCard())
+            .append("mind", getMind())
+            .append("psychologicalDescription", getPsychologicalDescription())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("remark", getRemark())
+            .toString();
+    }
+}

+ 63 - 0
ruoyi-system/src/main/java/com/ruoyi/system/mapper/StudentLiveOldMapper.java

@@ -0,0 +1,63 @@
+package com.ruoyi.system.mapper;
+
+import java.util.List;
+import com.ruoyi.system.domain.StudentLiveOld;
+
+/**
+ * 学生生活历史信息Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2023-08-03
+ */
+public interface StudentLiveOldMapper 
+{
+    /**
+     * 查询学生生活历史信息
+     * 
+     * @param liveId 学生生活历史信息主键
+     * @return 学生生活历史信息
+     */
+    public StudentLiveOld selectStudentLiveOldByLiveId(Long liveId);
+
+    /**
+     * 查询学生生活历史信息列表
+     * 
+     * @param studentLiveOld 学生生活历史信息
+     * @return 学生生活历史信息集合
+     */
+    public List<StudentLiveOld> selectStudentLiveOldList(StudentLiveOld studentLiveOld);
+
+    /**
+     * 新增学生生活历史信息
+     * 
+     * @param studentLiveOld 学生生活历史信息
+     * @return 结果
+     */
+    public int insertStudentLiveOld(StudentLiveOld studentLiveOld);
+
+    /**
+     * 修改学生生活历史信息
+     * 
+     * @param studentLiveOld 学生生活历史信息
+     * @return 结果
+     */
+    public int updateStudentLiveOld(StudentLiveOld studentLiveOld);
+
+    /**
+     * 删除学生生活历史信息
+     * 
+     * @param liveId 学生生活历史信息主键
+     * @return 结果
+     */
+    public int deleteStudentLiveOldByLiveId(Long liveId);
+
+    /**
+     * 批量删除学生生活历史信息
+     * 
+     * @param liveIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteStudentLiveOldByLiveIds(Long[] liveIds);
+
+    List<StudentLiveOld> selectStudentLiveOldListEcharts(StudentLiveOld studentLiveOld);
+}

+ 61 - 0
ruoyi-system/src/main/java/com/ruoyi/system/mapper/StudentMindOldMapper.java

@@ -0,0 +1,61 @@
+package com.ruoyi.system.mapper;
+
+import java.util.List;
+import com.ruoyi.system.domain.StudentMindOld;
+
+/**
+ * 学生心理健康历史信息Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2023-08-03
+ */
+public interface StudentMindOldMapper 
+{
+    /**
+     * 查询学生心理健康历史信息
+     * 
+     * @param mindId 学生心理健康历史信息主键
+     * @return 学生心理健康历史信息
+     */
+    public StudentMindOld selectStudentMindOldByMindId(Long mindId);
+
+    /**
+     * 查询学生心理健康历史信息列表
+     * 
+     * @param studentMindOld 学生心理健康历史信息
+     * @return 学生心理健康历史信息集合
+     */
+    public List<StudentMindOld> selectStudentMindOldList(StudentMindOld studentMindOld);
+
+    /**
+     * 新增学生心理健康历史信息
+     * 
+     * @param studentMindOld 学生心理健康历史信息
+     * @return 结果
+     */
+    public int insertStudentMindOld(StudentMindOld studentMindOld);
+
+    /**
+     * 修改学生心理健康历史信息
+     * 
+     * @param studentMindOld 学生心理健康历史信息
+     * @return 结果
+     */
+    public int updateStudentMindOld(StudentMindOld studentMindOld);
+
+    /**
+     * 删除学生心理健康历史信息
+     * 
+     * @param mindId 学生心理健康历史信息主键
+     * @return 结果
+     */
+    public int deleteStudentMindOldByMindId(Long mindId);
+
+    /**
+     * 批量删除学生心理健康历史信息
+     * 
+     * @param mindIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteStudentMindOldByMindIds(Long[] mindIds);
+}

+ 2 - 1
ruoyi-system/src/main/java/com/ruoyi/system/service/IStudentInfoOldService.java

@@ -4,6 +4,7 @@ import java.util.List;
 
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.system.domain.StudentInfoOld;
+import com.ruoyi.system.domain.StudentLiveOld;
 
 /**
  * 学生档案历史信息Service接口
@@ -61,5 +62,5 @@ public interface IStudentInfoOldService
      */
     public int deleteStudentInfoOldById(Long id);
 
-    AjaxResult selectStudentInfoOldListEcharts(StudentInfoOld studentInfoOld);
+    AjaxResult selectStudentInfoOldListEcharts(StudentLiveOld studentLiveOld);
 }

+ 61 - 0
ruoyi-system/src/main/java/com/ruoyi/system/service/IStudentLiveOldService.java

@@ -0,0 +1,61 @@
+package com.ruoyi.system.service;
+
+import java.util.List;
+import com.ruoyi.system.domain.StudentLiveOld;
+
+/**
+ * 学生生活历史信息Service接口
+ * 
+ * @author ruoyi
+ * @date 2023-08-03
+ */
+public interface IStudentLiveOldService 
+{
+    /**
+     * 查询学生生活历史信息
+     * 
+     * @param liveId 学生生活历史信息主键
+     * @return 学生生活历史信息
+     */
+    public StudentLiveOld selectStudentLiveOldByLiveId(Long liveId);
+
+    /**
+     * 查询学生生活历史信息列表
+     * 
+     * @param studentLiveOld 学生生活历史信息
+     * @return 学生生活历史信息集合
+     */
+    public List<StudentLiveOld> selectStudentLiveOldList(StudentLiveOld studentLiveOld);
+
+    /**
+     * 新增学生生活历史信息
+     * 
+     * @param studentLiveOld 学生生活历史信息
+     * @return 结果
+     */
+    public int insertStudentLiveOld(StudentLiveOld studentLiveOld);
+
+    /**
+     * 修改学生生活历史信息
+     * 
+     * @param studentLiveOld 学生生活历史信息
+     * @return 结果
+     */
+    public int updateStudentLiveOld(StudentLiveOld studentLiveOld);
+
+    /**
+     * 批量删除学生生活历史信息
+     * 
+     * @param liveIds 需要删除的学生生活历史信息主键集合
+     * @return 结果
+     */
+    public int deleteStudentLiveOldByLiveIds(Long[] liveIds);
+
+    /**
+     * 删除学生生活历史信息信息
+     * 
+     * @param liveId 学生生活历史信息主键
+     * @return 结果
+     */
+    public int deleteStudentLiveOldByLiveId(Long liveId);
+}

+ 61 - 0
ruoyi-system/src/main/java/com/ruoyi/system/service/IStudentMindOldService.java

@@ -0,0 +1,61 @@
+package com.ruoyi.system.service;
+
+import java.util.List;
+import com.ruoyi.system.domain.StudentMindOld;
+
+/**
+ * 学生心理健康历史信息Service接口
+ * 
+ * @author ruoyi
+ * @date 2023-08-03
+ */
+public interface IStudentMindOldService 
+{
+    /**
+     * 查询学生心理健康历史信息
+     * 
+     * @param mindId 学生心理健康历史信息主键
+     * @return 学生心理健康历史信息
+     */
+    public StudentMindOld selectStudentMindOldByMindId(Long mindId);
+
+    /**
+     * 查询学生心理健康历史信息列表
+     * 
+     * @param studentMindOld 学生心理健康历史信息
+     * @return 学生心理健康历史信息集合
+     */
+    public List<StudentMindOld> selectStudentMindOldList(StudentMindOld studentMindOld);
+
+    /**
+     * 新增学生心理健康历史信息
+     * 
+     * @param studentMindOld 学生心理健康历史信息
+     * @return 结果
+     */
+    public int insertStudentMindOld(StudentMindOld studentMindOld);
+
+    /**
+     * 修改学生心理健康历史信息
+     * 
+     * @param studentMindOld 学生心理健康历史信息
+     * @return 结果
+     */
+    public int updateStudentMindOld(StudentMindOld studentMindOld);
+
+    /**
+     * 批量删除学生心理健康历史信息
+     * 
+     * @param mindIds 需要删除的学生心理健康历史信息主键集合
+     * @return 结果
+     */
+    public int deleteStudentMindOldByMindIds(Long[] mindIds);
+
+    /**
+     * 删除学生心理健康历史信息信息
+     * 
+     * @param mindId 学生心理健康历史信息主键
+     * @return 结果
+     */
+    public int deleteStudentMindOldByMindId(Long mindId);
+}

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

@@ -5,6 +5,8 @@ import java.util.*;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.system.domain.StudentLiveOld;
+import com.ruoyi.system.mapper.StudentLiveOldMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.system.mapper.StudentInfoOldMapper;
@@ -22,6 +24,8 @@ public class StudentInfoOldServiceImpl implements IStudentInfoOldService
 {
     @Autowired
     private StudentInfoOldMapper studentInfoOldMapper;
+    @Autowired
+    private StudentLiveOldMapper studentLiveOldMapper;
 
     /**
      * 查询学生档案历史信息
@@ -101,11 +105,11 @@ public class StudentInfoOldServiceImpl implements IStudentInfoOldService
     }
 
     @Override
-    public AjaxResult selectStudentInfoOldListEcharts(StudentInfoOld studentInfoOld) {
-        if(studentInfoOld.getStudentId()==null || studentInfoOld.getStudentId()==0L){
+    public AjaxResult selectStudentInfoOldListEcharts(StudentLiveOld studentLiveOld) {
+        if(studentLiveOld.getStudentId()==null || studentLiveOld.getStudentId()==0L){
             throw new ServiceException("参数错误");
         }
-        List<StudentInfoOld> StudentInfoOldList = studentInfoOldMapper.selectStudentInfoOldListEcharts(studentInfoOld);
+        List<StudentLiveOld> studentLiveOldList = studentLiveOldMapper.selectStudentLiveOldListEcharts(studentLiveOld);
 
         Map<String,Object> map = new HashMap<>();
         List<Object> x = new ArrayList<>();
@@ -114,25 +118,25 @@ public class StudentInfoOldServiceImpl implements IStudentInfoOldService
         String sg = "0";
         String tz = "0";
 
-        for (int i = 0; i < StudentInfoOldList.size(); i++) {
-            StudentInfoOld infoOld = StudentInfoOldList.get(i);
+        for (int i = 0; i < studentLiveOldList.size(); i++) {
+            StudentLiveOld liveOld = studentLiveOldList.get(i);
             if(i==0){
-                sg = infoOld.getHeight();
-                tz = infoOld.getWeight();
-                x.add(DateUtils.dateTime(infoOld.getUpdateTime()));
-                y1.add(infoOld.getHeight());
-                y2.add(infoOld.getWeight());
+                sg = liveOld.getHeight();
+                tz = liveOld.getWeight();
+                x.add(DateUtils.dateTime(liveOld.getUpdateTime()));
+                y1.add(liveOld.getHeight());
+                y2.add(liveOld.getWeight());
 
                 map.put("X",x);
                 map.put("Y1",y1);
                 map.put("Y2",y2);
             }else{
-                if(!sg.equals(infoOld.getHeight()) || !tz.equals(infoOld.getWeight())){
-                    sg = infoOld.getHeight();
-                    tz = infoOld.getWeight();
-                    x.add(DateUtils.dateTime(infoOld.getUpdateTime()));
-                    y1.add(infoOld.getHeight());
-                    y2.add(infoOld.getWeight());
+                if(!sg.equals(liveOld.getHeight()) || !tz.equals(liveOld.getWeight())){
+                    sg = liveOld.getHeight();
+                    tz = liveOld.getWeight();
+                    x.add(DateUtils.dateTime(liveOld.getUpdateTime()));
+                    y1.add(liveOld.getHeight());
+                    y2.add(liveOld.getWeight());
 
                     map.put("X",x);
                     map.put("Y1",y1);

+ 22 - 0
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/StudentInfoServiceImpl.java

@@ -6,7 +6,11 @@ import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.utils.ClassUtils;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.system.domain.StudentInfoOld;
+import com.ruoyi.system.domain.StudentLiveOld;
+import com.ruoyi.system.domain.StudentMindOld;
 import com.ruoyi.system.mapper.StudentInfoOldMapper;
+import com.ruoyi.system.mapper.StudentLiveOldMapper;
+import com.ruoyi.system.mapper.StudentMindOldMapper;
 import lombok.SneakyThrows;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -27,6 +31,10 @@ public class StudentInfoServiceImpl implements IStudentInfoService
     private StudentInfoMapper studentInfoMapper;
     @Autowired
     private StudentInfoOldMapper studentInfoOldMapper;
+    @Autowired
+    private StudentLiveOldMapper studentLiveOldMapper;
+    @Autowired
+    private StudentMindOldMapper studentMindOldMapper;
 
     /**
      * 查询学生档案信息
@@ -58,6 +66,7 @@ public class StudentInfoServiceImpl implements IStudentInfoService
      * @param studentInfo 学生档案信息
      * @return 结果
      */
+    @SneakyThrows
     @Override
     public AjaxResult insertStudentInfo(StudentInfo studentInfo)
     {
@@ -69,6 +78,19 @@ public class StudentInfoServiceImpl implements IStudentInfoService
             return AjaxResult.error("参数错误");
         }
         studentInfo.setCreateTime(DateUtils.getNowDate());
+        //新增 心理健康
+        StudentMindOld studentMindOld = new StudentMindOld();
+        ClassUtils.copyProperties(student, studentMindOld);
+        studentMindOld.setCreateTime(DateUtils.getNowDate());
+        studentMindOld.setUpdateTime(DateUtils.getNowDate());
+        studentMindOldMapper.insertStudentMindOld(studentMindOld);
+
+        //新增 身高体重
+        StudentLiveOld studentLiveOld = new StudentLiveOld();
+        ClassUtils.copyProperties(student, studentLiveOld);
+        studentLiveOld.setCreateTime(DateUtils.getNowDate());
+        studentLiveOld.setUpdateTime(DateUtils.getNowDate());
+        studentLiveOldMapper.insertStudentLiveOld(studentLiveOld);
         int rows = studentInfoMapper.insertStudentInfo(studentInfo);
         return rows > 0 ? AjaxResult.success() : AjaxResult.error();
 

+ 121 - 0
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/StudentLiveOldServiceImpl.java

@@ -0,0 +1,121 @@
+package com.ruoyi.system.service.impl;
+
+import java.util.List;
+
+import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.exception.ServiceException;
+import com.ruoyi.common.utils.ClassUtils;
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.system.domain.StudentInfo;
+import com.ruoyi.system.mapper.StudentInfoMapper;
+import lombok.SneakyThrows;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.system.mapper.StudentLiveOldMapper;
+import com.ruoyi.system.domain.StudentLiveOld;
+import com.ruoyi.system.service.IStudentLiveOldService;
+
+/**
+ * 学生生活历史信息Service业务层处理
+ * 
+ * @author ruoyi
+ * @date 2023-08-03
+ */
+@Service
+public class StudentLiveOldServiceImpl implements IStudentLiveOldService 
+{
+    @Autowired
+    private StudentLiveOldMapper studentLiveOldMapper;
+    @Autowired
+    private StudentInfoMapper studentInfoMapper;
+
+    /**
+     * 查询学生生活历史信息
+     * 
+     * @param liveId 学生生活历史信息主键
+     * @return 学生生活历史信息
+     */
+    @Override
+    public StudentLiveOld selectStudentLiveOldByLiveId(Long liveId)
+    {
+        return studentLiveOldMapper.selectStudentLiveOldByLiveId(liveId);
+    }
+
+    /**
+     * 查询学生生活历史信息列表
+     * 
+     * @param studentLiveOld 学生生活历史信息
+     * @return 学生生活历史信息
+     */
+    @Override
+    public List<StudentLiveOld> selectStudentLiveOldList(StudentLiveOld studentLiveOld)
+    {
+        return studentLiveOldMapper.selectStudentLiveOldList(studentLiveOld);
+    }
+
+    /**
+     * 新增学生生活历史信息
+     * 
+     * @param studentLiveOld 学生生活历史信息
+     * @return 结果
+     */
+    @SneakyThrows
+    @Override
+    public int insertStudentLiveOld(StudentLiveOld studentLiveOld)
+    {
+        SysUser user = SecurityUtils.getLoginUser().getUser();
+
+        StudentInfo student = studentInfoMapper.selectStudentInfoByStudentId(studentLiveOld.getStudentId());
+        if(student==null){
+            throw new ServiceException("请先填写学生档案信息");
+        }
+        student.setHeight(studentLiveOld.getHeight());
+        student.setWeight(studentLiveOld.getWeight());
+        student.setUpdateTime(DateUtils.getNowDate());
+        studentInfoMapper.updateStudentInfo(student);
+
+        ClassUtils.copyProperties(student, studentLiveOld);
+        studentLiveOld.setCreateTime(DateUtils.getNowDate());
+        studentLiveOld.setUpdateTime(DateUtils.getNowDate());
+        studentLiveOld.setCreateBy(user.getUserName());
+        return studentLiveOldMapper.insertStudentLiveOld(studentLiveOld);
+    }
+
+    /**
+     * 修改学生生活历史信息
+     * 
+     * @param studentLiveOld 学生生活历史信息
+     * @return 结果
+     */
+    @Override
+    public int updateStudentLiveOld(StudentLiveOld studentLiveOld)
+    {
+        studentLiveOld.setUpdateTime(DateUtils.getNowDate());
+        return studentLiveOldMapper.updateStudentLiveOld(studentLiveOld);
+    }
+
+    /**
+     * 批量删除学生生活历史信息
+     * 
+     * @param liveIds 需要删除的学生生活历史信息主键
+     * @return 结果
+     */
+    @Override
+    public int deleteStudentLiveOldByLiveIds(Long[] liveIds)
+    {
+        return studentLiveOldMapper.deleteStudentLiveOldByLiveIds(liveIds);
+    }
+
+    /**
+     * 删除学生生活历史信息信息
+     * 
+     * @param liveId 学生生活历史信息主键
+     * @return 结果
+     */
+    @Override
+    public int deleteStudentLiveOldByLiveId(Long liveId)
+    {
+        return studentLiveOldMapper.deleteStudentLiveOldByLiveId(liveId);
+    }
+}

+ 121 - 0
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/StudentMindOldServiceImpl.java

@@ -0,0 +1,121 @@
+package com.ruoyi.system.service.impl;
+
+import java.util.List;
+
+import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.exception.ServiceException;
+import com.ruoyi.common.utils.ClassUtils;
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.system.domain.StudentInfo;
+import com.ruoyi.system.mapper.StudentInfoMapper;
+import lombok.SneakyThrows;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.system.mapper.StudentMindOldMapper;
+import com.ruoyi.system.domain.StudentMindOld;
+import com.ruoyi.system.service.IStudentMindOldService;
+
+/**
+ * 学生心理健康历史信息Service业务层处理
+ * 
+ * @author ruoyi
+ * @date 2023-08-03
+ */
+@Service
+public class StudentMindOldServiceImpl implements IStudentMindOldService 
+{
+    @Autowired
+    private StudentMindOldMapper studentMindOldMapper;
+    @Autowired
+    private StudentInfoMapper studentInfoMapper;
+
+    /**
+     * 查询学生心理健康历史信息
+     * 
+     * @param mindId 学生心理健康历史信息主键
+     * @return 学生心理健康历史信息
+     */
+    @Override
+    public StudentMindOld selectStudentMindOldByMindId(Long mindId)
+    {
+        return studentMindOldMapper.selectStudentMindOldByMindId(mindId);
+    }
+
+    /**
+     * 查询学生心理健康历史信息列表
+     * 
+     * @param studentMindOld 学生心理健康历史信息
+     * @return 学生心理健康历史信息
+     */
+    @Override
+    public List<StudentMindOld> selectStudentMindOldList(StudentMindOld studentMindOld)
+    {
+        return studentMindOldMapper.selectStudentMindOldList(studentMindOld);
+    }
+
+    /**
+     * 新增学生心理健康历史信息
+     * 
+     * @param studentMindOld 学生心理健康历史信息
+     * @return 结果
+     */
+    @SneakyThrows
+    @Override
+    public int insertStudentMindOld(StudentMindOld studentMindOld)
+    {
+        SysUser user = SecurityUtils.getLoginUser().getUser();
+
+        StudentInfo student = studentInfoMapper.selectStudentInfoByStudentId(studentMindOld.getStudentId());
+        if(student==null){
+            throw new ServiceException("请先填写学生档案信息");
+        }
+        student.setMind(studentMindOld.getMind());
+        student.setPsychologicalDescription(studentMindOld.getPsychologicalDescription());
+        student.setUpdateTime(DateUtils.getNowDate());
+        studentInfoMapper.updateStudentInfo(student);
+
+        ClassUtils.copyProperties(student, studentMindOld);
+        studentMindOld.setCreateTime(DateUtils.getNowDate());
+        studentMindOld.setUpdateTime(DateUtils.getNowDate());
+        studentMindOld.setCreateBy(user.getUserName());
+        return studentMindOldMapper.insertStudentMindOld(studentMindOld);
+    }
+
+    /**
+     * 修改学生心理健康历史信息
+     * 
+     * @param studentMindOld 学生心理健康历史信息
+     * @return 结果
+     */
+    @Override
+    public int updateStudentMindOld(StudentMindOld studentMindOld)
+    {
+        studentMindOld.setUpdateTime(DateUtils.getNowDate());
+        return studentMindOldMapper.updateStudentMindOld(studentMindOld);
+    }
+
+    /**
+     * 批量删除学生心理健康历史信息
+     * 
+     * @param mindIds 需要删除的学生心理健康历史信息主键
+     * @return 结果
+     */
+    @Override
+    public int deleteStudentMindOldByMindIds(Long[] mindIds)
+    {
+        return studentMindOldMapper.deleteStudentMindOldByMindIds(mindIds);
+    }
+
+    /**
+     * 删除学生心理健康历史信息信息
+     * 
+     * @param mindId 学生心理健康历史信息主键
+     * @return 结果
+     */
+    @Override
+    public int deleteStudentMindOldByMindId(Long mindId)
+    {
+        return studentMindOldMapper.deleteStudentMindOldByMindId(mindId);
+    }
+}

+ 2 - 2
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/notice/XiaoyuanInfoServiceImpl.java

@@ -94,11 +94,11 @@ public class XiaoyuanInfoServiceImpl implements IXiaoyuanInfoService
         //获取点赞/分享/这个人是否点赞信息
         Object dianZan = redisCache.getCacheObject(XIAOYUAN_INFO_DIANZAN + xiaoyuanInfo.getInfoId());
         if (ObjectUtils.isNotEmpty(dianZan)){
-            xiaoyuanInfo.setIsDianZan((String)dianZan);
+            xiaoyuanInfo.setInfoDianZan(String.valueOf(dianZan));
         }
         Object zhuanFa = redisCache.getCacheObject(XIAOYUAN_INFO_ZHUANFA+ xiaoyuanInfo.getInfoId());
         if (ObjectUtils.isNotEmpty(zhuanFa)){
-            xiaoyuanInfo.setInfoZhuanFa((String)zhuanFa);
+            xiaoyuanInfo.setInfoZhuanFa(String.valueOf(zhuanFa));
         }
         Object dianZanUser = redisCache.getCacheObject(XIAOYUAN_INFO_DIANZAN_USER + xiaoyuanInfo.getInfoId());
         xiaoyuanInfo.setIsDianZan("N");

+ 138 - 0
ruoyi-system/src/main/resources/mapper/system/StudentLiveOldMapper.xml

@@ -0,0 +1,138 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.system.mapper.StudentLiveOldMapper">
+    
+    <resultMap type="StudentLiveOld" id="StudentLiveOldResult">
+        <result property="liveId"    column="live_id"    />
+        <result property="studentId"    column="student_id"    />
+        <result property="name"    column="name"    />
+        <result property="sex"    column="sex"    />
+        <result property="age"    column="age"    />
+        <result property="school"    column="school"    />
+        <result property="studentNumber"    column="student_number"    />
+        <result property="idCard"    column="id_card"    />
+        <result property="height"    column="height"    />
+        <result property="weight"    column="weight"    />
+        <result property="createType"    column="create_type"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="remark"    column="remark"    />
+    </resultMap>
+
+    <sql id="selectStudentLiveOldVo">
+        select live_id, student_id, name, sex, age, school, student_number, id_card, height, weight,create_type, create_by, create_time, update_by, update_time, remark from student_live_old
+    </sql>
+
+    <select id="selectStudentLiveOldList" parameterType="StudentLiveOld" resultMap="StudentLiveOldResult">
+        <include refid="selectStudentLiveOldVo"/>
+        <where>  
+            <if test="studentId != null "> and student_id = #{studentId}</if>
+            <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
+            <if test="sex != null  and sex != ''"> and sex = #{sex}</if>
+            <if test="age != null  and age != ''"> and age = #{age}</if>
+            <if test="school != null  and school != ''"> and school = #{school}</if>
+            <if test="studentNumber != null  and studentNumber != ''"> and student_number = #{studentNumber}</if>
+            <if test="idCard != null  and idCard != ''"> and id_card = #{idCard}</if>
+            <if test="height != null  and height != ''"> and height = #{height}</if>
+            <if test="weight != null  and weight != ''"> and weight = #{weight}</if>
+            <if test="createType != null and createType != ''"> and create_type = #{createType}</if>
+        </where>
+        order by create_time desc
+    </select>
+    
+    <select id="selectStudentLiveOldByLiveId" parameterType="Long" resultMap="StudentLiveOldResult">
+        <include refid="selectStudentLiveOldVo"/>
+        where live_id = #{liveId}
+    </select>
+    <select id="selectStudentLiveOldListEcharts" resultMap="StudentLiveOldResult">
+        <include refid="selectStudentLiveOldVo"/>
+        <where>
+            <if test="studentId != null "> and student_id = #{studentId}</if>
+            <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
+            <if test="sex != null  and sex != ''"> and sex = #{sex}</if>
+            <if test="age != null  and age != ''"> and age = #{age}</if>
+            <if test="school != null  and school != ''"> and school = #{school}</if>
+            <if test="studentNumber != null  and studentNumber != ''"> and student_number = #{studentNumber}</if>
+            <if test="idCard != null  and idCard != ''"> and id_card = #{idCard}</if>
+            <if test="height != null  and height != ''"> and height = #{height}</if>
+            <if test="weight != null  and weight != ''"> and weight = #{weight}</if>
+            <if test="createType != null and createType != ''"> and create_type = #{createType}</if>
+        </where>
+        order by create_time asc
+    </select>
+
+    <insert id="insertStudentLiveOld" parameterType="StudentLiveOld" useGeneratedKeys="true" keyProperty="liveId">
+        insert into student_live_old
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="studentId != null">student_id,</if>
+            <if test="name != null">name,</if>
+            <if test="sex != null">sex,</if>
+            <if test="age != null">age,</if>
+            <if test="school != null">school,</if>
+            <if test="studentNumber != null">student_number,</if>
+            <if test="idCard != null">id_card,</if>
+            <if test="height != null">height,</if>
+            <if test="weight != null">weight,</if>
+            <if test="createType != null">create_type,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="remark != null">remark,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="studentId != null">#{studentId},</if>
+            <if test="name != null">#{name},</if>
+            <if test="sex != null">#{sex},</if>
+            <if test="age != null">#{age},</if>
+            <if test="school != null">#{school},</if>
+            <if test="studentNumber != null">#{studentNumber},</if>
+            <if test="idCard != null">#{idCard},</if>
+            <if test="height != null">#{height},</if>
+            <if test="weight != null">#{weight},</if>
+            <if test="createType != null"> #{createType},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="remark != null">#{remark},</if>
+         </trim>
+    </insert>
+
+    <update id="updateStudentLiveOld" parameterType="StudentLiveOld">
+        update student_live_old
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="studentId != null">student_id = #{studentId},</if>
+            <if test="name != null">name = #{name},</if>
+            <if test="sex != null">sex = #{sex},</if>
+            <if test="age != null">age = #{age},</if>
+            <if test="school != null">school = #{school},</if>
+            <if test="studentNumber != null">student_number = #{studentNumber},</if>
+            <if test="createType != null">create_type = #{createType},</if>
+            <if test="idCard != null">id_card = #{idCard},</if>
+            <if test="height != null">height = #{height},</if>
+            <if test="weight != null">weight = #{weight},</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>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="remark != null">remark = #{remark},</if>
+        </trim>
+        where live_id = #{liveId}
+    </update>
+
+    <delete id="deleteStudentLiveOldByLiveId" parameterType="Long">
+        delete from student_live_old where live_id = #{liveId}
+    </delete>
+
+    <delete id="deleteStudentLiveOldByLiveIds" parameterType="String">
+        delete from student_live_old where live_id in 
+        <foreach item="liveId" collection="array" open="(" separator="," close=")">
+            #{liveId}
+        </foreach>
+    </delete>
+</mapper>

+ 124 - 0
ruoyi-system/src/main/resources/mapper/system/StudentMindOldMapper.xml

@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.system.mapper.StudentMindOldMapper">
+    
+    <resultMap type="StudentMindOld" id="StudentMindOldResult">
+        <result property="mindId"    column="mind_id"    />
+        <result property="studentId"    column="student_id"    />
+        <result property="name"    column="name"    />
+        <result property="sex"    column="sex"    />
+        <result property="age"    column="age"    />
+        <result property="school"    column="school"    />
+        <result property="studentNumber"    column="student_number"    />
+        <result property="idCard"    column="id_card"    />
+        <result property="mind"    column="mind"    />
+        <result property="psychologicalDescription"    column="psychological_description"    />
+
+        <result property="createType"    column="create_type"    />
+
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="remark"    column="remark"    />
+    </resultMap>
+
+    <sql id="selectStudentMindOldVo">
+        select mind_id, student_id, name, sex, age, school, student_number, id_card, mind, psychological_description,create_type, create_by, create_time, update_by, update_time, remark from student_mind_old
+    </sql>
+
+    <select id="selectStudentMindOldList" parameterType="StudentMindOld" resultMap="StudentMindOldResult">
+        <include refid="selectStudentMindOldVo"/>
+        <where>  
+            <if test="studentId != null "> and student_id = #{studentId}</if>
+            <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
+            <if test="sex != null  and sex != ''"> and sex = #{sex}</if>
+            <if test="age != null  and age != ''"> and age = #{age}</if>
+            <if test="school != null  and school != ''"> and school = #{school}</if>
+            <if test="studentNumber != null  and studentNumber != ''"> and student_number = #{studentNumber}</if>
+            <if test="idCard != null  and idCard != ''"> and id_card = #{idCard}</if>
+            <if test="mind != null  and mind != ''"> and mind = #{mind}</if>
+            <if test="psychologicalDescription != null  and psychologicalDescription != ''"> and psychological_description = #{psychologicalDescription}</if>
+            <if test="createType != null and createType != ''"> and create_type = #{createType}</if>
+        </where>
+        order by create_time desc
+    </select>
+    
+    <select id="selectStudentMindOldByMindId" parameterType="Long" resultMap="StudentMindOldResult">
+        <include refid="selectStudentMindOldVo"/>
+        where mind_id = #{mindId}
+    </select>
+        
+    <insert id="insertStudentMindOld" parameterType="StudentMindOld" useGeneratedKeys="true" keyProperty="mindId">
+        insert into student_mind_old
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="studentId != null">student_id,</if>
+            <if test="name != null">name,</if>
+            <if test="sex != null">sex,</if>
+            <if test="age != null">age,</if>
+            <if test="school != null">school,</if>
+            <if test="studentNumber != null">student_number,</if>
+            <if test="idCard != null">id_card,</if>
+            <if test="mind != null">mind,</if>
+            <if test="psychologicalDescription != null">psychological_description,</if>
+            <if test="createType != null">create_type,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="remark != null">remark,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="studentId != null">#{studentId},</if>
+            <if test="name != null">#{name},</if>
+            <if test="sex != null">#{sex},</if>
+            <if test="age != null">#{age},</if>
+            <if test="school != null">#{school},</if>
+            <if test="studentNumber != null">#{studentNumber},</if>
+            <if test="idCard != null">#{idCard},</if>
+            <if test="mind != null">#{mind},</if>
+            <if test="psychologicalDescription != null">#{psychologicalDescription},</if>
+            <if test="createType != null"> #{createType},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="remark != null">#{remark},</if>
+         </trim>
+    </insert>
+
+    <update id="updateStudentMindOld" parameterType="StudentMindOld">
+        update student_mind_old
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="studentId != null">student_id = #{studentId},</if>
+            <if test="name != null">name = #{name},</if>
+            <if test="sex != null">sex = #{sex},</if>
+            <if test="age != null">age = #{age},</if>
+            <if test="school != null">school = #{school},</if>
+            <if test="studentNumber != null">student_number = #{studentNumber},</if>
+            <if test="idCard != null">id_card = #{idCard},</if>
+            <if test="mind != null">mind = #{mind},</if>
+            <if test="psychologicalDescription != null">psychological_description = #{psychologicalDescription},</if>
+            <if test="createType != null">create_type = #{createType},</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>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="remark != null">remark = #{remark},</if>
+        </trim>
+        where mind_id = #{mindId}
+    </update>
+
+    <delete id="deleteStudentMindOldByMindId" parameterType="Long">
+        delete from student_mind_old where mind_id = #{mindId}
+    </delete>
+
+    <delete id="deleteStudentMindOldByMindIds" parameterType="String">
+        delete from student_mind_old where mind_id in 
+        <foreach item="mindId" collection="array" open="(" separator="," close=")">
+            #{mindId}
+        </foreach>
+    </delete>
+</mapper>