三资具体问题上报

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

@@ -0,0 +1,89 @@
+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.BizThreeAssetsProblemReport;
+import com.ruoyi.web.modules.industryservice.service.IBizThreeAssetsProblemReportService;
+
+/**
+ * 三资具体问题上报 REST。
+ * <p>Base：{@code /dataModel/threeAssetsProblemReport}；权限 {@code dataModel:threeAssetsProblemReport:*}；无导入导出。</p>
+ */
+@RestController
+@RequestMapping("/dataModel/threeAssetsProblemReport")
+public class BizThreeAssetsProblemReportController extends BaseController
+{
+    @Autowired
+    private IBizThreeAssetsProblemReportService service;
+
+    @PreAuthorize("@ss.hasPermi('dataModel:threeAssetsProblemReport:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(BizThreeAssetsProblemReport query)
+    {
+        startPage();
+        List<BizThreeAssetsProblemReport> list = service.selectBizThreeAssetsProblemReportList(query);
+        return getDataTable(list);
+    }
+
+    @PreAuthorize("@ss.hasPermi('dataModel:threeAssetsProblemReport:query')")
+    @GetMapping("/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return success(service.selectBizThreeAssetsProblemReportById(id));
+    }
+
+    @PreAuthorize("@ss.hasPermi('dataModel:threeAssetsProblemReport:add')")
+    @Log(title = "三资具体问题上报", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@Validated @RequestBody BizThreeAssetsProblemReport row)
+    {
+        row.setCreateBy(getUsername());
+        return toAjax(service.insertBizThreeAssetsProblemReport(row));
+    }
+
+    @PreAuthorize("@ss.hasPermi('dataModel:threeAssetsProblemReport:edit')")
+    @Log(title = "三资具体问题上报", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@Validated @RequestBody BizThreeAssetsProblemReport row)
+    {
+        row.setUpdateBy(getUsername());
+        return toAjax(service.updateBizThreeAssetsProblemReport(row));
+    }
+
+    @PreAuthorize("@ss.hasPermi('dataModel:threeAssetsProblemReport:remove')")
+    @Log(title = "三资具体问题上报", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(service.deleteBizThreeAssetsProblemReportByIds(ids, getUsername()));
+    }
+
+    @PreAuthorize("@ss.hasPermi('dataModel:threeAssetsProblemReport:list')")
+    @GetMapping("/townOptions")
+    public AjaxResult townOptions()
+    {
+        return success(service.listTownOptions());
+    }
+
+    @PreAuthorize("@ss.hasPermi('dataModel:threeAssetsProblemReport:list')")
+    @GetMapping("/villageTree")
+    public AjaxResult villageTree()
+    {
+        return success(service.listVillageTree());
+    }
+}

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

@@ -0,0 +1,166 @@
+package com.ruoyi.web.modules.industryservice.domain;
+
+import java.util.Date;
+import javax.validation.constraints.NotNull;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 三资具体问题上报，对应表 {@code biz_three_assets_problem_report}。
+ */
+public class BizThreeAssetsProblemReport extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    private Long id;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date reportTime;
+
+    private Long townDeptId;
+
+    private String townName;
+
+    @NotNull(message = "所属村不能为空")
+    private Long villageDeptId;
+
+    private String villageName;
+
+    /** 问题类型：fund/asset/resource/other */
+    private String problemType;
+
+    /** 问题等级：general/key/major */
+    private String problemLevel;
+
+    private String problemDetail;
+
+    private String handleResult;
+
+    /** 查询：上报时间起 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date beginReportTime;
+
+    /** 查询：上报时间止 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date endReportTime;
+
+    public Long getId()
+    {
+        return id;
+    }
+
+    public void setId(Long id)
+    {
+        this.id = id;
+    }
+
+    public Date getReportTime()
+    {
+        return reportTime;
+    }
+
+    public void setReportTime(Date reportTime)
+    {
+        this.reportTime = reportTime;
+    }
+
+    public Long getTownDeptId()
+    {
+        return townDeptId;
+    }
+
+    public void setTownDeptId(Long townDeptId)
+    {
+        this.townDeptId = townDeptId;
+    }
+
+    public String getTownName()
+    {
+        return townName;
+    }
+
+    public void setTownName(String townName)
+    {
+        this.townName = townName;
+    }
+
+    public Long getVillageDeptId()
+    {
+        return villageDeptId;
+    }
+
+    public void setVillageDeptId(Long villageDeptId)
+    {
+        this.villageDeptId = villageDeptId;
+    }
+
+    public String getVillageName()
+    {
+        return villageName;
+    }
+
+    public void setVillageName(String villageName)
+    {
+        this.villageName = villageName;
+    }
+
+    public String getProblemType()
+    {
+        return problemType;
+    }
+
+    public void setProblemType(String problemType)
+    {
+        this.problemType = problemType;
+    }
+
+    public String getProblemLevel()
+    {
+        return problemLevel;
+    }
+
+    public void setProblemLevel(String problemLevel)
+    {
+        this.problemLevel = problemLevel;
+    }
+
+    public String getProblemDetail()
+    {
+        return problemDetail;
+    }
+
+    public void setProblemDetail(String problemDetail)
+    {
+        this.problemDetail = problemDetail;
+    }
+
+    public String getHandleResult()
+    {
+        return handleResult;
+    }
+
+    public void setHandleResult(String handleResult)
+    {
+        this.handleResult = handleResult;
+    }
+
+    public Date getBeginReportTime()
+    {
+        return beginReportTime;
+    }
+
+    public void setBeginReportTime(Date beginReportTime)
+    {
+        this.beginReportTime = beginReportTime;
+    }
+
+    public Date getEndReportTime()
+    {
+        return endReportTime;
+    }
+
+    public void setEndReportTime(Date endReportTime)
+    {
+        this.endReportTime = endReportTime;
+    }
+}

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

@@ -0,0 +1,21 @@
+package com.ruoyi.web.modules.industryservice.mapper;
+
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+import com.ruoyi.web.modules.industryservice.domain.BizThreeAssetsProblemReport;
+
+/**
+ * 三资具体问题上报 Mapper。
+ */
+public interface BizThreeAssetsProblemReportMapper
+{
+    BizThreeAssetsProblemReport selectBizThreeAssetsProblemReportById(Long id);
+
+    List<BizThreeAssetsProblemReport> selectBizThreeAssetsProblemReportList(BizThreeAssetsProblemReport query);
+
+    int insertBizThreeAssetsProblemReport(BizThreeAssetsProblemReport row);
+
+    int updateBizThreeAssetsProblemReport(BizThreeAssetsProblemReport row);
+
+    int deleteBizThreeAssetsProblemReportByIds(@Param("ids") Long[] ids);
+}

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

@@ -0,0 +1,26 @@
+package com.ruoyi.web.modules.industryservice.service;
+
+import java.util.List;
+import java.util.Map;
+import com.ruoyi.common.core.domain.TreeSelect;
+import com.ruoyi.web.modules.industryservice.domain.BizThreeAssetsProblemReport;
+
+/**
+ * 三资具体问题上报服务（仅 CRUD，无导入导出）。
+ */
+public interface IBizThreeAssetsProblemReportService
+{
+    BizThreeAssetsProblemReport selectBizThreeAssetsProblemReportById(Long id);
+
+    List<BizThreeAssetsProblemReport> selectBizThreeAssetsProblemReportList(BizThreeAssetsProblemReport query);
+
+    int insertBizThreeAssetsProblemReport(BizThreeAssetsProblemReport row);
+
+    int updateBizThreeAssetsProblemReport(BizThreeAssetsProblemReport row);
+
+    int deleteBizThreeAssetsProblemReportByIds(Long[] ids, String updateBy);
+
+    List<Map<String, Object>> listTownOptions();
+
+    List<TreeSelect> listVillageTree();
+}

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

@@ -0,0 +1,108 @@
+package com.ruoyi.web.modules.industryservice.service.impl;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import com.ruoyi.common.core.domain.TreeSelect;
+import com.ruoyi.common.exception.ServiceException;
+import com.ruoyi.web.modules.industryservice.domain.BizThreeAssetsProblemReport;
+import com.ruoyi.web.modules.industryservice.mapper.BizThreeAssetsProblemReportMapper;
+import com.ruoyi.web.modules.industryservice.service.IBizThreeAssetsProblemReportService;
+import com.ruoyi.web.modules.industryservice.support.ReportDeptDataScopeSupport;
+import com.ruoyi.web.modules.industryservice.support.ThreeAssetsProblemReportValidation;
+import com.ruoyi.web.modules.industryservice.support.TownDeptSupport;
+
+/**
+ * 三资具体问题上报服务实现。
+ */
+@Service
+public class BizThreeAssetsProblemReportServiceImpl implements IBizThreeAssetsProblemReportService
+{
+    @Autowired
+    private BizThreeAssetsProblemReportMapper mapper;
+
+    @Autowired
+    private TownDeptSupport townDeptSupport;
+
+    @Override
+    public BizThreeAssetsProblemReport selectBizThreeAssetsProblemReportById(Long id)
+    {
+        return mapper.selectBizThreeAssetsProblemReportById(id);
+    }
+
+    @Override
+    public List<BizThreeAssetsProblemReport> selectBizThreeAssetsProblemReportList(BizThreeAssetsProblemReport query)
+    {
+        ReportDeptDataScopeSupport.apply(query, "r");
+        return mapper.selectBizThreeAssetsProblemReportList(query);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public int insertBizThreeAssetsProblemReport(BizThreeAssetsProblemReport row)
+    {
+        ThreeAssetsProblemReportValidation.validateRowForSave(row, townDeptSupport);
+        return mapper.insertBizThreeAssetsProblemReport(row);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public int updateBizThreeAssetsProblemReport(BizThreeAssetsProblemReport row)
+    {
+        if (row.getId() == null)
+        {
+            throw new ServiceException("主键不能为空");
+        }
+        requireExistingRow(row.getId());
+        ThreeAssetsProblemReportValidation.validateRowForSave(row, townDeptSupport);
+        return mapper.updateBizThreeAssetsProblemReport(row);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public int deleteBizThreeAssetsProblemReportByIds(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 mapper.deleteBizThreeAssetsProblemReportByIds(cleaned.toArray(new Long[0]));
+    }
+
+    @Override
+    public List<Map<String, Object>> listTownOptions()
+    {
+        return townDeptSupport.toOptionList();
+    }
+
+    @Override
+    public List<TreeSelect> listVillageTree()
+    {
+        return townDeptSupport.buildVillageTree();
+    }
+
+    private BizThreeAssetsProblemReport requireExistingRow(Long id)
+    {
+        BizThreeAssetsProblemReport row = mapper.selectBizThreeAssetsProblemReportById(id);
+        if (row == null)
+        {
+            throw new ServiceException("记录不存在");
+        }
+        return row;
+    }
+}

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

@@ -0,0 +1,42 @@
+package com.ruoyi.web.modules.industryservice.support;
+
+/**
+ * 三资具体问题上报常量。
+ * <p>问题类型 Excel 未列选项，按「三资」暂定资金/资产/资源/其他；问题等级：一般/重点/重大。</p>
+ */
+public final class ThreeAssetsProblemReportRules
+{
+    /** 资金问题 */
+    public static final String TYPE_FUND = "fund";
+    /** 资产问题 */
+    public static final String TYPE_ASSET = "asset";
+    /** 资源问题 */
+    public static final String TYPE_RESOURCE = "resource";
+    /** 其他 */
+    public static final String TYPE_OTHER = "other";
+
+    /** 一般 */
+    public static final String LEVEL_GENERAL = "general";
+    /** 重点 */
+    public static final String LEVEL_KEY = "key";
+    /** 重大 */
+    public static final String LEVEL_MAJOR = "major";
+
+    public static final int MAX_DETAIL_LEN = 2000;
+    public static final int MAX_HANDLE_RESULT_LEN = 2000;
+
+    private ThreeAssetsProblemReportRules()
+    {
+    }
+
+    public static boolean isValidType(String type)
+    {
+        return TYPE_FUND.equals(type) || TYPE_ASSET.equals(type)
+                || TYPE_RESOURCE.equals(type) || TYPE_OTHER.equals(type);
+    }
+
+    public static boolean isValidLevel(String level)
+    {
+        return LEVEL_GENERAL.equals(level) || LEVEL_KEY.equals(level) || LEVEL_MAJOR.equals(level);
+    }
+}

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

@@ -0,0 +1,93 @@
+package com.ruoyi.web.modules.industryservice.support;
+
+import java.util.Date;
+import com.ruoyi.common.core.domain.entity.SysDept;
+import com.ruoyi.common.exception.ServiceException;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.web.modules.industryservice.domain.BizThreeAssetsProblemReport;
+
+/**
+ * 三资具体问题上报校验：村反推乡镇、类型/等级枚举、描述长度。
+ */
+public final class ThreeAssetsProblemReportValidation
+{
+    private ThreeAssetsProblemReportValidation()
+    {
+    }
+
+    public static void validateRowForSave(BizThreeAssetsProblemReport row, TownDeptSupport townDeptSupport)
+    {
+        if (row == null)
+        {
+            throw new ServiceException("参数不能为空");
+        }
+        if (row.getVillageDeptId() == null)
+        {
+            throw new ServiceException("所属村不能为空");
+        }
+        SysDept village = townDeptSupport.requireReportVillage(row.getVillageDeptId());
+        if (village == null)
+        {
+            throw new ServiceException("所属村不合法");
+        }
+        SysDept town = townDeptSupport.requireReportTown(village.getParentId());
+        if (town == null)
+        {
+            throw new ServiceException("所属村的上级乡镇不合法");
+        }
+        row.setVillageName(village.getDeptName());
+        row.setTownDeptId(town.getDeptId());
+        row.setTownName(town.getDeptName());
+
+        if (row.getReportTime() == null)
+        {
+            row.setReportTime(new Date());
+        }
+        if (StringUtils.isEmpty(row.getProblemType()))
+        {
+            throw new ServiceException("问题类型不能为空");
+        }
+        if (!ThreeAssetsProblemReportRules.isValidType(row.getProblemType()))
+        {
+            throw new ServiceException("问题类型不合法");
+        }
+        if (StringUtils.isEmpty(row.getProblemLevel()))
+        {
+            throw new ServiceException("问题等级不能为空");
+        }
+        if (!ThreeAssetsProblemReportRules.isValidLevel(row.getProblemLevel()))
+        {
+            throw new ServiceException("问题等级不合法");
+        }
+        String detail = StringUtils.trim(row.getProblemDetail());
+        if (StringUtils.isEmpty(detail))
+        {
+            throw new ServiceException("问题详细描述不能为空");
+        }
+        if (detail.length() > ThreeAssetsProblemReportRules.MAX_DETAIL_LEN)
+        {
+            throw new ServiceException("问题详细描述不能超过"
+                    + ThreeAssetsProblemReportRules.MAX_DETAIL_LEN + "字");
+        }
+        row.setProblemDetail(detail);
+
+        String handle = StringUtils.trim(row.getHandleResult());
+        if (StringUtils.isEmpty(handle))
+        {
+            row.setHandleResult(null);
+        }
+        else
+        {
+            if (handle.length() > ThreeAssetsProblemReportRules.MAX_HANDLE_RESULT_LEN)
+            {
+                throw new ServiceException("处理结果不能超过"
+                        + ThreeAssetsProblemReportRules.MAX_HANDLE_RESULT_LEN + "字");
+            }
+            row.setHandleResult(handle);
+        }
+        if (StringUtils.isNotEmpty(row.getRemark()) && row.getRemark().length() > 500)
+        {
+            throw new ServiceException("备注不能超过500字");
+        }
+    }
+}

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

@@ -0,0 +1,103 @@
+<?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">
+<!-- 三资具体问题上报 biz_three_assets_problem_report -->
+<mapper namespace="com.ruoyi.web.modules.industryservice.mapper.BizThreeAssetsProblemReportMapper">
+
+    <resultMap type="com.ruoyi.web.modules.industryservice.domain.BizThreeAssetsProblemReport"
+               id="BizThreeAssetsProblemReportResult">
+        <id     property="id"              column="id"/>
+        <result property="reportTime"      column="report_time"/>
+        <result property="townDeptId"      column="town_dept_id"/>
+        <result property="townName"        column="town_name"/>
+        <result property="villageDeptId"   column="village_dept_id"/>
+        <result property="villageName"     column="village_name"/>
+        <result property="problemType"     column="problem_type"/>
+        <result property="problemLevel"    column="problem_level"/>
+        <result property="problemDetail"   column="problem_detail"/>
+        <result property="handleResult"    column="handle_result"/>
+        <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.report_time, r.town_dept_id, r.town_name, r.village_dept_id, r.village_name,
+               r.problem_type, r.problem_level, r.problem_detail, r.handle_result,
+               r.create_by, r.create_time, r.update_by, r.update_time, r.remark
+        from biz_three_assets_problem_report r
+    </sql>
+
+    <select id="selectBizThreeAssetsProblemReportById" parameterType="long"
+            resultMap="BizThreeAssetsProblemReportResult">
+        <include refid="selectVo"/>
+        where r.id = #{id}
+    </select>
+
+    <select id="selectBizThreeAssetsProblemReportList"
+            parameterType="com.ruoyi.web.modules.industryservice.domain.BizThreeAssetsProblemReport"
+            resultMap="BizThreeAssetsProblemReportResult">
+        <include refid="selectVo"/>
+        left join sys_dept d on r.town_dept_id = d.dept_id
+        left join sys_dept v on r.village_dept_id = v.dept_id
+        <where>
+            <if test="townDeptId != null">
+                and r.town_dept_id = #{townDeptId}
+            </if>
+            <if test="villageDeptId != null">
+                and r.village_dept_id = #{villageDeptId}
+            </if>
+            <if test="problemType != null and problemType != ''">
+                and r.problem_type = #{problemType}
+            </if>
+            <if test="beginReportTime != null">
+                and date_format(r.report_time,'%y%m%d') &gt;= date_format(#{beginReportTime},'%y%m%d')
+            </if>
+            <if test="endReportTime != null">
+                and date_format(r.report_time,'%y%m%d') &lt;= date_format(#{endReportTime},'%y%m%d')
+            </if>
+            ${params.dataScope}
+        </where>
+        order by r.report_time desc, d.order_num asc, v.order_num asc, r.id desc
+    </select>
+
+    <insert id="insertBizThreeAssetsProblemReport"
+            parameterType="com.ruoyi.web.modules.industryservice.domain.BizThreeAssetsProblemReport"
+            useGeneratedKeys="true" keyProperty="id">
+        insert into biz_three_assets_problem_report (
+            report_time, town_dept_id, town_name, village_dept_id, village_name,
+            problem_type, problem_level, problem_detail, handle_result,
+            create_by, create_time, remark
+        ) values (
+            #{reportTime}, #{townDeptId}, #{townName}, #{villageDeptId}, #{villageName},
+            #{problemType}, #{problemLevel}, #{problemDetail}, #{handleResult},
+            #{createBy}, sysdate(), #{remark}
+        )
+    </insert>
+
+    <update id="updateBizThreeAssetsProblemReport"
+            parameterType="com.ruoyi.web.modules.industryservice.domain.BizThreeAssetsProblemReport">
+        update biz_three_assets_problem_report set
+            report_time = #{reportTime},
+            town_dept_id = #{townDeptId},
+            town_name = #{townName},
+            village_dept_id = #{villageDeptId},
+            village_name = #{villageName},
+            problem_type = #{problemType},
+            problem_level = #{problemLevel},
+            problem_detail = #{problemDetail},
+            handle_result = #{handleResult},
+            update_by = #{updateBy},
+            update_time = sysdate(),
+            remark = #{remark}
+        where id = #{id}
+    </update>
+
+    <delete id="deleteBizThreeAssetsProblemReportByIds">
+        delete from biz_three_assets_problem_report 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/ThreeAssetsProblemReportValidationTest.java

@@ -0,0 +1,86 @@
+package com.ruoyi.web.modules.industryservice.support;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.mockito.Mockito.when;
+
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import com.ruoyi.common.core.domain.entity.SysDept;
+import com.ruoyi.common.exception.ServiceException;
+import com.ruoyi.web.modules.industryservice.domain.BizThreeAssetsProblemReport;
+
+@ExtendWith(MockitoExtension.class)
+@DisplayName("ThreeAssetsProblemReportValidation")
+class ThreeAssetsProblemReportValidationTest
+{
+    @Mock
+    private TownDeptSupport townDeptSupport;
+
+    @Test
+    @DisplayName("保存时反填乡镇并默认上报时间")
+    void fillTownAndDefaultReportTime()
+    {
+        SysDept town = town(101L, "雅安镇");
+        SysDept village = village(201L, "荣嘎村", 101L);
+        when(townDeptSupport.requireReportVillage(201L)).thenReturn(village);
+        when(townDeptSupport.requireReportTown(101L)).thenReturn(town);
+
+        BizThreeAssetsProblemReport row = new BizThreeAssetsProblemReport();
+        row.setVillageDeptId(201L);
+        row.setProblemType(ThreeAssetsProblemReportRules.TYPE_FUND);
+        row.setProblemLevel(ThreeAssetsProblemReportRules.LEVEL_GENERAL);
+        row.setProblemDetail("资金账目不清");
+        ThreeAssetsProblemReportValidation.validateRowForSave(row, townDeptSupport);
+
+        assertEquals(101L, row.getTownDeptId());
+        assertEquals("雅安镇", row.getTownName());
+        assertEquals("荣嘎村", row.getVillageName());
+        assertNotNull(row.getReportTime());
+    }
+
+    @Test
+    @DisplayName("问题类型不合法时拒绝")
+    void invalidTypeRejected()
+    {
+        SysDept town = town(101L, "雅安镇");
+        SysDept village = village(201L, "荣嘎村", 101L);
+        when(townDeptSupport.requireReportVillage(201L)).thenReturn(village);
+        when(townDeptSupport.requireReportTown(101L)).thenReturn(town);
+
+        BizThreeAssetsProblemReport row = new BizThreeAssetsProblemReport();
+        row.setVillageDeptId(201L);
+        row.setProblemType("unknown");
+        row.setProblemLevel(ThreeAssetsProblemReportRules.LEVEL_KEY);
+        row.setProblemDetail("描述");
+        assertThrows(ServiceException.class,
+                () -> ThreeAssetsProblemReportValidation.validateRowForSave(row, townDeptSupport));
+    }
+
+    private static SysDept town(Long id, String name)
+    {
+        SysDept d = new SysDept();
+        d.setDeptId(id);
+        d.setDeptName(name);
+        d.setParentId(YakHerdInventoryRules.TOWN_PARENT_ID);
+        d.setOrderNum(20);
+        d.setStatus("0");
+        d.setDelFlag("0");
+        return d;
+    }
+
+    private static SysDept village(Long id, String name, Long townId)
+    {
+        SysDept d = new SysDept();
+        d.setDeptId(id);
+        d.setDeptName(name);
+        d.setParentId(townId);
+        d.setStatus("0");
+        d.setDelFlag("0");
+        return d;
+    }
+}

doc/产业数据模型及服务/三资具体问题上报/三资具体问题上报功能需求.md

@@ -0,0 +1,57 @@
+# 三资具体问题上报 — 功能需求
+
+## 1. 文档说明
+
+| 项 | 说明 |
+| --- | --- |
+| 模块名称 | 三资具体问题上报 |
+| 来源 | `三资具体问题上报.xlsx` |
+| 范围 | 普通增删改查；**无需**导入/导出 |
+
+---
+
+## 2. 字段
+
+| 字段 | 逻辑 | 搜索 | 列表 | 表单 |
+| --- | --- | --- | --- | --- |
+| 上报时间 | 新增默认当前时间 | √（日期区间） | √ | √ |
+| 所属村 | 必填；反推乡镇 | √ | √ | √ |
+| 所属乡镇 | 由村反推 | √ | √ | 查看展示 |
+| 问题类型 | 单选 | √ | √ | √ |
+| 问题等级 | 单选：一般/重点/重大 | — | √ | √ |
+| 问题详细描述 | 必填，≤2000 字 | — | √ | √ |
+| 处理结果 | 选填，≤2000 字 | — | — | √ |
+
+**问题类型说明**：Excel 仅写「单选，」未列选项；实现暂按三资类别：资金问题 / 资产问题 / 资源问题 / 其他（码值 `fund`/`asset`/`resource`/`other`）。若业务另有口径可再改。
+
+**问题等级码值**：`general`（一般）/ `key`（重点）/ `major`（重大）。
+
+---
+
+## 3. 业务规则
+
+1. 普通 CRUD，无导入导出。
+2. 新增时上报时间默认当前时间（前后端均可带默认值；后端空则补 `now`）。
+3. 保存时按所属村反推并落库乡镇。
+4. 列表/乡镇村下拉沿用填报部门数据权限（乡镇看本镇及村，村看本村）。
+
+---
+
+## 4. 权限与菜单
+
+- 权限：`dataModel:threeAssetsProblemReport:list|query|add|edit|remove`
+- 组件：`dataModel/threeAssetsProblemReport/index`
+
+---
+
+## 5. 相关文档
+
+- [三资具体问题上报技术方案.md](./三资具体问题上报技术方案.md)
+- [三资具体问题上报前端技术方案.md](./三资具体问题上报前端技术方案.md)
+- [三资具体问题上报测试用例.md](./三资具体问题上报测试用例.md)
+
+## 6. 修订记录
+
+| 版本 | 说明 |
+| --- | --- |
+| 1.0 | 初版：按 Excel 实现 CRUD |

doc/产业数据模型及服务/三资具体问题上报/三资具体问题上报技术方案.md

@@ -0,0 +1,60 @@
+# 三资具体问题上报 — 技术方案
+
+## 1. 架构
+
+Controller `/dataModel/threeAssetsProblemReport` → Service → Mapper；校验 `ThreeAssetsProblemReportValidation`；列表数据范围 `ReportDeptDataScopeSupport`；乡镇/村 `TownDeptSupport`。
+
+## 2. 表结构
+
+见 `sql/biz_three_assets_problem_report.sql`。
+
+| 列 | 说明 |
+| --- | --- |
+| `report_time` | 上报时间 |
+| `town_dept_id` / `town_name` | 乡镇 |
+| `village_dept_id` / `village_name` | 村 |
+| `problem_type` | fund/asset/resource/other |
+| `problem_level` | general/key/major |
+| `problem_detail` | 详细描述 |
+| `handle_result` | 处理结果（可空） |
+
+物理删除；无村级唯一约束（同一村可多次上报）。
+
+## 3. 接口
+
+| 方法 | 路径 | 权限 |
+| --- | --- | --- |
+| GET | `/list` | list |
+| GET | `/{id}` | query |
+| POST | `/` | add |
+| PUT | `/` | edit |
+| DELETE | `/{ids}` | remove |
+| GET | `/townOptions` | list |
+| GET | `/villageTree` | list |
+
+列表筛选：`beginReportTime`/`endReportTime`、`townDeptId`、`villageDeptId`、`problemType`。
+
+## 4. 前端
+
+详见 [三资具体问题上报前端技术方案.md](./三资具体问题上报前端技术方案.md)。
+
+## 5. 菜单示例
+
+```sql
+-- parent_id 替换为「产业数据模型」实际 ID；menu_id 按环境递增
+INSERT INTO sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, remark)
+VALUES ('三资具体问题上报', {parentId}, 20, 'threeAssetsProblemReport', 'dataModel/threeAssetsProblemReport/index', 1, 0, 'C', '0', '0', 'dataModel:threeAssetsProblemReport:list', 'form', 'admin', sysdate(), '三资具体问题上报');
+
+-- 按钮权限（parent_id = 上菜单 id）
+INSERT INTO sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, remark) VALUES
+('三资问题上报查询', {menuId}, 1, '#', '', 1, 0, 'F', '0', '0', 'dataModel:threeAssetsProblemReport:query', '#', 'admin', sysdate(), ''),
+('三资问题上报新增', {menuId}, 2, '#', '', 1, 0, 'F', '0', '0', 'dataModel:threeAssetsProblemReport:add', '#', 'admin', sysdate(), ''),
+('三资问题上报修改', {menuId}, 3, '#', '', 1, 0, 'F', '0', '0', 'dataModel:threeAssetsProblemReport:edit', '#', 'admin', sysdate(), ''),
+('三资问题上报删除', {menuId}, 4, '#', '', 1, 0, 'F', '0', '0', 'dataModel:threeAssetsProblemReport:remove', '#', 'admin', sysdate(), '');
+```
+
+## 6. 修订记录
+
+| 版本 | 说明 |
+| --- | --- |
+| 1.0 | 初版 |

doc/产业数据模型及服务/三资具体问题上报/三资具体问题上报测试用例.md

@@ -0,0 +1,35 @@
+# 三资具体问题上报 — 测试用例
+
+> **接口 Base Path**：`/dataModel/threeAssetsProblemReport`
+
+## 1. 列表与筛选
+
+| 编号 | 步骤 | 期望 |
+| --- | --- | --- |
+| L1 | 超管打开列表 | 返回分页数据 |
+| L2 | 按上报时间区间筛选 | 仅区间内记录 |
+| L3 | 按乡镇/村/问题类型筛选 | 条件生效 |
+| L4 | 乡镇账号登录 | 仅本镇数据；乡镇下拉仅本镇 |
+
+## 2. 新增
+
+| 编号 | 步骤 | 期望 |
+| --- | --- | --- |
+| A1 | 打开新增 | 上报时间默认当前 |
+| A2 | 不选村提交 | 校验失败 |
+| A3 | 必填齐全提交 | 成功；乡镇由村反推落库 |
+| A4 | 问题类型非法码 | 后端拒绝 |
+
+## 3. 修改 / 查看 / 删除
+
+| 编号 | 步骤 | 期望 |
+| --- | --- | --- |
+| U1 | 修改描述与处理结果 | 保存成功 |
+| V1 | 查看详情 | 展示全部字段含处理结果 |
+| D1 | 删除一条 | 物理删除，列表不再出现 |
+
+## 4. 修订记录
+
+| 版本 | 说明 |
+| --- | --- |
+| 1.0 | 初版 |

sql/biz_three_assets_problem_report.sql

@@ -0,0 +1,24 @@
+-- 三资具体问题上报（物理删除；普通 CRUD，无导入导出）
+DROP TABLE IF EXISTS `biz_three_assets_problem_report`;
+CREATE TABLE `biz_three_assets_problem_report` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键',
+  `report_time` datetime NOT NULL COMMENT '上报时间',
+  `town_dept_id` bigint(20) NOT NULL COMMENT '所属乡镇dept_id',
+  `town_name` varchar(64) NOT NULL COMMENT '乡镇名称',
+  `village_dept_id` bigint(20) NOT NULL COMMENT '所属村dept_id',
+  `village_name` varchar(128) NOT NULL COMMENT '所属村名称',
+  `problem_type` varchar(32) NOT NULL COMMENT '问题类型：fund/asset/resource/other',
+  `problem_level` varchar(16) NOT NULL COMMENT '问题等级：general/key/major',
+  `problem_detail` varchar(2000) NOT NULL COMMENT '问题详细描述',
+  `handle_result` varchar(2000) 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`),
+  KEY `idx_town_dept_id` (`town_dept_id`),
+  KEY `idx_village_dept_id` (`village_dept_id`),
+  KEY `idx_report_time` (`report_time`),
+  KEY `idx_problem_type` (`problem_type`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='三资具体问题上报';