From 9c088c91d18124f22866647557e75528032b16d2 Mon Sep 17 00:00:00 2001
From: cjw <miko20001@163.com>
Date: Thu, 30 May 2024 15:42:09 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=99=E8=81=8C=E5=B7=A5Vo=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../org/dromara/file/domain/SysTeacher.java     |  2 +-
 .../dromara/file/domain/bo/SysTeacherBo.java    |  2 +-
 .../dromara/file/domain/vo/SysTeacherVo.java    | 17 ++++++++++++++++-
 .../service/impl/SysTeacherServiceImpl.java     |  2 +-
 4 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/domain/SysTeacher.java b/ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/domain/SysTeacher.java
index 5c9f954..34ab863 100644
--- a/ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/domain/SysTeacher.java
+++ b/ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/domain/SysTeacher.java
@@ -74,7 +74,7 @@ public class SysTeacher extends TenantEntity {
     /**
      * 职务
      */
-    private String post;
+    private String postCode;
 
     /**
      * 用户性别（0男 1女 2未知）
diff --git a/ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/domain/bo/SysTeacherBo.java b/ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/domain/bo/SysTeacherBo.java
index ee96036..63b8340 100644
--- a/ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/domain/bo/SysTeacherBo.java
+++ b/ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/domain/bo/SysTeacherBo.java
@@ -79,7 +79,7 @@ public class SysTeacherBo extends BaseEntity {
      * 职务
      */
     @NotBlank(message = "职务不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String post;
+    private String postCode;
 
     /**
      * 用户性别（0男 1女 2未知）
diff --git a/ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/domain/vo/SysTeacherVo.java b/ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/domain/vo/SysTeacherVo.java
index 8729585..8b7df57 100644
--- a/ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/domain/vo/SysTeacherVo.java
+++ b/ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/domain/vo/SysTeacherVo.java
@@ -3,9 +3,12 @@ package org.dromara.file.domain.vo;
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import io.github.linpeilie.annotations.AutoMapper;
+import io.github.linpeilie.annotations.AutoMapping;
 import lombok.Data;
 import org.dromara.common.excel.annotation.ExcelDictFormat;
 import org.dromara.common.excel.convert.ExcelDictConvert;
+import org.dromara.common.translation.annotation.Translation;
+import org.dromara.common.translation.constant.TransConstant;
 import org.dromara.file.domain.SysTeacher;
 
 import java.io.Serial;
@@ -40,6 +43,10 @@ public class SysTeacherVo implements Serializable {
     @ExcelProperty(value = "部门ID")
     private Long deptId;
 
+    @Translation(type = TransConstant.DEPT_ID_TO_NAME)
+    @AutoMapping(target = "deptId")
+    private String deptName;
+
     /**
      * 教职工姓名
      */
@@ -82,11 +89,19 @@ public class SysTeacherVo implements Serializable {
     @ExcelProperty(value = "学科")
     private String subjectCode;
 
+    @Translation(type = TransConstant.DICT_TYPE_TO_LABEL,other = "sys_subject")
+    @AutoMapping(target = "subjectCode")
+    private String subjectName;
+
     /**
      * 职务
      */
     @ExcelProperty(value = "职务")
-    private String post;
+    private String postCode;
+
+    @Translation(type = TransConstant.DICT_TYPE_TO_LABEL,other = "sys_post")
+    @AutoMapping(target = "postCode")
+    private String postName;
 
     /**
      * 用户性别（0男 1女 2未知）
diff --git a/ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/service/impl/SysTeacherServiceImpl.java b/ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/service/impl/SysTeacherServiceImpl.java
index 8c00de2..9ded850 100644
--- a/ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/service/impl/SysTeacherServiceImpl.java
+++ b/ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/service/impl/SysTeacherServiceImpl.java
@@ -81,7 +81,7 @@ public class SysTeacherServiceImpl implements ISysTeacherService {
         lqw.eq(StringUtils.isNotBlank(bo.getEducationCode()), SysTeacher::getEducationCode, bo.getEducationCode());
         lqw.eq(StringUtils.isNotBlank(bo.getDegreeCode()), SysTeacher::getDegreeCode, bo.getDegreeCode());
         lqw.eq(StringUtils.isNotBlank(bo.getSubjectCode()), SysTeacher::getSubjectCode, bo.getSubjectCode());
-        lqw.eq(StringUtils.isNotBlank(bo.getPost()), SysTeacher::getPost, bo.getPost());
+        lqw.eq(StringUtils.isNotBlank(bo.getPostCode()), SysTeacher::getPostCode, bo.getPostCode());
         lqw.eq(StringUtils.isNotBlank(bo.getSex()), SysTeacher::getSex, bo.getSex());
         lqw.eq(bo.getBirthday() != null, SysTeacher::getBirthday, bo.getBirthday());
         return lqw;