Procházet zdrojové kódy

管理老师代码提交

baifucheng před 3 měsíci
rodič
revize
7023b2c516

+ 125 - 0
ruoyi-admin/src/main/java/com/ruoyi/web/controller/info/ManagementTeacherController.java

@@ -0,0 +1,125 @@
+package com.ruoyi.web.controller.info;
+
+import java.util.Arrays;
+import java.util.List;
+
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+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.annotation.RepeatSubmit;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.PageQuery;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.core.validate.AddGroup;
+import com.ruoyi.common.core.validate.EditGroup;
+import com.ruoyi.common.core.validate.QueryGroup;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.info.management.domain.bo.ManagementTeacherBo;
+import com.ruoyi.info.management.domain.vo.ManagementTeacherVo;
+import com.ruoyi.info.management.service.IManagementTeacherService;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import lombok.RequiredArgsConstructor;
+
+/**
+ * 管理老师信息Controller
+ *
+ * @author baifc
+ * @date 2025-09-30
+ */
+@Validated
+@Api(value = "管理老师信息控制器", tags = {"管理老师信息管理"})
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/info/managementTeacher")
+public class ManagementTeacherController extends BaseController {
+
+    private final IManagementTeacherService iManagementTeacherService;
+
+    /**
+     * 分页查询管理老师信息列表
+     */
+    @ApiOperation("查询管理老师信息列表")
+    @SaCheckPermission("info:managementTeacher:list")
+    @GetMapping("/page")
+    public TableDataInfo<ManagementTeacherVo> page(@Validated(QueryGroup.class) ManagementTeacherBo bo, PageQuery pageQuery) {
+        return iManagementTeacherService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 获取管理老师信息详细信息
+     */
+    @ApiOperation("获取管理老师信息详细信息")
+    @SaCheckPermission("info:managementTeacher:query")
+    @GetMapping("/info/{id}")
+    public R<ManagementTeacherVo> getInfo(@ApiParam("主键")
+                                                  @NotNull(message = "主键不能为空")
+                                                  @PathVariable("id") Long id) {
+        return R.ok(iManagementTeacherService.queryById(id));
+    }
+
+    /**
+     * 新增管理老师信息
+     */
+    @ApiOperation("新增管理老师信息")
+    @SaCheckPermission("info:managementTeacher:add")
+    @Log(title = "管理老师信息", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping("/add")
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody ManagementTeacherBo bo) {
+        return toAjax(iManagementTeacherService.insertByBo(bo) ? 1 : 0);
+    }
+
+    /**
+     * 修改管理老师信息
+     */
+    @ApiOperation("修改管理老师信息")
+    @SaCheckPermission("info:managementTeacher:edit")
+    @Log(title = "管理老师信息", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PostMapping("/edit")
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody ManagementTeacherBo bo) {
+        return toAjax(iManagementTeacherService.updateByBo(bo) ? 1 : 0);
+    }
+
+    /**
+     * 删除管理老师信息
+     */
+    @ApiOperation("删除管理老师信息")
+    @SaCheckPermission("info:managementTeacher:remove")
+    @Log(title = "管理老师信息", businessType = BusinessType.DELETE)
+    @PostMapping("/del/{ids}")
+    public R<Void> remove(@ApiParam("主键串")
+                                       @NotEmpty(message = "主键不能为空")
+                                       @PathVariable Long[] ids) {
+        return toAjax(iManagementTeacherService.deleteWithValidByIds(Arrays.asList(ids), true) ? 1 : 0);
+    }
+
+    /**
+     * 导出管理老师信息列表
+     */
+    @ApiOperation("导出管理老师信息列表")
+    @SaCheckPermission("info:managementTeacher:export")
+    @Log(title = "管理老师信息", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(@Validated ManagementTeacherBo bo, HttpServletResponse response) {
+        List<ManagementTeacherVo> list = iManagementTeacherService.queryList(bo);
+        ExcelUtil.exportExcel(list, "管理老师信息", ManagementTeacherVo.class, response);
+    }
+
+}

+ 1 - 0
ruoyi-admin/src/main/java/com/ruoyi/web/controller/info/NursingWorkerController.java

@@ -142,6 +142,7 @@ public class NursingWorkerController extends BaseController {
     @Log(title = "护工信息", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(@Validated NursingWorkerBo bo, HttpServletResponse response) {
+        // TODO 列表信息导出
         List<NursingWorkerVo> list = iNursingWorkerService.queryList(bo);
         ExcelUtil.exportExcel(list, "护工信息", NursingWorkerVo.class, response);
     }

+ 47 - 0
ruoyi-info/src/main/java/com/ruoyi/info/management/domain/TeacherDepartmentRel.java

@@ -0,0 +1,47 @@
+package com.ruoyi.info.management.domain;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import java.io.Serializable;
+import java.util.Date;
+import java.math.BigDecimal;
+
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 管理老师科室关联对象 tb_teacher_department_rel
+ *
+ * @author baifc
+ * @date 2025-09-30
+ */
+@Data
+@TableName("tb_teacher_department_rel")
+public class TeacherDepartmentRel extends BaseEntity {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * id
+     */
+    @TableId(value = "id")
+    private Long id;
+    /**
+     * 管理老师id
+     */
+    private Long teacherId;
+    /**
+     * 医院id
+     */
+    private Long hospitalId;
+    /**
+     * 科室id
+     */
+    private Long departmentId;
+    /**
+     * 删除标识(0:未删除,2:已删除)
+     */
+    @TableLogic
+    private String delFlag;
+
+}

+ 81 - 0
ruoyi-info/src/main/java/com/ruoyi/info/management/domain/bo/ManagementTeacherPageReqBo.java

@@ -0,0 +1,81 @@
+package com.ruoyi.info.management.domain.bo;
+
+import java.util.Date;
+
+import javax.validation.constraints.NotBlank;
+
+import org.springframework.format.annotation.DateTimeFormat;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.core.validate.AddGroup;
+import com.ruoyi.common.core.validate.EditGroup;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author fucheng.bai
+ * @date 2025/9/30
+ */
+@Data
+@ApiModel("管理老师信息业务对象")
+public class ManagementTeacherPageReqBo {
+
+    /**
+     * 姓名
+     */
+    @ApiModelProperty(value = "姓名", required = true)
+    @NotBlank(message = "姓名不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String name;
+
+    /**
+     * 手机号
+     */
+    @ApiModelProperty(value = "手机号", required = true)
+    @NotBlank(message = "手机号不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String phoneNumber;
+
+    /**
+     * 性别
+     */
+    @ExcelProperty(value = "性别")
+    @NotBlank(message = "性别不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String sex;
+
+    /**
+     * 状态 0-启用 1-禁用
+     */
+    @ApiModelProperty(value = "状态 0-启用 1-禁用", required = true)
+    @NotBlank(message = "状态 0-启用 1-禁用不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String enableStatus;
+
+    /**
+     * 医院id
+     */
+    @ApiModelProperty(value = "医院id")
+    private Long hospitalId;
+
+    /**
+     * 科室id
+     */
+    @ApiModelProperty(value = "科室id")
+    private Long departmentId;
+
+    /**
+     * 创建时间开始
+     */
+    @ApiModelProperty(value = "创建时间开始")
+    @JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTimeStart;
+
+    /**
+     * 创建时间结束
+     */
+    @JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "创建时间结束")
+    private Date createTimeEnd;
+}

+ 55 - 0
ruoyi-info/src/main/java/com/ruoyi/info/management/domain/bo/TeacherDepartmentRelBo.java

@@ -0,0 +1,55 @@
+package com.ruoyi.info.management.domain.bo;
+
+import com.ruoyi.common.core.validate.AddGroup;
+import com.ruoyi.common.core.validate.EditGroup;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import javax.validation.constraints.*;
+
+import java.util.Date;
+
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 管理老师科室关联业务对象 tb_teacher_department_rel
+ *
+ * @author baifc
+ * @date 2025-09-30
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("管理老师科室关联业务对象")
+public class TeacherDepartmentRelBo extends BaseEntity {
+
+    /**
+     * id
+     */
+    @ApiModelProperty(value = "id", required = true)
+    @NotNull(message = "id不能为空", groups = { EditGroup.class })
+    private Long id;
+
+    /**
+     * 管理老师id
+     */
+    @ApiModelProperty(value = "管理老师id", required = true)
+    @NotNull(message = "管理老师id不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long teacherId;
+
+    /**
+     * 医院id
+     */
+    @ApiModelProperty(value = "医院id", required = true)
+    @NotNull(message = "医院id不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long hospitalId;
+
+    /**
+     * 科室id
+     */
+    @ApiModelProperty(value = "科室id", required = true)
+    @NotNull(message = "科室id不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long departmentId;
+
+
+}

+ 55 - 0
ruoyi-info/src/main/java/com/ruoyi/info/management/domain/vo/TeacherDepartmentRelVo.java

@@ -0,0 +1,55 @@
+package com.ruoyi.info.management.domain.vo;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.ruoyi.common.annotation.ExcelDictFormat;
+import com.ruoyi.common.convert.ExcelDictConvert;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.util.Date;
+
+
+/**
+ * 管理老师科室关联视图对象 tb_teacher_department_rel
+ *
+ * @author baifc
+ * @date 2025-09-30
+ */
+@Data
+@ApiModel("管理老师科室关联视图对象")
+@ExcelIgnoreUnannotated
+public class TeacherDepartmentRelVo {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * id
+     */
+    @ExcelProperty(value = "id")
+    @ApiModelProperty("id")
+    private Long id;
+
+    /**
+     * 管理老师id
+     */
+    @ExcelProperty(value = "管理老师id")
+    @ApiModelProperty("管理老师id")
+    private Long teacherId;
+
+    /**
+     * 医院id
+     */
+    @ExcelProperty(value = "医院id")
+    @ApiModelProperty("医院id")
+    private Long hospitalId;
+
+    /**
+     * 科室id
+     */
+    @ExcelProperty(value = "科室id")
+    @ApiModelProperty("科室id")
+    private Long departmentId;
+
+
+}

+ 53 - 0
ruoyi-info/src/main/java/com/ruoyi/info/management/exception/TeacherDepartmentRelExceptionEnum.java

@@ -0,0 +1,53 @@
+package com.ruoyi.info.management.exception;
+
+import com.ruoyi.common.enums.IIntegerEnum;
+import java.util.Objects;
+
+
+/**
+ * 异常枚举
+ */
+public enum TeacherDepartmentRelExceptionEnum implements IIntegerEnum {
+
+    // TODO 注意检查错误码,保证系统内唯一
+    TeacherDepartmentRel_IS_NOT_EXISTS(200001, "管理老师科室关联不存在"),
+
+    ;
+
+    private Integer code;
+
+    private String msg;
+
+    TeacherDepartmentRelExceptionEnum(Integer code, String msg) {
+        this.code = code;
+        this.msg = msg;
+    }
+
+    @Override
+    public Integer getCode() {
+        return code;
+    }
+
+    public void setCode(Integer code) {
+        this.code = code;
+    }
+
+    @Override
+    public String getMsg() {
+        return msg;
+    }
+
+    public void setMsg(String msg) {
+        this.msg = msg;
+    }
+
+    public static TeacherDepartmentRelExceptionEnum getByCode(int code, TeacherDepartmentRelExceptionEnum[] values) {
+        for (TeacherDepartmentRelExceptionEnum value : values) {
+            if (Objects.equals(code, value.getCode())) {
+                return value;
+            }
+        }
+        return null;
+    }
+
+}

+ 15 - 0
ruoyi-info/src/main/java/com/ruoyi/info/management/mapper/TeacherDepartmentRelMapper.java

@@ -0,0 +1,15 @@
+package com.ruoyi.info.management.mapper;
+
+import com.ruoyi.info.management.domain.TeacherDepartmentRel;
+import com.ruoyi.info.management.domain.vo.TeacherDepartmentRelVo;
+import com.ruoyi.common.core.mapper.BaseMapperPlus;
+
+/**
+ * 管理老师科室关联Mapper接口
+ *
+ * @author baifc
+ * @date 2025-09-30
+ */
+public interface TeacherDepartmentRelMapper extends BaseMapperPlus<TeacherDepartmentRelMapper, TeacherDepartmentRel, TeacherDepartmentRelVo> {
+
+}

+ 77 - 0
ruoyi-info/src/main/java/com/ruoyi/info/management/service/ITeacherDepartmentRelService.java

@@ -0,0 +1,77 @@
+package com.ruoyi.info.management.service;
+
+import com.ruoyi.info.management.domain.TeacherDepartmentRel;
+import com.ruoyi.info.management.domain.vo.TeacherDepartmentRelVo;
+import com.ruoyi.info.management.domain.bo.TeacherDepartmentRelBo;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.core.domain.PageQuery;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 管理老师科室关联Service接口
+ *
+ * @author baifc
+ * @date 2025-09-30
+ */
+public interface ITeacherDepartmentRelService {
+
+    /**
+     * 查询管理老师科室关联分页
+     *
+     * @param bo 管理老师科室关联
+     * @return 管理老师科室关联集合
+     */
+    TableDataInfo<TeacherDepartmentRelVo> queryPageList(TeacherDepartmentRelBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询管理老师科室关联列表
+     *
+     * @param bo 管理老师科室关联
+     * @return 管理老师科室关联集合
+     */
+    List<TeacherDepartmentRelVo> queryList(TeacherDepartmentRelBo bo);
+
+    /**
+     * 查询管理老师科室关联
+     *
+     * @param id 管理老师科室关联主键
+     * @return 管理老师科室关联
+     */
+    TeacherDepartmentRelVo queryById(Long id);
+
+    /**
+     * 详情管理老师科室关联
+     *
+     * @param id 管理老师科室关联主键
+     * @return 管理老师科室关联
+     */
+    TeacherDepartmentRel loadById(Long id, Boolean tw);
+
+    /**
+     * 新增管理老师科室关联
+     *
+     * @param bo 管理老师科室关联
+     * @return 结果
+     */
+    Boolean insertByBo(TeacherDepartmentRelBo bo);
+
+    /**
+     * 修改管理老师科室关联
+     *
+     * @param bo 管理老师科室关联
+     * @return 结果
+     */
+    Boolean updateByBo(TeacherDepartmentRelBo bo);
+
+    /**
+     * 校验并批量删除管理老师科室关联信息
+     *
+     * @param ids 需要删除的管理老师科室关联主键集合
+     * @param isValid 是否校验,true-删除前校验,false-不校验
+     * @return 结果
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+}

+ 153 - 0
ruoyi-info/src/main/java/com/ruoyi/info/management/service/impl/TeacherDepartmentRelServiceImpl.java

@@ -0,0 +1,153 @@
+package com.ruoyi.info.management.service.impl;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.common.core.domain.PageQuery;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.exception.ServiceException;
+import com.ruoyi.common.utils.BeanCopyUtils;
+import com.ruoyi.info.management.domain.TeacherDepartmentRel;
+import com.ruoyi.info.management.domain.bo.TeacherDepartmentRelBo;
+import com.ruoyi.info.management.domain.vo.TeacherDepartmentRelVo;
+import com.ruoyi.info.management.exception.TeacherDepartmentRelExceptionEnum;
+import com.ruoyi.info.management.mapper.TeacherDepartmentRelMapper;
+import com.ruoyi.info.management.service.ITeacherDepartmentRelService;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
+import lombok.RequiredArgsConstructor;
+
+/**
+ * 管理老师科室关联Service业务层处理
+ *
+ * @author baifc
+ * @date 2025-09-30
+ */
+@RequiredArgsConstructor
+@Service
+public class TeacherDepartmentRelServiceImpl implements ITeacherDepartmentRelService {
+
+    private final TeacherDepartmentRelMapper baseMapper;
+
+    /**
+     * 查询管理老师科室关联分页
+     *
+     * @param bo 管理老师科室关联
+     * @return 管理老师科室关联
+     */
+    @Override
+    public TableDataInfo<TeacherDepartmentRelVo> queryPageList(TeacherDepartmentRelBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<TeacherDepartmentRel> lqw = buildQueryWrapper(bo);
+        Page<TeacherDepartmentRelVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询管理老师科室关联列表
+     *
+     * @param bo 管理老师科室关联
+     * @return 管理老师科室关联
+     */
+    @Override
+    public List<TeacherDepartmentRelVo> queryList(TeacherDepartmentRelBo bo) {
+        LambdaQueryWrapper<TeacherDepartmentRel> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<TeacherDepartmentRel> buildQueryWrapper(TeacherDepartmentRelBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<TeacherDepartmentRel> lqw = Wrappers.lambdaQuery();
+        lqw.eq(bo.getTeacherId() != null, TeacherDepartmentRel::getTeacherId, bo.getTeacherId());
+        lqw.eq(bo.getHospitalId() != null, TeacherDepartmentRel::getHospitalId, bo.getHospitalId());
+        lqw.eq(bo.getDepartmentId() != null, TeacherDepartmentRel::getDepartmentId, bo.getDepartmentId());
+        return lqw;
+    }
+
+    /**
+     * 查询管理老师科室关联
+     *
+     * @param id 管理老师科室关联主键
+     * @return 管理老师科室关联
+     */
+    @Override
+    public TeacherDepartmentRelVo queryById(Long id){
+        return baseMapper.selectVoById(id);
+    }
+
+    /**
+     * 详情管理老师科室关联
+     *
+     * @param id 管理老师科室关联主键
+     * @return 管理老师科室关联
+     */
+    @Override
+    public TeacherDepartmentRel loadById(Long id, Boolean tw){
+        TeacherDepartmentRel info = this.baseMapper.selectById(id);
+        if(ObjectUtil.isEmpty(info) && tw){
+            throw new ServiceException(TeacherDepartmentRelExceptionEnum.TeacherDepartmentRel_IS_NOT_EXISTS);
+        }
+        return info;
+    }
+
+    /**
+     * 新增管理老师科室关联
+     *
+     * @param bo 管理老师科室关联
+     * @return 结果
+     */
+    @Override
+    public Boolean insertByBo(TeacherDepartmentRelBo bo) {
+        TeacherDepartmentRel add = BeanUtil.toBean(bo, TeacherDepartmentRel.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改管理老师科室关联
+     *
+     * @param bo 管理老师科室关联
+     * @return 结果
+     */
+    @Override
+    public Boolean updateByBo(TeacherDepartmentRelBo bo) {
+        TeacherDepartmentRel teacherDepartmentRel = baseMapper.selectById(bo.getId());
+        TeacherDepartmentRel update = BeanCopyUtils.copy(bo, teacherDepartmentRel);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     *
+     * @param entity 实体类数据
+     */
+    private void validEntityBeforeSave(TeacherDepartmentRel entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 批量删除管理老师科室关联
+     *
+     * @param ids 需要删除的管理老师科室关联主键
+     * @return 结果
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteBatchIds(ids) > 0;
+    }
+
+}

+ 27 - 0
ruoyi-info/src/main/resources/mapper/management/ManagementTeacherMapper.xml

@@ -0,0 +1,27 @@
+<?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.info.management.mapper.ManagementTeacherMapper">
+
+    <resultMap type="com.ruoyi.info.management.domain.ManagementTeacher" id="ManagementTeacherResult">
+        <result property="id" column="id"/>
+        <result property="name" column="name"/>
+        <result property="phoneNumber" column="phone_number"/>
+        <result property="sex" column="sex"/>
+        <result property="age" column="age"/>
+        <result property="workYears" column="work_years"/>
+        <result property="idCard" column="id_card"/>
+        <result property="enableStatus" column="enable_status"/>
+        <result property="sortOrder" column="sort_order"/>
+        <result property="photographUrl" column="photograph_url"/>
+        <result property="manageNursingFlag" column="manage_nursing_flag"/>
+        <result property="delFlag" column="del_flag"/>
+        <result property="createTime" column="create_time"/>
+        <result property="createBy" column="create_by"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="updateBy" column="update_by"/>
+    </resultMap>
+
+
+</mapper>

+ 20 - 0
ruoyi-info/src/main/resources/mapper/management/TeacherDepartmentRelMapper.xml

@@ -0,0 +1,20 @@
+<?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.info.management.mapper.TeacherDepartmentRelMapper">
+
+    <resultMap type="com.ruoyi.info.management.domain.TeacherDepartmentRel" id="TeacherDepartmentRelResult">
+        <result property="id" column="id"/>
+        <result property="teacherId" column="teacher_id"/>
+        <result property="hospitalId" column="hospital_id"/>
+        <result property="departmentId" column="department_id"/>
+        <result property="delFlag" column="del_flag"/>
+        <result property="createTime" column="create_time"/>
+        <result property="createBy" column="create_by"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="updateBy" column="update_by"/>
+    </resultMap>
+
+
+</mapper>

+ 1 - 0
ruoyi-user/src/main/java/com/ruoyi/user/domain/User.java

@@ -100,5 +100,6 @@ public class User  {
     /**
      * 小程序用户扩展信息
      */
+    @TableField(exist = false)
     private UserExtendInfo userExtendInfo;
 }

+ 1 - 0
script/sql/baifc-0928.sql

@@ -58,6 +58,7 @@ CREATE TABLE `tb_management_teacher`
     `id`                     bigint       NOT NULL AUTO_INCREMENT COMMENT 'id',
     `name`                   varchar(64)  NOT NULL DEFAULT '' COMMENT '姓名',
     `phone_number`            varchar(64)  NOT NULL DEFAULT '' COMMENT '手机号',
+    `sex`                    varchar(4)   NOT NULL DEFAULT '' COMMENT '性别 1-男 2-女',
     `age`                    int          NOT NULL DEFAULT 0 COMMENT '年龄',
     `work_years`             int          NOT NULL DEFAULT 0 COMMENT '工作年限',
     `id_card`                varchar(64)  NOT NULL DEFAULT '' COMMENT '身份证号',