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

隐患考评调整

main
zhaokai 2026-04-13 11:26:10 +08:00
parent 817f3f2d9c
commit bcfa7d87e9
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
web-app/src/main/java/com/zcloud/hidden/evaluation/command/query/HiddenEvaluationRecordQueryExe.java
View File

@ -79,7 +79,7 @@ public class HiddenEvaluationRecordQueryExe {
examCenterCOS.forEach(co -> { examCenterCOS.forEach(co -> {
if (co.getCheckUserId() != null && co.getCheckUserId().contains(checkKey)) { if (co.getCheckUserId() != null && co.getCheckUserId().contains(checkKey)) {
co.setCurrentEvaluationFlag(false); co.setCurrentEvaluationFlag(true);
} }
}); });
return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex()); return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex());

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

@ -42,8 +42,8 @@ public class HiddenStatisticsCO implements Serializable {
private String noEvaluationMembers; private String noEvaluationMembers;
@ApiModelProperty(value = "考评结果.1:考核未完成,2:考评合格,3:考核不合格") @ApiModelProperty(value = "考评结果.1:考核未完成,2:考评合格,3:考核不合格")
private String evaluationResult; private String evaluationResult;
@ApiModelProperty(value = "当前人是否考评过,true是,false否") @ApiModelProperty(value = "当前人是否可以考评,true是,false否")
private Boolean currentEvaluationFlag = true; private Boolean currentEvaluationFlag = false;
} }

2
web-infrastructure/src/main/resources/mapper/HiddenEvaluationRecordMapper.xml
View File

@ -117,7 +117,7 @@
LEFT JOIN user usr ON ec.user_id = usr.id LEFT JOIN user usr ON ec.user_id = usr.id
WHERE ec.corpinfo_id = h.corp_id WHERE ec.corpinfo_id = h.corp_id
AND ec.delete_enum = 'FALSE' AND ec.delete_enum = 'FALSE'
AND ec.evaluation_type = 1 AND ec.evaluation_type = #{params.evaluationType}
AND usr.id NOT IN (SELECT DISTINCT hed2.evaluation_user_id AND usr.id NOT IN (SELECT DISTINCT hed2.evaluation_user_id
FROM hidden_evaluation_detail hed2 FROM hidden_evaluation_detail hed2
LEFT JOIN hidden_evaluation_record her2 LEFT JOIN hidden_evaluation_record her2