diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffVerifier.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffVerifier.java index dce8f6e..2918938 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffVerifier.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffVerifier.java @@ -3,6 +3,8 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -44,9 +46,14 @@ private String certNo; @ApiModelProperty(value = "证书类型", dataType = "String") + @DictCodeField(message = "证书类型代码描述不合法", cacheName = MeterDictCode.CERT_TYPE) @TableField("cert_type") private String certType; + @ApiModelProperty(value = "证书类型(字典value)", dataType = "String") + @TableField(exist = false) + private String certTypeName; + /** * 证书名称 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffVerifier.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffVerifier.java index dce8f6e..2918938 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffVerifier.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceStaffVerifier.java @@ -3,6 +3,8 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.constants.MeterDictCode; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -44,9 +46,14 @@ private String certNo; @ApiModelProperty(value = "证书类型", dataType = "String") + @DictCodeField(message = "证书类型代码描述不合法", cacheName = MeterDictCode.CERT_TYPE) @TableField("cert_type") private String certType; + @ApiModelProperty(value = "证书类型(字典value)", dataType = "String") + @TableField(exist = false) + private String certTypeName; + /** * 证书名称 */ diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceStaffInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceStaffInfoServiceImpl.java index da000bc..8c7eb0b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceStaffInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceStaffInfoServiceImpl.java @@ -567,6 +567,13 @@ QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("staff_id", idDto.getId()); Page verifierPage = staffVerifierMapper.selectPage(page, wrapper); + for (BizResourceStaffVerifier record : verifierPage.getRecords()) { + try { + DictCodeUtils.convertDictCodeToName(record); + } catch (Exception e) { + throw new RuntimeException(e); + } + } return verifierPage; }