update

mec-auth/mec-auth-server/src/main/resources/config/mybatis/SysMenuMapper.xml

@@ -87,9 +87,9 @@
     </update>
 
     <!-- 根据主键删除一条记录 -->
-    <delete id="delete">
-		DELETE FROM sys_menu WHERE id_ = #{id}
-	</delete>
+    <update id="delete">
+		UPDATE sys_menu SET del_flag_ = 1 WHERE id_ = #{id}
+	</update>
 
     <!-- 分页查询 -->
     <select id="queryPage" resultMap="SysMenu" parameterType="map">

mec-auth/mec-auth-server/src/main/resources/config/mybatis/SysRoleMapper.xml

@@ -63,7 +63,7 @@
 
     <!-- 根据主键删除一条记录 -->
     <delete id="delete">
-		DELETE FROM sys_role WHERE id_ = #{id}
+		UPDATE sys_role SET del_flag_ = 1 WHERE id_ = #{id}
 	</delete>
 
     <!-- 分页查询 -->

mec-auth/mec-auth-server/src/main/resources/config/mybatis/SysUserMapper.xml

@@ -128,7 +128,7 @@
 
     <!-- 根据主键删除一条记录 -->
     <delete id="delete">
-		DELETE FROM sys_user WHERE id_ = #{id}
+		UPDATE sys_user SET del_flag_ = 1 WHERE id_ = #{id}
 	</delete>
 
     <!-- 分页查询 -->

mec-web/src/main/java/com/ym/mec/web/controller/TeacherController.java

@@ -65,19 +65,24 @@ public class TeacherController extends BaseController {
 
     @ApiOperation(value = "根据教师编号查询教师")
     @GetMapping("/get/{id}")
-    public Object get(@ApiParam(value = "教师编号", required = true) @PathVariable("id") Integer id) {
+    @ApiParam(value = "教师编号", required = true)
+    public Object get(@PathVariable("id") Integer id) {
         return succeed(teacherService.get(id));
     }
 
     @ApiOperation(value = "分页查询教师列表")
     @PostMapping("/queryPage")
-    public Object queryPage(@RequestBody TeacherQueryInfo queryInfo) {
+    public Object queryPage(@RequestBody(required = false) TeacherQueryInfo queryInfo) {
+        if(queryInfo == null){
+            queryInfo = new TeacherQueryInfo();
+        }
         return succeed(teacherService.queryPage(queryInfo));
     }
 
     @ApiOperation(value = "根据教师编号查询教师课程班列表")
     @GetMapping("/getClass/{id}")
-    public Object getClassGroup(@ApiParam(value = "教师编号", required = true) @PathVariable("id") Integer id) {
+    @ApiParam(value = "教师编号", required = true)
+    public Object getClassGroup(@PathVariable("id") Integer id) {
         return succeed(classGroupService.findClassGroup4Teacher(id));
     }
 }

mec-web/src/main/java/com/ym/mec/web/dal/dto/TeacherUserDto.java

@@ -0,0 +1,168 @@
+package com.ym.mec.web.dal.dto;
+
+import com.ym.mec.auth.api.entity.SysUser;
+import com.ym.mec.web.dal.enums.JobNatureEnum;
+import com.ym.mec.web.dal.enums.JobTypeEnum;
+import com.ym.mec.web.dal.enums.YesOrNoEnum;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.util.Date;
+
+public class TeacherUserDto extends SysUser {
+
+    @ApiModelProperty(value = "职务类型（指导老师 ADVISER、教务老师 ACADEMIC、教学主管 TEACHING）", required = false)
+    private JobTypeEnum jobType;
+
+    @ApiModelProperty(value = "工作性质（兼职 PART_JOB、全职FULL_JOB）", required = false)
+    private JobNatureEnum jobNature;
+
+    @ApiModelProperty(value = "是否试用期1是，0否", required = false)
+    private YesOrNoEnum isProbationPeriod;
+
+    @ApiModelProperty(value = "学历", required = false)
+    private String educationBackground;
+
+    @ApiModelProperty(value = "毕业学校", required = false)
+    private String graduateSchool;
+
+    /** 技术职称 */
+    @ApiModelProperty(value = "技术职称", required = false)
+    private String technicalTitles;
+
+    @ApiModelProperty(value = "工作单位", required = false)
+    private String workUnit;
+
+    @ApiModelProperty(value = "专业技能（支持多个，用|分隔），对应科目表编号", required = false)
+    private String subjectId;
+
+    /** 入职时间 */
+    @ApiModelProperty(value = "入职时间", required = false)
+    private java.util.Date entryDate;
+
+    @ApiModelProperty(value = "证件类型", required = false)
+    private String certificateType;
+
+    @ApiModelProperty(value = "证件号码", required = false)
+    private String certificateNum;
+
+    @ApiModelProperty(value = "流动范围(多个用|分开)", required = false)
+    private String flowOrganRange;
+
+    @ApiModelProperty(value = "老师介绍", required = false)
+    private String introduction;
+
+    @ApiModelProperty(value = "离职时间", required = false)
+    private Date demissionDate;
+
+    public JobTypeEnum getJobType() {
+        return jobType;
+    }
+
+    public void setJobType(JobTypeEnum jobType) {
+        this.jobType = jobType;
+    }
+
+    public JobNatureEnum getJobNature() {
+        return jobNature;
+    }
+
+    public void setJobNature(JobNatureEnum jobNature) {
+        this.jobNature = jobNature;
+    }
+
+    public YesOrNoEnum getIsProbationPeriod() {
+        return isProbationPeriod;
+    }
+
+    public void setIsProbationPeriod(YesOrNoEnum isProbationPeriod) {
+        this.isProbationPeriod = isProbationPeriod;
+    }
+
+    public String getEducationBackground() {
+        return educationBackground;
+    }
+
+    public void setEducationBackground(String educationBackground) {
+        this.educationBackground = educationBackground;
+    }
+
+    public String getGraduateSchool() {
+        return graduateSchool;
+    }
+
+    public void setGraduateSchool(String graduateSchool) {
+        this.graduateSchool = graduateSchool;
+    }
+
+    public String getTechnicalTitles() {
+        return technicalTitles;
+    }
+
+    public void setTechnicalTitles(String technicalTitles) {
+        this.technicalTitles = technicalTitles;
+    }
+
+    public String getWorkUnit() {
+        return workUnit;
+    }
+
+    public void setWorkUnit(String workUnit) {
+        this.workUnit = workUnit;
+    }
+
+    public String getSubjectId() {
+        return subjectId;
+    }
+
+    public void setSubjectId(String subjectId) {
+        this.subjectId = subjectId;
+    }
+
+    public Date getEntryDate() {
+        return entryDate;
+    }
+
+    public void setEntryDate(Date entryDate) {
+        this.entryDate = entryDate;
+    }
+
+    public String getCertificateType() {
+        return certificateType;
+    }
+
+    public void setCertificateType(String certificateType) {
+        this.certificateType = certificateType;
+    }
+
+    public String getCertificateNum() {
+        return certificateNum;
+    }
+
+    public void setCertificateNum(String certificateNum) {
+        this.certificateNum = certificateNum;
+    }
+
+    public String getFlowOrganRange() {
+        return flowOrganRange;
+    }
+
+    public void setFlowOrganRange(String flowOrganRange) {
+        this.flowOrganRange = flowOrganRange;
+    }
+
+    public String getIntroduction() {
+        return introduction;
+    }
+
+    public void setIntroduction(String introduction) {
+        this.introduction = introduction;
+    }
+
+    public Date getDemissionDate() {
+        return demissionDate;
+    }
+
+    public void setDemissionDate(Date demissionDate) {
+        this.demissionDate = demissionDate;
+    }
+}

mec-web/src/main/resources/config/mybatis/ChargeTypeMapper.xml

@@ -58,7 +58,7 @@
 
     <!-- 根据主键删除一条记录 -->
     <delete id="delete">
-		DELETE FROM charge_type WHERE id_ = #{id} 
+		UPDATE charge_type SET del_flag_ = 1 WHERE id_ = #{id}
 	</delete>
 
     <!-- 分页查询 -->

mec-web/src/main/resources/config/mybatis/ClassGroupMapper.xml

@@ -101,7 +101,7 @@
 
     <!-- 根据主键删除一条记录 -->
     <delete id="delete">
-        DELETE FROM class_group WHERE id_ = #{id}
+        UPDATE class_group SET del_flag_ = 1 WHERE id_ = #{id}
     </delete>
 
     <!-- 分页查询 -->

mec-web/src/main/resources/config/mybatis/CourseHomeworkTemplateMapper.xml

@@ -69,7 +69,7 @@ create_time_ = #{createTime},
 	
 	<!-- 根据主键删除一条记录 -->
 	<delete id="delete" >
-		DELETE FROM course_homework_template WHERE id_ = #{id} 
+		UPDATE course_homework_template SET del_flag_ = 1 WHERE id_ = #{id}
 	</delete>
 
 	<sql id="queryCondition">

mec-web/src/main/resources/config/mybatis/LeaveCategoryMapper.xml

@@ -59,7 +59,7 @@
 
     <!-- 根据主键删除一条记录 -->
     <delete id="delete">
-		DELETE FROM leave_category WHERE id_ = #{id} 
+		UPDATE leave_category SET del_flag_ = 1 WHERE id_ = #{id}
 	</delete>
 
     <!-- 分页查询 -->

mec-web/src/main/resources/config/mybatis/OrganizationMapper.xml

@@ -79,7 +79,7 @@
 
     <!-- 根据主键删除一条记录 -->
     <delete id="delete">
-		DELETE FROM organization WHERE id_ = #{id} 
+		UPDATE organization SET del_flag_ = 1 WHERE id_ = #{id}
 	</delete>
 
     <sql id="queryPageSql">

mec-web/src/main/resources/config/mybatis/SchoolMapper.xml

@@ -80,7 +80,7 @@
 
     <!-- 根据主键删除一条记录 -->
     <delete id="delete">
-		DELETE FROM school WHERE id_ = #{id} 
+		UPDATE school SET del_flag_ = 1 WHERE id_ = #{id}
 	</delete>
 
     <!-- 分页查询 -->

mec-web/src/main/resources/config/mybatis/SubjectMapper.xml

@@ -63,7 +63,7 @@
 
     <!-- 根据主键删除一条记录 -->
     <delete id="delete">
-		DELETE FROM subject WHERE id_ = #{id} AND parent_subject_id_ = #{id}
+		UPDATE `subject` SET del_flag_ = 1 WHERE id_ = #{id} AND parent_subject_ = #{id}
 	</delete>
 
     <!-- 分页查询 -->

mec-web/src/main/resources/config/mybatis/SysAreaMapper.xml

@@ -63,7 +63,7 @@
 
     <!-- 根据主键删除一条记录 -->
     <delete id="delete">
-		DELETE FROM sys_area WHERE id_ = #{id} 
+		UPDATE sys_area SET del_flag_ = 1 WHERE id_ = #{id}
 	</delete>
 
     <!-- 分页查询 -->