fix(88272): 标准主计划-查询后导出，导出了所有数据

laws-modules/src/main/java/com/jero/modules/laws/standardmasterplan/controller/LawsStandardMasterPlanController.java

@@ -145,7 +145,7 @@ public class LawsStandardMasterPlanController {
     @ApiOperation(value="标准主计划-导出", notes="标准主计划-导出")
     @GetMapping(value = "/exportExcel")
     @RequiresPermissions("standardMasterPlan:export")
-    public ModelAndView exportExcel(HttpServletRequest request) {
+    public ModelAndView exportExcel(HttpServletRequest request, LawsStandardMasterPlanVO lawsStandardMasterPlanVO) {
-        return lawsStandardMasterPlanService.exportExcel(request);
+        return lawsStandardMasterPlanService.exportExcel(request, lawsStandardMasterPlanVO);
     }
 }

laws-modules/src/main/java/com/jero/modules/laws/standardmasterplan/servicce/ILawsStandardMasterPlanService.java

@@ -56,7 +56,7 @@ public interface ILawsStandardMasterPlanService extends IService<LawsStandardMas
     /**
      * 标准主计划-导出
      */
-    ModelAndView exportExcel(HttpServletRequest request);
+    ModelAndView exportExcel(HttpServletRequest request, LawsStandardMasterPlanVO lawsStandardMasterPlanVO);
 
     /**
      * 标准主计划-同步 法规解读

laws-modules/src/main/java/com/jero/modules/laws/standardmasterplan/servicce/impl/LawsStandardMasterPlanServiceImpl.java

@@ -123,6 +123,9 @@ public class LawsStandardMasterPlanServiceImpl
         }
         queryWrapper.eq(StringUtils.isNotBlank(lawsStandardMasterPlanVO.getId()),
                 "lsmp.id", lawsStandardMasterPlanVO.getId());
+        if (StringUtils.isNotBlank(lawsStandardMasterPlanVO.getIds())){
+            queryWrapper.in("lsmp.id", Arrays.asList(lawsStandardMasterPlanVO.getIds().split(",")));
+        }
         queryWrapper.eq("lsmp.del_flag", CommonConstant.DEL_FLAG_0);
         queryWrapper.orderByDesc("lsmp.create_time");
         return queryWrapper;
@@ -319,7 +322,7 @@ public class LawsStandardMasterPlanServiceImpl
     }
 
     @Override
-    public ModelAndView exportExcel(HttpServletRequest request) {
+    public ModelAndView exportExcel(HttpServletRequest request, LawsStandardMasterPlanVO lawsStandardMasterPlanVO) {
         String templateUrl = exportExcelTempPath + File.separator + "主计划导出.xlsx";
         TemplateExportParams params = new TemplateExportParams(templateUrl);
         Map<String, Object> map = new HashMap<>();
@@ -330,12 +333,11 @@ public class LawsStandardMasterPlanServiceImpl
         // 查询 标准主计划基础信息
         LambdaQueryWrapper<LawsStandardMasterPlan> queryWrapper = new LambdaQueryWrapper<>();
         if (StringUtils.isNotBlank(selections)){
-            List<String> idList = Arrays.asList(selections.split(","));
+            lawsStandardMasterPlanVO.setIds(selections);
-            queryWrapper.in(LawsStandardMasterPlan::getId, idList);
         }
-        List<LawsStandardMasterPlan> list = list(queryWrapper);
+        List<LawsStandardMasterPlanVO> lawsStandardMasterPlanVOList = queryByList(lawsStandardMasterPlanVO);
         SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
-        for (LawsStandardMasterPlan lawsStandardMasterPlan : list) {
+        for (LawsStandardMasterPlanVO lawsStandardMasterPlan : lawsStandardMasterPlanVOList) {
             Map<String, String> lm = new HashMap<>();
             LawsDomesticStandard lawsDomesticStandard =
                     lawsDomesticStandardService.getOne(new LambdaQueryWrapper<LawsDomesticStandard>()
@@ -349,12 +351,14 @@ public class LawsStandardMasterPlanServiceImpl
                 lm.put("standardState", sysDictService.queryDictTextByKey("standard_state",
                         lawsDomesticStandard.getStandardState()));
             }
-            lm.put("applicableMarket", lawsStandardMasterPlan.getApplicableMarket());
+            lm.put("applicableMarket", sysDictService.queryDictTextByKey("market_state",
+                    lawsStandardMasterPlan.getApplicableMarket()));
 
             // 查询 标准主计划_子表信息
+            LawsStandardMasterPlanDetailsVO lawsStandardMasterPlanDetailsVO =
+                    queryDetails(lawsStandardMasterPlan.getId());
             List<LawsStandardMasterPlanSublist> lawsStandardMasterPlanSublistList =
-                    lawsStandardMasterPlanSublistService.list(new LambdaQueryWrapper<LawsStandardMasterPlanSublist>()
+                    lawsStandardMasterPlanDetailsVO.getLawsStandardMasterPlanSublistList();
-                            .eq(LawsStandardMasterPlanSublist::getMasterPlanId, lawsStandardMasterPlan.getId()));
             // 信息输入
             informationInput(lawsStandardMasterPlanSublistList, lm, dateFormat);
             // 文本入库

laws-modules/src/main/java/com/jero/modules/laws/standardmasterplan/vo/LawsStandardMasterPlanVO.java

@@ -46,4 +46,8 @@ public class LawsStandardMasterPlanVO implements Serializable {
     @ApiModelProperty(value = "版本标识,用于绑定多个版本（市场法规清单）")
     @TableField(exist = false)
     private String versionFlag;
+
+    /** ids 搜索用 */
+    @ApiModelProperty(value = "ids 搜索用")
+    private java.lang.String ids;
 }