diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java index 6ca4564..f9e2b4b 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java @@ -43,10 +43,15 @@ private String priceName; @TableField("check_type") - @ExcelProperty(value = "校验类型",order = 2) + @ExcelProperty(value = "校验类型") @ApiModelProperty(value = "校验类型-字典value", dataType = "String") private String checkType; + @TableField(exist = false) + @ExcelProperty(value = "校验类型",order = 2) + @ApiModelProperty(value = "校验类型名称", dataType = "String") + private String checkTypeName; + @TableField("price_type") @ApiModelProperty(value = "类别id", dataType = "String") private String priceType; @@ -83,15 +88,25 @@ private String priceDescription; @TableField("operator_discount_permission") - @ExcelProperty(value = "业务员折扣权限",order = 7) + @ExcelProperty(value = "业务员折扣权限") @ApiModelProperty(value = "业务员折扣权限-字典value", dataType = "String") private String operatorDiscountPermission; + @TableField(exist = false) + @ExcelProperty(value = "业务员折扣权限",order = 7) + @ApiModelProperty(value = "业务员折扣权限名称", dataType = "String") + private String operatorDiscountPermissionName; + @TableField("director_discount_permission") - @ExcelProperty(value = "负责人折扣权限",order = 8) + @ExcelProperty(value = "负责人折扣权限") @ApiModelProperty(value = "负责人折扣权限-字典value", dataType = "String") private String directorDiscountPermission; + @TableField(exist = false) + @ExcelProperty(value = "负责人折扣权限",order = 8) + @ApiModelProperty(value = "负责人折扣权限名称", dataType = "String") + private String directorDiscountPermissionName; + @TableField("remark") @ApiModelProperty(value = "备注", dataType = "String") private String remark; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java index 6ca4564..f9e2b4b 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java @@ -43,10 +43,15 @@ private String priceName; @TableField("check_type") - @ExcelProperty(value = "校验类型",order = 2) + @ExcelProperty(value = "校验类型") @ApiModelProperty(value = "校验类型-字典value", dataType = "String") private String checkType; + @TableField(exist = false) + @ExcelProperty(value = "校验类型",order = 2) + @ApiModelProperty(value = "校验类型名称", dataType = "String") + private String checkTypeName; + @TableField("price_type") @ApiModelProperty(value = "类别id", dataType = "String") private String priceType; @@ -83,15 +88,25 @@ private String priceDescription; @TableField("operator_discount_permission") - @ExcelProperty(value = "业务员折扣权限",order = 7) + @ExcelProperty(value = "业务员折扣权限") @ApiModelProperty(value = "业务员折扣权限-字典value", dataType = "String") private String operatorDiscountPermission; + @TableField(exist = false) + @ExcelProperty(value = "业务员折扣权限",order = 7) + @ApiModelProperty(value = "业务员折扣权限名称", dataType = "String") + private String operatorDiscountPermissionName; + @TableField("director_discount_permission") - @ExcelProperty(value = "负责人折扣权限",order = 8) + @ExcelProperty(value = "负责人折扣权限") @ApiModelProperty(value = "负责人折扣权限-字典value", dataType = "String") private String directorDiscountPermission; + @TableField(exist = false) + @ExcelProperty(value = "负责人折扣权限",order = 8) + @ApiModelProperty(value = "负责人折扣权限名称", dataType = "String") + private String directorDiscountPermissionName; + @TableField("remark") @ApiModelProperty(value = "备注", dataType = "String") private String remark; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java index 643ba4c..ab30ff5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java @@ -99,9 +99,9 @@ @Override public MeterPrice queryPriceInfo(IdDTO idDto) { MeterPrice meterPrice = meterPriceMapper.queryPriceInfo(idDto.getId()); - meterPrice.setCheckType(dictService.getDictNameByCode(MeterDictEnum.CHECK_TYPE,meterPrice.getCheckType())); - meterPrice.setDirectorDiscountPermission(dictService.getDictNameByCode(MeterDictEnum.DIRECTOR_DISCOUNT_PERMISSION,meterPrice.getDirectorDiscountPermission())); - meterPrice.setOperatorDiscountPermission(dictService.getDictNameByCode(MeterDictEnum.OPERATOR_DISCOUNT_PERMISSION,meterPrice.getOperatorDiscountPermission())); + meterPrice.setCheckTypeName(dictService.getDictNameByCode(MeterDictEnum.CHECK_TYPE,meterPrice.getCheckType())); + meterPrice.setDirectorDiscountPermissionName(dictService.getDictNameByCode(MeterDictEnum.DIRECTOR_DISCOUNT_PERMISSION,meterPrice.getDirectorDiscountPermission())); + meterPrice.setOperatorDiscountPermissionName(dictService.getDictNameByCode(MeterDictEnum.OPERATOR_DISCOUNT_PERMISSION,meterPrice.getOperatorDiscountPermission())); return meterPrice; } @@ -208,9 +208,9 @@ private List supplementList(List meterPriceList){ meterPriceList.forEach(bean->{ - bean.setCheckType(dictService.getDictNameByCode(MeterDictEnum.CHECK_TYPE,bean.getCheckType())); - bean.setDirectorDiscountPermission(dictService.getDictNameByCode(MeterDictEnum.DIRECTOR_DISCOUNT_PERMISSION,bean.getDirectorDiscountPermission())); - bean.setOperatorDiscountPermission(dictService.getDictNameByCode(MeterDictEnum.OPERATOR_DISCOUNT_PERMISSION,bean.getOperatorDiscountPermission())); + bean.setCheckTypeName(dictService.getDictNameByCode(MeterDictEnum.CHECK_TYPE,bean.getCheckType())); + bean.setDirectorDiscountPermissionName(dictService.getDictNameByCode(MeterDictEnum.DIRECTOR_DISCOUNT_PERMISSION,bean.getDirectorDiscountPermission())); + bean.setOperatorDiscountPermissionName(dictService.getDictNameByCode(MeterDictEnum.OPERATOR_DISCOUNT_PERMISSION,bean.getOperatorDiscountPermission())); }); return meterPriceList; }