diff --git a/laws-modules-docking/src/main/java/com/jero/modules/docking/asms/service/impl/LawsAsmsOpenApiServiceImpl.java b/laws-modules-docking/src/main/java/com/jero/modules/docking/asms/service/impl/LawsAsmsOpenApiServiceImpl.java index 5dffaff9..b7b571d8 100644 --- a/laws-modules-docking/src/main/java/com/jero/modules/docking/asms/service/impl/LawsAsmsOpenApiServiceImpl.java +++ b/laws-modules-docking/src/main/java/com/jero/modules/docking/asms/service/impl/LawsAsmsOpenApiServiceImpl.java @@ -291,11 +291,21 @@ public class LawsAsmsOpenApiServiceImpl extends ServiceImpl> mapList = asmsPostUtil.sendGetReq(lawsAsmsOpenApi.getApiUrl(), map); List lawsStandardizationList = new ArrayList(); - LawsStandardization parent = lawsStandardizationService.getById("0"); + + LambdaQueryWrapper parentQueryWrapper = new LambdaQueryWrapper<>(); + parentQueryWrapper.eq(LawsStandardization::getPid, "0"); + List parentList = lawsStandardizationService.list(parentQueryWrapper); + String parentId; + if (CollectionUtils.isEmpty(parentList)) { + parentId = "0"; + } else { + parentId = parentList.get(0).getId(); + } + mapList.forEach(eMap -> { LawsStandardization lawsStandardization = new LawsStandardization(); lawsStandardization.setStandardizationType("分标委"); - lawsStandardization.setPid(parent.getId()); + lawsStandardization.setPid(parentId); eMap.forEach((k,v) -> { if ("code".equals(k)) { lawsStandardization.setNum(v); diff --git a/laws-modules/src/main/java/com/jero/modules/laws/common/constant/FieldCommon.java b/laws-modules/src/main/java/com/jero/modules/laws/common/constant/FieldCommon.java index f42ab6e8..e91833ab 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/common/constant/FieldCommon.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/common/constant/FieldCommon.java @@ -96,8 +96,8 @@ public class FieldCommon { public static final String STANDARD_SYSTEM = "standard_system"; // 标准类别 public static final String STANDARD_CLASS = "standard_class"; - // 零部件名称 - public static final String PART_NAME = "part_name"; + // 分标委 + public static final String BIDDING_COMMITTEE = "bidding_committee"; // 代替标准号 public static final String REPLACED_STANDARD = "substitute_standard_number"; diff --git a/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java index 6eed0dc6..cd1a6a77 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java @@ -437,6 +437,11 @@ public class LawsCommonServiceImpl implements ILawsCommonService { resultMap.put(key + FieldCommon._DICT_TEXT, StringUtils.join(fileList.stream() .map(OSSFile::getFileName).collect(Collectors.toList()), ",")); } + } else if (FieldCommon.BIDDING_COMMITTEE.equals(key) && StringUtils.isNotBlank(value)) { + // 如果是分标委 + LawsStandardization lawsStandardization = lawsStandardizationService.getById(value); + resultMap.put(key, value); + resultMap.put(key + FieldCommon._DICT_TEXT, lawsStandardization.getName()); } } @@ -2111,10 +2116,18 @@ public class LawsCommonServiceImpl implements ILawsCommonService { **/ @Override public List getBiddingCommittee() { - LawsStandardization parent = lawsStandardizationService.getById("0"); + LambdaQueryWrapper parentQueryWrapper = new LambdaQueryWrapper<>(); + parentQueryWrapper.eq(LawsStandardization::getPid, "0"); + List parentList = lawsStandardizationService.list(parentQueryWrapper); + if (CollectionUtils.isEmpty(parentList)) { + return new ArrayList<>(); + } + List parentIds = parentList.stream().map(LawsStandardization::getId).collect(Collectors.toList()); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(LawsStandardization::getPid, parent.getId()); + queryWrapper.in(LawsStandardization::getPid, parentIds); List standardizationList = lawsStandardizationService.list(queryWrapper); + List lawsDictModelList = new ArrayList<>(); standardizationList.forEach(standardization -> { LawsDictModel lawsDictModel = new LawsDictModel();