From 4e52cb2253af9a22571c7d0c239ee283178d2fd4 Mon Sep 17 00:00:00 2001
From: 孔祥富 <kongxf@daryun.com>
Date: 星期一, 08 三月 2021 10:05:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpJobChangeMapper.xml |   12 ++++++++++++
 1 files changed, 12 insertions(+), 0 deletions(-)

diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpJobChangeMapper.xml b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpJobChangeMapper.xml
index b43c997..a734f8c 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpJobChangeMapper.xml
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpJobChangeMapper.xml
@@ -2,4 +2,16 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="cc.mrbird.febs.server.hr.mapper.EmpJobChangeMapper">
 
+    <select id="selectPageVo" resultType="java.util.Map">
+        select a.*,b.empNumb,b.certificateNumb from t_emp_jobchange a
+        inner join t_emp_baseinfo b on a.empId = b.empId
+        inner join t_dept c on b.deptId = c.DEPT_ID
+        ${ew.customSqlSegment}
+    </select>
+    <select id="selectPageVoBean" resultType="cc.mrbird.febs.server.hr.entity.EmpJobChange">
+           select a.*,b.empNumb,b.certificateNumb from t_emp_jobchange a
+        inner join t_emp_baseinfo b on a.empId = b.empId
+        inner join t_dept c on b.deptId = c.DEPT_ID
+        ${ew.customSqlSegment}
+    </select>
 </mapper>

--
Gitblit v1.8.0