From aa789e1e93bfa76443e047b0096069c2818a762b Mon Sep 17 00:00:00 2001
From: "shuo.wang" <shuo.wang@hao168.com>
Date: Mon, 9 Jun 2025 14:30:02 +0800
Subject: [PATCH] fix

---
 .../src/main/resources/mapper/ShopInfoMapper.xml              | 1 +
 .../cool/store/service/impl/FranchiseReportServiceImpl.java   | 2 +-
 .../java/com/cool/store/controller/webb/ExportController.java | 4 ++--
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml
index daeff0ba3..ef7cab4e7 100644
--- a/coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml
+++ b/coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml
@@ -514,6 +514,7 @@
             </foreach>
         </if>
        and  b.actual_complete_time >= #{request.buildStartTime} and b.actual_complete_time &lt;= #{request.buildEndTime}
+        order by b.actual_complete_time desc
     </select>
     <select id="selectShopListByUser" resultType="com.cool.store.entity.ShopInfoDO">
         select
diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FranchiseReportServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FranchiseReportServiceImpl.java
index 3832db410..3c54e09d1 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FranchiseReportServiceImpl.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FranchiseReportServiceImpl.java
@@ -272,7 +272,7 @@ public class FranchiseReportServiceImpl implements FranchiseReportService {
             log.info("数据为空");
             return null;
         }
-        franchiseReportDTOPageInfo.setList(list.stream().sorted(Comparator.comparing(ShopReportResponse::getBuildTime).reversed()).collect(Collectors.toList()));
+        franchiseReportDTOPageInfo.setList(list);
         return franchiseReportDTOPageInfo;
     }
 
diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/ExportController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/ExportController.java
index 00462931a..4b6412bf3 100644
--- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/ExportController.java
+++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/ExportController.java
@@ -58,13 +58,13 @@ public class ExportController {
     }
 
     @PostMapping("/zxjpOpenShopReport")
-    @ApiOperation("正新鸡排开店")
+    @ApiOperation("正新鸡排开店导出")
     public ResponseResult zxjpOpenShopReport(@RequestBody FranchiseReportRequest request) {
         return ResponseResult.success(exportService.exportZxjpOpenShopReport(request, CurrentUserHolder.getUser()));
     }
 
     @PostMapping("/zxjpOpenShopReportPage")
-    @ApiOperation("正新鸡排开店")
+    @ApiOperation("正新鸡排开店明细报表导出")
     public ResponseResult zxjpOpenShopReportPage(@RequestBody FranchiseReportRequest request) {
         return ResponseResult.success(exportService.exportZxjpOpenShopReportPage(request, CurrentUserHolder.getUser()));
     }