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

fix(标准主计划): 同步 市场法规清单更新

Browse Source
This commit is contained in:
yjz
2024-07-31 14:48:32 +08:00
parent a95960a1ac
commit 3b81a3f86b
2 changed files with 29 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/assessmentLibrary/service/impl/LawsConformityAssessmentLibraryServiceImpl.java
+7 -4
View File
@@ -201,10 +201,13 @@ public class LawsConformityAssessmentLibraryServiceImpl extends ServiceImpl<Laws
public LawsConformityAssessmentLibrary queryOne(LawsConformityAssessmentLibrary lawsConformityAssessmentLibrary) {
QueryWrapper<LawsConformityAssessmentLibrary> queryWrapper = new QueryWrapper<>();
queryWrapper.eq(StringUtils.isNotBlank(lawsConformityAssessmentLibrary.getStandardNumber()),
"d.standard_number", lawsConformityAssessmentLibrary.getStandardNumber());
queryWrapper.like(StringUtils.isNotBlank(lawsConformityAssessmentLibrary.getApplicableMarket())
,"lms.country", lawsConformityAssessmentLibrary.getApplicableMarket());
queryWrapper.orderByAsc("cs.valuation_time");
"standard_number", lawsConformityAssessmentLibrary.getStandardNumber());
if (StringUtils.isNotBlank(lawsConformityAssessmentLibrary.getApplicableMarket())){
List<String> list = Arrays.asList(lawsConformityAssessmentLibrary.getApplicableMarket().split(","));
queryWrapper.and(query -> list.forEach(item ->
query.or(qw -> qw.gt("find_in_set('" + item + "', applicableMarket)", 0))));
}
queryWrapper.orderByAsc("valuation_time");
queryWrapper.last("limit 1");
List<LawsConformityAssessmentLibrary> result = lawsConformityAssessmentLibraryMapper.queryByPage(queryWrapper);
if (CollectionUtils.isNotEmpty(result)){
laws-modules/src/main/java/com/jero/modules/laws/standardmasterplan/servicce/impl/LawsStandardMasterPlanServiceImpl.java
+22 -11
View File
@@ -443,11 +443,17 @@ public class LawsStandardMasterPlanServiceImpl
public void syncMarketRegulationListUpdate(String id, String applicableMarkets) {
// 适用市场可能有多个，每个适用市场判断是否最早发布的
for (String applicableMarket : applicableMarkets.split(",")) {
LawsMarketStandard lawsMarketStandard = lawsMarketStandardService.getOne(
new LambdaQueryWrapper<LawsMarketStandard>()
.eq(LawsMarketStandard::getCountry, applicableMarket)
.eq(LawsMarketStandard::getManifestStatus, MarketStandardConstants.MANIFEST_STATUS_PUBLISH)
.orderByAsc(LawsMarketStandard::getCreateTime).last("limit 1"));
QueryWrapper<LawsMarketStandard> lawsMarketStandardQueryWrapper = new QueryWrapper<>();
lawsMarketStandardQueryWrapper.eq("manifest_status",
MarketStandardConstants.MANIFEST_STATUS_PUBLISH);
lawsMarketStandardQueryWrapper.orderByAsc("create_time").last("limit 1");
if (StringUtils.isNotBlank(applicableMarket)){
List<String> list2 = Arrays.asList(applicableMarket.split(","));
lawsMarketStandardQueryWrapper.and(query -> list2.forEach(item ->
query.or(qw -> qw.gt("find_in_set('" + item + "', getCountry)", 0))));
}
// 根据适用市场查询获取最早发布的市场法规清单
LawsMarketStandard lawsMarketStandard = lawsMarketStandardService.getOne(lawsMarketStandardQueryWrapper);
if (!Objects.isNull(lawsMarketStandard) && lawsMarketStandard.getId().equals(id)){
// 更新标准主计划数据
List<LawsStandardMasterPlan> standardMasterPlanList = list(new LambdaUpdateWrapper<LawsStandardMasterPlan>()
@@ -525,12 +531,17 @@ public class LawsStandardMasterPlanServiceImpl
// 市场法规清单更新
LawsStandardMasterPlanSublist masterPlanSublist2 = new LawsStandardMasterPlanSublist();
masterPlanSublist2.setType(LawsStandardMasterPlanCommon.MARKET_REGULATION_LIST_UPDATE);
QueryWrapper<LawsMarketStandard> lawsMarketStandardQueryWrapper = new QueryWrapper<>();
lawsMarketStandardQueryWrapper.eq("manifest_status",
MarketStandardConstants.MANIFEST_STATUS_PUBLISH);
lawsMarketStandardQueryWrapper.orderByAsc("create_time").last("limit 1");
if (StringUtils.isNotBlank(applicableMarket)){
List<String> list2 = Arrays.asList(applicableMarket.split(","));
lawsMarketStandardQueryWrapper.and(query -> list2.forEach(item ->
query.or(qw -> qw.gt("find_in_set('" + item + "', getCountry)", 0))));
}
// 根据适用市场查询获取最早发布的市场法规清单
LawsMarketStandard lawsMarketStandard = lawsMarketStandardService.getOne(
new LambdaQueryWrapper<LawsMarketStandard>()
.like(LawsMarketStandard::getCountry, applicableMarket)
.eq(LawsMarketStandard::getManifestStatus, MarketStandardConstants.MANIFEST_STATUS_PUBLISH)
.orderByAsc(LawsMarketStandard::getCreateTime).last("limit 1"));
LawsMarketStandard lawsMarketStandard = lawsMarketStandardService.getOne(lawsMarketStandardQueryWrapper);
if (!Objects.isNull(lawsMarketStandard)){
// 查询第一个发布版本
masterPlanSublist2.setAssociationId(lawsMarketStandard.getId());
@@ -551,7 +562,7 @@ public class LawsStandardMasterPlanServiceImpl
lawsConformityAssessmentLibraryService.queryOne(lawsConformityAssessmentLibrary);
if (!Objects.isNull(lawsConformityAssessmentLibrary1)){
masterPlanSublist3.setAssociationId(lawsConformityAssessmentLibrary1.getId());
masterPlanSublist3.setActualCompletionDate(lawsConformityAssessmentLibrary.getValuationTime());
masterPlanSublist3.setActualCompletionDate(lawsConformityAssessmentLibrary1.getValuationTime());
}
list.add(masterPlanSublist3);