From 8a7a4e95ec0df4aebcfe85334df2df50c70aa921 Mon Sep 17 00:00:00 2001 From: luotaiqian <1147642922@qq.com> Date: Tue, 21 Jul 2026 09:37:25 +0800 Subject: [PATCH] init --- .../adapter/web/QualOnSiteReviewController.java | 2 +- .../response/QualOnSiteReviewStatisticsCo.java | 14 ++++---------- .../resources/mapper/QualOnSiteReviewMapper.xml | 10 +++++----- 3 files changed, 10 insertions(+), 16 deletions(-) diff --git a/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/QualOnSiteReviewController.java b/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/QualOnSiteReviewController.java index 7af4556..8645851 100644 --- a/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/QualOnSiteReviewController.java +++ b/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/QualOnSiteReviewController.java @@ -60,7 +60,7 @@ public class QualOnSiteReviewController implements Serializable { return qualOnSiteReviewServiceI.orgPage(qry); } - @GetMapping("/statistics") + @GetMapping("/monitor/page/statistics") @ApiOperation("资质现场核查统计") public SingleResponse statistics(@RequestParam(required = false) Long orgId) { return SingleResponse.of(qualOnSiteReviewServiceI.statistics(orgId)); diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/review/response/QualOnSiteReviewStatisticsCo.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/review/response/QualOnSiteReviewStatisticsCo.java index 36d0179..df7f939 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/review/response/QualOnSiteReviewStatisticsCo.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/review/response/QualOnSiteReviewStatisticsCo.java @@ -22,15 +22,9 @@ public class QualOnSiteReviewStatisticsCo extends ClientObject { @ApiModelProperty(value = "本年度累计") private Integer annualCumulativeCount; - @ApiModelProperty(value = "待开展审查") - private Integer pendingReviewCount; + @ApiModelProperty(value = "未来30日待开展的审查") + private Integer pendingReviewNextThirtyDaysCount; - @ApiModelProperty(value = "未来30日内") - private Integer nextThirtyDaysCount; - - @ApiModelProperty(value = "已完成") - private Integer completedCount; - - @ApiModelProperty(value = "审查结果已归档") - private Integer archivedCount; + @ApiModelProperty(value = "已完成审查结果已归档") + private Integer completedArchivedCount; } diff --git a/safety-eval-infrastructure/src/main/resources/mapper/QualOnSiteReviewMapper.xml b/safety-eval-infrastructure/src/main/resources/mapper/QualOnSiteReviewMapper.xml index 3a108fe..5088a51 100644 --- a/safety-eval-infrastructure/src/main/resources/mapper/QualOnSiteReviewMapper.xml +++ b/safety-eval-infrastructure/src/main/resources/mapper/QualOnSiteReviewMapper.xml @@ -111,11 +111,11 @@ resultType="org.qinan.safetyeval.client.review.response.QualOnSiteReviewStatisticsCo"> select count(*) as totalCount, - SUM(CASE WHEN YEAR(create_time) = YEAR(CURDATE()) THEN 1 ELSE 0 END) AS annualCumulativeCount, - SUM(CASE WHEN status IN ('AGENCY_PENDING_CONFIRMATION', 'AGENCY_CONFIRMED') THEN 1 ELSE 0 END) AS pendingReviewCount, - SUM(CASE WHEN review_date_start BETWEEN CURDATE() AND DATE_ADD(CURDATE(), INTERVAL 30 DAY) THEN 1 ELSE 0 END) AS nextThirtyDaysCount, - SUM(CASE WHEN status = 'REVIEW_PASSED' THEN 1 ELSE 0 END) AS completedCount, - SUM(CASE WHEN status = 'REVIEW_FAILED' THEN 1 ELSE 0 END) AS archivedCount + SUM(CASE WHEN YEAR(review_date_start) = YEAR(CURDATE()) THEN 1 ELSE 0 END) AS annualCumulativeCount, + SUM(CASE WHEN status IN ('AGENCY_PENDING_CONFIRMATION', 'AGENCY_CONFIRMED') + AND review_date_start BETWEEN CURDATE() AND DATE_ADD(CURDATE(), INTERVAL 30 DAY) THEN 1 ELSE 0 END) + AS pendingReviewNextThirtyDaysCount, + SUM(CASE WHEN status IN ('REVIEW_PASSED', 'REVIEW_FAILED') THEN 1 ELSE 0 END) AS completedArchivedCount from qual_on_site_review where delete_enum = 'false'