From 7969ec5309612851733604fdccc012edaff46128 Mon Sep 17 00:00:00 2001
From: pengjie <17373303529@163.com>
Date: Thu, 5 Sep 2024 11:36:03 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=BA=E5=91=98=E5=AE=9A?=
 =?UTF-8?q?=E4=BD=8D=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/zhgd/xmgl/modules/project/mapper/xml/ProjectMapper.xml | 3 +++
 .../project/service/impl/ProjectDevStatisticsServiceImpl.java  | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

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..994bcf9fa 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
@@ -325,6 +325,7 @@
              , IFNULL(sum(IFNULL(en.environment_dev_num, 0)), 0) environmentDevNum
              , IFNULL(sum(IFNULL(tow.tower_dev_num, 0)), 0)      towerDevNum
              , IFNULL(sum(IFNULL(lf.lifter_dev_num, 0)), 0)      lifterDevNum
+             , IFNULL(sum(IFNULL(hat.hat_dev_num, 0)), 0)      hatDevNum
         FROM project a
                  INNER JOIN company cp ON a.company_sn = cp.company_sn
                  INNER JOIN company b ON cp.parent_id = b.company_id
@@ -342,6 +343,8 @@
             a.project_sn = tow.project_sn
                  LEFT JOIN (SELECT project_sn, COUNT(1) lifter_dev_num from lifter GROUP BY project_sn) lf ON
             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
         <where>
             <if test="companyType == '1'.toString()">
diff --git a/src/main/java/com/zhgd/xmgl/modules/project/service/impl/ProjectDevStatisticsServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/project/service/impl/ProjectDevStatisticsServiceImpl.java
index df1ea66f4..a1fcfa80e 100644
--- a/src/main/java/com/zhgd/xmgl/modules/project/service/impl/ProjectDevStatisticsServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/project/service/impl/ProjectDevStatisticsServiceImpl.java
@@ -141,7 +141,7 @@ public class ProjectDevStatisticsServiceImpl extends ServiceImpl<ProjectDevStati
                 environmentList.add(map2);
             }
             Map<String, Object> map3 = hatMap.get(dateStr);
-            if (map == null) {
+            if (map3 == null) {
                 Map<String, Object> m = new HashMap<>(16);
                 m.put(queryTime, dateStr);
                 m.put(devNum, 0);