2025-09-22 wj 整体修改3

b418d657 · wangjian · 8b0a4fb0 · b418d657 · b418d657 · b418d657
Commit b418d657 authored Sep 22, 2025 by wangjian
9 changed files
--- a/qianhe-ydsj/src/main/java/com/qianhe/controller/SjFybpController.java
+++ b/qianhe-ydsj/src/main/java/com/qianhe/controller/SjFybpController.java
@@ -42,7 +42,6 @@ public class SjFybpController extends BaseController
    /**
     * 查询三基-费用报批列表
     */
-    @PreAuthorize("@ss.hasPermi('system:sjFybp:list')")
    @GetMapping("/list")
    public TableDataInfo list(SjFybp sjFybp)
    {
@@ -54,7 +53,6 @@ public class SjFybpController extends BaseController
    /**
     * 导出三基-费用报批列表
     */
-    @PreAuthorize("@ss.hasPermi('system:sjFybp:export')")
    @Log(title = "三基-费用报批", businessType = BusinessType.EXPORT)
    @PostMapping("/export")
    public void export(HttpServletResponse response, SjFybp sjFybp)
@@ -67,7 +65,6 @@ public class SjFybpController extends BaseController
    /**
     * 获取三基-费用报批详细信息
     */
-    @PreAuthorize("@ss.hasPermi('system:sjFybp:query')")
    @GetMapping(value = "/{id}")
    public AjaxResult getInfo(@PathVariable("id") Long id)
    {
@@ -77,7 +74,6 @@ public class SjFybpController extends BaseController
    /**
     * 新增三基-费用报批
     */
-    @PreAuthorize("@ss.hasPermi('system:sjFybp:add')")
    @Log(title = "三基-费用报批", businessType = BusinessType.INSERT)
    @PostMapping
    public AjaxResult add(@RequestBody SjFybp sjFybp)
@@ -88,7 +84,6 @@ public class SjFybpController extends BaseController
    /**
     * 修改三基-费用报批
     */
-    @PreAuthorize("@ss.hasPermi('system:sjFybp:edit')")
    @Log(title = "三基-费用报批", businessType = BusinessType.UPDATE)
    @PutMapping
    public AjaxResult edit(@RequestBody SjFybp sjFybp)
@@ -99,7 +94,6 @@ public class SjFybpController extends BaseController
    /**
     * 删除三基-费用报批
     */
-    @PreAuthorize("@ss.hasPermi('system:sjFybp:remove')")
    @Log(title = "三基-费用报批", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
    public AjaxResult remove(@PathVariable Long[] ids)
@@ -111,7 +105,6 @@ public class SjFybpController extends BaseController
    /**
     * 提交
     */
-//    @PreAuthorize("@ss.hasPermi('system:sjFybp:tj')")
    @Log(title = "三基-费用报批", businessType = BusinessType.UPDATE)
    @PostMapping("/tj")
    public AjaxResult tj(@RequestBody SjFybp sjFybp)
@@ -169,7 +162,6 @@ public class SjFybpController extends BaseController
    /**
     * 费用维护
     */
-//    @PreAuthorize("@ss.hasPermi('system:sjFybp:fywh')")
    @Log(title = "三基-费用报批", businessType = BusinessType.UPDATE)
    @PostMapping("fywh")
    public AjaxResult fywh(@RequestBody SjFybp sjFybp)
@@ -216,7 +208,6 @@ public class SjFybpController extends BaseController
    /**
     * 导出三基-费用报批列表
     */
-//    @PreAuthorize("@ss.hasPermi('system:sjFybp:export')")
    @Log(title = "三基-费用报批", businessType = BusinessType.EXPORT)
    @PostMapping("/exportTj")
    public void exportTj(HttpServletResponse response, SjFybp sjFybp)
@@ -231,4 +222,13 @@ public class SjFybpController extends BaseController
 //        ExcelUtil<SjfybpVo> util = new ExcelUtil<SjfybpVo>(SjfybpVo.class);
 //        util.exportExcel(response, voList, "统计");
    }
+    /** 直属单位三基建设费用统计表 */
+    @GetMapping("/zsdwNdfytj")
+    public List<SjfybpVo> zsdwNdfytj(SjFybp sjFybp)
+    {
+        List<SjfybpVo> list = sjFybpService.zsdwNdfytj(sjFybp);
+        return list;
+    }
 }
--- a/qianhe-ydsj/src/main/java/com/qianhe/controller/SjFybpWhController.java
+++ b/qianhe-ydsj/src/main/java/com/qianhe/controller/SjFybpWhController.java
@@ -37,7 +37,6 @@ public class SjFybpWhController extends BaseController
    /**
     * 查询三基-费用维护列表
     */
-    @PreAuthorize("@ss.hasPermi('system:sjFybpWh:list')")
    @GetMapping("/list")
    public TableDataInfo list(SjFybpWh sjFybpWh)
    {
@@ -49,7 +48,6 @@ public class SjFybpWhController extends BaseController
    /**
     * 导出三基-费用维护列表
     */
-    @PreAuthorize("@ss.hasPermi('system:sjFybpWh:export')")
    @Log(title = "三基-费用维护", businessType = BusinessType.EXPORT)
    @PostMapping("/export")
    public void export(HttpServletResponse response, SjFybpWh sjFybpWh)
@@ -62,7 +60,6 @@ public class SjFybpWhController extends BaseController
    /**
     * 获取三基-费用维护详细信息
     */
-    @PreAuthorize("@ss.hasPermi('system:sjFybpWh:query')")
    @GetMapping(value = "/{id}")
    public AjaxResult getInfo(@PathVariable("id") Long id)
    {
@@ -72,7 +69,6 @@ public class SjFybpWhController extends BaseController
    /**
     * 新增三基-费用维护
     */
-    @PreAuthorize("@ss.hasPermi('system:sjFybpWh:add')")
    @Log(title = "三基-费用维护", businessType = BusinessType.INSERT)
    @PostMapping
    public AjaxResult add(@RequestBody SjFybpWh sjFybpWh)
@@ -83,7 +79,6 @@ public class SjFybpWhController extends BaseController
    /**
     * 修改三基-费用维护
     */
-    @PreAuthorize("@ss.hasPermi('system:sjFybpWh:edit')")
    @Log(title = "三基-费用维护", businessType = BusinessType.UPDATE)
    @PutMapping
    public AjaxResult edit(@RequestBody SjFybpWh sjFybpWh)
@@ -94,7 +89,6 @@ public class SjFybpWhController extends BaseController
    /**
     * 删除三基-费用维护
     */
-    @PreAuthorize("@ss.hasPermi('system:sjFybpWh:remove')")
    @Log(title = "三基-费用维护", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
    public AjaxResult remove(@PathVariable Long[] ids)

--- a/qianhe-ydsj/src/main/java/com/qianhe/domain/SjFybpWh.java
+++ b/qianhe-ydsj/src/main/java/com/qianhe/domain/SjFybpWh.java
 package com.qianhe.domain;
 import java.math.BigDecimal;
+import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.qianhe.common.annotation.Excel;
@@ -12,6 +14,7 @@ import com.qianhe.common.core.domain.BaseEntity;
 * @author qianhe
 * @date 2024-07-05
 */
+@Data
 public class SjFybpWh extends BaseEntity
 {
    private static final long serialVersionUID = 1L;
@@ -23,16 +26,16 @@ public class SjFybpWh extends BaseEntity
    @Excel(name = "费用报批id")
    private Long fybpId;
-    /** 使用日期 */
+    /** 使用日期  年份 */
-    @Excel(name = "使用日期")
+    @Excel(name = "使用日期  年份")
    private String syrq;
    /** 费用金额 */
    @Excel(name = "费用金额")
    private BigDecimal syje;
-    /** 预留1 */
+    /** 预留1  季度 */
-    @Excel(name = "预留1")
+    @Excel(name = "预留1  季度")
    private String yl1;
    /** 预留2 */
@@ -51,101 +54,8 @@ public class SjFybpWh extends BaseEntity
    @Excel(name = "预留5")
    private String yl5;
-    public void setId(Long id)
-    {
-        this.id = id;
-    }
-    public Long getId()
-    {
-        return id;
-    }
-    public void setFybpId(Long fybpId)
-    {
-        this.fybpId = fybpId;
-    }
-    public Long getFybpId()
-    {
-        return fybpId;
-    }
-    public void setSyrq(String syrq)
-    {
-        this.syrq = syrq;
-    }
-    public String getSyrq()
-    {
-        return syrq;
-    }
-    public void setSyje(BigDecimal syje)
-    {
-        this.syje = syje;
-    }
-    public BigDecimal getSyje()
-    {
-        return syje;
-    }
-    public void setYl1(String yl1)
-    {
-        this.yl1 = yl1;
-    }
-    public String getYl1()
-    {
-        return yl1;
-    }
-    public void setYl2(String yl2)
-    {
-        this.yl2 = yl2;
-    }
-    public String getYl2()
-    {
-        return yl2;
-    }
-    public void setYl3(String yl3)
-    {
-        this.yl3 = yl3;
-    }
-    public String getYl3()
-    {
-        return yl3;
-    }
-    public void setYl4(String yl4)
-    {
-        this.yl4 = yl4;
-    }
-    public String getYl4()
-    {
-        return yl4;
-    }
-    public void setYl5(String yl5)
-    {
-        this.yl5 = yl5;
-    }
-    public String getYl5()
+    private String zbId;//主表id
-    {
+    private String fylx;//类型
-        return yl5;
-    }
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("fybpId", getFybpId())
-            .append("syrq", getSyrq())
-            .append("syje", getSyje())
-            .append("remark", getRemark())
-            .append("yl1", getYl1())
-            .append("yl2", getYl2())
-            .append("yl3", getYl3())
-            .append("yl4", getYl4())
-            .append("yl5", getYl5())
-            .toString();
-    }
 }
--- a/qianhe-ydsj/src/main/java/com/qianhe/domain/SjFybpZb.java
+++ b/qianhe-ydsj/src/main/java/com/qianhe/domain/SjFybpZb.java
@@ -95,10 +95,11 @@ public class SjFybpZb extends BaseEntity
    private String spcx;
-    private String tqbz;
+    private String tqbz;//参考标准 提取标准 文字
-    private String jsbz;
+    private String jsbz;//参考标准 计算标准 计算结果 文字
-    private String jl;
+    private String jl;//参考标准 结论 文字
-    private Boolean jlflag;
+    private Boolean jlflag;//参考标准 结论 是否符合标准
+    private String jsbzSum;//参考标准 计算标准 计算结果
 }
--- a/qianhe-ydsj/src/main/java/com/qianhe/domain/Vo/SjfybpVo.java
+++ b/qianhe-ydsj/src/main/java/com/qianhe/domain/Vo/SjfybpVo.java
@@ -9,7 +9,7 @@ import java.math.BigDecimal;
 public class SjfybpVo {
    @Excel(name = "单位")
-    private String deptName;
+    private String deptName;//单位名称
    private String deptId;
@@ -26,6 +26,33 @@ public class SjfybpVo {
    private BigDecimal xmje;
    //已使用金额总和
    @Excel(name = "已用费用")
-    private BigDecimal ysyje;
+    private BigDecimal ysyje;//实际提取额度（万元）
+    private String id;//主表id
+    private String fyrq;//费用日期 年
+    private String abztqzded;//按标准提取最低额度（万元）
+    private String jd;//季度
+    //三基标杆打造
+    private String xmzc1;//分项1 支出费用（万元）
+    private String xmzcmx1;//分项1 支出明细 文字描述
+    //三个最强全员练兵
+    private String xmzc2;//分项2 支出费用（万元）
+    private String xmzcmx2;//分项2 支出明细 文字描述
+    //三标建设5S管理
+    private String xmzc3;//分项3 支出费用（万元）
+    private String xmzcmx3;//分项3 支出明细 文字描述
+    //基层班站建设
+    private String xmzc4;//分项4 支出费用（万元）
+    private String xmzcmx4;//分项4 支出明细 文字描述
+    //其他
+    private String xmzc5;//分项5 支出费用（万元）
+    private String xmzcmx5;//分项5 支出明细 文字描述
 }
--- a/qianhe-ydsj/src/main/java/com/qianhe/service/ISjFybpService.java
+++ b/qianhe-ydsj/src/main/java/com/qianhe/service/ISjFybpService.java
@@ -75,6 +75,7 @@ public interface ISjFybpService
    SjFybp getFygzById(Long id);
    List<SjFybp> selectSjFybpCtList(SjFybp sjFybp);
+    List<SjfybpVo> zsdwNdfytj(SjFybp sjFybp);
 }
--- a/qianhe-ydsj/src/main/java/com/qianhe/service/impl/SjFybpServiceImpl.java
+++ b/qianhe-ydsj/src/main/java/com/qianhe/service/impl/SjFybpServiceImpl.java
--- a/qianhe-ydsj/src/main/resources/mapper/SjFybpMapper.xml
+++ b/qianhe-ydsj/src/main/resources/mapper/SjFybpMapper.xml
@@ -195,7 +195,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
    </select>
    <select id="tjtbByDept" resultType="com.qianhe.domain.Vo.SjfybpVo">
        select
-        a.dept_id,d.dept_name,IFNULL(count(b.id),0) zsl,IFNULL(sum(b.fyje),0) xmje,  IFNULL(sum(b.ysyje ), 0) ysyje
+        a.dept_id,d.dept_name,a.id,a.fyrq,IFNULL(count(b.id),0) zsl,IFNULL(sum(b.fyje),0) xmje,  IFNULL(sum(b.ysyje ), 0) ysyje
        from sj_fybp_zb a
        left join sj_fybp b on a.id = b.zb_id
@@ -207,7 +207,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        <if test="fylx != null  and fylx != ''"> and b.fylx = #{fylx}</if>
        <!-- 数据范围过滤 -->
        ${params.dataScope}
-        group by a.dept_id,d.dept_name
+        group by a.dept_id,d.dept_name,a.id,a.fyrq
    </select>
    <select id="selectSjFybpCtList" resultMap="SjFybpResult">
        select

--- a/qianhe-ydsj/src/main/resources/mapper/SjFybpWhMapper.xml
+++ b/qianhe-ydsj/src/main/resources/mapper/SjFybpWhMapper.xml
@@ -15,29 +15,34 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        <result property="yl3"    column="yl3"    />
        <result property="yl4"    column="yl4"    />
        <result property="yl5"    column="yl5"    />
+        <result property="zbId"    column="zb_id"    />
+        <result property="fylx"    column="fylx"    />
    </resultMap>
    <sql id="selectSjFybpWhVo">
-        select id, fybp_id, syrq, syje, remark, yl1, yl2, yl3, yl4, yl5 from sj_fybp_wh
+        select w.id, w.fybp_id, w.syrq, w.syje, w.remark, w.yl1, w.yl2, w.yl3, w.yl4, w.yl5,
+               f.zb_id, f.fylx
+        from sj_fybp_wh w
+        left join sj_fybp f on w.fybp_id = f.id
    </sql>
    <select id="selectSjFybpWhList" parameterType="SjFybpWh" resultMap="SjFybpWhResult">
        <include refid="selectSjFybpWhVo"/>
        <where>  
-            <if test="fybpId != null "> and fybp_id = #{fybpId}</if>
+            <if test="fybpId != null "> and w.fybp_id = #{fybpId}</if>
-            <if test="syrq != null  and syrq != ''"> and syrq = #{syrq}</if>
+            <if test="syrq != null  and syrq != ''"> and w.syrq = #{syrq}</if>
-            <if test="syje != null "> and syje = #{syje}</if>
+            <if test="syje != null "> and w.syje = #{syje}</if>
-            <if test="yl1 != null  and yl1 != ''"> and yl1 = #{yl1}</if>
+            <if test="yl1 != null  and yl1 != ''"> and w.yl1 = #{yl1}</if>
-            <if test="yl2 != null  and yl2 != ''"> and yl2 = #{yl2}</if>
+            <if test="yl2 != null  and yl2 != ''"> and w.yl2 = #{yl2}</if>
-            <if test="yl3 != null  and yl3 != ''"> and yl3 = #{yl3}</if>
+            <if test="yl3 != null  and yl3 != ''"> and w.yl3 = #{yl3}</if>
-            <if test="yl4 != null  and yl4 != ''"> and yl4 = #{yl4}</if>
+            <if test="yl4 != null  and yl4 != ''"> and w.yl4 = #{yl4}</if>
-            <if test="yl5 != null  and yl5 != ''"> and yl5 = #{yl5}</if>
+            <if test="yl5 != null  and yl5 != ''"> and w.yl5 = #{yl5}</if>
        </where>
    </select>
    <select id="selectSjFybpWhById" parameterType="Long" resultMap="SjFybpWhResult">
        <include refid="selectSjFybpWhVo"/>
-        where id = #{id}
+        where w.id = #{id}
    </select>
    <insert id="insertSjFybpWh" parameterType="SjFybpWh" useGeneratedKeys="true" keyProperty="id">