监管大屏代码提交

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/mapper/CommonMapper.java

@@ -133,6 +133,6 @@ public interface CommonMapper extends BaseMapper<EquipmentCategory> {
      */
     List<Long> countAllInFlowingForDPNoFinishedBizData(@Param("orgCode")String orgCode, @Param("dto") DPFilterParamDto dpFilterParamDto);
 
-    List<Map<String, String>> getOrgCodeByCompanyCodes(@Param("regionCodes") List<Integer> regionCodes);
+    List<Map<String, String>> getOrgCodesByCompanyCodes(@Param("regionCodes") List<Integer> regionCodes);
 }
 

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/mapper/DPStatisticsMapper.java

@@ -8,8 +8,8 @@ import java.util.Map;
 
 public interface DPStatisticsMapper {
 
-    List<Map<String, Object>> maintenanceCountTopTen(@Param("dpFilterParamDto") DPFilterParamDto dpFilterParamDto);
-    List<Map<String, Object>> maintenanceCount(@Param("dpFilterParamDto") DPFilterParamDto dpFilterParamDto);
+    List<Map<String, Object>> maintenanceCountTopTen(@Param("dpFilterParamDto") DPFilterParamDto dpFilterParamDto, @Param("regionCodeList") List<Integer> regionCodeList);
+    List<Map<String, Object>> maintenanceCount(@Param("dpFilterParamDto") DPFilterParamDto dpFilterParamDto, @Param("regionCodeList") List<Integer> regionCodeList);
 
     List<Map<String, Object>> installEquCount(@Param("cityCode") String cityCode,@Param("startTime") String startTime);
 

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/CommonMapper.xml

@@ -1036,9 +1036,8 @@
         union all
         select count(1) from tzs_jg_scrap_cancel a, privilege_company b where a.receive_org_code= b.company_code and b.org_code like CONCAT(#{orgCode}, '%') and a.audit_status != '使用单位待提交' and a.audit_status  != '使用单位已撤回' and a.audit_status  != '已作废' and a.audit_status  != '已完成' and date_ge(CAST(a.create_date as date),#{dto.beginDate}) and date_le(CAST(a.create_date as date),#{dto.endDate})
     </select>
-    <select id="getOrgCodeByCompanyCodes" resultType="java.util.Map">
-        select P.org_code AS orgCode,R.region_name AS regionName from privilege_company P
-        INNER JOIN systemctl_region R ON P.company_code = R.region_code
+    <select id="getOrgCodesByCompanyCodes" resultType="java.util.Map">
+        select P.org_code AS orgCode,P.company_code AS companyCode from privilege_company P
         where P.company_code in
         <foreach collection="regionCodes" item="regionCode" separator="," open="(" close=")">
             #{regionCode} :: VARCHAR

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/DPStatisticsMapper.xml

@@ -6,16 +6,18 @@
         SELECT
             COUNT(1),
             pc.company_name AS companyName,
-            sr.region_name AS regionName
+            pc.company_code AS companyCode
         FROM
             privilege_company pc
                 INNER JOIN tz_base_enterprise_info bi ON bi.supervise_org_code LIKE CONCAT ( pc.org_code, '%' )
                 INNER JOIN ( SELECT DISTINCT record, ME_UNIT_CREDIT_CODE FROM idx_biz_jg_maintenance_record_info ) AS jri ON jri.ME_UNIT_CREDIT_CODE = bi.use_unit_code
-                INNER JOIN systemctl_region sr ON pc.company_code = sr.region_code
         WHERE
-                pc.company_code IN ( SELECT region_code :: VARCHAR FROM systemctl_region WHERE parent_region_code = #{dpFilterParamDto.cityCode} )
+                pc.company_code IN
+                <foreach collection="regionCodeList" item="item" open="(" separator="," close=")">
+                    #{item} :: VARCHAR
+                </foreach>
         GROUP BY
-            sr.region_code
+            pc.company_code
         ORDER BY
             COUNT DESC
             LIMIT 10;
@@ -25,16 +27,18 @@
         SELECT
             COUNT(1),
             pc.company_name AS companyName,
-            sr.region_name AS regionName
+            pc.company_code AS companyCode
         FROM
             privilege_company pc
                 INNER JOIN tz_base_enterprise_info bi ON bi.supervise_org_code LIKE CONCAT ( pc.org_code, '%' )
                 INNER JOIN ( SELECT DISTINCT record, ME_UNIT_CREDIT_CODE FROM idx_biz_jg_maintenance_record_info ) AS jri ON jri.ME_UNIT_CREDIT_CODE = bi.use_unit_code
-                INNER JOIN systemctl_region sr ON pc.company_code = sr.region_code
         WHERE
-                pc.company_code IN ( SELECT region_code :: VARCHAR FROM systemctl_region WHERE parent_region_code = #{dpFilterParamDto.cityCode} )
+                pc.company_code IN
+                <foreach collection="regionCodeList" item="item" open="(" separator="," close=")">
+                    #{item} :: VARCHAR
+                </foreach>
         GROUP BY
-            sr.region_code
+        pc.company_code
     </select>
     <select id="installEquCount" resultType="java.util.Map">
         SELECT COUNT