diff --git a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/controller/MarketStandardDetailController.java b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/controller/MarketStandardDetailController.java index 6a89cdb9..21d49a1b 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/controller/MarketStandardDetailController.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/controller/MarketStandardDetailController.java @@ -17,6 +17,7 @@ import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.util.List; import java.util.Map; @@ -31,6 +32,24 @@ public class MarketStandardDetailController { @Resource private ILawsMarketStandardDetailService lawsMarketStandardDetailService; + + /** + * 市场法规清单详情分页 + * + * @param marketStandardDetail + * @return + */ + @AutoLog(value = "外部标准库-市场法规清单详情分页") + @ApiOperation(value = "外部标准库-市场法规清单详情分页", notes = "外部标准库-市场法规清单详情分页") + @GetMapping(value = "/page") + @ApiOperationSupport(order = 2) + @RequiresPermissions("marketStandard:page") + public Result getPage(LawsMarketStandardDetail marketStandardDetail, HttpServletRequest request, + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) { + return lawsMarketStandardDetailService.getPage(marketStandardDetail,request,pageNo,pageSize); + } + /** * 市场法规清单详情列表 * @@ -78,6 +97,21 @@ public class MarketStandardDetailController { return lawsMarketStandardDetailService.edit(marketStandardDetail); } + /** + * 根据id获取详情 + * + * @param id + * @return + */ + @AutoLog(value = "外部标准库-市场法规清单-根据id获取详情") + @ApiOperation(value = "外部标准库-市场法规清单-根据id获取详情", notes = "外部标准库-市场法规清单-根据id获取详情") + @ApiOperationSupport(order = 2) + @PostMapping(value = "/getById") + @RequiresPermissions("marketStandard:getById") + @Translation + public Result getById(@RequestParam("id") String id) { + return Result.OK(lawsMarketStandardDetailService.getById(id)); + } /** * 删除 diff --git a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/ILawsMarketStandardDetailService.java b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/ILawsMarketStandardDetailService.java index a901de5a..0e603bdb 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/ILawsMarketStandardDetailService.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/ILawsMarketStandardDetailService.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.multipart.MultipartFile; +import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.util.List; @@ -16,6 +17,15 @@ import java.util.List; */ public interface ILawsMarketStandardDetailService extends IService { + /** + * 分页 + * @param marketStandardDetail + * @param request + * @return + */ + Result getPage(LawsMarketStandardDetail marketStandardDetail, HttpServletRequest request, + Integer pageNo, Integer pageSize); + /** * 获取清单列表 * @param manifestId 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 96b10987..3b3d61c5 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 @@ -1,8 +1,12 @@ package com.jero.modules.laws.marketStandard.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; 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.system.query.QueryGenerator; import com.jero.modules.laws.marketStandard.entity.LawsMarketStandard; import com.jero.modules.laws.marketStandard.entity.LawsMarketStandardDetail; import com.jero.modules.laws.marketStandard.mapper.LawsMarketStandardDetailMapper; @@ -17,6 +21,7 @@ import org.springframework.stereotype.Service; import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.*; import java.util.ArrayList; @@ -40,6 +45,37 @@ public class LawsMarketStandardDetailServiceImpl extends ServiceImpl getPage(LawsMarketStandardDetail marketStandardDetail, HttpServletRequest request, + Integer pageNo, Integer pageSize) { + String manifestId = marketStandardDetail.getManifestId(); + if(StringUtils.isBlank(marketStandardDetail.getManifestId())){ + throw new JeroBootException("id不能为空"); + } + String manifestVersion = marketStandardDetail.getManifestVersion(); + if(!StringUtils.isBlank(marketStandardDetail.getManifestVersion())){ + LawsMarketStandard lawsMarketStandardOld = marketStandardService.getById(manifestId); + if(Objects.isNull(lawsMarketStandardOld)){ + return Result.error("数据不存在"); + } + LambdaQueryWrapper queryLawsMarketStandard = new LambdaQueryWrapper<>(); + queryLawsMarketStandard.eq(LawsMarketStandard::getManifestNo,lawsMarketStandardOld.getManifestNo()); + queryLawsMarketStandard.eq(LawsMarketStandard::getManifestVersion,manifestVersion); + LawsMarketStandard lawsMarketStandard = marketStandardService.getOne(queryLawsMarketStandard,false); + if(Objects.isNull(lawsMarketStandard)){ + return Result.error(manifestVersion + "版本不存在"); + } + manifestId = lawsMarketStandard.getId(); + } + List listIds = Arrays.asList(manifestId.split(",")); + QueryWrapper queryWrapper = + QueryGenerator.initQueryWrapper(marketStandardDetail, request.getParameterMap()); + queryWrapper.in("manifest_id",listIds); + queryWrapper.orderByDesc("create_time"); + Page page = new Page<>(pageNo, pageSize); + return Result.OK(page(page, queryWrapper)); + } + @Override public Result getList(String manifestId,String manifestVersion) { if(StringUtils.isBlank(manifestId)){