From 8a0e5a335ef11eec4bbf2b3e959068611507f5c9 Mon Sep 17 00:00:00 2001 From: lishiwei <3230787218@qq.com> Date: Wed, 10 Jun 2026 16:45:02 +0800 Subject: [PATCH] =?UTF-8?q?feat():=20=E6=B7=BB=E5=8A=A0=E8=80=83=E8=AF=84?= =?UTF-8?q?=E6=8C=89=E9=92=AE=E7=8A=B6=E6=80=81=E6=9F=A5=E8=AF=A2=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../evaluation/web/EvaluationConfigController.java | 6 ++++++ .../evaluation/command/EvaluationCorpUpdateExe.java | 4 ++++ .../service/EvaluationConfigServiceImpl.java | 5 +++++ .../evaluation/api/EvaluationConfigServiceI.java | 2 ++ .../domain/gateway/EvaluationCorpGateway.java | 5 +++++ .../gatewayimpl/EvaluationCorpGatewayImpl.java | 11 +++++++++++ .../main/resources/mapper/EvaluationConfigMapper.xml | 2 +- .../resources/mapper/HiddenEvaluationRecordMapper.xml | 6 +++--- 8 files changed, 37 insertions(+), 4 deletions(-) diff --git a/web-adapter/src/main/java/com/zcloud/hidden/evaluation/web/EvaluationConfigController.java b/web-adapter/src/main/java/com/zcloud/hidden/evaluation/web/EvaluationConfigController.java index 3887f74..99f4862 100644 --- a/web-adapter/src/main/java/com/zcloud/hidden/evaluation/web/EvaluationConfigController.java +++ b/web-adapter/src/main/java/com/zcloud/hidden/evaluation/web/EvaluationConfigController.java @@ -62,6 +62,12 @@ public class EvaluationConfigController { return SingleResponse.buildSuccess(); } + @ApiOperation("查询考评结束状态") + @GetMapping("/getEvalClosedStatus") + public SingleResponse getEvalClosedStatus() { + return SingleResponse.of(evaluationConfigService.getEvalClosedStatus()); + } + diff --git a/web-app/src/main/java/com/zcloud/hidden/evaluation/command/EvaluationCorpUpdateExe.java b/web-app/src/main/java/com/zcloud/hidden/evaluation/command/EvaluationCorpUpdateExe.java index a21c532..2e4e910 100644 --- a/web-app/src/main/java/com/zcloud/hidden/evaluation/command/EvaluationCorpUpdateExe.java +++ b/web-app/src/main/java/com/zcloud/hidden/evaluation/command/EvaluationCorpUpdateExe.java @@ -41,5 +41,9 @@ public class EvaluationCorpUpdateExe { throw new BizException("配置失败"); } } + + public Integer getEvalClosedStatus() { + return evaluationCorpGateway.getEvalClosedStatus(); + } } diff --git a/web-app/src/main/java/com/zcloud/hidden/evaluation/service/EvaluationConfigServiceImpl.java b/web-app/src/main/java/com/zcloud/hidden/evaluation/service/EvaluationConfigServiceImpl.java index 4e0115f..6a7dcce 100644 --- a/web-app/src/main/java/com/zcloud/hidden/evaluation/service/EvaluationConfigServiceImpl.java +++ b/web-app/src/main/java/com/zcloud/hidden/evaluation/service/EvaluationConfigServiceImpl.java @@ -74,5 +74,10 @@ public class EvaluationConfigServiceImpl implements EvaluationConfigServiceI { public void toggleEvalClosed(ToggleEvalClosedCmd cmd) { evaluationCorpUpdateExe.toggleEvalClosed(cmd); } + + @Override + public Integer getEvalClosedStatus() { + return evaluationCorpUpdateExe.getEvalClosedStatus(); + } } diff --git a/web-client/src/main/java/com/zcloud/hidden/evaluation/api/EvaluationConfigServiceI.java b/web-client/src/main/java/com/zcloud/hidden/evaluation/api/EvaluationConfigServiceI.java index 86e4961..4fb1d55 100644 --- a/web-client/src/main/java/com/zcloud/hidden/evaluation/api/EvaluationConfigServiceI.java +++ b/web-client/src/main/java/com/zcloud/hidden/evaluation/api/EvaluationConfigServiceI.java @@ -31,5 +31,7 @@ public interface EvaluationConfigServiceI { void editBath(EvaluationConfigBathUpdateCmd evaluationConfigBathUpdateCmd); void toggleEvalClosed(ToggleEvalClosedCmd cmd); + + Integer getEvalClosedStatus(); } diff --git a/web-domain/src/main/java/com/zcloud/hidden/evaluation/domain/gateway/EvaluationCorpGateway.java b/web-domain/src/main/java/com/zcloud/hidden/evaluation/domain/gateway/EvaluationCorpGateway.java index 889b3c6..ff17517 100644 --- a/web-domain/src/main/java/com/zcloud/hidden/evaluation/domain/gateway/EvaluationCorpGateway.java +++ b/web-domain/src/main/java/com/zcloud/hidden/evaluation/domain/gateway/EvaluationCorpGateway.java @@ -25,6 +25,11 @@ public interface EvaluationCorpGateway { */ Boolean toggleEvalClosed(EvaluationCorpE evaluationCorpE); + /** + * 查询考评结束状态 + */ + Integer getEvalClosedStatus(); + /** * 删除 */ diff --git a/web-infrastructure/src/main/java/com/zcloud/hidden/evaluation/gatewayimpl/EvaluationCorpGatewayImpl.java b/web-infrastructure/src/main/java/com/zcloud/hidden/evaluation/gatewayimpl/EvaluationCorpGatewayImpl.java index fabefb5..b0dafb3 100644 --- a/web-infrastructure/src/main/java/com/zcloud/hidden/evaluation/gatewayimpl/EvaluationCorpGatewayImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/hidden/evaluation/gatewayimpl/EvaluationCorpGatewayImpl.java @@ -11,6 +11,7 @@ import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import java.util.Collections; +import java.util.List; /** * web-infrastructure @@ -51,6 +52,16 @@ public class EvaluationCorpGatewayImpl implements EvaluationCorpGateway { return true; } + @Override + public Integer getEvalClosedStatus() { + List list = evaluationCorpRepository.list(); + if (list.isEmpty()) { + return 0; + } + Integer closed = list.get(0).getEvaluationClosed(); + return closed != null ? closed : 0; + } + @Override public Boolean deletedEvaluationCorpById(Long id) { return evaluationCorpRepository.removeById(id); diff --git a/web-infrastructure/src/main/resources/mapper/EvaluationConfigMapper.xml b/web-infrastructure/src/main/resources/mapper/EvaluationConfigMapper.xml index fb5476b..be82562 100644 --- a/web-infrastructure/src/main/resources/mapper/EvaluationConfigMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/EvaluationConfigMapper.xml @@ -11,7 +11,7 @@ COALESCE(ec_safe.members, '') AS safeEvaluationMember, CASE WHEN ec_env.id IS NOT NULL THEN '已分配' ELSE '未分配' END AS envEvaluationConfigStatus, COALESCE(ec_env.members, '') AS envEvaluationMember, - (SELECT e.evaluation_closed FROM evaluation_corp e WHERE e.delete_enum = 'FALSE' LIMIT 1) AS evaluationClosed + COALESCE((SELECT e.evaluation_closed FROM evaluation_corp e WHERE e.delete_enum = 'FALSE' LIMIT 1), 0) AS evaluationClosed FROM evaluation_corp ec left join corp_info ci on ec.corpinfo_id = ci.id LEFT JOIN (SELECT ec.id,ec.corpinfo_id, GROUP_CONCAT(CONCAT(d.name, '-', u.name) SEPARATOR ',') AS members diff --git a/web-infrastructure/src/main/resources/mapper/HiddenEvaluationRecordMapper.xml b/web-infrastructure/src/main/resources/mapper/HiddenEvaluationRecordMapper.xml index 45629ba..381945f 100644 --- a/web-infrastructure/src/main/resources/mapper/HiddenEvaluationRecordMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/HiddenEvaluationRecordMapper.xml @@ -62,7 +62,7 @@ COUNT(DISTINCT CASE WHEN h.source = 7 AND her.evaluation_result != 1 THEN h.hidden_id END) as videoPatrolEvalCount, COUNT(DISTINCT CASE WHEN h.source = 7 THEN h.hidden_id END) as videoPatrolTotalCount, IFNULL(ec_all.evaluationMembers, '') AS evaluationMembers, - (SELECT e.evaluation_closed FROM evaluation_corp e WHERE e.delete_enum = 'FALSE' LIMIT 1) AS evaluationClosed + COALESCE((SELECT e.evaluation_closed FROM evaluation_corp e WHERE e.delete_enum = 'FALSE' LIMIT 1), 0) AS evaluationClosed FROM evaluation_config ec left join evaluation_corp ecorp ON ecorp.corpinfo_id = ec.corpinfo_id AND ecorp.delete_enum = 'FALSE' LEFT JOIN corp_info ci ON ci.id = ec.corpinfo_id AND ci.delete_enum = 'FALSE' @@ -303,7 +303,7 @@ WHERE ec.corpinfo_id = ci.id AND ec.delete_enum = 'FALSE' AND ec.evaluation_type = 2) AS envEvaluationMember, - (SELECT e.evaluation_closed FROM evaluation_corp e WHERE e.delete_enum = 'FALSE' LIMIT 1) AS evaluationClosed + COALESCE((SELECT e.evaluation_closed FROM evaluation_corp e WHERE e.delete_enum = 'FALSE' LIMIT 1), 0) AS evaluationClosed FROM corp_info ci LEFT JOIN user hu ON hu.corpinfo_id = ci.id LEFT JOIN hidden h ON hu.id = h.creator_id AND h.delete_enum = 'FALSE' AND h.state = 301 AND @@ -534,7 +534,7 @@ COUNT(DISTINCT CASE WHEN her.evaluation_result = 2 AND her.exchange_flag = 0 AND u.corpinfo_id = ecorp.corpinfo_id THEN h.id END) AS unExchangeScoreCount, - (SELECT e.evaluation_closed FROM evaluation_corp e WHERE e.delete_enum = 'FALSE' LIMIT 1) AS evaluationClosed + COALESCE((SELECT e.evaluation_closed FROM evaluation_corp e WHERE e.delete_enum = 'FALSE' LIMIT 1), 0) AS evaluationClosed FROM evaluation_corp ecorp LEFT JOIN evaluation_config ec on ecorp.corpinfo_id = ec.corpinfo_id AND ecorp.delete_enum = 'FALSE' LEFT JOIN corp_info ci