admin/wisdomisite-java
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/wangcheng' into wangcheng

Browse Source
This commit is contained in:
guoshengxiong 2024-09-14 13:37:44 +08:00
commit 4efbc8f59f
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/zhgd/xmgl/modules/project/mapper/xml/ProjectMapper.xml
View File

@ -85,7 +85,8 @@
ex.contract_period_end_time ,ex.contract_period_start_time), 4 )), ex.contract_period_end_time ,ex.contract_period_start_time), 4 )),
0 0
) * 100, ) * 100,
2) period_ratio 2) period_ratio,
ex.owner_unit
FROM project a FROM project a
INNER JOIN company b ON a.company_sn = b.company_sn INNER JOIN company b ON a.company_sn = b.company_sn
LEFT JOIN system_provinces c ON a.provinces_code = c.provinceid LEFT JOIN system_provinces c ON a.provinces_code = c.provinceid

2
src/main/java/com/zhgd/xmgl/modules/worker/entity/vo/PersonTypeAndEduStatisticsVo.java
View File

@ -48,7 +48,7 @@ public class PersonTypeAndEduStatisticsVo {
private String totalPerson; private String totalPerson;
@ApiModelProperty(value = "考勤日环比%") @ApiModelProperty(value = "考勤日环比%")
private Double totalPersonRhbRatio; private Double totalPersonRhbRatio;
private Integer lwExitPersonTotal;
} }
@Data @Data

7
src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/WorkerInfoMapper.xml
View File

@ -1038,9 +1038,11 @@
select COUNT(1) totalPerson, 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 = 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 = 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 from
(SELECT DISTINCT w1.* (SELECT w1.*,
ifnull(sum(if(p.pass_type=2,1,0)),0) as exitNum
from worker_info w1 from worker_info w1
INNER JOIN worker_attendance p ON w1.person_sn = p.person_sn INNER JOIN worker_attendance p ON w1.person_sn = p.person_sn
<where> <where>
@ -1070,6 +1072,7 @@
and FIND_IN_SET(w1.enterprise_id, #{userEnterpriseId}) and FIND_IN_SET(w1.enterprise_id, #{userEnterpriseId})
</if> </if>
</where> </where>
group by w1.id
) tp ) tp
</select> </select>
<select id="selectYesterdayAttendanceWorkerPersonTypeTotal" resultType="java.util.Map"> <select id="selectYesterdayAttendanceWorkerPersonTypeTotal" resultType="java.util.Map">