fix(Statistics)：设备认领率统计

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-api/src/main/java/com/yeejoin/amos/boot/module/statistics/api/mapper/ZLStatisticsMapper.java

@@ -16,7 +16,6 @@ import java.util.Map;
 @Mapper
 public interface ZLStatisticsMapper {
 
-
     List<Map<String, Object>> getCompanyInfo(@Param("screenDto") DPFilterParamDto screenDto);
 
     List<Map<String, Object>> testOrg(@Param("screenDto") DPFilterParamDto screenDto);
@@ -34,4 +33,6 @@ public interface ZLStatisticsMapper {
     Long countCompanyForCertDateTemporary(@Param("dto")DPFilterParamDto dpFilterParamDto, @Param("orgCode") String orgCode, @Param("limitDate") String limitDate);
 
     Long getEquipTotal(@Param("cityCode") String cityCode);
+
+    Long getEquListTotal(@Param("field") String field, @Param("cityCode") String cityCode);
 }

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-api/src/main/resources/mapper/ZLStatisticsMapper.xml

@@ -101,6 +101,10 @@
 	<select id="getEquipTotal" resultType="java.lang.Long">
 		select equip_num from tzs_equip_claim_statistics where city_code = #{cityCode}
 	</select>
+
+	<select id="getEquListTotal" resultType="java.lang.Long">
+		select ${field} from tzs_equip_claim_statistics where city_code = #{cityCode}
+	</select>
 </mapper>
 
 

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

 package com.yeejoin.amos.boot.module.statistcs.biz.controller;
 
 import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.module.common.api.dto.DPFilterParamDto;
+import com.yeejoin.amos.boot.module.common.api.dto.DPFilterParamForDetailDto;
 import com.yeejoin.amos.boot.module.statistcs.biz.service.impl.ZLDPStatisticsServiceImpl;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.validation.BindingResult;
 import org.springframework.validation.FieldError;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
@@ -100,7 +100,15 @@ public class ZLDPStatisticsController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @PostMapping(value = "/getEquipManagementRateStatistics")
     @ApiOperation(httpMethod = "POST", value = "大屏-总览-左屏-设备纳管率", notes = "大屏-总览-左屏-设备纳管率")
-    public ResponseModel<Map<String, Object>> getEquipManagementRateStatistics(@RequestBody DPFilterParamDto screenDto){
-        return ResponseHelper.buildResponse(statisticsService.getEquipManagementRateStatistics(screenDto));
+    public ResponseModel<Map<String, Object>> getEquipManagementRateStatistics(@RequestBody DPFilterParamForDetailDto paramDto){
+        return ResponseHelper.buildResponse(statisticsService.getEquipManagementRateStatistics(paramDto));
+    }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/viewJgAll")
+    @ApiOperation(httpMethod = "GET", value = "viewJgAll", notes = "viewJgAll")
+    public ResponseModel<Page<JSONObject>> viewJgAll(@RequestParam Map<String, Object> map) {
+        JSONObject jsonObject = new JSONObject(map);
+        return ResponseHelper.buildResponse(statisticsService.queryByKeys(jsonObject));
     }
 }