【五大图层】数据展示：完善

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/IcResiServiceImpl.java

@@ -51,6 +51,7 @@ public class IcResiServiceImpl implements IcResiService {
         if (StringUtils.isNotBlank(search)) {
             query.like(IcResiUserEntity::getName, search);
         }
+        query.orderByAsc(IcResiUserEntity::getCreatedTime);
         return resiUserDao.selectList(query);
     }
 

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgCoverageServiceImpl.java

@@ -106,6 +106,7 @@ public class GovOrgCoverageServiceImpl implements GovOrgCoverageService {
         if (isPage) {
             PageHelper.startPage(pageNo ,pageSize);
         }
+        query.orderByAsc(IcCityManagementEntity::getCreatedTime);
         return cityManagementDao.selectList(query);
     }
 
@@ -133,6 +134,7 @@ public class GovOrgCoverageServiceImpl implements GovOrgCoverageService {
         if (isPage) {
             PageHelper.startPage(pageNo ,pageSize);
         }
+        query.orderByAsc(IcDangerousChemicalsEntity::getCreatedTime);
         return dangerousChemicalsDao.selectList(query);
     }
 
@@ -166,6 +168,7 @@ public class GovOrgCoverageServiceImpl implements GovOrgCoverageService {
         if (isPage) {
             PageHelper.startPage(pageNo ,pageSize);
         }
+        query.orderByAsc(IcPublicServiceEntity::getCreatedTime);
         return publicServiceDao.selectList(query);
     }
 
@@ -183,6 +186,7 @@ public class GovOrgCoverageServiceImpl implements GovOrgCoverageService {
         if (isPage) {
             PageHelper.startPage(pageNo ,pageSize);
         }
+        query.orderByAsc(IcSuperiorResourceEntity::getCreatedTime);
         return superiorResourceDao.selectList(query);
     }
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/heart/impl/HeartServiceImpl.java

@@ -50,6 +50,7 @@ public class HeartServiceImpl implements HeartService {
         if (isPage) {
             PageHelper.startPage(pageNo, pageSize);
         }
+        query.orderByAsc(IcCommunitySelfOrganizationEntity::getCreatedTime);
         return communitySelfOrganizationDao.selectList(query);
     }
 
@@ -80,6 +81,7 @@ public class HeartServiceImpl implements HeartService {
         if (isPage) {
             PageHelper.startPage(pageNo, pageSize);
         }
+        query.orderByAsc(IcPartyUnitEntity::getCreatedTime);
         return partyUnitDao.selectList(query);
     }
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java

@@ -14,7 +14,6 @@ import com.epmet.dataaggre.entity.heart.IcCommunitySelfOrganizationEntity;
 import com.epmet.dataaggre.entity.heart.IcPartyUnitEntity;
 import com.epmet.dataaggre.service.CoverageService;
 import com.epmet.dataaggre.service.epmetuser.IcResiService;
-import com.epmet.dataaggre.service.epmetuser.impl.IcResiServiceImpl;
 import com.epmet.dataaggre.service.govorg.GovOrgCoverageService;
 import com.epmet.dataaggre.service.govorg.GovOrgService;
 import com.epmet.dataaggre.service.heart.HeartService;
@@ -97,6 +96,10 @@ public class CoverageServiceImpl implements CoverageService {
         String staffPids = getStaffPidsFromStaffInfo(staffInfo);
         String agencyId = staffInfo.getAgencyId();
 
+        // 分页不太好分，先查出所有的数据，然后partation()吧
+        int start = (pageNo - 1) * pageSize;
+        int end = pageNo * pageSize;
+
         List<CoverageAnalisisDataListResultDTO> rls = new ArrayList<>();
         for (String coverageType : coverageTypes) {
             List<GovOrgCoverageService.CategoryCoverageMapping> ccm = mapping.get(coverageType);
@@ -105,8 +108,21 @@ public class CoverageServiceImpl implements CoverageService {
             }
             for (GovOrgCoverageService.CategoryCoverageMapping e : ccm) {
                 // 执行查询
-                List<CoverageAnalisisDataListResultDTO> rl = doDataListSearch(EpmetRequestHolder.getLoginUserCustomerId(), agencyId, staffPids, e.getPlaceType(), e.getCategoryKey(), search, pageNo, pageSize, isPage);
+                List<CoverageAnalisisDataListResultDTO> rl = doDataListSearch(
+                        EpmetRequestHolder.getLoginUserCustomerId(), agencyId, staffPids, e.getPlaceType(),
+                        e.getCategoryKey(), search, 1, end, isPage);
+
                 rls.addAll(rl);
+
+                if (!isPage) {
+                    // 不分页的话，直接下一个category
+                    continue;
+                }
+
+                // 要分页的话就要截取一下
+                if (rls.size() >= end) {
+                    return rls.subList(start, end);
+                }
             }
         }
         return rls;

epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/IcResiUserDao.xml

@@ -49,6 +49,7 @@
           and s.SPECIAL_RQLB like CONCAT('%', #{categoryKey},'%')
           and resi.DEL_FLAG = '0'
           and s.DEL_FLAG = '0'
+          order by s.CREATED_TIME asc
     </select>
 
 </mapper>