1.大屏-监管-业务办理时效新开发原有开发错误为了数量

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

@@ -1057,11 +1057,4 @@
         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="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
-        </foreach>
-    </select>
 </mapper>

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 → amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-api/src/main/java/com/yeejoin/amos/boot/module/statistics/api/mapper/JGStatisticsMapper.java

-package com.yeejoin.amos.boot.module.jg.api.mapper;
+package com.yeejoin.amos.boot.module.statistics.api.mapper;
 
+import com.yeejoin.amos.boot.biz.common.dto.CountDto;
 import com.yeejoin.amos.boot.module.common.api.dto.DPFilterParamDto;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 import java.util.Map;
 
-public interface DPStatisticsMapper {
+public interface JGStatisticsMapper {
 
     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);
+    List<Map<String, Object>> installEquCount(@Param("cityCode") String cityCode, @Param("startTime") String startTime);
 
-    List<Map<String, Object>> maintenanceEquCount(@Param("cityCode") String cityCode,@Param("startTime") String startTime);
+    List<Map<String, Object>> maintenanceEquCount(@Param("cityCode") String cityCode, @Param("startTime") String startTime);
 
-    List<Map<String, Object>> reformEquCount(@Param("cityCode") String cityCode,@Param("startTime") String startTime);
+    List<Map<String, Object>> reformEquCount(@Param("cityCode") String cityCode, @Param("startTime") String startTime);
 
-    List<Map<String, Object>> transferEquCount(@Param("cityCode") String cityCode,@Param("startTime") String startTime);
+    List<Map<String, Object>> transferEquCount(@Param("cityCode") String cityCode, @Param("startTime") String startTime);
 
 
 
-    List<Map<String, Object>> useEquCount(@Param("cityCode") String cityCode,@Param("startTime") String startTime);
+    List<Map<String, Object>> useEquCount(@Param("cityCode") String cityCode, @Param("startTime") String startTime);
 
-    List<Map<String, Object>> changeReformEquCount(@Param("cityCode") String cityCode,@Param("startTime") String startTime);
+    List<Map<String, Object>> changeReformEquCount(@Param("cityCode") String cityCode, @Param("startTime") String startTime);
 
-    List<Map<String, Object>> changeTransferEquCount(@Param("cityCode") String cityCode,@Param("startTime") String startTime);
+    List<Map<String, Object>> changeTransferEquCount(@Param("cityCode") String cityCode, @Param("startTime") String startTime);
 
-    List<Map<String, Object>> changeUnitEquCount(@Param("cityCode") String cityCode,@Param("startTime") String startTime);
+    List<Map<String, Object>> changeUnitEquCount(@Param("cityCode") String cityCode, @Param("startTime") String startTime);
 
-    List<Map<String, Object>> vehicleEquCount(@Param("cityCode") String cityCode,@Param("startTime") String startTime);
+    List<Map<String, Object>> vehicleEquCount(@Param("cityCode") String cityCode, @Param("startTime") String startTime);
 
     List<Map<String, Object>> newRegEquCountByMonth(@Param("cityCode") String cityCode);
 
@@ -40,32 +41,8 @@ public interface DPStatisticsMapper {
     List<Map<String, Object>> newVehicleEquCountByYear(@Param("cityCode") String cityCode);
 
     String newVehicleCountByYear(@Param("cityCode") String cityCode);
-    String newVehicleCountByMonth(@Param("cityCode") String cityCode);
-    List<Map<String, Object>> installCountByOrgCodes(@Param("orgCodes") List<String> orgCodes);
-
-    List<Map<String, Object>> maintenanceNoticeCountByOrgCodes(@Param("orgCodes") List<String> orgCodes);
-
-    List<Map<String, Object>> reformCountByOrgCodes(@Param("orgCodes") List<String> orgCodes);
-
-    List<Map<String, Object>> transferCountByOrgCodes(@Param("orgCodes") List<String> orgCodes);
-
-    List<Map<String, Object>> useCountByOrgCodes(@Param("orgCodes") List<String> orgCodes);
-
-    List<Map<String, Object>> vehicleCountByOrgCodes(@Param("orgCodes") List<String> orgCodes);
-
-    List<Map<String, Object>> changeNameCountByOrgCodes(@Param("orgCodes") List<String> orgCodes);
-
-    List<Map<String, Object>> changeReformCountByOrgCodes(@Param("orgCodes") List<String> orgCodes);
-
-    List<Map<String, Object>> changeTransferCountByOrgCodes(@Param("orgCodes") List<String> orgCodes);
 
-    List<Map<String, Object>> changeUnitCountByOrgCodes(@Param("orgCodes") List<String> orgCodes);
-
-    List<Map<String, Object>> changeVehicleCountByOrgCodes(@Param("orgCodes") List<String> orgCodes);
-
-    List<Map<String, Object>> disableCountByOrgCodes(@Param("orgCodes") List<String> orgCodes);
-
-    List<Map<String, Object>> cancelCountByOrgCodes(@Param("orgCodes") List<String> orgCodes);
+    String newVehicleCountByMonth(@Param("cityCode") String cityCode);
 
     long certificateCountByOrgCode(@Param("orgCode") String orgCode);
 
@@ -80,4 +57,14 @@ public interface DPStatisticsMapper {
     List<Map<String, Object>> selectNoticeList(@Param("orgCode") String orgCode, @Param("time") String time);
 
     List<Map<String, Object>> selectNoticeCountTopTen(@Param("orgCode") String orgCode, @Param("time") String time);
+
+    List<CountDto> queryNoticeAvgDayByReceiveCompany(@Param("dto") DPFilterParamDto dpFilterParamDto,@Param("orgCode") String orgCode);
+
+    List<CountDto> queryUseAvgDayByReceiveCompany(@Param("dto") DPFilterParamDto dpFilterParamDto, @Param("orgCode") String orgCode);
+
+    List<CountDto> queryChangeAvgDayByReceiveCompany(@Param("dto") DPFilterParamDto dpFilterParamDto, @Param("orgCode")  String orgCode);
+
+    List<CountDto> queryDisableAvgDayByReceiveCompany(DPFilterParamDto dpFilterParamDto, String orgCode);
+
+    List<CountDto> queryCancelAvgDayByReceiveCompany(DPFilterParamDto dpFilterParamDto, String orgCode);
 }

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/controller/JGDPStatisticsController.java

@@ -247,6 +247,7 @@ public class JGDPStatisticsController {
         }
         return ResponseHelper.buildResponse(statisticsService.dataStatisticCountByReginCode(dpFilterParamDto));
     }
+
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "POST", value = "监管大屏-中间地图左右两侧8大类、单位、人员数量全局统计", notes = "大屏总览中间-地图左右两侧8大类、单位、人员数量全局统计")
     @PostMapping(value = "/centre/dataStatistic")