From d83668994fcdedd17a3584c114bff3569bfc6c1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=BE=BE=E5=AF=8C=E6=96=8C?= Date: Mon, 15 Sep 2025 11:16:36 +0800 Subject: [PATCH] =?UTF-8?q?fix=20(farm):=20=E5=BE=AE=E6=9C=8D=E5=8A=A1API?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 数字驾驶舱-统计图-种植计划完成情况 --- .../admin/api/vo/PlantingPlanCompletionRespVO.java | 8 ++++---- .../mapper/productionplan/ProductionPlanMapper.xml | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/api/vo/PlantingPlanCompletionRespVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/api/vo/PlantingPlanCompletionRespVO.java index e1d6aa75..e462c8f7 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/api/vo/PlantingPlanCompletionRespVO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/api/vo/PlantingPlanCompletionRespVO.java @@ -16,12 +16,12 @@ import lombok.NoArgsConstructor; public class PlantingPlanCompletionRespVO { @Schema(description = "未开始数量") - private Double notStartedRatio; + private Integer notStartedRatio; @Schema(description = "进行中数量") - private Double inProgressRatio; + private Integer inProgressRatio; @Schema(description = "已完成数量") - private Double completedRatio; + private Integer completedRatio; @Schema(description = "逾期数量") - private Double overdueRatio; + private Integer overdueRatio; } diff --git a/yudao-module-farm/src/main/resources/mapper/productionplan/ProductionPlanMapper.xml b/yudao-module-farm/src/main/resources/mapper/productionplan/ProductionPlanMapper.xml index dc1ba677..1fa10cc5 100644 --- a/yudao-module-farm/src/main/resources/mapper/productionplan/ProductionPlanMapper.xml +++ b/yudao-module-farm/src/main/resources/mapper/productionplan/ProductionPlanMapper.xml @@ -67,10 +67,10 @@ resultType="cn.iocoder.yudao.module.farm.controller.admin.api.vo.PlantingPlanCompletionRespVO"> SELECT - ROUND(SUM(CASE WHEN plan_status = 1 THEN 1 ELSE 0 END) * 100.0 / COUNT(*), 2) AS notStartedRatio, - ROUND(SUM(CASE WHEN plan_status = 2 THEN 1 ELSE 0 END) * 100.0 / COUNT(*), 2) AS inProgressRatio, - ROUND(SUM(CASE WHEN plan_status = 3 THEN 1 ELSE 0 END) * 100.0 / COUNT(*), 2) AS completedRatio, - ROUND(SUM(CASE WHEN plan_status = 4 THEN 1 ELSE 0 END) * 100.0 / COUNT(*), 2) AS overdueRatio + SUM(CASE WHEN plan_status = 1 THEN 1 ELSE 0 END) AS notStartedRatio, + SUM(CASE WHEN plan_status = 2 THEN 1 ELSE 0 END) AS inProgressRatio, + SUM(CASE WHEN plan_status = 3 THEN 1 ELSE 0 END) AS completedRatio, + SUM(CASE WHEN plan_status = 4 THEN 1 ELSE 0 END) AS overdueRatio FROM farm_production_plan deleted = 0