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

fix:87896

Browse Source
This commit is contained in:
梁琦涛
2024-08-05 18:50:48 +08:00
parent 91d531e4ed
commit 9c6a97ce29
1 changed files with 28 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/service/impl/LawsMarketStandardServiceImpl.java
+28 -3
View File
@@ -93,13 +93,17 @@ public class LawsMarketStandardServiceImpl extends ServiceImpl<LawsMarketStandar
public IPage<LawsMarketStandard> queryPage(LawsMarketStandard marketStandard, Integer pageNo, Integer pageSize) { public IPage<LawsMarketStandard> queryPage(LawsMarketStandard marketStandard, Integer pageNo, Integer pageSize) {
Page<LawsMarketStandard> page = new Page<>(pageNo, pageSize); Page<LawsMarketStandard> page = new Page<>(pageNo, pageSize);
QueryWrapper<LawsMarketStandard> queryWrapper = getLawsMarketStandardQueryWrapper(marketStandard); QueryWrapper<LawsMarketStandard> queryWrapper = getLawsMarketStandardQueryWrapper(marketStandard);
return marketStandardMapper.queryByPage(page, queryWrapper); IPage<LawsMarketStandard> res = marketStandardMapper.queryByPage(page, queryWrapper);
List<LawsMarketStandard> list = res.getRecords();
setManifestVersion(list);
return res;
} }
@Override @Override
public IPage<LawsMarketStandard> queryPageListByOther(LawsMarketStandard marketStandard, Integer pageNo, Integer pageSize) { public IPage<LawsMarketStandard> queryPageListByOther(LawsMarketStandard marketStandard, Integer pageNo, Integer pageSize) {
Page<LawsMarketStandard> page = new Page<>(pageNo, pageSize); Page<LawsMarketStandard> page = new Page<>(pageNo, pageSize);
QueryWrapper<LawsMarketStandard> queryWrapper = getLawsMarketStandardQueryWrapper(marketStandard); QueryWrapper<LawsMarketStandard> queryWrapper = getLawsMarketStandardQueryWrapper(marketStandard);
IPage<LawsMarketStandard> res;
if(StringUtils.isBlank(marketStandard.getProcessFlag())){ if(StringUtils.isBlank(marketStandard.getProcessFlag())){
if(!StringUtils.isBlank(marketStandard.getHomeFlag())){ if(!StringUtils.isBlank(marketStandard.getHomeFlag())){
LocalDate currentDate = LocalDate.now(); LocalDate currentDate = LocalDate.now();
@@ -109,11 +113,32 @@ public class LawsMarketStandardServiceImpl extends ServiceImpl<LawsMarketStandar
DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")); DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
queryWrapper.ge("ms.release_date", time); queryWrapper.ge("ms.release_date", time);
} }
return marketStandardMapper.queryByPage(page, queryWrapper); res = marketStandardMapper.queryByPage(page, queryWrapper);
}else{ }else{
queryWrapper.isNull("pms1.manifest_id"); queryWrapper.isNull("pms1.manifest_id");
// 发起流程使用 // 发起流程使用
return marketStandardMapper.queryByPageProcess(page, queryWrapper); res = marketStandardMapper.queryByPageProcess(page, queryWrapper);
}
List<LawsMarketStandard> list = res.getRecords();
setManifestVersion(list);
return res;
}
private void setManifestVersion(List<LawsMarketStandard> list) {
if(!CollectionUtils.isEmpty(list)){
List<String> listVersionFlag = list.stream().map(LawsMarketStandard::getVersionFlag).collect(Collectors.toList());
QueryWrapper<LawsMarketStandard> queryLawsMarketStandard = new QueryWrapper<>();
queryLawsMarketStandard.select("version_flag,max(manifest_version) as manifest_version");
queryLawsMarketStandard.in("version_flag",listVersionFlag);
queryLawsMarketStandard.groupBy("version_flag");
List<LawsMarketStandard> listLawsMarketStandard = list(queryLawsMarketStandard);
if(!CollectionUtils.isEmpty(listLawsMarketStandard)){
for (LawsMarketStandard lawsMarketStandard : list) {
Optional<LawsMarketStandard> op = listLawsMarketStandard.stream().filter(o-> Objects.equals(lawsMarketStandard.getVersionFlag(),
o.getVersionFlag())).findFirst();
op.ifPresent(standard -> lawsMarketStandard.setManifestVersion(standard.getManifestVersion()));
}
}
} }
} }