diff --git a/ServiceSite/facade/src/main/java/com/seasky/projectplan/dto/baseconfig/devicetype/DeviceTypeOut.java b/ServiceSite/facade/src/main/java/com/seasky/projectplan/dto/baseconfig/devicetype/DeviceTypeOut.java index f9a233e641608b580a6839dadafdd74bb6616a5b..8699b52656bd4e43b50a9ca084990a001cd8b3f2 100644 --- a/ServiceSite/facade/src/main/java/com/seasky/projectplan/dto/baseconfig/devicetype/DeviceTypeOut.java +++ b/ServiceSite/facade/src/main/java/com/seasky/projectplan/dto/baseconfig/devicetype/DeviceTypeOut.java @@ -26,6 +26,9 @@ public class DeviceTypeOut { @ApiModelProperty("鏀块噰绫诲瀷") private String purchaseType = ""; + @ApiModelProperty("鏀块噰绫诲瀷涓枃鍚�") + private String purchaseTypeName = ""; + @ApiModelProperty("鍗曚环") private BigDecimal price = new BigDecimal(0); } diff --git a/ServiceSite/src/main/java/com/seasky/projectplan/domain/aggregate/baseConfig/DeviceTypeEntity.java b/ServiceSite/src/main/java/com/seasky/projectplan/domain/aggregate/baseConfig/DeviceTypeEntity.java index f4cfdd35d9be1e9c5f0ab352ddb6719dce55d0ea..c99006bbd3a8a5f43770f7352ab4c483a975a9b7 100644 --- a/ServiceSite/src/main/java/com/seasky/projectplan/domain/aggregate/baseConfig/DeviceTypeEntity.java +++ b/ServiceSite/src/main/java/com/seasky/projectplan/domain/aggregate/baseConfig/DeviceTypeEntity.java @@ -26,7 +26,10 @@ public class DeviceTypeEntity extends BaseEntity { private String typeName; @ApiModelProperty("鏀块噰绫诲瀷") - private PurchaseTypeEnum purchaseType; + private PurchaseTypeEnum purchaseType = PurchaseTypeEnum.FOU; + + @ApiModelProperty("鏀块噰绫诲瀷涓枃鍚�") + private String purchaseTypeName = purchaseType.key(); @ApiModelProperty("鍗曚环") private BigDecimal price; diff --git a/ServiceSite/src/main/java/com/seasky/projectplan/domain/aggregate/common/PurchaseTypeEnum.java b/ServiceSite/src/main/java/com/seasky/projectplan/domain/aggregate/common/PurchaseTypeEnum.java index 1990a75b10e0f8134dd16cfb2b5aca2995075eaf..454c901165369b5248625ddf14e1762b642f9f3f 100644 --- a/ServiceSite/src/main/java/com/seasky/projectplan/domain/aggregate/common/PurchaseTypeEnum.java +++ b/ServiceSite/src/main/java/com/seasky/projectplan/domain/aggregate/common/PurchaseTypeEnum.java @@ -38,4 +38,12 @@ public enum PurchaseTypeEnum { return null; } + public static String getN(String v) { + for (PurchaseTypeEnum e:values()) { + if (e.name().equals(v)){ + return e.key(); + } + } + return null; + } } diff --git a/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/reader/baseconfig/BaseConfigReaderConvert.java b/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/reader/baseconfig/BaseConfigReaderConvert.java index 6439c37ff7e75a19cbc30add07775ee431fd74b1..275a71ab011eaebc561bd36c76b5ae13fef77de1 100644 --- a/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/reader/baseconfig/BaseConfigReaderConvert.java +++ b/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/reader/baseconfig/BaseConfigReaderConvert.java @@ -1,10 +1,12 @@ package com.seasky.projectplan.infrastructure.reader.baseconfig; +import cn.hutool.core.util.ObjectUtil; import com.alibaba.druid.util.StringUtils; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.seasky.core.ddd.utils.MapperUtils; +import com.seasky.projectplan.domain.aggregate.common.PurchaseTypeEnum; import com.seasky.projectplan.dto.baseconfig.budgetswitch.BudgetSwitchOut; import com.seasky.projectplan.dto.baseconfig.budgetswitch.DeptSwitchOut; import com.seasky.projectplan.dto.baseconfig.devicetype.DeviceTypeOut; @@ -41,7 +43,13 @@ public class BaseConfigReaderConvert { } public static List<DeviceTypeOut> toDeviceTypeList(List<DeviceTypePo> pos) { - return MapperUtils.INSTANCE.mapAsList(DeviceTypeOut.class, pos); + List<DeviceTypeOut> out = MapperUtils.INSTANCE.mapAsList(DeviceTypeOut.class, pos); + for(DeviceTypeOut data:out){ + if (!ObjectUtil.isNull(data.getPurchaseType())) { + data.setPurchaseTypeName(PurchaseTypeEnum.getN(data.getPurchaseType())); + } + } + return out; }