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..e3e70b44b 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 @@ -1040,7 +1040,8 @@ 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 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,13 +1071,15 @@ and FIND_IN_SET(w1.enterprise_id, #{userEnterpriseId}) + group by w1.id ) tp