可支配收入数据填报

baqing-admin/src/main/java/com/ruoyi/web/modules/industryservice/controller/BizDisposableIncomeController.java

@@ -0,0 +1,81 @@
+package com.ruoyi.web.modules.industryservice.controller;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.web.modules.industryservice.domain.BizDisposableIncome;
+import com.ruoyi.web.modules.industryservice.service.IBizDisposableIncomeService;
+
+/**
+ * 可支配收入数据填报
+ */
+@RestController
+@RequestMapping("/dataModel/disposableIncome")
+public class BizDisposableIncomeController extends BaseController
+{
+    @Autowired
+    private IBizDisposableIncomeService bizDisposableIncomeService;
+
+    @PreAuthorize("@ss.hasPermi('dataModel:disposableIncome:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(BizDisposableIncome query)
+    {
+        startPage();
+        List<BizDisposableIncome> list = bizDisposableIncomeService.selectBizDisposableIncomeList(query);
+        return getDataTable(list);
+    }
+
+    @PreAuthorize("@ss.hasPermi('dataModel:disposableIncome:query')")
+    @GetMapping("/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return success(bizDisposableIncomeService.selectBizDisposableIncomeById(id));
+    }
+
+    @PreAuthorize("@ss.hasPermi('dataModel:disposableIncome:add')")
+    @Log(title = "可支配收入数据填报", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@Validated @RequestBody BizDisposableIncome row)
+    {
+        row.setCreateBy(getUsername());
+        return toAjax(bizDisposableIncomeService.insertBizDisposableIncome(row));
+    }
+
+    @PreAuthorize("@ss.hasPermi('dataModel:disposableIncome:edit')")
+    @Log(title = "可支配收入数据填报", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@Validated @RequestBody BizDisposableIncome row)
+    {
+        row.setUpdateBy(getUsername());
+        return toAjax(bizDisposableIncomeService.updateBizDisposableIncome(row));
+    }
+
+    @PreAuthorize("@ss.hasPermi('dataModel:disposableIncome:remove')")
+    @Log(title = "可支配收入数据填报", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(bizDisposableIncomeService.deleteBizDisposableIncomeByIds(ids, getUsername()));
+    }
+
+    @PreAuthorize("@ss.hasPermi('dataModel:disposableIncome:list')")
+    @GetMapping("/yearOptions")
+    public AjaxResult yearOptions()
+    {
+        return success(bizDisposableIncomeService.listYearOptions());
+    }
+}

baqing-admin/src/main/java/com/ruoyi/web/modules/industryservice/domain/BizDisposableIncome.java

@@ -0,0 +1,90 @@
+package com.ruoyi.web.modules.industryservice.domain;
+
+import java.math.BigDecimal;
+import javax.validation.constraints.NotNull;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 可支配收入数据填报 biz_disposable_income
+ */
+public class BizDisposableIncome extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    private Long id;
+
+    @NotNull(message = "所属年份不能为空")
+    private Integer statYear;
+
+    /** 农村居民人均可支配收入（元） */
+    private BigDecimal ruralDisposableIncome;
+
+    /** 脱贫人口人均纯收入（元） */
+    private BigDecimal povertyNetIncome;
+
+    /** 增幅（元）= 本年可支配收入 - 上年可支配收入，非落库 */
+    private BigDecimal incomeIncrease;
+
+    /** 增速 = 增幅 / 上年可支配收入，非落库 */
+    private BigDecimal incomeGrowthRate;
+
+    public Long getId()
+    {
+        return id;
+    }
+
+    public void setId(Long id)
+    {
+        this.id = id;
+    }
+
+    public Integer getStatYear()
+    {
+        return statYear;
+    }
+
+    public void setStatYear(Integer statYear)
+    {
+        this.statYear = statYear;
+    }
+
+    public BigDecimal getRuralDisposableIncome()
+    {
+        return ruralDisposableIncome;
+    }
+
+    public void setRuralDisposableIncome(BigDecimal ruralDisposableIncome)
+    {
+        this.ruralDisposableIncome = ruralDisposableIncome;
+    }
+
+    public BigDecimal getPovertyNetIncome()
+    {
+        return povertyNetIncome;
+    }
+
+    public void setPovertyNetIncome(BigDecimal povertyNetIncome)
+    {
+        this.povertyNetIncome = povertyNetIncome;
+    }
+
+    public BigDecimal getIncomeIncrease()
+    {
+        return incomeIncrease;
+    }
+
+    public void setIncomeIncrease(BigDecimal incomeIncrease)
+    {
+        this.incomeIncrease = incomeIncrease;
+    }
+
+    public BigDecimal getIncomeGrowthRate()
+    {
+        return incomeGrowthRate;
+    }
+
+    public void setIncomeGrowthRate(BigDecimal incomeGrowthRate)
+    {
+        this.incomeGrowthRate = incomeGrowthRate;
+    }
+}

baqing-admin/src/main/java/com/ruoyi/web/modules/industryservice/mapper/BizDisposableIncomeMapper.java

@@ -0,0 +1,25 @@
+package com.ruoyi.web.modules.industryservice.mapper;
+
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+import com.ruoyi.web.modules.industryservice.domain.BizDisposableIncome;
+
+/**
+ * 可支配收入数据填报 Mapper
+ */
+public interface BizDisposableIncomeMapper
+{
+    BizDisposableIncome selectBizDisposableIncomeById(Long id);
+
+    BizDisposableIncome selectByStatYear(@Param("statYear") Integer statYear);
+
+    int countByStatYearExcludeId(@Param("statYear") Integer statYear, @Param("excludeId") Long excludeId);
+
+    List<BizDisposableIncome> selectBizDisposableIncomeList(BizDisposableIncome query);
+
+    int insertBizDisposableIncome(BizDisposableIncome row);
+
+    int updateBizDisposableIncome(BizDisposableIncome row);
+
+    int deleteBizDisposableIncomeByIds(@Param("ids") Long[] ids);
+}

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

@@ -0,0 +1,22 @@
+package com.ruoyi.web.modules.industryservice.service;
+
+import java.util.List;
+import com.ruoyi.web.modules.industryservice.domain.BizDisposableIncome;
+
+/**
+ * 可支配收入数据填报
+ */
+public interface IBizDisposableIncomeService
+{
+    BizDisposableIncome selectBizDisposableIncomeById(Long id);
+
+    List<BizDisposableIncome> selectBizDisposableIncomeList(BizDisposableIncome query);
+
+    int insertBizDisposableIncome(BizDisposableIncome row);
+
+    int updateBizDisposableIncome(BizDisposableIncome row);
+
+    int deleteBizDisposableIncomeByIds(Long[] ids, String updateBy);
+
+    List<Integer> listYearOptions();
+}

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

@@ -0,0 +1,126 @@
+package com.ruoyi.web.modules.industryservice.service.impl;
+
+import java.util.ArrayList;
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import com.ruoyi.common.exception.ServiceException;
+import com.ruoyi.web.modules.industryservice.domain.BizDisposableIncome;
+import com.ruoyi.web.modules.industryservice.mapper.BizDisposableIncomeMapper;
+import com.ruoyi.web.modules.industryservice.service.IBizDisposableIncomeService;
+import com.ruoyi.web.modules.industryservice.support.DisposableIncomeGrowthSupport;
+import com.ruoyi.web.modules.industryservice.support.DisposableIncomeValidation;
+import com.ruoyi.web.modules.industryservice.support.YakHerdInventoryYearSupport;
+
+/**
+ * 可支配收入数据填报服务实现
+ */
+@Service
+public class BizDisposableIncomeServiceImpl implements IBizDisposableIncomeService
+{
+    @Autowired
+    private BizDisposableIncomeMapper bizDisposableIncomeMapper;
+
+    @Override
+    public BizDisposableIncome selectBizDisposableIncomeById(Long id)
+    {
+        BizDisposableIncome row = bizDisposableIncomeMapper.selectBizDisposableIncomeById(id);
+        fillGrowth(row);
+        return row;
+    }
+
+    @Override
+    public List<BizDisposableIncome> selectBizDisposableIncomeList(BizDisposableIncome query)
+    {
+        List<BizDisposableIncome> list = bizDisposableIncomeMapper.selectBizDisposableIncomeList(query);
+        if (list != null)
+        {
+            for (BizDisposableIncome row : list)
+            {
+                fillGrowth(row);
+            }
+        }
+        return list;
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public int insertBizDisposableIncome(BizDisposableIncome row)
+    {
+        DisposableIncomeValidation.validateRowForSave(row);
+        assertUniqueYear(row.getStatYear(), null);
+        return bizDisposableIncomeMapper.insertBizDisposableIncome(row);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public int updateBizDisposableIncome(BizDisposableIncome row)
+    {
+        if (row.getId() == null)
+        {
+            throw new ServiceException("主键不能为空");
+        }
+        DisposableIncomeValidation.validateRowForSave(row);
+        requireExistingRow(row.getId());
+        assertUniqueYear(row.getStatYear(), row.getId());
+        return bizDisposableIncomeMapper.updateBizDisposableIncome(row);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public int deleteBizDisposableIncomeByIds(Long[] ids, String updateBy)
+    {
+        if (ids == null || ids.length == 0)
+        {
+            return 0;
+        }
+        List<Long> cleaned = new ArrayList<>();
+        for (Long id : ids)
+        {
+            if (id != null)
+            {
+                cleaned.add(id);
+            }
+        }
+        if (cleaned.isEmpty())
+        {
+            return 0;
+        }
+        return bizDisposableIncomeMapper.deleteBizDisposableIncomeByIds(cleaned.toArray(new Long[0]));
+    }
+
+    @Override
+    public List<Integer> listYearOptions()
+    {
+        return YakHerdInventoryYearSupport.resolveYearOptions();
+    }
+
+    private void fillGrowth(BizDisposableIncome row)
+    {
+        if (row == null || row.getStatYear() == null)
+        {
+            return;
+        }
+        BizDisposableIncome previous = bizDisposableIncomeMapper.selectByStatYear(row.getStatYear() - 1);
+        DisposableIncomeGrowthSupport.fillGrowth(row, previous);
+    }
+
+    private void assertUniqueYear(Integer statYear, Long excludeId)
+    {
+        int count = bizDisposableIncomeMapper.countByStatYearExcludeId(statYear, excludeId);
+        if (count > 0)
+        {
+            throw new ServiceException("该年份数据已存在");
+        }
+    }
+
+    private void requireExistingRow(Long id)
+    {
+        BizDisposableIncome existing = bizDisposableIncomeMapper.selectBizDisposableIncomeById(id);
+        if (existing == null)
+        {
+            throw new ServiceException("记录不存在或已删除");
+        }
+    }
+}

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

@@ -0,0 +1,40 @@
+package com.ruoyi.web.modules.industryservice.support;
+
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import com.ruoyi.web.modules.industryservice.domain.BizDisposableIncome;
+
+/**
+ * 可支配收入增幅、增速计算：增幅=本年-上年；增速=增幅/上年
+ */
+public final class DisposableIncomeGrowthSupport
+{
+    private static final int RATE_SCALE = 4;
+
+    private DisposableIncomeGrowthSupport()
+    {
+    }
+
+    public static void fillGrowth(BizDisposableIncome current, BizDisposableIncome previousYear)
+    {
+        if (current == null)
+        {
+            return;
+        }
+        current.setIncomeIncrease(null);
+        current.setIncomeGrowthRate(null);
+        if (current.getRuralDisposableIncome() == null || previousYear == null
+                || previousYear.getRuralDisposableIncome() == null)
+        {
+            return;
+        }
+        BigDecimal prev = previousYear.getRuralDisposableIncome();
+        BigDecimal increase = current.getRuralDisposableIncome().subtract(prev);
+        current.setIncomeIncrease(increase);
+        if (prev.compareTo(BigDecimal.ZERO) == 0)
+        {
+            return;
+        }
+        current.setIncomeGrowthRate(increase.divide(prev, RATE_SCALE, RoundingMode.HALF_UP));
+    }
+}

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

@@ -0,0 +1,52 @@
+package com.ruoyi.web.modules.industryservice.support;
+
+import java.math.BigDecimal;
+import com.ruoyi.common.exception.ServiceException;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.web.modules.industryservice.domain.BizDisposableIncome;
+
+/**
+ * 可支配收入数据填报校验
+ */
+public final class DisposableIncomeValidation
+{
+    private DisposableIncomeValidation()
+    {
+    }
+
+    public static void validateRowForSave(BizDisposableIncome row)
+    {
+        if (row == null)
+        {
+            throw new ServiceException("参数不能为空");
+        }
+        if (row.getStatYear() == null)
+        {
+            throw new ServiceException("所属年份不能为空");
+        }
+        if (!YakHerdInventoryYearSupport.isAllowedYear(row.getStatYear()))
+        {
+            throw new ServiceException("所属年份不在可选范围内");
+        }
+        if (row.getRuralDisposableIncome() == null)
+        {
+            throw new ServiceException("农村居民人均可支配收入不能为空");
+        }
+        if (row.getRuralDisposableIncome().compareTo(BigDecimal.ZERO) < 0)
+        {
+            throw new ServiceException("农村居民人均可支配收入不能为负数");
+        }
+        if (row.getPovertyNetIncome() == null)
+        {
+            throw new ServiceException("脱贫人口人均纯收入不能为空");
+        }
+        if (row.getPovertyNetIncome().compareTo(BigDecimal.ZERO) < 0)
+        {
+            throw new ServiceException("脱贫人口人均纯收入不能为负数");
+        }
+        if (StringUtils.isNotEmpty(row.getRemark()) && row.getRemark().length() > 500)
+        {
+            throw new ServiceException("备注不能超过500字");
+        }
+    }
+}

baqing-admin/src/main/resources/mapper/industryservice/BizDisposableIncomeMapper.xml

@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.web.modules.industryservice.mapper.BizDisposableIncomeMapper">
+
+    <resultMap type="com.ruoyi.web.modules.industryservice.domain.BizDisposableIncome" id="BizDisposableIncomeResult">
+        <id property="id" column="id"/>
+        <result property="statYear" column="stat_year"/>
+        <result property="ruralDisposableIncome" column="rural_disposable_income"/>
+        <result property="povertyNetIncome" column="poverty_net_income"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="remark" column="remark"/>
+    </resultMap>
+
+    <sql id="selectVo">
+        select r.id, r.stat_year, r.rural_disposable_income, r.poverty_net_income,
+               r.create_by, r.create_time, r.update_by, r.update_time, r.remark
+        from biz_disposable_income r
+    </sql>
+
+    <select id="selectBizDisposableIncomeById" parameterType="long" resultMap="BizDisposableIncomeResult">
+        <include refid="selectVo"/>
+        where r.id = #{id}
+    </select>
+
+    <select id="selectByStatYear" resultMap="BizDisposableIncomeResult">
+        <include refid="selectVo"/>
+        where r.stat_year = #{statYear}
+        limit 1
+    </select>
+
+    <select id="countByStatYearExcludeId" resultType="int">
+        select count(1) from biz_disposable_income
+        where stat_year = #{statYear}
+        <if test="excludeId != null">and id != #{excludeId}</if>
+    </select>
+
+    <select id="selectBizDisposableIncomeList" parameterType="com.ruoyi.web.modules.industryservice.domain.BizDisposableIncome"
+            resultMap="BizDisposableIncomeResult">
+        <include refid="selectVo"/>
+        <where>
+            <if test="statYear != null">and r.stat_year = #{statYear}</if>
+        </where>
+        order by r.stat_year desc, r.id desc
+    </select>
+
+    <insert id="insertBizDisposableIncome" parameterType="com.ruoyi.web.modules.industryservice.domain.BizDisposableIncome"
+            useGeneratedKeys="true" keyProperty="id">
+        insert into biz_disposable_income (
+            stat_year, rural_disposable_income, poverty_net_income, create_by, create_time, remark
+        ) values (
+            #{statYear}, #{ruralDisposableIncome}, #{povertyNetIncome}, #{createBy}, sysdate(), #{remark}
+        )
+    </insert>
+
+    <update id="updateBizDisposableIncome" parameterType="com.ruoyi.web.modules.industryservice.domain.BizDisposableIncome">
+        update biz_disposable_income set
+            stat_year = #{statYear},
+            rural_disposable_income = #{ruralDisposableIncome},
+            poverty_net_income = #{povertyNetIncome},
+            update_by = #{updateBy},
+            update_time = sysdate(),
+            remark = #{remark}
+        where id = #{id}
+    </update>
+
+    <delete id="deleteBizDisposableIncomeByIds">
+        delete from biz_disposable_income where id in
+        <foreach collection="ids" item="id" open="(" separator="," close=")">#{id}</foreach>
+    </delete>
+</mapper>

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

@@ -0,0 +1,53 @@
+package com.ruoyi.web.modules.industryservice.support;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+
+import java.math.BigDecimal;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import com.ruoyi.web.modules.industryservice.domain.BizDisposableIncome;
+
+@DisplayName("DisposableIncomeGrowthSupport")
+class DisposableIncomeGrowthSupportTest
+{
+    @Test
+    @DisplayName("有上年数据时计算增幅与增速")
+    void fillGrowthWithPrevious()
+    {
+        BizDisposableIncome current = row(2020, "13346");
+        BizDisposableIncome previous = row(2019, "11886");
+        DisposableIncomeGrowthSupport.fillGrowth(current, previous);
+        assertEquals(new BigDecimal("1460"), current.getIncomeIncrease());
+        assertEquals(new BigDecimal("0.1228"), current.getIncomeGrowthRate());
+    }
+
+    @Test
+    @DisplayName("无上年数据时增幅增速为空")
+    void fillGrowthWithoutPrevious()
+    {
+        BizDisposableIncome current = row(2019, "11886");
+        DisposableIncomeGrowthSupport.fillGrowth(current, null);
+        assertNull(current.getIncomeIncrease());
+        assertNull(current.getIncomeGrowthRate());
+    }
+
+    @Test
+    @DisplayName("上年可支配收入为0时仅填增幅")
+    void fillGrowthWhenPreviousZero()
+    {
+        BizDisposableIncome current = row(2021, "100");
+        BizDisposableIncome previous = row(2020, "0");
+        DisposableIncomeGrowthSupport.fillGrowth(current, previous);
+        assertEquals(new BigDecimal("100"), current.getIncomeIncrease());
+        assertNull(current.getIncomeGrowthRate());
+    }
+
+    private static BizDisposableIncome row(int year, String income)
+    {
+        BizDisposableIncome row = new BizDisposableIncome();
+        row.setStatYear(year);
+        row.setRuralDisposableIncome(new BigDecimal(income));
+        return row;
+    }
+}

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

@@ -0,0 +1,78 @@
+package com.ruoyi.web.modules.industryservice.support;
+
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.math.BigDecimal;
+import java.time.Year;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import com.ruoyi.common.exception.ServiceException;
+import com.ruoyi.web.modules.industryservice.domain.BizDisposableIncome;
+
+@DisplayName("DisposableIncomeValidation")
+class DisposableIncomeValidationTest
+{
+    @Test
+    @DisplayName("缺年份失败")
+    void missingYear()
+    {
+        BizDisposableIncome row = validRow();
+        row.setStatYear(null);
+        ServiceException ex = assertThrows(ServiceException.class, () -> DisposableIncomeValidation.validateRowForSave(row));
+        assertTrue(ex.getMessage().contains("所属年份"));
+    }
+
+    @Test
+    @DisplayName("非法年份失败")
+    void illegalYear()
+    {
+        BizDisposableIncome row = validRow();
+        row.setStatYear(1999);
+        ServiceException ex = assertThrows(ServiceException.class, () -> DisposableIncomeValidation.validateRowForSave(row));
+        assertTrue(ex.getMessage().contains("可选范围"));
+    }
+
+    @Test
+    @DisplayName("负可支配收入失败")
+    void negativeRuralIncome()
+    {
+        BizDisposableIncome row = validRow();
+        row.setRuralDisposableIncome(new BigDecimal("-1"));
+        ServiceException ex = assertThrows(ServiceException.class, () -> DisposableIncomeValidation.validateRowForSave(row));
+        assertTrue(ex.getMessage().contains("不能为负数"));
+    }
+
+    @Test
+    @DisplayName("备注超长失败")
+    void remarkTooLong()
+    {
+        BizDisposableIncome row = validRow();
+        StringBuilder sb = new StringBuilder();
+        for (int i = 0; i < 501; i++)
+        {
+            sb.append('a');
+        }
+        row.setRemark(sb.toString());
+        ServiceException ex = assertThrows(ServiceException.class, () -> DisposableIncomeValidation.validateRowForSave(row));
+        assertTrue(ex.getMessage().contains("500"));
+    }
+
+    @Test
+    @DisplayName("合法数据通过")
+    void validRowPasses()
+    {
+        assertDoesNotThrow(() -> DisposableIncomeValidation.validateRowForSave(validRow()));
+    }
+
+    private static BizDisposableIncome validRow()
+    {
+        BizDisposableIncome row = new BizDisposableIncome();
+        row.setStatYear(Year.now().getValue());
+        row.setRuralDisposableIncome(new BigDecimal("22190"));
+        row.setPovertyNetIncome(new BigDecimal("16965"));
+        row.setRemark("ok");
+        return row;
+    }
+}

doc/产业数据模型及服务/可支配收入数据填报/可支配收入数据填报功能需求.md

@@ -0,0 +1,44 @@
+# 可支配收入数据填报 — 功能需求
+
+## 1. 文档说明
+
+| 项 | 说明 |
+| --- | --- |
+| 模块名称 | 可支配收入数据填报 |
+| 目标 | 按**所属年份**登记农村居民人均可支配收入、脱贫人口人均纯收入；列表展示增幅与增速 |
+| 关联系统 | 业务后台 |
+| 修订依据 | 交接表 `可支配收入数据填报.xlsx` |
+
+---
+
+## 2. 填报粒度
+
+- 一条记录：某一自然年的县级收入快照（无乡镇/村维度）。
+- 唯一键：所属年份。
+- 增幅、增速不落库：增幅 = 本年可支配收入 − 上年可支配收入；增速 = 增幅 / 上年可支配收入。
+- 无导入 / 导出。
+
+---
+
+## 3. 功能范围
+
+| 能力 | 说明 |
+| --- | --- |
+| 分页列表 | 筛选：所属年份；列：年份、农村居民人均可支配收入、增幅、增速、脱贫人口人均纯收入 |
+| 新增 / 修改 | 年份、人均可支配收入、人均纯收入、备注；新增默认本年 |
+| 详情 | 全部字段含增幅、增速 |
+| 删除 | 物理删除 |
+
+---
+
+## 4. 权限
+
+`dataModel:disposableIncome:list|query|add|edit|remove`
+
+---
+
+## 5. 修订记录
+
+| 版本 | 说明 |
+| --- | --- |
+| 1.0 | 首版：县级年度 CRUD；增幅/增速计算展示 |

doc/产业数据模型及服务/可支配收入数据填报/可支配收入数据填报技术方案.md

@@ -0,0 +1,31 @@
+# 可支配收入数据填报 — 技术方案
+
+## 1. 接口
+
+| 方法 | 路径 | 权限 |
+| --- | --- | --- |
+| GET | `/dataModel/disposableIncome/list` | list |
+| GET | `/dataModel/disposableIncome/{id}` | query |
+| POST | `/dataModel/disposableIncome` | add |
+| PUT | `/dataModel/disposableIncome` | edit |
+| DELETE | `/dataModel/disposableIncome/{ids}` | remove |
+| GET | `/dataModel/disposableIncome/yearOptions` | list |
+
+## 2. 表结构
+
+表名：`biz_disposable_income`（见 `sql/biz_disposable_income.sql`）
+
+| 字段 | 说明 |
+| --- | --- |
+| stat_year | 所属年份，唯一 |
+| rural_disposable_income | 农村居民人均可支配收入（元） |
+| poverty_net_income | 脱贫人口人均纯收入（元） |
+| remark | 备注 |
+
+非落库：`incomeIncrease`、`incomeGrowthRate`（列表/详情按上年记录计算）。
+
+## 3. 前端
+
+- 页面：`ruoyi-ui/src/views/dataModel/disposableIncome/index.vue`
+- API：`ruoyi-ui/src/api/dataModel/disposableIncome.js`
+- 菜单组件路径建议：`dataModel/disposableIncome/index`

doc/产业数据模型及服务/可支配收入数据填报/可支配收入数据填报测试用例.md

@@ -0,0 +1,72 @@
+# 可支配收入数据填报 — 测试用例
+
+> 依据：`可支配收入数据填报功能需求.md`、`可支配收入数据填报技术方案.md`  
+> **接口 Base Path**：`/dataModel/disposableIncome`  
+> **建表**：执行 `sql/biz_disposable_income.sql`
+
+**通用前置**：已登录且具备模块权限；测试库无冲突年份数据或已隔离。
+
+---
+
+## 一、单元测试用例
+
+| 用例编号 | 测试模块 | 测试项 | 测试类型 | 测试工具 | 测试目的 | 前置条件 | 测试步骤 | 预期结果 |
+| --- | --- | --- | --- | --- | --- | --- | --- | --- |
+| ZCZX-KZPMSR-UT-001 | 增幅增速 | 有上年数据 | 单元测试 | JUnit5 | 计算逻辑 | 本年 13346、上年 11886 | `DisposableIncomeGrowthSupport.fillGrowth` | 增幅=1460；增速≈0.1228 |
+| ZCZX-KZPMSR-UT-002 | 增幅增速 | 无上年数据 | 单元测试 | JUnit5 | 首年无对比 | previous=null | `fillGrowth` | 增幅、增速均为 null |
+| ZCZX-KZPMSR-UT-003 | 增幅增速 | 上年为 0 | 单元测试 | JUnit5 | 除零保护 | 上年可支配收入=0 | `fillGrowth` | 增幅有值；增速为 null |
+| ZCZX-KZPMSR-UT-004 | 校验 | 必填年份 | 单元测试 | JUnit5 | 保存校验 | 缺 `statYear` | `validateRowForSave` | 抛 `ServiceException` |
+| ZCZX-KZPMSR-UT-005 | 校验 | 非法年份 | 单元测试 | JUnit5 | 年份范围 | `statYear=1999` | `validateRowForSave` | 抛「所属年份不在可选范围内」 |
+| ZCZX-KZPMSR-UT-006 | 校验 | 负收入拒绝 | 单元测试 | JUnit5 | 非负约束 | 可支配收入=-1 | `validateRowForSave` | 抛 `ServiceException` |
+| ZCZX-KZPMSR-UT-007 | 校验 | 备注超长 | 单元测试 | JUnit5 | 长度限制 | remark 长度>500 | `validateRowForSave` | 抛「备注不能超过500字」 |
+| ZCZX-KZPMSR-UT-008 | 校验 | 合法保存 | 单元测试 | JUnit5 | 正向 | 本年合法数据 | `validateRowForSave` | 不抛异常 |
+
+对应代码：`DisposableIncomeGrowthSupportTest`、`DisposableIncomeValidationTest`
+
+---
+
+## 二、接口测试用例
+
+| 用例编号 | 测试模块 | 测试项 | 测试类型 | 测试工具 | 测试目的 | 前置条件 | 测试步骤 | 预期结果 |
+| --- | --- | --- | --- | --- | --- | --- | --- | --- |
+| ZCZX-KZPMSR-API-001 | 列表 | 默认分页 | 接口测试 | Postman | 列表 | 有样本 | `GET /list` | `code=200`；含年份、可支配收入、增幅、增速、人均纯收入 |
+| ZCZX-KZPMSR-API-002 | 列表 | 按年份筛选 | 接口测试 | Postman | 搜索 | 多年数据 | `statYear=2025` | 仅 2025 |
+| ZCZX-KZPMSR-API-003 | 列表 | 增幅增速回填 | 接口测试 | Postman | 计算展示 | 连续两年有数据 | `GET /list` | 较新年份带增幅、增速；最早年可为空 |
+| ZCZX-KZPMSR-API-004 | 详情 | 全字段 | 接口测试 | Postman | 详情 | 有效 id | `GET /{id}` | 含收入字段与增幅、增速 |
+| ZCZX-KZPMSR-API-005 | 新增 | 必填成功 | 接口测试 | Postman | 新增 | 该年无记录 | `POST` 含年份+两项收入 | 成功 |
+| ZCZX-KZPMSR-API-006 | 新增 | 缺年份 | 接口测试 | Postman | 校验 | 已登录 | 缺 `statYear` | 失败 |
+| ZCZX-KZPMSR-API-007 | 新增 | 缺可支配收入 | 接口测试 | Postman | 校验 | 已登录 | 缺 `ruralDisposableIncome` | 失败 |
+| ZCZX-KZPMSR-API-008 | 新增 | 重复年份 | 接口测试 | Postman | 唯一键 | 已有同年记录 | 再 `POST` 同年 | 失败「该年份数据已存在」 |
+| ZCZX-KZPMSR-API-009 | 修改 | 更新收入 | 接口测试 | Postman | 修改 | 有效 id | `PUT` 改可支配收入 | 成功；列表增幅随之变化 |
+| ZCZX-KZPMSR-API-010 | 修改 | 改到已有年份 | 接口测试 | Postman | 唯一键 | 存在 2024、2025 | 将 2025 的年份改为 2024 | 失败 |
+| ZCZX-KZPMSR-API-011 | 删除 | 物理删除 | 接口测试 | Postman | 删除 | 有效 id | `DELETE /{id}` | 记录移除；再查 404/空 |
+| ZCZX-KZPMSR-API-012 | 下拉 | 年份选项 | 接口测试 | Postman | 下拉 | 已登录 | `GET /yearOptions` | 当前年起向前 5 年共 6 个 |
+| ZCZX-KZPMSR-API-013 | 权限 | 无 add | 接口测试 | Postman | 权限 | 仅 list | `POST /` | 403 |
+| ZCZX-KZPMSR-API-014 | 权限 | 无 remove | 接口测试 | Postman | 权限 | 无 remove | `DELETE /{id}` | 403 |
+| ZCZX-KZPMSR-API-015 | 端到端 | 增-查-改-删 | 接口测试 | Postman | 闭环 | 空库该年 | 新增→list→详情→修改→删除 | 各步数据一致 |
+
+---
+
+## 三、界面测试用例（UI）
+
+**工具**：Playwright / 手工均可。
+
+| 用例编号 | 测试模块 | 测试项 | 测试类型 | 测试工具 | 测试目的 | 前置条件 | 测试步骤 | 预期结果 |
+| --- | --- | --- | --- | --- | --- | --- | --- | --- |
+| ZCZX-KZPMSR-UI-001 | 列表 | 列展示 | 界面测试 | Chrome | 列表 | 有数据 | 打开页面 | 显示年份、可支配收入、增幅、增速、人均纯收入 |
+| ZCZX-KZPMSR-UI-002 | 列表 | 年份筛选 | 界面测试 | Chrome | 搜索 | 有多年数据 | 选年份→搜索 | 仅该年 |
+| ZCZX-KZPMSR-UI-003 | 新增 | 默认本年 | 界面测试 | Chrome | 默认值 | 已登录 | 点新增 | 年份默认当前年 |
+| ZCZX-KZPMSR-UI-004 | 新增 | 保存成功 | 界面测试 | Chrome | 新增 | 该年无数据 | 填两项收入→确定 | 提示成功；列表出现 |
+| ZCZX-KZPMSR-UI-005 | 新增 | 必填校验 | 界面测试 | Chrome | 校验 | 打开新增 | 不填收入直接确定 | 表单校验提示 |
+| ZCZX-KZPMSR-UI-006 | 详情 | 只读含增幅增速 | 界面测试 | Chrome | 详情 | 有上年数据 | 点查看 | 展示增幅、增速（百分比） |
+| ZCZX-KZPMSR-UI-007 | 修改 | 编辑回填 | 界面测试 | Chrome | 修改 | 有效行 | 点编辑 | 表单回填；可保存 |
+| ZCZX-KZPMSR-UI-008 | 删除 | 确认删除 | 界面测试 | Chrome | 删除 | 有效行 | 点删除→确认 | 行消失 |
+| ZCZX-KZPMSR-UI-009 | 范围 | 无导入导出按钮 | 界面测试 | Chrome | 需求边界 | 有权限 | 查看工具栏 | 无导入、导出入口 |
+
+---
+
+## 四、修订记录
+
+| 版本 | 说明 |
+| --- | --- |
+| 1.0 | 首版：CRUD + 增幅/增速计算；无导入导出用例 |

sql/biz_disposable_income.sql

@@ -0,0 +1,15 @@
+-- 可支配收入数据填报（物理删除；县级年度；全量覆盖建表）
+DROP TABLE IF EXISTS `biz_disposable_income`;
+CREATE TABLE `biz_disposable_income` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键',
+  `stat_year` int(11) NOT NULL COMMENT '所属年份',
+  `rural_disposable_income` decimal(18,2) DEFAULT NULL COMMENT '农村居民人均可支配收入（元）',
+  `poverty_net_income` decimal(18,2) DEFAULT NULL COMMENT '脱贫人口人均纯收入（元）',
+  `create_by` varchar(64) DEFAULT '' COMMENT '创建者',
+  `create_time` datetime DEFAULT NULL COMMENT '创建时间',
+  `update_by` varchar(64) DEFAULT '' COMMENT '更新者',
+  `update_time` datetime DEFAULT NULL COMMENT '更新时间',
+  `remark` varchar(500) DEFAULT NULL COMMENT '备注',
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `uk_stat_year` (`stat_year`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='可支配收入数据填报';