diff --git a/yun-admin/src/main/java/net/lab1024/sa/admin/module/service/dao/ServiceApplicationsDao.java b/yun-admin/src/main/java/net/lab1024/sa/admin/module/service/dao/ServiceApplicationsDao.java index 5846fba..10a73af 100644 --- a/yun-admin/src/main/java/net/lab1024/sa/admin/module/service/dao/ServiceApplicationsDao.java +++ b/yun-admin/src/main/java/net/lab1024/sa/admin/module/service/dao/ServiceApplicationsDao.java @@ -162,7 +162,7 @@ public interface ServiceApplicationsDao extends BaseMapper getLawyerActivityDetail(@Param("userId") Long userId, @Param("queryForm") LawyerStatisticsQueryFormPage queryForm); /** - * 查询律所列表(分页) + * 查询律所列表(分页,按活动总数排序) */ List getFirmActivityCount(@Param("page") Page page, @Param("queryForm") LawyerStatisticsQueryFormPage queryForm); diff --git a/yun-admin/src/main/java/net/lab1024/sa/admin/module/service/service/ServiceApplicationsService.java b/yun-admin/src/main/java/net/lab1024/sa/admin/module/service/service/ServiceApplicationsService.java index a0d83e8..1ff8358 100644 --- a/yun-admin/src/main/java/net/lab1024/sa/admin/module/service/service/ServiceApplicationsService.java +++ b/yun-admin/src/main/java/net/lab1024/sa/admin/module/service/service/ServiceApplicationsService.java @@ -2226,7 +2226,7 @@ public class ServiceApplicationsService { // 设置时间范围(根据季度参数设置) setTimeRangeByQuarter(queryForm); - // 使用 SmartPageUtil 创建分页对象,查询律所列表 + // 使用 SmartPageUtil 创建分页对象,查询律所列表(已按活动总数降序排序) Page page = SmartPageUtil.convert2PageQuery(queryForm); List firmList = serviceApplicationsDao.getFirmActivityCount(page, queryForm); @@ -2268,6 +2268,13 @@ public class ServiceApplicationsService { lawyer.setActivityList(activityList); lawyer.setTotalCount(lawyerTotalCount); } + + // 按律师的活动总次数降序排序 + firmLawyers.sort((a, b) -> { + int countA = a.getTotalCount() != null ? a.getTotalCount() : 0; + int countB = b.getTotalCount() != null ? b.getTotalCount() : 0; + return Integer.compare(countB, countA); + }); } firm.setLawyerList(firmLawyers); @@ -2304,13 +2311,6 @@ public class ServiceApplicationsService { firm.setTotalCount(totalCount); } - // 按服务总次数降序排序 - firmList.sort((a, b) -> { - int countA = a.getTotalCount() != null ? a.getTotalCount() : 0; - int countB = b.getTotalCount() != null ? b.getTotalCount() : 0; - return Integer.compare(countB, countA); - }); - return SmartPageUtil.convert2PageResult(page, firmList); } diff --git a/yun-admin/src/main/resources/mapper/service/ServiceApplicationsMapper.xml b/yun-admin/src/main/resources/mapper/service/ServiceApplicationsMapper.xml index 2145325..95f6e72 100644 --- a/yun-admin/src/main/resources/mapper/service/ServiceApplicationsMapper.xml +++ b/yun-admin/src/main/resources/mapper/service/ServiceApplicationsMapper.xml @@ -831,11 +831,12 @@ ORDER BY g.goods_id - +