diff --git a/src/main/java/com/zhgd/xmgl/modules/project/mapper/xml/ProjectMapper.xml b/src/main/java/com/zhgd/xmgl/modules/project/mapper/xml/ProjectMapper.xml
index 82d5ff328..b5fcd5b96 100644
--- a/src/main/java/com/zhgd/xmgl/modules/project/mapper/xml/ProjectMapper.xml
+++ b/src/main/java/com/zhgd/xmgl/modules/project/mapper/xml/ProjectMapper.xml
@@ -85,7 +85,8 @@
ex.contract_period_end_time ,ex.contract_period_start_time), 4 )),
0
) * 100,
- 2) period_ratio
+ 2) period_ratio,
+ ex.owner_unit
FROM project a
INNER JOIN company b ON a.company_sn = b.company_sn
LEFT JOIN system_provinces c ON a.provinces_code = c.provinceid
diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/entity/vo/PersonTypeAndEduStatisticsVo.java b/src/main/java/com/zhgd/xmgl/modules/worker/entity/vo/PersonTypeAndEduStatisticsVo.java
index eca2ffbf5..43bca8c47 100644
--- a/src/main/java/com/zhgd/xmgl/modules/worker/entity/vo/PersonTypeAndEduStatisticsVo.java
+++ b/src/main/java/com/zhgd/xmgl/modules/worker/entity/vo/PersonTypeAndEduStatisticsVo.java
@@ -48,7 +48,7 @@ public class PersonTypeAndEduStatisticsVo {
private String totalPerson;
@ApiModelProperty(value = "考勤日环比%")
private Double totalPersonRhbRatio;
-
+ private Integer lwExitPersonTotal;
}
@Data
diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/WorkerInfoMapper.xml b/src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/WorkerInfoMapper.xml
index 95aafcd34..ed1fff39f 100644
--- a/src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/WorkerInfoMapper.xml
+++ b/src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/WorkerInfoMapper.xml
@@ -1038,9 +1038,11 @@
select COUNT(1) totalPerson,
IFNULL(sum((CASE WHEN tp.person_type = 1 then 1 ELSE 0 END)), 0) lwPersonTotal,
IFNULL(sum((CASE WHEN tp.person_type = 2 then 1 ELSE 0 END)), 0) glPersonTotal,
- IFNULL(sum((CASE WHEN tp.person_type = 3 then 1 ELSE 0 END)), 0) lsPersonTotal
+ IFNULL(sum((CASE WHEN tp.person_type = 3 then 1 ELSE 0 END)), 0) lsPersonTotal,
+ IFNULL(sum(if(tp.person_type = 1 and exitNum>0,1,0)), 0) lwExitPersonTotal
from
- (SELECT DISTINCT w1.*
+ (SELECT w1.*,
+ ifnull(sum(if(p.pass_type=2,1,0)),0) as exitNum
from worker_info w1
INNER JOIN worker_attendance p ON w1.person_sn = p.person_sn
@@ -1070,6 +1072,7 @@
and FIND_IN_SET(w1.enterprise_id, #{userEnterpriseId})
+ group by w1.id
) tp