施工单位施工总量排名TOP10下钻列表

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

@@ -8,6 +8,7 @@ import com.yeejoin.amos.boot.module.ymt.api.dto.TzBaseEnterpriseInfoDto;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -52,4 +53,5 @@ public interface CylinderStatisticsMapper {
     Long countOffloading(@Param("orgCode") String orgCode, @Param("startTime") String startTime, @Param("endTime") String endTime);
 
     Page<Map<String, Object>> getNormalPage(@Param("page") Page<Map<String, Object>> page, @Param("dpFilterParamForDetailDto") DPFilterParamForDetailDto dpFilterParamForDetailDto);
+    List<Map<String, Object>> getNormalByUnitCode(@Param("unitCodeList") List<String> unitCodeList, @Param("dpFilterParamForDetailDto") DPFilterParamForDetailDto dpFilterParamForDetailDto);
 }

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/service/impl/CylinderDPStatisticsServiceImpl.java

@@ -956,16 +956,26 @@ public class CylinderDPStatisticsServiceImpl {
     public Page<Map<String, Object>> normalPage(Page<Map<String, Object>> page, DPFilterParamForDetailDto dpFilterParamForDetailDto) {
         String orgCode = stCommonService.getAndSetOrgCode(dpFilterParamForDetailDto.getCityCode());
         dpFilterParamForDetailDto.setOrgCode(orgCode);
-        Page<Map<String, Object>> list = cylinderStatisticsMapper.getNormalPage(page, dpFilterParamForDetailDto);
+        Page<Map<String, Object>> returnPage = cylinderStatisticsMapper.getNormalPage(page, dpFilterParamForDetailDto);
+        List<String> unitCodeList = new ArrayList<>();
+        for (int i = 0; i < returnPage.getRecords().size(); i++){
+            unitCodeList.add(returnPage.getRecords().get(i).get("useUnitCode").toString());
+        }
+        if (org.apache.commons.collections.CollectionUtils.isEmpty(unitCodeList)){
+            return page;
+        }
+
+        List<Map<String, Object>> list = cylinderStatisticsMapper.getNormalByUnitCode(unitCodeList,dpFilterParamForDetailDto);
 
-        for(int i = 0; i < list.getRecords().size(); i++){
-            if("0.0".equals(list.getRecords().get(i).get("fillingCount")+"") && "0.0".equals(list.getRecords().get(i).get("offloadingVolume")+"")){
-                list.getRecords().get(i).put("isDock","未对接");
+        for(int i = 0; i < list.size(); i++){
+            if("0.0".equals(list.get(i).get("fillingCount")+"") && "0.0".equals(list.get(i).get("offloadingVolume")+"")){
+                list.get(i).put("isDock","未对接");
             }else{
-                list.getRecords().get(i).put("isDock","对接");
+                list.get(i).put("isDock","对接");
             }
         }
-        return list;
+        returnPage.setRecords(list);
+        return returnPage;
     }
 
     public Map<String,List<Map<String,Object>>> normalSearch(DPFilterParamForDetailDto dpFilterParamForDetailDto) {