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

增加人员定位统计

Browse Source
This commit is contained in:
pengjie 2024-09-05 11:36:03 +08:00
parent fcb45af0ea
commit 7969ec5309
2 changed files with 4 additions and 1 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

@ -325,6 +325,7 @@
, IFNULL(sum(IFNULL(en.environment_dev_num, 0)), 0) environmentDevNum , IFNULL(sum(IFNULL(en.environment_dev_num, 0)), 0) environmentDevNum
, IFNULL(sum(IFNULL(tow.tower_dev_num, 0)), 0) towerDevNum , IFNULL(sum(IFNULL(tow.tower_dev_num, 0)), 0) towerDevNum
, IFNULL(sum(IFNULL(lf.lifter_dev_num, 0)), 0) lifterDevNum , IFNULL(sum(IFNULL(lf.lifter_dev_num, 0)), 0) lifterDevNum
, IFNULL(sum(IFNULL(hat.hat_dev_num, 0)), 0) hatDevNum
FROM project a FROM project a
INNER JOIN company cp ON a.company_sn = cp.company_sn INNER JOIN company cp ON a.company_sn = cp.company_sn
INNER JOIN company b ON cp.parent_id = b.company_id INNER JOIN company b ON cp.parent_id = b.company_id
@ -342,6 +343,8 @@
a.project_sn = tow.project_sn a.project_sn = tow.project_sn
LEFT JOIN (SELECT project_sn, COUNT(1) lifter_dev_num from lifter GROUP BY project_sn) lf ON LEFT JOIN (SELECT project_sn, COUNT(1) lifter_dev_num from lifter GROUP BY project_sn) lf ON
a.project_sn = lf.project_sn a.project_sn = lf.project_sn
LEFT JOIN (SELECT project_sn, COUNT(1) hat_dev_num from safety_hat_dev GROUP BY project_sn) hat ON
a.project_sn = hat.project_sn
Left JOIN company f ON b.parent_id = f.company_id Left JOIN company f ON b.parent_id = f.company_id
<where> <where>
<if test="companyType == '1'.toString()"> <if test="companyType == '1'.toString()">

2
src/main/java/com/zhgd/xmgl/modules/project/service/impl/ProjectDevStatisticsServiceImpl.java
View File

@ -141,7 +141,7 @@ public class ProjectDevStatisticsServiceImpl extends ServiceImpl<ProjectDevStati
environmentList.add(map2); environmentList.add(map2);
} }
Map<String, Object> map3 = hatMap.get(dateStr); Map<String, Object> map3 = hatMap.get(dateStr);
if (map == null) { if (map3 == null) {
Map<String, Object> m = new HashMap<>(16); Map<String, Object> m = new HashMap<>(16);
m.put(queryTime, dateStr); m.put(queryTime, dateStr);
m.put(devNum, 0); m.put(devNum, 0);