Merge remote-tracking branch 'origin/main'

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

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;
     }

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,9 +54,10 @@ 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,emp.word_id,emp.`position` from kh_pc_emp pe,kh_employee emp
         <where>
             <if test="id != null ">  pe.pc_id = #{id}</if>
+            and pe.bkhdx_id = emp.id
         </where>
     </select>