From fda3f979616e3c5e26993ec7033900cd188ea296 Mon Sep 17 00:00:00 2001
From: 孔祥富 <kongxf@daryun.com>
Date: 星期四, 11 三月 2021 09:38:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpAccessoryMapper.xml | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpAccessoryMapper.xml b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpAccessoryMapper.xml
index e2ea815..db78ee4 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpAccessoryMapper.xml
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpAccessoryMapper.xml
@@ -13,8 +13,8 @@
FROM t_label label where label.delFlag = 0 order by label.sort)) as querySql
</select>
<select id="selectPageVo" resultType="java.util.Map">
- select a.delFlag,a.empName,a.empStatus,a.empId,a.empNumb,a.age,a.archivesStatus,a.sex,a.insuranceType,a.politics,a.education,a.entryDate,a.certificateNumb,
- (select dept_Name from t_dept as dept where dept.dept_Id= a.deptId) as deptName,a.jobName ${sql} from t_emp_baseinfo a
+ select a.delFlag,a.empName,a.empStatus,a.empId,a.certificateNumb,a.empNumb,
+ (select dept_Name from t_dept as dept where dept.dept_Id= a.deptId) as deptName,a.jobName from t_emp_baseinfo a
inner join t_dept c on a.deptId = c.DEPT_ID
${ew.customSqlSegment}
</select>
@@ -22,4 +22,8 @@
<select id="getDictType" resultType="cc.mrbird.febs.common.core.entity.system.DicItem">
select * from t_dicitem where dicCode=#{type}
</select>
+ <select id="getEmpAccessoryNumber" resultType="java.util.Map">
+ select a.labelCode,(select count(1) from t_emp_accessory b
+ where b.empId = ${empId} and b.delFlag = 0 and b.labelId = a.labelId) as number from t_label a where delFlag = 0
+ </select>
</mapper>
--
Gitblit v1.8.0