From 36e8002e213fa98ab6d45c84a565c8f8eb86259a Mon Sep 17 00:00:00 2001 From: zhaokai Date: Thu, 16 Apr 2026 11:15:47 +0800 Subject: [PATCH] =?UTF-8?q?feat(hidden-evaluation):=20=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E8=80=83=E8=AF=84=E7=BB=93=E6=9E=9C=E5=AD=97=E6=AE=B5=E6=94=AF?= =?UTF-8?q?=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../evaluation/dto/clientobject/HiddenExchangeInfoCO.java | 3 +++ .../persistence/dataobject/HiddenExchangeInfoDO.java | 3 +++ .../src/main/resources/mapper/HiddenExchangeInfoMapper.xml | 3 ++- 3 files changed, 8 insertions(+), 1 deletion(-) 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'