畜牧资源

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

@@ -51,6 +51,7 @@ public final class YakHerdInventoryValidation
         validateNonNegative(row.getFertileCowCount(), "能繁母牛存栏数");
         validateNonNegative(row.getSheepTotal(), "羊总存栏数");
         validateNonNegative(row.getMilkingSheepCount(), "产奶羊存栏数");
+        validateMilkingSheepLessThanSheepTotal(row);
         validateNonNegative(row.getInsuredYakCount(), "保险牦牛存栏数");
         if (StringUtils.isNotEmpty(row.getRemark()) && row.getRemark().length() > 500)
         {
@@ -59,6 +60,21 @@ public final class YakHerdInventoryValidation
         recalculateDerived(row);
     }
 
+    /**
+     * 产奶羊存栏数须小于羊总存栏数（两者均非空时）。
+     */
+    public static void validateMilkingSheepLessThanSheepTotal(BizYakHerdInventory row)
+    {
+        if (row == null || row.getMilkingSheepCount() == null || row.getSheepTotal() == null)
+        {
+            return;
+        }
+        if (row.getMilkingSheepCount() >= row.getSheepTotal())
+        {
+            throw new ServiceException("产奶羊存栏数须小于羊总存栏数");
+        }
+    }
+
     /**
      * 按模板计算逻辑回写合计字段（直接覆盖，不以 Excel 合计为准）。
      */

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

@@ -68,6 +68,27 @@ class YakHerdInventoryValidationTest
         assertEquals(1, row.getBullTotal());
     }
 
+    @Test
+    @DisplayName("产奶羊存栏数须小于羊总存栏数")
+    void milkingSheepLessThanSheepTotal()
+    {
+        BizYakHerdInventory row = new BizYakHerdInventory();
+        row.setSheepTotal(10);
+        row.setMilkingSheepCount(10);
+        assertThrows(ServiceException.class,
+                () -> YakHerdInventoryValidation.validateMilkingSheepLessThanSheepTotal(row));
+
+        row.setMilkingSheepCount(11);
+        assertThrows(ServiceException.class,
+                () -> YakHerdInventoryValidation.validateMilkingSheepLessThanSheepTotal(row));
+
+        row.setMilkingSheepCount(9);
+        YakHerdInventoryValidation.validateMilkingSheepLessThanSheepTotal(row);
+
+        row.setMilkingSheepCount(null);
+        YakHerdInventoryValidation.validateMilkingSheepLessThanSheepTotal(row);
+    }
+
     @Test
     @DisplayName("派生合计计算")
     void recalculateDerived()

doc/产业数据模型及服务/牦牛存栏数据填报/牦牛存栏数据填报功能需求.md

@@ -177,7 +177,7 @@ flowchart TD
 | 默认值 | 打开新增弹窗时，所属年份、所属月份**默认当前年月**（可改） |
 | 唯一性 | 同年同月同村已存在有效记录时**禁止新增**，提示「该年该月该村已填报」 |
 | 计算字段 | 表单**不展示**；保存时服务端按 **§2.5** 重算 |
-| 数字 | 选填项若填写须为非负整数 |
+| 数字 | 选填项若填写须为非负整数；**产奶羊存栏数与羊总存栏数均填写时，产奶羊须小于羊总** |
 
 ---
 
@@ -328,4 +328,5 @@ flowchart TD
 | 1.4 | 取消逻辑删除：表无 `del_flag`，删除为物理删除；唯一约束 `uk_year_town` |
 | 1.5 | **按年月填报**：增加 `stat_month`；唯一键「年+月+乡镇」；每月导入一次 |
 | 1.6 | **按村填报**：唯一键「年+月+村」；表单只选村；字段对齐新模板（幼畜/成畜、奶牛、羊、保险等）；导入年月全量覆盖；导出合计按列求和；计算字段仅详情展示 |
+| 1.8 | 后端校验：产奶羊存栏数须小于羊总存栏数（两者均非空） |
 | 1.7 | 导入改为按 `(年,月,村)` upsert；导出增加可选所属乡镇筛选 |

doc/产业数据模型及服务/牦牛存栏数据填报/牦牛存栏数据填报技术方案.md

@@ -130,7 +130,7 @@ yak_sheep_total = bull_total + cow_total + insured_yak_count + sheep_total
 | --- | --- | --- |
 | `statYear` / `statMonth` | Y | 合法且非未来月 |
 | `villageDeptId` | Y | 合法村；反推乡镇 |
-| 明细 `*Count` | N | `>= 0` |
+| 明细 `*Count` | N | `>= 0`；**产奶羊与羊总均非空时**：`milkingSheepCount < sheepTotal` |
 | `id` | 修改必填 | — |
 
 **唯一性**：`countByYearMonthAndVillageExcludeId(...) > 0` →「该年该月该村已填报」。