feat: 查看改为前端分页

laws-modules/src/main/java/com/jero/modules/laws/marketStandard/controller/MarketStandardController.java

@@ -61,8 +61,6 @@ public class MarketStandardController {
      * 查看
      *
      * @param marketStandardDetail
-     * @param pageNo
-     * @param pageSize
      * @return
      */
     @AutoLog(value = "外部标准库-市场法规清单-查看")
@@ -70,10 +68,8 @@ public class MarketStandardController {
     @GetMapping(value = "/detail")
     @ApiOperationSupport(order = 2)
     @RequiresPermissions("marketStandard:detail")
-    public Result<MarketStandardDetailVO> detail(LawsMarketStandardDetail marketStandardDetail,
+    public Result<MarketStandardDetailVO> detail(LawsMarketStandardDetail marketStandardDetail) {
-                                                 @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+        MarketStandardDetailVO result = marketStandardService.detail(marketStandardDetail);
-                                                 @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
-        MarketStandardDetailVO result = marketStandardService.detail(marketStandardDetail, pageNo, pageSize);
         return Result.OK(result);
     }
 

laws-modules/src/main/java/com/jero/modules/laws/marketStandard/entity/MarketStandardDetailVO.java

@@ -16,9 +16,6 @@ public class MarketStandardDetailVO {
     @ApiModelProperty(value = "新增编辑数据")
     private List<LawsMarketStandardDetail> lists;
 
-    @ApiModelProperty(value = "查看分页数据")
-    private IPage<LawsMarketStandardDetail> pageData;
-
     @ApiModelProperty(value = "历史版本")
     private List<String> historyVersions;
 

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

@@ -37,11 +37,9 @@ public interface ILawsMarketStandardService extends IService<LawsMarketStandard>
     /**
      * 查看
      * @param marketStandardDetail
-     * @param pageNo
-     * @param pageSize
      * @return
      */
-    MarketStandardDetailVO detail(LawsMarketStandardDetail marketStandardDetail, Integer pageNo, Integer pageSize);
+    MarketStandardDetailVO detail(LawsMarketStandardDetail marketStandardDetail);
 
     /**
      * 分页查询

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

@@ -101,7 +101,7 @@ public class LawsMarketStandardServiceImpl extends ServiceImpl<LawsMarketStandar
 
     @Override
     public void export(HttpServletResponse response, LawsMarketStandard lawsMarketStandard, String fileName, String sheetName, HttpServletRequest req) {
-
+        //TODO 导出具体模板查看NAS文档
     }
 
     @Override
@@ -113,21 +113,20 @@ public class LawsMarketStandardServiceImpl extends ServiceImpl<LawsMarketStandar
     }
 
     @Override
-    public MarketStandardDetailVO detail(LawsMarketStandardDetail marketStandardDetail, Integer pageNo, Integer pageSize) {
+    public MarketStandardDetailVO detail(LawsMarketStandardDetail marketStandardDetail) {
         MarketStandardDetailVO result = new MarketStandardDetailVO();
         String ids = marketStandardDetail.getManifestId();
         List<String> idList = Arrays.asList(ids.split(","));
 
         // 列表数据
-        Page<LawsMarketStandardDetail> page = new Page<>(pageNo, pageSize);
         LambdaQueryWrapper<LawsMarketStandardDetail> wrapper = new LambdaQueryWrapper<>();
         wrapper.like(StringUtils.isNotBlank(marketStandardDetail.getStandardNumber()),
                 LawsMarketStandardDetail::getStandardNumber, marketStandardDetail.getStandardNumber());
         wrapper.like(StringUtils.isNotBlank(marketStandardDetail.getStandardName()),
                 LawsMarketStandardDetail::getStandardName, marketStandardDetail.getStandardName());
         wrapper.in(LawsMarketStandardDetail::getManifestId, idList);
-        Page<LawsMarketStandardDetail> pageData = lawsMarketStandardDetailService.page(page, wrapper);
+        List<LawsMarketStandardDetail> pageData = lawsMarketStandardDetailService.list(wrapper);
-        result.setPageData(pageData);
+        result.setLists(pageData);
 
         // 如果不是合并查看列表页面
         if (idList.size() > 1) {