QR/laws_chery_serve
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

完善市场法规库清单详情

Browse Source
This commit is contained in:
梁琦涛
2024-07-04 11:53:26 +08:00
parent a31f57f99d
commit cb85f58307
2 changed files with 22 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/laws/marketStandard/controller/MarketStandardDetailController.java
+2 -2
View File
@@ -52,8 +52,8 @@ public class MarketStandardDetailController {
@ApiOperationSupport(order = 2) @ApiOperationSupport(order = 2)
@RequiresPermissions("marketStandard:detail") @RequiresPermissions("marketStandard:detail")
@Translation @Translation
public Result<?> list(@RequestParam("manifestId") String manifestId) { public Result<?> list(@RequestParam("manifestId") String manifestId, @RequestParam("manifestVersion") String manifestVersion) {
return lawsMarketStandardDetailService.getList(manifestId); return lawsMarketStandardDetailService.getList(manifestId,manifestVersion);
} }
} }
laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/impl/LawsMarketStandardDetailServiceImpl.java
+20 -1
View File
@@ -16,6 +16,7 @@ import javax.annotation.Resource;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors; import java.util.stream.Collectors;
/** /**
@@ -27,11 +28,29 @@ import java.util.stream.Collectors;
public class LawsMarketStandardDetailServiceImpl extends ServiceImpl<LawsMarketStandardDetailMapper, LawsMarketStandardDetail> public class LawsMarketStandardDetailServiceImpl extends ServiceImpl<LawsMarketStandardDetailMapper, LawsMarketStandardDetail>
implements ILawsMarketStandardDetailService { implements ILawsMarketStandardDetailService {
@Resource
private ILawsMarketStandardService marketStandardService;
@Override @Override
public Result<?> getList(String manifestId) { public Result<?> getList(String manifestId,String manifestVersion) {
if(StringUtils.isBlank(manifestId)){ if(StringUtils.isBlank(manifestId)){
return Result.error("id不能为空"); return Result.error("id不能为空");
} }
if(!StringUtils.isBlank(manifestVersion)){
LawsMarketStandard lawsMarketStandardOld = marketStandardService.getById(manifestId);
if(Objects.isNull(lawsMarketStandardOld)){
return Result.error("数据不存在");
}
LambdaQueryWrapper<LawsMarketStandard> 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<String> listIds = Arrays.asList(manifestId.split(",")); List<String> listIds = Arrays.asList(manifestId.split(","));
LambdaQueryWrapper<LawsMarketStandardDetail> queryLawsMarketStandardDetail = new LambdaQueryWrapper<>(); LambdaQueryWrapper<LawsMarketStandardDetail> queryLawsMarketStandardDetail = new LambdaQueryWrapper<>();
queryLawsMarketStandardDetail.in(LawsMarketStandardDetail::getManifestId,listIds); queryLawsMarketStandardDetail.in(LawsMarketStandardDetail::getManifestId,listIds);