From c5c7da182e741f3c906703669d7d12ee3283bf57 Mon Sep 17 00:00:00 2001
From: hshansha <qingkongguiyatou@126.com>
Date: Tue, 28 Oct 2025 14:19:54 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E8=80=83=E6=A0=B8=E8=AF=84?=
 =?UTF-8?q?=E6=B5=8B=E6=97=B6=E6=B7=BB=E5=8A=A0=E5=AD=97=E6=AE=B5=E5=B7=A5?=
 =?UTF-8?q?=E5=8F=B7=E3=80=81=E8=BA=AB=E4=BB=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/application-hs.yml     |  1 +
 .../java/com/ruoyi/kaohe/domain/Bkhdx.java    | 28 +++++++++++++++++++
 .../resources/mapper/kaohe/KhPingceMapper.xml |  4 ++-
 3 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/ruoyi-admin/src/main/resources/application-hs.yml b/ruoyi-admin/src/main/resources/application-hs.yml
index 712e10b..27a8a8c 100644
--- a/ruoyi-admin/src/main/resources/application-hs.yml
+++ b/ruoyi-admin/src/main/resources/application-hs.yml
@@ -8,6 +8,7 @@ spring:
             master:
                 #url: jdbc:mysql://localhost:3307/kaohe?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                 url: jdbc:mysql://172.16.9.9:3306/kaohe?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                #url: jdbc:mysql://172.16.9.9:3306/kaohetest?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                 username: root
                 password: ruanfa
                 #password: hs123456
diff --git a/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/domain/Bkhdx.java b/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/domain/Bkhdx.java
index 7b3e2b3..c577f41 100644
--- a/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/domain/Bkhdx.java
+++ b/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/domain/Bkhdx.java
@@ -30,6 +30,34 @@ public class Bkhdx extends BaseEntity {
     @Excel(name = "被考核对象类型")
     private String bkhdxType;*/
 
+    /**
+     * 工号
+     */
+    @Excel(name = "*工号")
+    private String wordId;
+
+    /**
+     * 职位
+     */
+    @Excel(name = "职位")
+    private String position;
+
+    public String getWordId() {
+        return wordId;
+    }
+
+    public void setWordId(String wordId) {
+        this.wordId = wordId;
+    }
+
+    public String getPosition() {
+        return position;
+    }
+
+    public void setPosition(String position) {
+        this.position = position;
+    }
+
     public Long getBkhdxId() {
         return bkhdxId;
     }
diff --git a/ruoyi-kaohe/src/main/resources/mapper/kaohe/KhPingceMapper.xml b/ruoyi-kaohe/src/main/resources/mapper/kaohe/KhPingceMapper.xml
index 18f9669..cedabb2 100644
--- a/ruoyi-kaohe/src/main/resources/mapper/kaohe/KhPingceMapper.xml
+++ b/ruoyi-kaohe/src/main/resources/mapper/kaohe/KhPingceMapper.xml
@@ -33,6 +33,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="bkhdxName"    column="bkhdx_name"  />
         <result property="deptId"    column="dept_id"  />
         <result property="deptName"    column="dept_name"  />
+        <result property="wordId"    column="word_id"  />
+        <result property="position"    column="position"  />
     </resultMap>
 
     <sql id="selectKhPingceVo">
@@ -52,7 +54,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="getBkhdxs"  resultMap="BkhdxsResult">
-        select bkhdx_id,bkhdx_name,dept_id,dept_name from kh_pc_emp pe
+        select pe.bkhdx_id,pe.bkhdx_name,pe.dept_id,pe.dept_name,word_id,`position` from kh_pc_emp pe,kh_employee
         <where>
             <if test="id != null ">  pe.pc_id = #{id}</if>
         </where>