重点防火地块 植树造林数据中台权限

src/main/java/com/sooka/sponest/data/digitalforest/mapper/ForestBigDataMapper.java

@@ -50,8 +50,6 @@ public interface ForestBigDataMapper {
 
     List<GridUserGwCount> selectCqpm();
 
-    CenterdataTForestPlanTj selectCenterdataTForestPlanHz();
-
     List<Map<String, Object>> queryTaskArea(CenterdataTAfforestationTask centerdataTAfforestationTask);
 
 

src/main/java/com/sooka/sponest/data/digitalforest/service/impl/ForestBigDataServiceImpl.java

@@ -173,6 +173,7 @@ public class ForestBigDataServiceImpl extends BaseServiceImpl implements IForest
     }
 
     @Override
+    @DataScopeMutiDept(deptAlias = "d")
     public List<Map<String, Object>> selectCenterdataTForestPlanHz(CenterdataTAfforestationTask centerdataTAfforestationTask) {
         setSookaDataBase(centerdataTAfforestationTask);
         List<Map<String,Object>> list = forestBigDataMapper.queryTaskArea(centerdataTAfforestationTask);

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

@@ -191,13 +191,6 @@
         limit 5
     </select>
 
-    <select id="selectCenterdataTForestPlanHz"
-            resultType="com.sooka.sponest.data.digitalforest.domain.bo.CenterdataTForestPlanTj">
-        select  a.*  ,b.totalarea from (select  SUM(CASE WHEN plan_last_time>=plan_end_time THEN 1 ELSE 0 END)  totalywc, SUM(CASE WHEN plan_last_time>plan_start_time and plan_last_time&lt; plan_end_time THEN 1 ELSE 0 END)  totaljxz,
-                                                SUM(CASE WHEN plan_last_time&lt; plan_start_time THEN 1 ELSE 0 END)  totalwks,count(id)  total
-        from centerdata_t_forest_plan ) a, (select sum(area) as totalarea  from centerdata_t_forest_afforestationarea) b
-    </select>
-
     <select id="queryTaskArea" resultType="map">
         SELECT
             d.ancestors,
@@ -209,6 +202,9 @@
             centerdata_t_afforestation_task a
         LEFT JOIN
             ${database_system}.sys_dept d ON d.dept_id = a.dept_id
+        <where>
+            ${params.dataScope}
+        </where>
         GROUP BY
             a.dept_id, d.ancestors;
 
@@ -246,6 +242,9 @@
     FROM
     `centerdata_t_forest_keyfireproofplots` a
     LEFT JOIN ${database_system}.sys_dept d ON a.dept_id = d.dept_id
+        <where>
+            ${params.dataScope}
+        </where>
     GROUP BY
     d.ancestors, a.dept_id;
     </select>