消防 应急 中台sql变化

src/main/resources/mapper/digitalemergency/EmergencyBigDataMapper.xml

@@ -59,7 +59,7 @@
             dict.dict_label AS name,
             COUNT( a.id ) AS value
         FROM
-            onest_data.centerdata_t_emergency_material a
+            centerdata_t_emergency_material a
             RIGHT JOIN ${database_system}.sys_dict_data dict ON dict.dict_type = 'emergency_material_type'
             AND dict.dict_value = a.material_type
         WHERE

src/main/resources/mapper/digitalfirecontrol/FireControlBigDataMapper.xml

@@ -101,11 +101,17 @@
     </select>
     <select id="selectBigDataFirecontrolFoamLiquidDeptCount" parameterType="CenterdataTFirecontrolFoamLiquid"
             resultType="java.util.Map">
-        select d.ancestors ancestors,a.dept_id deptId,count(a.id) num
-        from centerdata_t_firecontrol_foam_liquid a
-        left join ${database_system}.sys_dept d on d.dept_id = a.dept_id
-        where 1=1  ${params.dataScope}
-        group by a.dept_id
+        SELECT
+	    d.ancestors AS ancestors,
+	    a.dept_id AS deptId,
+	    SUM( a.reserves ) AS reserves
+        FROM
+	    centerdata_t_firecontrol_foam_liquid a
+	    LEFT JOIN ${database_system}.sys_dept d ON d.dept_id = a.dept_id
+        WHERE 1 = 1 ${params.dataScope}
+        GROUP BY
+	    a.dept_id,
+	    d.ancestors;
     </select>
 
     <select id="getbasiclinkageforeList" parameterType="CenterdataTFirecontrolBasicLinkageForce"