From 82e17aae9b2ee58467e3bb5127136752a5f6499d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= Date: Fri, 5 Jul 2024 10:05:30 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=B8=82=E5=9C=BA=E6=B3=95?= =?UTF-8?q?=E8=A7=84=E5=BA=93=E6=B8=85=E5=8D=95=E5=AF=BC=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/MarketStandardController.java | 4 ++-- .../service/ILawsMarketStandardService.java | 2 +- .../LawsMarketStandardDetailServiceImpl.java | 19 ++++++++++++++----- .../impl/LawsMarketStandardServiceImpl.java | 10 +++++++++- 4 files changed, 26 insertions(+), 9 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/controller/MarketStandardController.java b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/controller/MarketStandardController.java index 939c9daa..4cdf81ca 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/controller/MarketStandardController.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/controller/MarketStandardController.java @@ -82,8 +82,8 @@ public class MarketStandardController { @ApiOperationSupport(order = 3) @RequiresPermissions("marketStandard:export") @GetMapping(value = "/exportXls", produces = "application/zip") - public ModelAndView exportXls(HttpServletResponse response, LawsMarketStandard lawsMarketStandard, HttpServletRequest req) { - return marketStandardService.export(response, lawsMarketStandard, "市场法规清单", "市场法规清单", req); + public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response, LawsMarketStandard lawsMarketStandard, HttpServletRequest req) { + return marketStandardService.export(request, response, lawsMarketStandard, "市场法规清单", "市场法规清单", req); } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/ILawsMarketStandardService.java b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/ILawsMarketStandardService.java index 8cb8631b..676f00af 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/ILawsMarketStandardService.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/ILawsMarketStandardService.java @@ -39,7 +39,7 @@ public interface ILawsMarketStandardService extends IService * @param sheetName * @param req */ - ModelAndView export(HttpServletResponse response, LawsMarketStandard lawsMarketStandard, String fileName, String sheetName, HttpServletRequest req); + ModelAndView export(HttpServletRequest request, HttpServletResponse response, LawsMarketStandard lawsMarketStandard, String fileName, String sheetName, HttpServletRequest req); /** * 查看 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 e7699e00..a241dc59 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 @@ -3,6 +3,8 @@ package com.jero.modules.laws.marketStandard.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.common.api.vo.Result; +import com.jero.common.exception.JeroBootException; +import com.jero.common.util.ImportExcelUtil; import com.jero.modules.laws.marketStandard.entity.LawsMarketStandard; import com.jero.modules.laws.marketStandard.entity.LawsMarketStandardDetail; import com.jero.modules.laws.marketStandard.service.ILawsMarketStandardDetailService; @@ -72,12 +74,19 @@ public class LawsMarketStandardDetailServiceImpl extends ServiceImpl importExcel(MultipartFile file) { List list = new ArrayList<>(); ImportParams params = new ImportParams(); - params.setTitleRows(2); - params.setHeadRows(1); - params.setStartRows(4); - params.setNeedSave(true); + params.setHeadRows(0); + params.setSheetNum(1); + // 校验excel 字段是否正确 +// boolean b = ImportExcelUtil.checkTemplateTitle(file, LawsMarketStandardDetail.class, null, 0); +// if (!b) { +// throw new JeroBootException("excel文件表头错误，请重新下载"); +// } try { - return ExcelImportUtil.importExcel(file.getInputStream(), LawsMarketStandardDetail.class, params); + List listLawsMarketStandardDetail = ExcelImportUtil.importExcel(file.getInputStream(), LawsMarketStandardDetail.class, params); + if(!CollectionUtils.isEmpty(listLawsMarketStandardDetail) && listLawsMarketStandardDetail.size() >= 2){ + listLawsMarketStandardDetail = listLawsMarketStandardDetail.subList(2,listLawsMarketStandardDetail.size()); + } + return listLawsMarketStandardDetail; } catch (Exception e) { log.error(e.getMessage(),e); } finally { 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 4177d3e0..e9960574 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 @@ -86,6 +86,9 @@ public class LawsMarketStandardServiceImpl extends ServiceImpl getLawsMarketStandardQueryWrapper(LawsMarketStandard marketStandard) { QueryWrapper queryWrapper = new QueryWrapper<>(); + if(!StringUtils.isBlank(marketStandard.getId())){ + queryWrapper.in("ms.id", Arrays.asList(marketStandard.getId().split(","))); + } queryWrapper.like(StringUtils.isNotBlank(marketStandard.getManifestNo()), "ms.manifest_no", marketStandard.getManifestNo()); queryWrapper.like(StringUtils.isNotBlank(marketStandard.getManifestName()), @@ -197,7 +200,12 @@ public class LawsMarketStandardServiceImpl extends ServiceImpl queryWrapper = getLawsMarketStandardQueryWrapper(marketStandard); List listLawsMarketStandard = marketStandardMapper.queryByPage(queryWrapper); if(!CollectionUtils.isEmpty(listLawsMarketStandard)){