完善市场法规库清单导入

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);
     }
 
 

laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/ILawsMarketStandardService.java

@@ -39,7 +39,7 @@ public interface ILawsMarketStandardService extends IService<LawsMarketStandard>
      * @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);
 
     /**
      * 查看

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<LawsMarketS
     public List<LawsMarketStandardDetail> importExcel(MultipartFile file) {
         List<LawsMarketStandardDetail> 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<LawsMarketStandardDetail> 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 {

laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/impl/LawsMarketStandardServiceImpl.java

@@ -86,6 +86,9 @@ public class LawsMarketStandardServiceImpl extends ServiceImpl<LawsMarketStandar
     @NotNull
     private QueryWrapper<LawsMarketStandard> getLawsMarketStandardQueryWrapper(LawsMarketStandard marketStandard) {
         QueryWrapper<LawsMarketStandard> 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<LawsMarketStandar
     }
 
     @Override
-    public ModelAndView export(HttpServletResponse response, LawsMarketStandard marketStandard, String fileName, String sheetName, HttpServletRequest req) {
+    public ModelAndView export(HttpServletRequest request, HttpServletResponse response, LawsMarketStandard marketStandard, String fileName, String sheetName, HttpServletRequest req) {
+        // 过滤选中数据
+        String selections = request.getParameter("selections");
+        if(!StringUtils.isEmpty(selections)){
+            marketStandard.setId(selections);
+        }
         QueryWrapper<LawsMarketStandard> queryWrapper = getLawsMarketStandardQueryWrapper(marketStandard);
         List<LawsMarketStandard> listLawsMarketStandard = marketStandardMapper.queryByPage(queryWrapper);
         if(!CollectionUtils.isEmpty(listLawsMarketStandard)){