修改统计接口

amos-boot-system-equip/src/main/resources/mapper/MaintenanceResourceDataMapper.xml

@@ -252,7 +252,17 @@
         m.maintenance_company_name,
         m.owner_unit_id,
         m.owner_unit_name,
-        m.fire_fight_sys_id,
+
+        <choose>
+            <when  test="fireFightSysId != null and fireFightSysId != '' ">
+                m.fire_fight_sys_id,
+            </when>
+            <otherwise>
+                '' as fire_fight_sys_id,
+            </otherwise>
+        </choose>
+
+
         m.fire_fight_sys_name,
         m.classify_id,
         m.classify_name,
@@ -279,7 +289,8 @@
             </if>
         </where>
         GROUP BY
-            m.classify_code
+--             m.classify_code
+        m.classify_id
     </select>
     <select id="getFireFacilityPage" resultType="com.yeejoin.equipmanage.common.dto.MaintenanceResourceDataDto">
         SELECT
@@ -316,7 +327,7 @@
             <if test="ownerUnitId != null">
                 AND m.owner_unit_id = #{ownerUnitId}
             </if>
-            <if test="fireFightSysId != null">
+            <if test="fireFightSysId != null and fireFightSysId != '' ">
                 AND m.fire_fight_sys_id = #{fireFightSysId}
             </if>
             <if test="classifyId != null">