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-09-27 15:36:21 +08:00
parent a4d7071da2
commit be27539d34
1 changed files with 40 additions and 14 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
+40 -14
View File
@@ -511,6 +511,7 @@ public class LawsMarketStandardServiceImpl extends ServiceImpl<LawsMarketStandar
} }
@Override @Override
@Transactional(rollbackFor = JeroBootException.class)
public Result<?> directRelease(String ids) { public Result<?> directRelease(String ids) {
List<String> listIds = Arrays.asList(ids.split(",")); List<String> listIds = Arrays.asList(ids.split(","));
List<LawsMarketStandard> lawsMarketStandardOldList = listByIds(listIds); List<LawsMarketStandard> lawsMarketStandardOldList = listByIds(listIds);
@@ -519,14 +520,8 @@ public class LawsMarketStandardServiceImpl extends ServiceImpl<LawsMarketStandar
} }
StringBuilder msg = new StringBuilder(); StringBuilder msg = new StringBuilder();
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
for (String listId : listIds) { for (LawsMarketStandard lawsMarketStandard : lawsMarketStandardOldList) {
Optional<LawsMarketStandard> op = lawsMarketStandardOldList.stream().filter(o->Objects.equals(o.getId(),listId)).findFirst();
if(!op.isPresent()){
continue;
}
LawsMarketStandard lawsMarketStandard = op.get();
// 已发布的清单所有人都可以查看，未发布的数据只能作者和管理管查看、编辑、删除 // 已发布的清单所有人都可以查看，未发布的数据只能作者和管理管查看、编辑、删除
if(!Arrays.asList(sysUser.getRoleIds().split(",")).contains(lawsAdmin) if(!Arrays.asList(sysUser.getRoleIds().split(",")).contains(lawsAdmin)
&& Arrays.stream(sysUser.getRoleIds().split(",")).noneMatch(otherAdmin::contains) && Arrays.stream(sysUser.getRoleIds().split(",")).noneMatch(otherAdmin::contains)
&& !Arrays.asList(sysUser.getRoleIds().split(",")).contains(superAdmin) && !Arrays.asList(sysUser.getRoleIds().split(",")).contains(superAdmin)
@@ -543,21 +538,52 @@ public class LawsMarketStandardServiceImpl extends ServiceImpl<LawsMarketStandar
continue; continue;
} }
try { try {
processMarketStandardReleaseService.checkProcessStatus(listId); processMarketStandardReleaseService.checkProcessStatus(lawsMarketStandard.getId());
}catch (Exception e){ }catch (Exception e){
msg.append(lawsMarketStandard.getManifestNo()) msg.append(lawsMarketStandard.getManifestNo())
.append("当前数据已发布的流程未结束，不可操作,"); .append("当前数据已发布的流程未结束，不可操作,");
} }
} }
if(!StringUtils.isEmpty(msg.toString())){ if(!StringUtils.isEmpty(msg.toString())){
return Result.error(msg.toString().substring(0,msg.toString().length() - 1)); return Result.error(msg.toString().substring(0,msg.toString().length() - 1));
} }
LambdaUpdateWrapper<LawsMarketStandard> updateLawsMarketStandard = new LambdaUpdateWrapper<>(); for (LawsMarketStandard lawsMarketStandardOld : lawsMarketStandardOldList) {
updateLawsMarketStandard.in(LawsMarketStandard::getId,listIds); LambdaQueryWrapper<LawsMarketStandard> queryLawsMarketStandard = new LambdaQueryWrapper<>();
updateLawsMarketStandard.set(LawsMarketStandard::getUpdateBy,sysUser.getUsername()); queryLawsMarketStandard.eq(LawsMarketStandard::getVersionFlag,lawsMarketStandardOld.getVersionFlag());
updateLawsMarketStandard.set(LawsMarketStandard::getUpdateBy,new Date()); long l = count(queryLawsMarketStandard);
updateLawsMarketStandard.set(LawsMarketStandard::getManifestStatus,MarketStandardConstants.MANIFEST_STATUS_PUBLISH); // 更新状态
update(updateLawsMarketStandard); LambdaUpdateWrapper<LawsMarketStandard> updateLawsMarketStandard = new LambdaUpdateWrapper<>();
updateLawsMarketStandard.eq(LawsMarketStandard::getId, lawsMarketStandardOld.getId());
updateLawsMarketStandard.set(LawsMarketStandard::getReleaseDate,new Date());
updateLawsMarketStandard.set(LawsMarketStandard::getManifestVersion, "V" + l + ".0");
updateLawsMarketStandard.set(LawsMarketStandard::getManifestStatus,MarketStandardConstants.MANIFEST_STATUS_PUBLISH);
updateLawsMarketStandard.set(LawsMarketStandard::getUpdateTime,new Date());
updateLawsMarketStandard.set(LawsMarketStandard::getUpdateBy,sysUser.getUsername());
update(updateLawsMarketStandard);
// 更新标准的市场数据
LambdaQueryWrapper<LawsMarketStandardDetail> queryLawsMarketStandardDetail = new LambdaQueryWrapper<>();
queryLawsMarketStandardDetail.eq(LawsMarketStandardDetail::getManifestId,lawsMarketStandardOld.getId());
List<LawsMarketStandardDetail> listLawsMarketStandardDetail = lawsMarketStandardDetailService
.list(queryLawsMarketStandardDetail);
if(CollectionUtils.isEmpty(listLawsMarketStandardDetail)){
continue;
}
List<LawsDomesticStandard> listLawsDomesticStandard = new ArrayList<>();
String country = lawsMarketStandardOld.getCountry();
for (LawsMarketStandardDetail lawsMarketStandardDetail : listLawsMarketStandardDetail) {
String countryDetail = lawsMarketStandardDetail.getCountry();
String dis = StringUtils.isEmpty(countryDetail) ? country : country + "," + countryDetail;
List<String> data = Arrays.stream(dis.split(",")).distinct().collect(Collectors.toList());
LawsDomesticStandard lawsDomesticStandard = new LawsDomesticStandard();
lawsDomesticStandard.setId(lawsMarketStandardDetail.getStandardId());
lawsDomesticStandard.setApplicableMarket(String.join(",",data));
listLawsDomesticStandard.add(lawsDomesticStandard);
}
lawsDomesticStandardService.updateBatchById(listLawsDomesticStandard);
lawsStandardMasterPlanService.syncMarketRegulationListUpdate(lawsMarketStandardOld.getId(),lawsMarketStandardOld.getCountry());
}
return Result.OK(ResultCommon.OK); return Result.OK(ResultCommon.OK);
} }