Merge remote-tracking branch 'origin/master'

ruoyi-admin/src/main/java/com/ruoyi/web/controller/formal/FormalParentsStudentController.java

@@ -46,6 +46,17 @@ public class FormalParentsStudentController extends BaseController
         return getDataTable(list);
     }
 
+    /**
+     * 查询家长-学生(审核通过之后数据)列表不分页
+     */
+    @GetMapping("noPage/list")
+    public TableDataInfo noPage(FormalParentsStudent formalParentsStudent)
+    {
+
+        List<FormalParentsStudent> list = formalParentsStudentService.selectFormalParentsStudentListNoPage(formalParentsStudent);
+        return getDataTable(list);
+    }
+
     /**
      * 导出家长-学生(审核通过之后数据)列表
      */

ruoyi-admin/src/main/java/com/ruoyi/web/controller/formal/FormalTeacherClassController.java

@@ -100,4 +100,14 @@ public class FormalTeacherClassController extends BaseController {
     public AjaxResult remove(@PathVariable Long[] ids) {
         return toAjax(formalTeacherClassService.deleteFormalTeacherClassByIds(ids));
     }
+
+    /***
+     * 查询老师信息（用于档案信息新增）
+     */
+    @GetMapping("/noPage/list")
+    public TableDataInfo noPage(FormalTeacherClass formalTeacherClass) {
+        List<FormalTeacherClass> list = formalTeacherClassService.selectFormalTeacherClassListNoPage(formalTeacherClass);
+        return getDataTable(list);
+    }
+
 }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/info/StudentInfoController.java

@@ -0,0 +1,104 @@
+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.StudentInfo;
+import com.ruoyi.system.service.IStudentInfoService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 学生档案信息Controller
+ * 
+ * @author ruoyi
+ * @date 2023-07-21
+ */
+@RestController
+@RequestMapping("/student/info")
+public class StudentInfoController extends BaseController
+{
+    @Autowired
+    private IStudentInfoService studentInfoService;
+
+    /**
+     * 查询学生档案信息列表
+     */
+    @PreAuthorize("@ss.hasPermi('student:info:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(StudentInfo studentInfo)
+    {
+        startPage();
+        List<StudentInfo> list = studentInfoService.selectStudentInfoList(studentInfo);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出学生档案信息列表
+     */
+    @PreAuthorize("@ss.hasPermi('student:info:export')")
+    @Log(title = "学生档案信息", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, StudentInfo studentInfo)
+    {
+        List<StudentInfo> list = studentInfoService.selectStudentInfoList(studentInfo);
+        ExcelUtil<StudentInfo> util = new ExcelUtil<StudentInfo>(StudentInfo.class);
+        util.exportExcel(response, list, "学生档案信息数据");
+    }
+
+    /**
+     * 获取学生档案信息详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('student:info:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return success(studentInfoService.selectStudentInfoById(id));
+    }
+
+    /**
+     * 新增学生档案信息
+     */
+    @PreAuthorize("@ss.hasPermi('student:info:add')")
+    @Log(title = "学生档案信息", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody StudentInfo studentInfo)
+    {
+        return studentInfoService.insertStudentInfo(studentInfo);
+    }
+
+    /**
+     * 修改学生档案信息
+     */
+    @PreAuthorize("@ss.hasPermi('student:info:edit')")
+    @Log(title = "学生档案信息", businessType = BusinessType.UPDATE)
+    @PostMapping(value = "/put")
+    public AjaxResult edit(@RequestBody StudentInfo studentInfo)
+    {
+        return toAjax(studentInfoService.updateStudentInfo(studentInfo));
+    }
+
+    /**
+     * 删除学生档案信息
+     */
+    @PreAuthorize("@ss.hasPermi('student:info:remove')")
+    @Log(title = "学生档案信息", businessType = BusinessType.DELETE)
+	@GetMapping("/delete/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(studentInfoService.deleteStudentInfoByIds(ids));
+    }
+}

ruoyi-admin/src/main/java/com/ruoyi/web/controller/info/TeacherInfoController.java

@@ -0,0 +1,104 @@
+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.TeacherInfo;
+import com.ruoyi.system.service.ITeacherInfoService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 老师档案信息Controller
+ * 
+ * @author ruoyi
+ * @date 2023-07-24
+ */
+@RestController
+@RequestMapping("/teacher/info")
+public class TeacherInfoController extends BaseController
+{
+    @Autowired
+    private ITeacherInfoService teacherInfoService;
+
+    /**
+     * 查询老师档案信息列表
+     */
+    @PreAuthorize("@ss.hasPermi('teacher:info:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(TeacherInfo teacherInfo)
+    {
+        startPage();
+        List<TeacherInfo> list = teacherInfoService.selectTeacherInfoList(teacherInfo);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出老师档案信息列表
+     */
+    @PreAuthorize("@ss.hasPermi('teacher:info:export')")
+    @Log(title = "老师档案信息", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, TeacherInfo teacherInfo)
+    {
+        List<TeacherInfo> list = teacherInfoService.selectTeacherInfoList(teacherInfo);
+        ExcelUtil<TeacherInfo> util = new ExcelUtil<TeacherInfo>(TeacherInfo.class);
+        util.exportExcel(response, list, "老师档案信息数据");
+    }
+
+    /**
+     * 获取老师档案信息详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('teacher:info:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return success(teacherInfoService.selectTeacherInfoById(id));
+    }
+
+    /**
+     * 新增老师档案信息
+     */
+    @PreAuthorize("@ss.hasPermi('teacher:info:add')")
+    @Log(title = "老师档案信息", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody TeacherInfo teacherInfo)
+    {
+        return teacherInfoService.insertTeacherInfo(teacherInfo);
+    }
+
+    /**
+     * 修改老师档案信息
+     */
+    @PreAuthorize("@ss.hasPermi('teacher:info:edit')")
+    @Log(title = "老师档案信息", businessType = BusinessType.UPDATE)
+    @PostMapping(value = "/put")
+    public AjaxResult edit(@RequestBody TeacherInfo teacherInfo)
+    {
+        return toAjax(teacherInfoService.updateTeacherInfo(teacherInfo));
+    }
+
+    /**
+     * 删除老师档案信息
+     */
+    @PreAuthorize("@ss.hasPermi('teacher:info:remove')")
+    @Log(title = "老师档案信息", businessType = BusinessType.DELETE)
+	@GetMapping("/delete/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(teacherInfoService.deleteTeacherInfoByIds(ids));
+    }
+}

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

@@ -0,0 +1,304 @@
+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_info
+ * 
+ * @author ruoyi
+ * @date 2023-07-21
+ */
+public class StudentInfo extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** ID */
+    private Long id;
+
+    /** 学生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;
+
+    /** 血型 */
+    @Excel(name = "血型")
+    private String bloodType;
+
+    /** 政治面貌 */
+    @Excel(name = "政治面貌")
+    private String politicalStatus;
+
+    /** 证件照(地址) */
+    @Excel(name = "证件照(地址)")
+    private String identificationPhoto;
+
+    /** 门禁照(地址) */
+    @Excel(name = "门禁照(地址)")
+    private String entrancePermit;
+
+    /** 父亲 */
+    @Excel(name = "父亲")
+    private String fatherName;
+
+    /** 父亲联系方式 */
+    @Excel(name = "父亲联系方式")
+    private String fatherTelephone;
+
+    /** 母亲 */
+    @Excel(name = "母亲")
+    private String motherName;
+
+    /** 母亲联系方式 */
+    @Excel(name = "母亲联系方式")
+    private String motherTelephone;
+
+    /** 居住地址 */
+    @Excel(name = "s")
+    private String address;
+
+    private String classId;
+
+    public String getClassId() {
+        return classId;
+    }
+
+    public void setClassId(String classId) {
+        this.classId = classId;
+    }
+
+    public void setId(Long id)
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    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;
+    }
+    public void setBloodType(String bloodType) 
+    {
+        this.bloodType = bloodType;
+    }
+
+    public String getBloodType() 
+    {
+        return bloodType;
+    }
+    public void setPoliticalStatus(String politicalStatus) 
+    {
+        this.politicalStatus = politicalStatus;
+    }
+
+    public String getPoliticalStatus() 
+    {
+        return politicalStatus;
+    }
+    public void setIdentificationPhoto(String identificationPhoto) 
+    {
+        this.identificationPhoto = identificationPhoto;
+    }
+
+    public String getIdentificationPhoto() 
+    {
+        return identificationPhoto;
+    }
+    public void setEntrancePermit(String entrancePermit) 
+    {
+        this.entrancePermit = entrancePermit;
+    }
+
+    public String getEntrancePermit() 
+    {
+        return entrancePermit;
+    }
+    public void setFatherName(String fatherName) 
+    {
+        this.fatherName = fatherName;
+    }
+
+    public String getFatherName() 
+    {
+        return fatherName;
+    }
+    public void setFatherTelephone(String fatherTelephone) 
+    {
+        this.fatherTelephone = fatherTelephone;
+    }
+
+    public String getFatherTelephone() 
+    {
+        return fatherTelephone;
+    }
+    public void setMotherName(String motherName) 
+    {
+        this.motherName = motherName;
+    }
+
+    public String getMotherName() 
+    {
+        return motherName;
+    }
+    public void setMotherTelephone(String motherTelephone) 
+    {
+        this.motherTelephone = motherTelephone;
+    }
+
+    public String getMotherTelephone() 
+    {
+        return motherTelephone;
+    }
+    public void setAddress(String address) 
+    {
+        this.address = address;
+    }
+
+    public String getAddress() 
+    {
+        return address;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .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("bloodType", getBloodType())
+            .append("politicalStatus", getPoliticalStatus())
+            .append("identificationPhoto", getIdentificationPhoto())
+            .append("entrancePermit", getEntrancePermit())
+            .append("fatherName", getFatherName())
+            .append("fatherTelephone", getFatherTelephone())
+            .append("motherName", getMotherName())
+            .append("motherTelephone", getMotherTelephone())
+            .append("address", getAddress())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("remark", getRemark())
+            .toString();
+    }
+}

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

@@ -0,0 +1,294 @@
+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;
+
+/**
+ * 老师档案信息对象 teacher_info
+ * 
+ * @author ruoyi
+ * @date 2023-07-24
+ */
+public class TeacherInfo extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** ID */
+    private Long id;
+
+    /** 老师id(user表id)） */
+    @Excel(name = "老师id(user表id)）")
+    private Long teacherId;
+
+    /** 姓名 */
+    @Excel(name = "姓名")
+    private String name;
+
+    /** 性别(1：男，2：女) */
+    @Excel(name = "性别(1：男，2：女)")
+    private String sex;
+
+    /** 年龄 */
+    @Excel(name = "年龄")
+    private String age;
+
+    /** 联系方式 */
+    @Excel(name = "联系方式")
+    private String phone;
+
+    /** 职称 */
+    @Excel(name = "职称")
+    private String professional;
+
+    /** 身份证号 */
+    @Excel(name = "身份证号")
+    private String idCard;
+
+    /** 身高 */
+    @Excel(name = "身高")
+    private String height;
+
+    /** 体重 */
+    @Excel(name = "体重")
+    private String weight;
+
+    /** 血型 */
+    @Excel(name = "血型")
+    private String bloodType;
+
+    /** 政治面貌 */
+    @Excel(name = "政治面貌")
+    private String politicalStatus;
+
+    /** 毕业证明照(地址) */
+    @Excel(name = "毕业证明照(地址)")
+    private String graduationPhoto;
+
+    /** 毕业证书照(地址) */
+    @Excel(name = "学位证书照(地址)")
+    private String degreePhoto;
+
+    /** 教资证明照(地址) */
+    @Excel(name = "教资证明照(地址)")
+    private String teachingPhoto;
+
+    /** 职称证明照(地址) */
+    @Excel(name = "职称证明照(地址)")
+    private String professionalPhoto;
+
+    /** 证件照(地址) */
+    @Excel(name = "证件照(地址)")
+    private String identificationPhoto;
+
+    /** 门禁照(地址) */
+    @Excel(name = "门禁照(地址)")
+    private String entrancePermit;
+
+    /** 居住地址 */
+    @Excel(name = "居住地址")
+    private String address;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    public void setTeacherId(Long teacherId) 
+    {
+        this.teacherId = teacherId;
+    }
+
+    public Long getTeacherId() 
+    {
+        return teacherId;
+    }
+    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 setPhone(String phone) 
+    {
+        this.phone = phone;
+    }
+
+    public String getPhone() 
+    {
+        return phone;
+    }
+    public void setProfessional(String professional) 
+    {
+        this.professional = professional;
+    }
+
+    public String getProfessional() 
+    {
+        return professional;
+    }
+    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;
+    }
+    public void setBloodType(String bloodType) 
+    {
+        this.bloodType = bloodType;
+    }
+
+    public String getBloodType() 
+    {
+        return bloodType;
+    }
+    public void setPoliticalStatus(String politicalStatus) 
+    {
+        this.politicalStatus = politicalStatus;
+    }
+
+    public String getPoliticalStatus() 
+    {
+        return politicalStatus;
+    }
+    public void setGraduationPhoto(String graduationPhoto) 
+    {
+        this.graduationPhoto = graduationPhoto;
+    }
+
+    public String getGraduationPhoto() 
+    {
+        return graduationPhoto;
+    }
+    public void setDegreePhoto(String degreePhoto) 
+    {
+        this.degreePhoto = degreePhoto;
+    }
+
+    public String getDegreePhoto() 
+    {
+        return degreePhoto;
+    }
+    public void setTeachingPhoto(String teachingPhoto) 
+    {
+        this.teachingPhoto = teachingPhoto;
+    }
+
+    public String getTeachingPhoto() 
+    {
+        return teachingPhoto;
+    }
+    public void setProfessionalPhoto(String professionalPhoto) 
+    {
+        this.professionalPhoto = professionalPhoto;
+    }
+
+    public String getProfessionalPhoto() 
+    {
+        return professionalPhoto;
+    }
+    public void setIdentificationPhoto(String identificationPhoto) 
+    {
+        this.identificationPhoto = identificationPhoto;
+    }
+
+    public String getIdentificationPhoto() 
+    {
+        return identificationPhoto;
+    }
+    public void setEntrancePermit(String entrancePermit) 
+    {
+        this.entrancePermit = entrancePermit;
+    }
+
+    public String getEntrancePermit() 
+    {
+        return entrancePermit;
+    }
+    public void setAddress(String address) 
+    {
+        this.address = address;
+    }
+
+    public String getAddress() 
+    {
+        return address;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("teacherId", getTeacherId())
+            .append("name", getName())
+            .append("sex", getSex())
+            .append("age", getAge())
+            .append("phone", getPhone())
+            .append("professional", getProfessional())
+            .append("idCard", getIdCard())
+            .append("height", getHeight())
+            .append("weight", getWeight())
+            .append("bloodType", getBloodType())
+            .append("politicalStatus", getPoliticalStatus())
+            .append("graduationPhoto", getGraduationPhoto())
+            .append("degreePhoto", getDegreePhoto())
+            .append("teachingPhoto", getTeachingPhoto())
+            .append("professionalPhoto", getProfessionalPhoto())
+            .append("identificationPhoto", getIdentificationPhoto())
+            .append("entrancePermit", getEntrancePermit())
+            .append("address", getAddress())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("remark", getRemark())
+            .toString();
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/system/mapper/StudentInfoMapper.java

@@ -0,0 +1,61 @@
+package com.ruoyi.system.mapper;
+
+import java.util.List;
+import com.ruoyi.system.domain.StudentInfo;
+
+/**
+ * 学生档案信息Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2023-07-21
+ */
+public interface StudentInfoMapper 
+{
+    /**
+     * 查询学生档案信息
+     * 
+     * @param id 学生档案信息主键
+     * @return 学生档案信息
+     */
+    public StudentInfo selectStudentInfoById(Long id);
+
+    /**
+     * 查询学生档案信息列表
+     * 
+     * @param studentInfo 学生档案信息
+     * @return 学生档案信息集合
+     */
+    public List<StudentInfo> selectStudentInfoList(StudentInfo studentInfo);
+
+    /**
+     * 新增学生档案信息
+     * 
+     * @param studentInfo 学生档案信息
+     * @return 结果
+     */
+    public int insertStudentInfo(StudentInfo studentInfo);
+
+    /**
+     * 修改学生档案信息
+     * 
+     * @param studentInfo 学生档案信息
+     * @return 结果
+     */
+    public int updateStudentInfo(StudentInfo studentInfo);
+
+    /**
+     * 删除学生档案信息
+     * 
+     * @param id 学生档案信息主键
+     * @return 结果
+     */
+    public int deleteStudentInfoById(Long id);
+
+    /**
+     * 批量删除学生档案信息
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteStudentInfoByIds(Long[] ids);
+}

ruoyi-system/src/main/java/com/ruoyi/system/mapper/TeacherInfoMapper.java

@@ -0,0 +1,61 @@
+package com.ruoyi.system.mapper;
+
+import java.util.List;
+import com.ruoyi.system.domain.TeacherInfo;
+
+/**
+ * 老师档案信息Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2023-07-24
+ */
+public interface TeacherInfoMapper 
+{
+    /**
+     * 查询老师档案信息
+     * 
+     * @param id 老师档案信息主键
+     * @return 老师档案信息
+     */
+    public TeacherInfo selectTeacherInfoById(Long id);
+
+    /**
+     * 查询老师档案信息列表
+     * 
+     * @param teacherInfo 老师档案信息
+     * @return 老师档案信息集合
+     */
+    public List<TeacherInfo> selectTeacherInfoList(TeacherInfo teacherInfo);
+
+    /**
+     * 新增老师档案信息
+     * 
+     * @param teacherInfo 老师档案信息
+     * @return 结果
+     */
+    public int insertTeacherInfo(TeacherInfo teacherInfo);
+
+    /**
+     * 修改老师档案信息
+     * 
+     * @param teacherInfo 老师档案信息
+     * @return 结果
+     */
+    public int updateTeacherInfo(TeacherInfo teacherInfo);
+
+    /**
+     * 删除老师档案信息
+     * 
+     * @param id 老师档案信息主键
+     * @return 结果
+     */
+    public int deleteTeacherInfoById(Long id);
+
+    /**
+     * 批量删除老师档案信息
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteTeacherInfoByIds(Long[] ids);
+}

ruoyi-system/src/main/java/com/ruoyi/system/service/IFormalParentsStudentService.java

@@ -58,4 +58,6 @@ public interface IFormalParentsStudentService
      * @return 结果
      */
     public int deleteFormalParentsStudentById(Long id);
+
+    List<FormalParentsStudent> selectFormalParentsStudentListNoPage(FormalParentsStudent formalParentsStudent);
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/IFormalTeacherClassService.java

@@ -65,4 +65,6 @@ public interface IFormalTeacherClassService
     public List<FormalTeacherClass> getTeacherClass(String teacherId);
 
     AjaxResult updateFormalTeacherClassList(FormalTeacherClassVo formalTeacherClassVo);
+
+    List<FormalTeacherClass> selectFormalTeacherClassListNoPage(FormalTeacherClass formalTeacherClass);
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/IStudentInfoService.java

@@ -0,0 +1,63 @@
+package com.ruoyi.system.service;
+
+import java.util.List;
+
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.system.domain.StudentInfo;
+
+/**
+ * 学生档案信息Service接口
+ * 
+ * @author ruoyi
+ * @date 2023-07-21
+ */
+public interface IStudentInfoService 
+{
+    /**
+     * 查询学生档案信息
+     * 
+     * @param id 学生档案信息主键
+     * @return 学生档案信息
+     */
+    public StudentInfo selectStudentInfoById(Long id);
+
+    /**
+     * 查询学生档案信息列表
+     * 
+     * @param studentInfo 学生档案信息
+     * @return 学生档案信息集合
+     */
+    public List<StudentInfo> selectStudentInfoList(StudentInfo studentInfo);
+
+    /**
+     * 新增学生档案信息
+     * 
+     * @param studentInfo 学生档案信息
+     * @return 结果
+     */
+    public AjaxResult insertStudentInfo(StudentInfo studentInfo);
+
+    /**
+     * 修改学生档案信息
+     * 
+     * @param studentInfo 学生档案信息
+     * @return 结果
+     */
+    public int updateStudentInfo(StudentInfo studentInfo);
+
+    /**
+     * 批量删除学生档案信息
+     * 
+     * @param ids 需要删除的学生档案信息主键集合
+     * @return 结果
+     */
+    public int deleteStudentInfoByIds(Long[] ids);
+
+    /**
+     * 删除学生档案信息信息
+     * 
+     * @param id 学生档案信息主键
+     * @return 结果
+     */
+    public int deleteStudentInfoById(Long id);
+}

ruoyi-system/src/main/java/com/ruoyi/system/service/ITeacherInfoService.java

@@ -0,0 +1,63 @@
+package com.ruoyi.system.service;
+
+import java.util.List;
+
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.system.domain.TeacherInfo;
+
+/**
+ * 老师档案信息Service接口
+ * 
+ * @author ruoyi
+ * @date 2023-07-24
+ */
+public interface ITeacherInfoService 
+{
+    /**
+     * 查询老师档案信息
+     * 
+     * @param id 老师档案信息主键
+     * @return 老师档案信息
+     */
+    public TeacherInfo selectTeacherInfoById(Long id);
+
+    /**
+     * 查询老师档案信息列表
+     * 
+     * @param teacherInfo 老师档案信息
+     * @return 老师档案信息集合
+     */
+    public List<TeacherInfo> selectTeacherInfoList(TeacherInfo teacherInfo);
+
+    /**
+     * 新增老师档案信息
+     * 
+     * @param teacherInfo 老师档案信息
+     * @return 结果
+     */
+    public AjaxResult insertTeacherInfo(TeacherInfo teacherInfo);
+
+    /**
+     * 修改老师档案信息
+     * 
+     * @param teacherInfo 老师档案信息
+     * @return 结果
+     */
+    public int updateTeacherInfo(TeacherInfo teacherInfo);
+
+    /**
+     * 批量删除老师档案信息
+     * 
+     * @param ids 需要删除的老师档案信息主键集合
+     * @return 结果
+     */
+    public int deleteTeacherInfoByIds(Long[] ids);
+
+    /**
+     * 删除老师档案信息信息
+     * 
+     * @param id 老师档案信息主键
+     * @return 结果
+     */
+    public int deleteTeacherInfoById(Long id);
+}

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

@@ -1,9 +1,11 @@
 package com.ruoyi.system.service.impl;
 
+import java.util.ArrayList;
 import java.util.List;
 
 import com.ruoyi.common.core.domain.entity.FormalParentsStudent;
 import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.system.mapper.FormalParentsStudentMapper;
@@ -94,4 +96,12 @@ public class FormalParentsStudentServiceImpl implements IFormalParentsStudentSer
     {
         return formalParentsStudentMapper.deleteFormalParentsStudentById(id);
     }
+
+    @Override
+    public List<FormalParentsStudent> selectFormalParentsStudentListNoPage(FormalParentsStudent formalParentsStudent) {
+        if(formalParentsStudent.getClassId()==null || formalParentsStudent.getClassId()==0L ){
+            return new ArrayList<>();
+        }
+        return formalParentsStudentMapper.selectFormalParentsStudentList(formalParentsStudent);
+    }
 }

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

@@ -127,4 +127,12 @@ public class FormalTeacherClassServiceImpl implements IFormalTeacherClassService
         }
         return AjaxResult.success();
     }
+
+    @Override
+    public List<FormalTeacherClass> selectFormalTeacherClassListNoPage(FormalTeacherClass formalTeacherClass) {
+        if(formalTeacherClass.getClassId()==null || formalTeacherClass.getClassId()==0L ){
+            return new ArrayList<>();
+        }
+        return formalTeacherClassMapper.selectFormalTeacherClassList(formalTeacherClass);
+    }
 }

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

@@ -0,0 +1,107 @@
+package com.ruoyi.system.service.impl;
+
+import java.util.List;
+
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.system.mapper.StudentInfoMapper;
+import com.ruoyi.system.domain.StudentInfo;
+import com.ruoyi.system.service.IStudentInfoService;
+
+/**
+ * 学生档案信息Service业务层处理
+ * 
+ * @author ruoyi
+ * @date 2023-07-21
+ */
+@Service
+public class StudentInfoServiceImpl implements IStudentInfoService 
+{
+    @Autowired
+    private StudentInfoMapper studentInfoMapper;
+
+    /**
+     * 查询学生档案信息
+     * 
+     * @param id 学生档案信息主键
+     * @return 学生档案信息
+     */
+    @Override
+    public StudentInfo selectStudentInfoById(Long id)
+    {
+        return studentInfoMapper.selectStudentInfoById(id);
+    }
+
+    /**
+     * 查询学生档案信息列表
+     * 
+     * @param studentInfo 学生档案信息
+     * @return 学生档案信息
+     */
+    @Override
+    public List<StudentInfo> selectStudentInfoList(StudentInfo studentInfo)
+    {
+        return studentInfoMapper.selectStudentInfoList(studentInfo);
+    }
+
+    /**
+     * 新增学生档案信息
+     * 
+     * @param studentInfo 学生档案信息
+     * @return 结果
+     */
+    @Override
+    public AjaxResult insertStudentInfo(StudentInfo studentInfo)
+    {
+        //查询数据库是否存在信息
+        StudentInfo student = new StudentInfo();
+        student.setStudentId(studentInfo.getStudentId());
+        List<StudentInfo> studentInfos = studentInfoMapper.selectStudentInfoList(student);
+        if(studentInfos!=null && studentInfos.size()>0){
+            return AjaxResult.error("参数错误");
+        }
+        studentInfo.setCreateTime(DateUtils.getNowDate());
+        int rows = studentInfoMapper.insertStudentInfo(studentInfo);
+        return rows > 0 ? AjaxResult.success() : AjaxResult.error();
+
+    }
+
+    /**
+     * 修改学生档案信息
+     * 
+     * @param studentInfo 学生档案信息
+     * @return 结果
+     */
+    @Override
+    public int updateStudentInfo(StudentInfo studentInfo)
+    {
+        studentInfo.setUpdateTime(DateUtils.getNowDate());
+        return studentInfoMapper.updateStudentInfo(studentInfo);
+    }
+
+    /**
+     * 批量删除学生档案信息
+     * 
+     * @param ids 需要删除的学生档案信息主键
+     * @return 结果
+     */
+    @Override
+    public int deleteStudentInfoByIds(Long[] ids)
+    {
+        return studentInfoMapper.deleteStudentInfoByIds(ids);
+    }
+
+    /**
+     * 删除学生档案信息信息
+     * 
+     * @param id 学生档案信息主键
+     * @return 结果
+     */
+    @Override
+    public int deleteStudentInfoById(Long id)
+    {
+        return studentInfoMapper.deleteStudentInfoById(id);
+    }
+}

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

@@ -0,0 +1,106 @@
+package com.ruoyi.system.service.impl;
+
+import java.util.List;
+
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.system.domain.StudentInfo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.system.mapper.TeacherInfoMapper;
+import com.ruoyi.system.domain.TeacherInfo;
+import com.ruoyi.system.service.ITeacherInfoService;
+
+/**
+ * 老师档案信息Service业务层处理
+ * 
+ * @author ruoyi
+ * @date 2023-07-24
+ */
+@Service
+public class TeacherInfoServiceImpl implements ITeacherInfoService 
+{
+    @Autowired
+    private TeacherInfoMapper teacherInfoMapper;
+
+    /**
+     * 查询老师档案信息
+     * 
+     * @param id 老师档案信息主键
+     * @return 老师档案信息
+     */
+    @Override
+    public TeacherInfo selectTeacherInfoById(Long id)
+    {
+        return teacherInfoMapper.selectTeacherInfoById(id);
+    }
+
+    /**
+     * 查询老师档案信息列表
+     * 
+     * @param teacherInfo 老师档案信息
+     * @return 老师档案信息
+     */
+    @Override
+    public List<TeacherInfo> selectTeacherInfoList(TeacherInfo teacherInfo)
+    {
+        return teacherInfoMapper.selectTeacherInfoList(teacherInfo);
+    }
+
+    /**
+     * 新增老师档案信息
+     * 
+     * @param teacherInfo 老师档案信息
+     * @return 结果
+     */
+    @Override
+    public AjaxResult insertTeacherInfo(TeacherInfo teacherInfo)
+    {
+        //查询数据库是否存在信息
+        TeacherInfo teacher = new TeacherInfo();
+        teacher.setTeacherId(teacherInfo.getTeacherId());
+        List<TeacherInfo> teacherInfos = teacherInfoMapper.selectTeacherInfoList(teacher);
+        if(teacherInfos!=null && teacherInfos.size()>0){
+            return AjaxResult.error("参数错误");
+        }
+        int rows = teacherInfoMapper.insertTeacherInfo(teacherInfo);
+        return rows > 0 ? AjaxResult.success() : AjaxResult.error();
+    }
+
+    /**
+     * 修改老师档案信息
+     * 
+     * @param teacherInfo 老师档案信息
+     * @return 结果
+     */
+    @Override
+    public int updateTeacherInfo(TeacherInfo teacherInfo)
+    {
+        teacherInfo.setUpdateTime(DateUtils.getNowDate());
+        return teacherInfoMapper.updateTeacherInfo(teacherInfo);
+    }
+
+    /**
+     * 批量删除老师档案信息
+     * 
+     * @param ids 需要删除的老师档案信息主键
+     * @return 结果
+     */
+    @Override
+    public int deleteTeacherInfoByIds(Long[] ids)
+    {
+        return teacherInfoMapper.deleteTeacherInfoByIds(ids);
+    }
+
+    /**
+     * 删除老师档案信息信息
+     * 
+     * @param id 老师档案信息主键
+     * @return 结果
+     */
+    @Override
+    public int deleteTeacherInfoById(Long id)
+    {
+        return teacherInfoMapper.deleteTeacherInfoById(id);
+    }
+}

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

@@ -92,7 +92,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         delete from register_teacher_class where teacher_id = #{teacherId}
     </delete>
     <delete id="deleteRegisterTeacherClassByTeacherIds" parameterType="String">
-        delete from register_teacher_class where id teacher_id
+        delete from register_teacher_class where teacher_id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>

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

@@ -0,0 +1,169 @@
+<?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.StudentInfoMapper">
+    
+    <resultMap type="StudentInfo" id="StudentInfoResult">
+        <result property="id"    column="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="bloodType"    column="blood_type"    />
+        <result property="politicalStatus"    column="political_status"    />
+        <result property="identificationPhoto"    column="identification_photo"    />
+        <result property="entrancePermit"    column="entrance_permit"    />
+        <result property="fatherName"    column="father_name"    />
+        <result property="fatherTelephone"    column="father_telephone"    />
+        <result property="motherName"    column="mother_name"    />
+        <result property="motherTelephone"    column="mother_telephone"    />
+        <result property="address"    column="address"    />
+        <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"    />
+
+        <result property="classId"    column="classId"    />
+
+    </resultMap>
+
+    <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 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
+        from student_info s
+        left join formal_parents_student f on s.student_id = f.id
+        <where>  
+            <if test="studentId != null "> and s.student_id = #{studentId}</if>
+            <if test="name != null  and name != ''"> and s.name like concat('%', #{name}, '%')</if>
+            <if test="sex != null  and sex != ''"> and s.sex = #{sex}</if>
+            <if test="age != null  and age != ''"> and s.age = #{age}</if>
+            <if test="school != null  and school != ''"> and s.school = #{school}</if>
+            <if test="studentNumber != null  and studentNumber != ''"> and s.student_number = #{studentNumber}</if>
+            <if test="idCard != null  and idCard != ''"> and s.id_card = #{idCard}</if>
+            <if test="height != null  and height != ''"> and s.height = #{height}</if>
+            <if test="weight != null  and weight != ''"> and s.weight = #{weight}</if>
+            <if test="bloodType != null  and bloodType != ''"> and s.blood_type = #{bloodType}</if>
+            <if test="politicalStatus != null  and politicalStatus != ''"> and s.political_status = #{politicalStatus}</if>
+            <if test="identificationPhoto != null  and identificationPhoto != ''"> and s.identification_photo = #{identificationPhoto}</if>
+            <if test="entrancePermit != null  and entrancePermit != ''"> and s.entrance_permit = #{entrancePermit}</if>
+            <if test="fatherName != null  and fatherName != ''"> and s.father_name like concat('%', #{fatherName}, '%')</if>
+            <if test="fatherTelephone != null  and fatherTelephone != ''"> and s.father_telephone = #{fatherTelephone}</if>
+            <if test="motherName != null  and motherName != ''"> and s.mother_name like concat('%', #{motherName}, '%')</if>
+            <if test="motherTelephone != null  and motherTelephone != ''"> and s.mother_telephone = #{motherTelephone}</if>
+            <if test="address != null  and address != ''"> and s.address = #{address}</if>
+            <if test="classId != null "> and f.class_id = #{classId}</if>
+        </where>
+    </select>
+    
+    <select id="selectStudentInfoById" parameterType="Long" resultMap="StudentInfoResult">
+        <include refid="selectStudentInfoVo"/>
+        where id = #{id}
+    </select>
+
+
+    <insert id="insertStudentInfo" parameterType="StudentInfo" useGeneratedKeys="true" keyProperty="id">
+        insert into student_info
+        <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="bloodType != null">blood_type,</if>
+            <if test="politicalStatus != null">political_status,</if>
+            <if test="identificationPhoto != null">identification_photo,</if>
+            <if test="entrancePermit != null">entrance_permit,</if>
+            <if test="fatherName != null">father_name,</if>
+            <if test="fatherTelephone != null">father_telephone,</if>
+            <if test="motherName != null">mother_name,</if>
+            <if test="motherTelephone != null">mother_telephone,</if>
+            <if test="address != null">address,</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="bloodType != null">#{bloodType},</if>
+            <if test="politicalStatus != null">#{politicalStatus},</if>
+            <if test="identificationPhoto != null">#{identificationPhoto},</if>
+            <if test="entrancePermit != null">#{entrancePermit},</if>
+            <if test="fatherName != null">#{fatherName},</if>
+            <if test="fatherTelephone != null">#{fatherTelephone},</if>
+            <if test="motherName != null">#{motherName},</if>
+            <if test="motherTelephone != null">#{motherTelephone},</if>
+            <if test="address != null">#{address},</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="updateStudentInfo" parameterType="StudentInfo">
+        update student_info
+        <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="height != null">height = #{height},</if>
+            <if test="weight != null">weight = #{weight},</if>
+            <if test="bloodType != null">blood_type = #{bloodType},</if>
+            <if test="politicalStatus != null">political_status = #{politicalStatus},</if>
+            <if test="identificationPhoto != null">identification_photo = #{identificationPhoto},</if>
+            <if test="entrancePermit != null">entrance_permit = #{entrancePermit},</if>
+            <if test="fatherName != null">father_name = #{fatherName},</if>
+            <if test="fatherTelephone != null">father_telephone = #{fatherTelephone},</if>
+            <if test="motherName != null">mother_name = #{motherName},</if>
+            <if test="motherTelephone != null">mother_telephone = #{motherTelephone},</if>
+            <if test="address != null">address = #{address},</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 id = #{id}
+    </update>
+
+    <delete id="deleteStudentInfoById" parameterType="Long">
+        delete from student_info where id = #{id}
+    </delete>
+
+    <delete id="deleteStudentInfoByIds" parameterType="String">
+        delete from student_info where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>

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

@@ -0,0 +1,161 @@
+<?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.TeacherInfoMapper">
+    
+    <resultMap type="TeacherInfo" id="TeacherInfoResult">
+        <result property="id"    column="id"    />
+        <result property="teacherId"    column="teacher_id"    />
+        <result property="name"    column="name"    />
+        <result property="sex"    column="sex"    />
+        <result property="age"    column="age"    />
+        <result property="phone"    column="phone"    />
+        <result property="professional"    column="professional"    />
+        <result property="idCard"    column="id_card"    />
+        <result property="height"    column="height"    />
+        <result property="weight"    column="weight"    />
+        <result property="bloodType"    column="blood_type"    />
+        <result property="politicalStatus"    column="political_status"    />
+        <result property="graduationPhoto"    column="graduation_photo"    />
+        <result property="degreePhoto"    column="degree_photo"    />
+        <result property="teachingPhoto"    column="teaching_photo"    />
+        <result property="professionalPhoto"    column="professional_photo"    />
+        <result property="identificationPhoto"    column="identification_photo"    />
+        <result property="entrancePermit"    column="entrance_permit"    />
+        <result property="address"    column="address"    />
+        <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="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
+    </sql>
+
+    <select id="selectTeacherInfoList" parameterType="TeacherInfo" resultMap="TeacherInfoResult">
+        <include refid="selectTeacherInfoVo"/>
+        <where>  
+            <if test="teacherId != null "> and teacher_id = #{teacherId}</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="phone != null  and phone != ''"> and phone = #{phone}</if>
+            <if test="professional != null  and professional != ''"> and professional = #{professional}</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="bloodType != null  and bloodType != ''"> and blood_type = #{bloodType}</if>
+            <if test="politicalStatus != null  and politicalStatus != ''"> and political_status = #{politicalStatus}</if>
+            <if test="graduationPhoto != null  and graduationPhoto != ''"> and graduation_photo = #{graduationPhoto}</if>
+            <if test="degreePhoto != null  and degreePhoto != ''"> and degree_photo = #{degreePhoto}</if>
+            <if test="teachingPhoto != null  and teachingPhoto != ''"> and teaching_photo = #{teachingPhoto}</if>
+            <if test="professionalPhoto != null  and professionalPhoto != ''"> and professional_photo = #{professionalPhoto}</if>
+            <if test="identificationPhoto != null  and identificationPhoto != ''"> and identification_photo = #{identificationPhoto}</if>
+            <if test="entrancePermit != null  and entrancePermit != ''"> and entrance_permit = #{entrancePermit}</if>
+            <if test="address != null  and address != ''"> and address = #{address}</if>
+        </where>
+    </select>
+    
+    <select id="selectTeacherInfoById" parameterType="Long" resultMap="TeacherInfoResult">
+        <include refid="selectTeacherInfoVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertTeacherInfo" parameterType="TeacherInfo" useGeneratedKeys="true" keyProperty="id">
+        insert into teacher_info
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="teacherId != null">teacher_id,</if>
+            <if test="name != null">name,</if>
+            <if test="sex != null">sex,</if>
+            <if test="age != null">age,</if>
+            <if test="phone != null">phone,</if>
+            <if test="professional != null">professional,</if>
+            <if test="idCard != null">id_card,</if>
+            <if test="height != null">height,</if>
+            <if test="weight != null">weight,</if>
+            <if test="bloodType != null">blood_type,</if>
+            <if test="politicalStatus != null">political_status,</if>
+            <if test="graduationPhoto != null">graduation_photo,</if>
+            <if test="degreePhoto != null">degree_photo,</if>
+            <if test="teachingPhoto != null">teaching_photo,</if>
+            <if test="professionalPhoto != null">professional_photo,</if>
+            <if test="identificationPhoto != null">identification_photo,</if>
+            <if test="entrancePermit != null">entrance_permit,</if>
+            <if test="address != null">address,</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="teacherId != null">#{teacherId},</if>
+            <if test="name != null">#{name},</if>
+            <if test="sex != null">#{sex},</if>
+            <if test="age != null">#{age},</if>
+            <if test="phone != null">#{phone},</if>
+            <if test="professional != null">#{professional},</if>
+            <if test="idCard != null">#{idCard},</if>
+            <if test="height != null">#{height},</if>
+            <if test="weight != null">#{weight},</if>
+            <if test="bloodType != null">#{bloodType},</if>
+            <if test="politicalStatus != null">#{politicalStatus},</if>
+            <if test="graduationPhoto != null">#{graduationPhoto},</if>
+            <if test="degreePhoto != null">#{degreePhoto},</if>
+            <if test="teachingPhoto != null">#{teachingPhoto},</if>
+            <if test="professionalPhoto != null">#{professionalPhoto},</if>
+            <if test="identificationPhoto != null">#{identificationPhoto},</if>
+            <if test="entrancePermit != null">#{entrancePermit},</if>
+            <if test="address != null">#{address},</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="updateTeacherInfo" parameterType="TeacherInfo">
+        update teacher_info
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="teacherId != null">teacher_id = #{teacherId},</if>
+            <if test="name != null">name = #{name},</if>
+            <if test="sex != null">sex = #{sex},</if>
+            <if test="age != null">age = #{age},</if>
+            <if test="phone != null">phone = #{phone},</if>
+            <if test="professional != null">professional = #{professional},</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="bloodType != null">blood_type = #{bloodType},</if>
+            <if test="politicalStatus != null">political_status = #{politicalStatus},</if>
+            <if test="graduationPhoto != null">graduation_photo = #{graduationPhoto},</if>
+            <if test="degreePhoto != null">degree_photo = #{degreePhoto},</if>
+            <if test="teachingPhoto != null">teaching_photo = #{teachingPhoto},</if>
+            <if test="professionalPhoto != null">professional_photo = #{professionalPhoto},</if>
+            <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="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 id = #{id}
+    </update>
+
+    <delete id="deleteTeacherInfoById" parameterType="Long">
+        delete from teacher_info where id = #{id}
+    </delete>
+
+    <delete id="deleteTeacherInfoByIds" parameterType="String">
+        delete from teacher_info where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>