矿产资源

src/main/java/com/sooka/sponest/data/digitalresource/mapper/DigitalResourcesBigDataMapper.java

@@ -22,7 +22,7 @@ public interface DigitalResourcesBigDataMapper {
      * @param centerdataTResourcesDeposit
      * @return
      */
-    List<CenterdataTResourcesDeposit> selectDepositResourcesCount(CenterdataTResourcesDeposit centerdataTResourcesDeposit);
+    List<Map<String, Object>> selectDepositResourcesCount(CenterdataTResourcesDeposit centerdataTResourcesDeposit);
 
     /**
      * 数字资源远端调用/综合信息

src/main/java/com/sooka/sponest/data/digitalresource/service/IResourceBigDataService.java

@@ -23,7 +23,7 @@ public interface IResourceBigDataService extends IBaseService {
      * @param centerdataTResourcesDeposit
      * @return
      */
-    List<CenterdataTResourcesDeposit> selectDepositResourcesCount(CenterdataTResourcesDeposit centerdataTResourcesDeposit);
+    List<Map<String, Object>> selectDepositResourcesCount(CenterdataTResourcesDeposit centerdataTResourcesDeposit);
 
     /**
      * 数字资源远端调用/综合信息

src/main/java/com/sooka/sponest/data/digitalresource/service/impl/ResourceBigDataServiceImpl.java

@@ -42,9 +42,10 @@ public class ResourceBigDataServiceImpl extends BaseServiceImpl implements IReso
      */
     @DataScopeMutiDept(deptAlias = "d")
     @Override
-    public List<CenterdataTResourcesDeposit> selectDepositResourcesCount(CenterdataTResourcesDeposit centerdataTResourcesDeposit) {
+    public List<Map<String, Object>> selectDepositResourcesCount(CenterdataTResourcesDeposit centerdataTResourcesDeposit) {
         setSookaDataBase(centerdataTResourcesDeposit);
-        return digitalResourcesBigDataMapper.selectDepositResourcesCount(centerdataTResourcesDeposit);
+        List<Map<String, Object>> mapList = digitalResourcesBigDataMapper.selectDepositResourcesCount(centerdataTResourcesDeposit);
+        return deptLevelUtil.getDeptLevel(mapList,String.valueOf(centerdataTResourcesDeposit.getDeptId()));
     }
 
     /**

src/main/resources/mapper/digitalresource/DigitalResourcesBigDataMapper.xml

@@ -164,49 +164,13 @@
     <select id="selectDepositResourcesCount" parameterType="CenterdataTResourcesDeposit"
             resultType="java.util.Map">
         SELECT
-            '双辽市' name ,
+            d.dept_id as deptId,
+            d.ancestors,
             count( a.id ) value
         FROM
             centerdata_t_resources_deposit a
             LEFT JOIN ${database_system}.sys_dept d ON a.dept_id = d.dept_id
-        WHERE
-            a.dept_id =369 or FIND_IN_SET( "369", d.ancestors )
-        UNION ALL
-        SELECT
-            '伊通县' name,
-            count( a.id ) value
-        FROM
-            centerdata_t_resources_deposit a
-            LEFT JOIN ${database_system}.sys_dept d ON a.dept_id = d.dept_id
-        WHERE
-            a.dept_id =370 or FIND_IN_SET( "370", d.ancestors )
-        UNION ALL
-        SELECT
-            '梨树县' name,
-            count( a.id ) value
-        FROM
-            centerdata_t_resources_deposit a
-            LEFT JOIN ${database_system}.sys_dept d ON a.dept_id = d.dept_id
-        WHERE
-            a.dept_id =371 or FIND_IN_SET( "371", d.ancestors )
-        UNION ALL
-        SELECT
-            '铁东区' name,
-            count( a.id ) value
-        FROM
-            centerdata_t_resources_deposit a
-            LEFT JOIN ${database_system}.sys_dept d ON a.dept_id = d.dept_id
-        WHERE
-            a.dept_id =372 or FIND_IN_SET( "372", d.ancestors )
-        UNION ALL
-        SELECT
-            '铁西区' name,
-            count( a.id ) value
-        FROM
-            centerdata_t_resources_deposit a
-            LEFT JOIN ${database_system}.sys_dept d ON a.dept_id = d.dept_id
-        WHERE
-            a.dept_id =373 or FIND_IN_SET( "373", d.ancestors )
+        GROUP BY a.id
     </select>
 
     <parameterMap id="pm_VisuForestCloudMapVO"