diff --git a/web-client/src/main/java/com/zcloud/hidden/evaluation/dto/clientobject/HiddenExchangeInfoCO.java b/web-client/src/main/java/com/zcloud/hidden/evaluation/dto/clientobject/HiddenExchangeInfoCO.java index 74cf4c3..b01780c 100644 --- a/web-client/src/main/java/com/zcloud/hidden/evaluation/dto/clientobject/HiddenExchangeInfoCO.java +++ b/web-client/src/main/java/com/zcloud/hidden/evaluation/dto/clientobject/HiddenExchangeInfoCO.java @@ -53,5 +53,8 @@ public class HiddenExchangeInfoCO implements Serializable { @ApiModelProperty(value = "是否兑换:0-否,1-是") private String exchangeFlag; + + @ApiModelProperty(value = "考评结果.1:考核未完成,2:考评合格,3:考核不合格") + private String evaluationResult; } diff --git a/web-infrastructure/src/main/java/com/zcloud/hidden/evaluation/persistence/dataobject/HiddenExchangeInfoDO.java b/web-infrastructure/src/main/java/com/zcloud/hidden/evaluation/persistence/dataobject/HiddenExchangeInfoDO.java index 4a018e3..fd2cdad 100644 --- a/web-infrastructure/src/main/java/com/zcloud/hidden/evaluation/persistence/dataobject/HiddenExchangeInfoDO.java +++ b/web-infrastructure/src/main/java/com/zcloud/hidden/evaluation/persistence/dataobject/HiddenExchangeInfoDO.java @@ -66,6 +66,9 @@ public class HiddenExchangeInfoDO extends BaseDO { @TableField(exist = false) private String exchangeFlag; + @ApiModelProperty(value = "考评结果.1:考核未完成,2:考评合格,3:考核不合格") + private String evaluationResult; + public HiddenExchangeInfoDO(String hiddenExchangeInfoId) { this.hiddenExchangeInfoId = hiddenExchangeInfoId; } diff --git a/web-infrastructure/src/main/resources/mapper/HiddenExchangeInfoMapper.xml b/web-infrastructure/src/main/resources/mapper/HiddenExchangeInfoMapper.xml index 7e56fe1..52b481e 100644 --- a/web-infrastructure/src/main/resources/mapper/HiddenExchangeInfoMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/HiddenExchangeInfoMapper.xml @@ -16,7 +16,8 @@ h.state as state, GROUP_CONCAT(DISTINCT hiddenUser.name) AS checkUserName, COALESCE(GROUP_CONCAT(DISTINCT CONCAT(d.name, '-', u.name)), '') AS evaluationMembers, - her.exchange_flag + her.exchange_flag, + her.evaluation_result from hidden_exchange_info hei left join hidden_evaluation_record her on hei.hidden_id = her.hidden_id and her.delete_enum = 'FALSE' left join hidden h on her.hidden_id = h.hidden_id and h.delete_enum = 'FALSE'