From 97630b2f6fe445f05d2e5e9e1e0dc8102035dd7c Mon Sep 17 00:00:00 2001
From: 孔祥富 <kongxf@daryun.com>
Date: 星期一, 08 三月 2021 19:20:10 +0800
Subject: [PATCH] 提交

---
 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpBaseInfoMapper.xml             |    4 ++--
 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBaseInfoServiceImpl.java |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpBaseInfoMapper.xml b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpBaseInfoMapper.xml
index 958b05e..8e7c98f 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpBaseInfoMapper.xml
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpBaseInfoMapper.xml
@@ -47,8 +47,8 @@
     <select id="countBaseInfoList" resultType="java.util.Map">
         SELECT
             count(1) zzyg,
-            count(IF(t.empType = '1', 1, NULL)) zsyg,
-            count(IF(t.empType = '2', 1, NULL)) lsyg,
+            count(IF(t.empType = '01', 1, NULL)) zsyg,
+            count(IF(t.empType = '02', 1, NULL)) lsyg,
         count( if(t.sex is not null and t.age !=0 and t.sex=1 and t.age&gt;=${manOld},1,null))+count( if(t.sex is not null and t.age !=0 and t.sex=2 and t.age&gt;=${womanOld},1,null)) clyg
         FROM
             t_emp_baseinfo t where 1=1 and t.delFlag=0 and t.empStatus = 0
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBaseInfoServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBaseInfoServiceImpl.java
index c85c989..32fd543 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBaseInfoServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBaseInfoServiceImpl.java
@@ -715,7 +715,7 @@
         }
 
         //离职员工总数
-        Integer empStatus = this.baseMapper.selectCount(new QueryWrapper<EmpBaseInfo>().eq("empStatus", 1));
+        Integer empStatus = this.baseMapper.selectCount(new QueryWrapper<EmpBaseInfo>().eq("delFlag", 0).eq("empStatus", 1));
         if (empStatus != null) {
             stringObjectMap.put("lzyg", empStatus);
         }

--
Gitblit v1.8.0