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/mapper/xml/WorkerInfoMapper.xml b/src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/WorkerInfoMapper.xml index e3e70b44b..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,7 +1038,8 @@ 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 w1.*, ifnull(sum(if(p.pass_type=2,1,0)),0) as exitNum @@ -1078,8 +1079,7 @@ 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(if(tp.person_type = 1 and exitNum>0,1,0)), 0) lwExitPersonTotal + IFNULL(sum((CASE WHEN tp.person_type = 3 then 1 ELSE 0 END)), 0) lsPersonTotal from (SELECT DISTINCT w1.* from worker_info w1