畜牧产品产量登记

baqing-admin/src/main/java/com/ruoyi/web/modules/industryservice/service/impl/BizDisposableIncomeServiceImpl.java

@@ -2,6 +2,7 @@ package com.ruoyi.web.modules.industryservice.service.impl;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -40,7 +41,7 @@ public class BizDisposableIncomeServiceImpl implements IBizDisposableIncomeServi
     {
         DisposableIncomeValidation.validateRowForSave(row);
         assertUniqueYear(row.getStatYear(), null);
-        applyMissingGrowth(row);
+        applyGrowthForSave(row, null);
         return bizDisposableIncomeMapper.insertBizDisposableIncome(row);
     }
 
@@ -53,9 +54,9 @@ public class BizDisposableIncomeServiceImpl implements IBizDisposableIncomeServi
             throw new ServiceException("主键不能为空");
         }
         DisposableIncomeValidation.validateRowForSave(row);
-        requireExistingRow(row.getId());
+        BizDisposableIncome existing = requireExistingRow(row.getId());
         assertUniqueYear(row.getStatYear(), row.getId());
-        applyMissingGrowth(row);
+        applyGrowthForSave(row, existing);
         return bizDisposableIncomeMapper.updateBizDisposableIncome(row);
     }
 
@@ -88,15 +89,27 @@ public class BizDisposableIncomeServiceImpl implements IBizDisposableIncomeServi
         return YakHerdInventoryYearSupport.resolveYearOptions();
     }
 
-    /** 增幅、增速未填时，按上年可支配收入公式补齐 */
-    private void applyMissingGrowth(BizDisposableIncome row)
+    /**
+     * 年份或可支配收入变更时按新口径强制重算；否则仅对未填的增幅/增速补齐。
+     */
+    private void applyGrowthForSave(BizDisposableIncome row, BizDisposableIncome existing)
     {
         if (row == null || row.getStatYear() == null)
         {
             return;
         }
         BizDisposableIncome previous = bizDisposableIncomeMapper.selectByStatYear(row.getStatYear() - 1);
-        DisposableIncomeGrowthSupport.fillMissingGrowth(row, previous);
+        boolean yearOrIncomeChanged = existing != null && (!Objects.equals(existing.getStatYear(), row.getStatYear())
+                || !DisposableIncomeGrowthSupport.sameDecimal(existing.getRuralDisposableIncome(),
+                        row.getRuralDisposableIncome()));
+        if (yearOrIncomeChanged)
+        {
+            DisposableIncomeGrowthSupport.recalculateGrowth(row, previous);
+        }
+        else
+        {
+            DisposableIncomeGrowthSupport.fillMissingGrowth(row, previous);
+        }
     }
 
     private void assertUniqueYear(Integer statYear, Long excludeId)
@@ -108,12 +121,13 @@ public class BizDisposableIncomeServiceImpl implements IBizDisposableIncomeServi
         }
     }
 
-    private void requireExistingRow(Long id)
+    private BizDisposableIncome requireExistingRow(Long id)
     {
         BizDisposableIncome existing = bizDisposableIncomeMapper.selectBizDisposableIncomeById(id);
         if (existing == null)
         {
             throw new ServiceException("记录不存在或已删除");
         }
+        return existing;
     }
 }

baqing-admin/src/main/java/com/ruoyi/web/modules/industryservice/support/DisposableIncomeGrowthSupport.java

@@ -5,7 +5,7 @@ import java.math.RoundingMode;
 import com.ruoyi.web.modules.industryservice.domain.BizDisposableIncome;
 
 /**
- * 可支配收入增幅、增速：可选填；未填时按公式补齐。
+ * 可支配收入增幅、增速：可选填；未填或口径变更时按公式计算。
  * 增幅 = 本年人均可支配收入 - 上年人均可支配收入；
  * 增速 = 增幅 / 上年人均可支配收入。
  */
@@ -17,6 +17,20 @@ public final class DisposableIncomeGrowthSupport
     {
     }
 
+    /**
+     * 按公式强制重算增幅、增速（先清空再填）。
+     */
+    public static void recalculateGrowth(BizDisposableIncome current, BizDisposableIncome previousYear)
+    {
+        if (current == null)
+        {
+            return;
+        }
+        current.setIncomeIncrease(null);
+        current.setIncomeGrowthRate(null);
+        fillMissingGrowth(current, previousYear);
+    }
+
     /**
      * 仅对未填写的增幅、增速按上年数据补齐；已填写的保留。
      */
@@ -46,4 +60,17 @@ public final class DisposableIncomeGrowthSupport
             }
         }
     }
+
+    public static boolean sameDecimal(BigDecimal a, BigDecimal b)
+    {
+        if (a == null && b == null)
+        {
+            return true;
+        }
+        if (a == null || b == null)
+        {
+            return false;
+        }
+        return a.compareTo(b) == 0;
+    }
 }

baqing-admin/src/test/java/com/ruoyi/web/modules/industryservice/support/DisposableIncomeGrowthSupportTest.java

@@ -68,6 +68,19 @@ class DisposableIncomeGrowthSupportTest
         assertNull(current.getIncomeGrowthRate());
     }
 
+    @Test
+    @DisplayName("强制重算会覆盖已有增幅增速")
+    void recalculateOverwritesManual()
+    {
+        BizDisposableIncome current = row(2022, "13346");
+        current.setIncomeIncrease(new BigDecimal("1"));
+        current.setIncomeGrowthRate(new BigDecimal("0.01"));
+        BizDisposableIncome previous = row(2021, "11886");
+        DisposableIncomeGrowthSupport.recalculateGrowth(current, previous);
+        assertEquals(0, new BigDecimal("1460").compareTo(current.getIncomeIncrease()));
+        assertEquals(0, new BigDecimal("0.122834").compareTo(current.getIncomeGrowthRate()));
+    }
+
     private static BizDisposableIncome row(int year, String income)
     {
         BizDisposableIncome row = new BizDisposableIncome();