修改市场法规清单直接发布
This commit is contained in:
+26
-28
@@ -567,21 +567,20 @@ public class LawsMarketStandardServiceImpl extends ServiceImpl<LawsMarketStandar
|
||||
queryLawsMarketStandardDetail.eq(LawsMarketStandardDetail::getManifestId,lawsMarketStandardOld.getId());
|
||||
List<LawsMarketStandardDetail> listLawsMarketStandardDetail = lawsMarketStandardDetailService
|
||||
.list(queryLawsMarketStandardDetail);
|
||||
if(CollectionUtils.isEmpty(listLawsMarketStandardDetail)){
|
||||
continue;
|
||||
if(!CollectionUtils.isEmpty(listLawsMarketStandardDetail)){
|
||||
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);
|
||||
}
|
||||
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);
|
||||
@@ -618,21 +617,20 @@ public class LawsMarketStandardServiceImpl extends ServiceImpl<LawsMarketStandar
|
||||
queryLawsMarketStandardDetail.eq(LawsMarketStandardDetail::getManifestId,id);
|
||||
List<LawsMarketStandardDetail> listLawsMarketStandardDetail = lawsMarketStandardDetailService
|
||||
.list(queryLawsMarketStandardDetail);
|
||||
if(CollectionUtils.isEmpty(listLawsMarketStandardDetail)){
|
||||
return Result.OK(ResultCommon.OK);
|
||||
if(!CollectionUtils.isEmpty(listLawsMarketStandardDetail)){
|
||||
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);
|
||||
}
|
||||
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(id,lawsMarketStandardOld.getCountry());
|
||||
return Result.OK(ResultCommon.OK);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user