重点防火地块 植树造林数据中台修改

src/main/resources/mapper/digitalforest/ForestBigDataMapper.xml

@@ -199,13 +199,19 @@
     </select>
 
     <select id="queryTaskArea" resultType="map">
-        SELECT d.ancestors ,a.dept_id deptId,
-       SUM(CASE WHEN task_status = 1 THEN 1 ELSE 0 END) AS begin,
-       SUM(CASE WHEN task_status = 2 THEN 1 ELSE 0 END) AS notbegin,
-       SUM(CASE WHEN task_status = 3 THEN 1 ELSE 0 END) AS success
-       FROM centerdata_t_afforestation_task a
-       LEFT JOIN ${database_system}.sys_dept d ON d.dept_id = a.dept_id
-       GROUP BY a.dept_id
+        SELECT
+            d.ancestors,
+            a.dept_id AS deptId,
+        SUM(CASE WHEN task_status = 1 THEN area ELSE 0 END) AS begin,
+        SUM(CASE WHEN task_status = 2 THEN area ELSE 0 END) AS notbegin,
+        SUM(CASE WHEN task_status = 3 THEN area ELSE 0 END) AS success
+        FROM
+            centerdata_t_afforestation_task a
+        LEFT JOIN
+            ${database_system}.sys_dept d ON d.dept_id = a.dept_id
+        GROUP BY
+            a.dept_id, d.ancestors;
+
     </select>
 
     <select id="linLeaderCount" resultType="map">
@@ -232,14 +238,16 @@
 
 
     <select id="focusOnFire" resultType="map">
-        SELECT d.ancestors,
-       a.dept_id AS deptId,
-       COALESCE(MAX(CASE WHEN a.forest_species = 'dominant_tree_species0' THEN a.plots_area END), 0) AS dominant_tree_species0,
-       COALESCE(MAX(CASE WHEN a.forest_species = 'dominant_tree_species1' THEN a.plots_area END), 0) AS dominant_tree_species1
-       FROM centerdata_t_forest_keyfireproofplots a
-       LEFT JOIN ${database_system}.sys_dept d ON d.dept_id = a.dept_id
-       WHERE a.forest_species IN ('dominant_tree_species0', 'dominant_tree_species1')
-       GROUP BY d.ancestors, a.dept_id;
+    SELECT
+    COALESCE(SUM(a.plots_area), 0) AS area,
+    COUNT(DISTINCT a.forest_species) AS species,
+    d.ancestors,
+    a.dept_id AS deptId
+    FROM
+    `centerdata_t_forest_keyfireproofplots` a
+    LEFT JOIN ${database_system}.sys_dept d ON a.dept_id = d.dept_id
+    GROUP BY
+    d.ancestors, a.dept_id;
     </select>
 
     <select id="selectResourcesAreaCount" resultType="java.util.Map">