diff --git a/web-app/src/main/java/com/zcloud/hidden/evaluation/command/query/HiddenEvaluationRecordQueryExe.java b/web-app/src/main/java/com/zcloud/hidden/evaluation/command/query/HiddenEvaluationRecordQueryExe.java index 02887d9..5139484 100644 --- a/web-app/src/main/java/com/zcloud/hidden/evaluation/command/query/HiddenEvaluationRecordQueryExe.java +++ b/web-app/src/main/java/com/zcloud/hidden/evaluation/command/query/HiddenEvaluationRecordQueryExe.java @@ -79,7 +79,7 @@ public class HiddenEvaluationRecordQueryExe { examCenterCOS.forEach(co -> { if (co.getCheckUserId() != null && co.getCheckUserId().contains(checkKey)) { - co.setCurrentEvaluationFlag(false); + co.setCurrentEvaluationFlag(true); } }); return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex()); diff --git a/web-client/src/main/java/com/zcloud/hidden/evaluation/dto/clientobject/HiddenStatisticsCO.java b/web-client/src/main/java/com/zcloud/hidden/evaluation/dto/clientobject/HiddenStatisticsCO.java index 65d88b7..55b72f1 100644 --- a/web-client/src/main/java/com/zcloud/hidden/evaluation/dto/clientobject/HiddenStatisticsCO.java +++ b/web-client/src/main/java/com/zcloud/hidden/evaluation/dto/clientobject/HiddenStatisticsCO.java @@ -42,8 +42,8 @@ public class HiddenStatisticsCO implements Serializable { private String noEvaluationMembers; @ApiModelProperty(value = "考评结果.1:考核未完成,2:考评合格,3:考核不合格") private String evaluationResult; - @ApiModelProperty(value = "当前人是否考评过,true是,false否") - private Boolean currentEvaluationFlag = true; + @ApiModelProperty(value = "当前人是否可以考评,true是,false否") + private Boolean currentEvaluationFlag = false; } diff --git a/web-infrastructure/src/main/resources/mapper/HiddenEvaluationRecordMapper.xml b/web-infrastructure/src/main/resources/mapper/HiddenEvaluationRecordMapper.xml index 1c82cf2..9975786 100644 --- a/web-infrastructure/src/main/resources/mapper/HiddenEvaluationRecordMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/HiddenEvaluationRecordMapper.xml @@ -117,7 +117,7 @@ LEFT JOIN user usr ON ec.user_id = usr.id WHERE ec.corpinfo_id = h.corp_id 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 FROM hidden_evaluation_detail hed2 LEFT JOIN hidden_evaluation_record her2