diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/entity/StandSystemDTO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/entity/StandSystemDTO.java index 34ed449e..8e2f01ee 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/entity/StandSystemDTO.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/entity/StandSystemDTO.java @@ -51,6 +51,9 @@ public class StandSystemDTO { @ApiModelProperty(value = "标准状态") private String standState; + @ApiModelProperty(value = "文本状态") + private String textStatus; + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") @DateTimeFormat(pattern="yyyy-MM-dd") @ApiModelProperty(value = "开始发布日期") diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/impl/SarMenuStandardNewServiceNewImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/impl/SarMenuStandardNewServiceNewImpl.java index b297ba57..4c7e5156 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/impl/SarMenuStandardNewServiceNewImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/impl/SarMenuStandardNewServiceNewImpl.java @@ -276,7 +276,9 @@ public class SarMenuStandardNewServiceNewImpl extends ServiceImpl gbStateDictList = dicItemService.selectAllDicTypeNameByDicCode("STANDSTATE"); +// List gbStateDictList = dicItemService.selectAllDicTypeNameByDicCode("STANDSTATE"); + // 国标外标标准文本状态 + List gbTextStateDictList = dicItemService.selectAllDicTypeNameByDicCode("WBZTCLASS"); // 企标标准状态字典 List esStateDictList = dicItemService.selectAllDicTypeNameByDicCode("TEXTSTATUSBUSS"); @@ -289,7 +291,8 @@ public class SarMenuStandardNewServiceNewImpl extends ServiceImpl gbStateDictList, List esStateDictList) { + private void translateStandardSystemDTO(StandSystemDTO dto, List gbTextStateDictList, List esStateDictList) { // 翻译数据来源、标准状态 switch (dto.getDataSource()) { case "INLAND": dto.setDataSource("国内标准库"); - dto.setStandState(gbStateDictList.stream() - .filter(dict -> dict.getDicTypeCode().equals(dto.getStandState())) + dto.setStandState(gbTextStateDictList.stream() + .filter(dict -> dict.getDicTypeCode().equals(dto.getTextStatus())) .findFirst().orElse(new TsDicType()).getDicTypeName()); break; case "FOREIGN": dto.setDataSource("海外标准库"); - dto.setStandState(gbStateDictList.stream() - .filter(dict -> dict.getDicTypeCode().equals(dto.getStandState())) + dto.setStandState(gbTextStateDictList.stream() + .filter(dict -> dict.getDicTypeCode().equals(dto.getTextStatus())) .findFirst().orElse(new TsDicType()).getDicTypeName()); break; case "ENTERPRISE": diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandMenu/SarStandMenuMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandMenu/SarStandMenuMapper.xml index 9ad53d50..f6ec0123 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandMenu/SarStandMenuMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandMenu/SarStandMenuMapper.xml @@ -177,9 +177,11 @@