From b480919fe49942e3db13b6fede2d9e90af1a70fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= <liangqitao@syxysoft.com>
Date: Fri, 12 Jul 2024 18:00:37 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B8=82=E5=9C=BA=E6=B3=95=E8=A7=84=E6=B8=85?=
 =?UTF-8?q?=E5=8D=95=E6=B7=BB=E5=8A=A0=E5=AF=BC=E5=87=BA=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../LawsMarketStandardDetailServiceImpl.java  |  5 ++---
 .../impl/LawsMarketStandardServiceImpl.java   | 19 ++++++++++---------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/impl/LawsMarketStandardDetailServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/impl/LawsMarketStandardDetailServiceImpl.java
index ee744874..60041a94 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/impl/LawsMarketStandardDetailServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/impl/LawsMarketStandardDetailServiceImpl.java
@@ -127,8 +127,7 @@ public class LawsMarketStandardDetailServiceImpl extends ServiceImpl<LawsMarketS
                 QueryGenerator.initQueryWrapper(marketStandardDetail, request.getParameterMap());
         queryWrapper.in("manifest_id",listIds);
         Page<LawsMarketStandardDetail> page = new Page<>(pageNo, pageSize);
-        IPage<LawsMarketStandardDetail> res = lawsMarketStandardDetailMapper.pageList(page, queryWrapper, listIds);
-        return Result.OK(res);
+        return Result.OK(page(page, queryWrapper));
     }
 
     @Override
@@ -568,7 +567,7 @@ public class LawsMarketStandardDetailServiceImpl extends ServiceImpl<LawsMarketS
         QueryWrapper<LawsMarketStandardDetail> queryWrapper =
                 QueryGenerator.initQueryWrapper(marketStandardDetail, request.getParameterMap());
         queryWrapper.in("manifest_id",listIds);
-        List<LawsMarketStandardDetail> res = lawsMarketStandardDetailMapper.pageList(queryWrapper, listIds);
+        List<LawsMarketStandardDetail> res = list(queryWrapper);
 
         // Step.2 AutoPoi 导出Excel
         ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
diff --git a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/impl/LawsMarketStandardServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/impl/LawsMarketStandardServiceImpl.java
index 5ae40b38..8f12246f 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/impl/LawsMarketStandardServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/impl/LawsMarketStandardServiceImpl.java
@@ -229,14 +229,15 @@ public class LawsMarketStandardServiceImpl extends ServiceImpl<LawsMarketStandar
         }
         QueryWrapper<LawsMarketStandard> queryWrapper = getLawsMarketStandardQueryWrapper(marketStandard);
         List<LawsMarketStandard> listLawsMarketStandard = marketStandardMapper.queryByPage(queryWrapper);
+        List<LawsMarketStandardDetail> listLawsMarketStandardDetail = new ArrayList<>();
         if(!CollectionUtils.isEmpty(listLawsMarketStandard)){
-            for (LawsMarketStandard lawsMarketStandard : listLawsMarketStandard) {
-                // 列表数据
-                LambdaQueryWrapper<LawsMarketStandardDetail> wrapper = new LambdaQueryWrapper<>();
-                wrapper.eq(LawsMarketStandardDetail::getManifestId, lawsMarketStandard.getId());
-                List<LawsMarketStandardDetail> pageData = lawsMarketStandardDetailService.list(wrapper);
-                lawsMarketStandard.setList(pageData);
-            }
+            List<String> listIds = listLawsMarketStandard.stream().map(LawsMarketStandard::getId).collect(Collectors.toList());
+            // 列表数据
+            LambdaQueryWrapper<LawsMarketStandardDetail> wrapper = new LambdaQueryWrapper<>();
+            wrapper.in(LawsMarketStandardDetail::getManifestId, listIds);
+            wrapper.orderByDesc(LawsMarketStandardDetail::getStandardNumber);
+            wrapper.orderByDesc(LawsMarketStandardDetail::getCreateTime);
+            listLawsMarketStandardDetail = lawsMarketStandardDetailService.list(wrapper);
         }
 
         // AutoPoi 导出Excel
@@ -244,11 +245,11 @@ public class LawsMarketStandardServiceImpl extends ServiceImpl<LawsMarketStandar
         String title = "市场法规清单";
         //此处设置的filename无效 ,前端会重更新设置一下
         mv.addObject("", title);
-        mv.addObject(CLASS, LawsMarketStandard.class);
+        mv.addObject(CLASS, LawsMarketStandardDetail.class);
         ExportParams exportParams = new ExportParams(null, title);
         // 导出xls
         mv.addObject(PARAMS, exportParams);
-        mv.addObject(NormalExcelConstants.DATA_LIST, listLawsMarketStandard);
+        mv.addObject(NormalExcelConstants.DATA_LIST, listLawsMarketStandardDetail);
         return mv;
     }