zcloud_gbs
/
zcloud_gbs_hidden_evaluation
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat(hidden-evaluation): 添加考评结果字段支持

main
zhaokai 2026-04-16 11:15:47 +08:00
parent 858ebd80e7
commit 36e8002e21
3 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
web-client/src/main/java/com/zcloud/hidden/evaluation/dto/clientobject/HiddenExchangeInfoCO.java
View File

@ -53,5 +53,8 @@ public class HiddenExchangeInfoCO implements Serializable {
@ApiModelProperty(value = "是否兑换:0-否,1-是") @ApiModelProperty(value = "是否兑换:0-否,1-是")
private String exchangeFlag; private String exchangeFlag;
@ApiModelProperty(value = "考评结果.1:考核未完成,2:考评合格,3:考核不合格")
private String evaluationResult;
} }

3
web-infrastructure/src/main/java/com/zcloud/hidden/evaluation/persistence/dataobject/HiddenExchangeInfoDO.java
View File

@ -66,6 +66,9 @@ public class HiddenExchangeInfoDO extends BaseDO {
@TableField(exist = false) @TableField(exist = false)
private String exchangeFlag; private String exchangeFlag;
@ApiModelProperty(value = "考评结果.1:考核未完成,2:考评合格,3:考核不合格")
private String evaluationResult;
public HiddenExchangeInfoDO(String hiddenExchangeInfoId) { public HiddenExchangeInfoDO(String hiddenExchangeInfoId) {
this.hiddenExchangeInfoId = hiddenExchangeInfoId; this.hiddenExchangeInfoId = hiddenExchangeInfoId;
} }

3
web-infrastructure/src/main/resources/mapper/HiddenExchangeInfoMapper.xml
View File

@ -16,7 +16,8 @@
h.state as state, h.state as state,
GROUP_CONCAT(DISTINCT hiddenUser.name) AS checkUserName, GROUP_CONCAT(DISTINCT hiddenUser.name) AS checkUserName,
COALESCE(GROUP_CONCAT(DISTINCT CONCAT(d.name, '-', u.name)), '') AS evaluationMembers, 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 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_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' left join hidden h on her.hidden_id = h.hidden_id and h.delete_enum = 'FALSE'