From af9f6c8ed167336ed12d86cb65b82d210e6f58ca Mon Sep 17 00:00:00 2001
From: yangzhe123 <2824096059@qq.com>
Date: Thu, 4 Dec 2025 10:02:13 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=80=BB=E9=9C=80=E6=B0=B4?=
 =?UTF-8?q?=E9=87=8F=E5=AD=97=E6=AE=B5=EF=BC=8C=E6=80=BB=E8=AE=A1=E5=88=92?=
 =?UTF-8?q?=E9=87=8F=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../project/hsz/model/RiceSupportBalance.java |  1 +
 .../hsz/model/RiceSupportBalanceDetail.java   |  6 +++
 .../service/RiceSupportBalanceService.java    |  4 ++
 .../project/hsz/util/LocalDateTimeUtils.java  | 40 -------------------
 4 files changed, 11 insertions(+), 40 deletions(-)

diff --git a/src/main/java/com/gunshi/project/hsz/model/RiceSupportBalance.java b/src/main/java/com/gunshi/project/hsz/model/RiceSupportBalance.java
index 07ad589..ef9ff9a 100644
--- a/src/main/java/com/gunshi/project/hsz/model/RiceSupportBalance.java
+++ b/src/main/java/com/gunshi/project/hsz/model/RiceSupportBalance.java
@@ -104,6 +104,7 @@ public class RiceSupportBalance implements Serializable {
     @Schema(description = "来水预测主键")
     private Long icWaterId;
 
+
     @TableField(exist = false)
     private List<RiceSupportBalanceDetail> details;
 }
\ No newline at end of file
diff --git a/src/main/java/com/gunshi/project/hsz/model/RiceSupportBalanceDetail.java b/src/main/java/com/gunshi/project/hsz/model/RiceSupportBalanceDetail.java
index b459681..1e2b099 100644
--- a/src/main/java/com/gunshi/project/hsz/model/RiceSupportBalanceDetail.java
+++ b/src/main/java/com/gunshi/project/hsz/model/RiceSupportBalanceDetail.java
@@ -68,4 +68,10 @@ public class RiceSupportBalanceDetail implements Serializable {
     @TableField(value = "eco_plan")
     @Schema(description = "生态水量(万m³)-计划供水量")
     private BigDecimal ecoPlan;
+
+    @TableField(exist = false)
+    private BigDecimal dailyTotalUse;
+
+    @TableField(exist = false)
+    private BigDecimal dailyTotalPlan;
 }
\ No newline at end of file
diff --git a/src/main/java/com/gunshi/project/hsz/service/RiceSupportBalanceService.java b/src/main/java/com/gunshi/project/hsz/service/RiceSupportBalanceService.java
index 0f0851b..909b4c8 100644
--- a/src/main/java/com/gunshi/project/hsz/service/RiceSupportBalanceService.java
+++ b/src/main/java/com/gunshi/project/hsz/service/RiceSupportBalanceService.java
@@ -353,6 +353,10 @@ public class RiceSupportBalanceService extends ServiceImpl<RiceSupportBalanceMap
         Page<RiceSupportBalance> riceSupportBalancePage = this.baseMapper.selectPage(page.getPageSo().toPage(), queryWrapper);
         for (RiceSupportBalance record : riceSupportBalancePage.getRecords()) {
             List<RiceSupportBalanceDetail> details =  riceSupportBalanceDetailService.selectByRCId(record.getId());
+            for (RiceSupportBalanceDetail detail : details) {
+                detail.setDailyTotalUse(detail.getEcoUse().add(detail.getIrrigationUse()));
+                detail.setDailyTotalPlan(detail.getEcoPlan().add(detail.getIrrigationPlan()));
+            }
             record.setDetails(details);
         }
         return riceSupportBalancePage;
diff --git a/src/main/java/com/gunshi/project/hsz/util/LocalDateTimeUtils.java b/src/main/java/com/gunshi/project/hsz/util/LocalDateTimeUtils.java
index 1f28713..ead1ed4 100644
--- a/src/main/java/com/gunshi/project/hsz/util/LocalDateTimeUtils.java
+++ b/src/main/java/com/gunshi/project/hsz/util/LocalDateTimeUtils.java
@@ -202,7 +202,6 @@ public class LocalDateTimeUtils {
         if (startTime == null || endTime == null) {
             return 0;
         }
-
         // 将开始和结束时间调整为同一年（比如都调整为2020年）
         int baseYear = 2020; // 选择一个基准年
 
@@ -219,43 +218,4 @@ public class LocalDateTimeUtils {
         return getTotalDayByRangeDate(adjustedStart, adjustedEnd);
     }
 
-    /**
-     * 判断日期是否在忽略年份的时间范围内
-     *
-     * @param checkDate 检查日期
-     * @param startTime 周期开始时间
-     * @param endTime 周期结束时间
-     * @return 是否在周期内
-     */
-    public static boolean isDateInCycleIgnoringYear(LocalDateTime checkDate,
-                                                    LocalDateTime startTime,
-                                                    LocalDateTime endTime) {
-        if (checkDate == null || startTime == null || endTime == null) {
-            return false;
-        }
-
-        // 提取月日
-        int checkMonth = checkDate.getMonthValue();
-        int checkDay = checkDate.getDayOfMonth();
-
-        int startMonth = startTime.getMonthValue();
-        int startDay = startTime.getDayOfMonth();
-
-        int endMonth = endTime.getMonthValue();
-        int endDay = endTime.getDayOfMonth();
-
-        // 判断日期是否在周期内
-        if (startMonth < endMonth || (startMonth == endMonth && startDay <= endDay)) {
-            // 不跨年情况
-            return (checkMonth > startMonth || (checkMonth == startMonth && checkDay >= startDay)) &&
-                    (checkMonth < endMonth || (checkMonth == endMonth && checkDay <= endDay));
-        } else {
-            // 跨年情况
-            return (checkMonth > startMonth || (checkMonth == startMonth && checkDay >= startDay)) ||
-                    (checkMonth < endMonth || (checkMonth == endMonth && checkDay <= endDay));
-        }
-    }
-
-
-
 }