支部党费收支管理

ruoyi-admin/src/main/java/com/ruoyi/web/controller/branch/TBranchDuesController.java

@@ -0,0 +1,145 @@
+package com.ruoyi.web.controller.branch;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+
+import com.ruoyi.web.controller.branch.vo.CalcVO;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+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.enums.BusinessType;
+import com.ruoyi.branch.domain.TBranchDues;
+import com.ruoyi.branch.service.ITBranchDuesService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 支部党费收支管理Controller
+ * 
+ * @author ruoyi
+ * @date 2023-07-14
+ */
+@RestController
+@RequestMapping("/branch/dues")
+public class TBranchDuesController extends BaseController
+{
+    @Autowired
+    private ITBranchDuesService tBranchDuesService;
+
+    /**
+     * 查询支部党费计算
+     */
+    @PreAuthorize("@ss.hasPermi('branch:dues:list')")
+    @GetMapping("/calc")
+    public AjaxResult calc(TBranchDues tBranchDues)
+    {
+        List<TBranchDues> tBranchDuesList = tBranchDuesService.selectTBranchDuesList(tBranchDues);
+        BigDecimal ndzmsr = BigDecimal.ZERO;//年度账面收入
+        BigDecimal ndzmzc = BigDecimal.ZERO;//年度账面支出
+        BigDecimal ndxjsr = BigDecimal.ZERO;//年度现金收入
+        BigDecimal ndxjzc = BigDecimal.ZERO;//年度现金支出
+        BigDecimal zmhj = BigDecimal.ZERO;//账面合计
+        BigDecimal xjhj = BigDecimal.ZERO;//现金合计
+        BigDecimal zhj = BigDecimal.ZERO;//总合计
+        for (TBranchDues branchDues : tBranchDuesList) {
+            if ("1".equals(branchDues.getDuesType())) {//账面
+                if ("1".equals(branchDues.getDuesInOut())) {//收入
+                    ndzmsr = ndzmsr.add(new BigDecimal(branchDues.getDuesAmount()));
+                } else {//支出
+                    ndzmzc = ndzmzc.add(new BigDecimal(branchDues.getDuesAmount()));
+                }
+            } else {//现金
+                if ("1".equals(branchDues.getDuesInOut())) {//收入
+                    ndxjsr = ndxjsr.add(new BigDecimal(branchDues.getDuesAmount()));
+                } else {//支出
+                    ndxjzc = ndxjzc.add(new BigDecimal(branchDues.getDuesAmount()));
+                }
+            }
+        }
+        zmhj = ndzmsr.subtract(ndzmzc);
+        xjhj = ndxjsr.subtract(ndxjzc);
+        zhj = zmhj.add(xjhj);
+        return AjaxResult.success(new CalcVO(ndzmsr, ndzmzc, ndxjsr, ndxjzc, zmhj, xjhj, zhj));
+    }
+
+    /**
+     * 查询支部党费收支管理列表
+     */
+    @PreAuthorize("@ss.hasPermi('branch:dues:list')")
+    @GetMapping("/list")
+    public AjaxResult list(TBranchDues tBranchDues)
+    {
+//        startPage();
+//        List<TBranchDues> list = tBranchDuesService.selectTBranchDuesList(tBranchDues);
+//        return getDataTable(list);
+        return AjaxResult.success(tBranchDuesService.selectTBranchDuesList(tBranchDues));
+    }
+
+    /**
+     * 导出支部党费收支管理列表
+     */
+    @PreAuthorize("@ss.hasPermi('branch:dues:export')")
+    @Log(title = "支部党费收支管理", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, TBranchDues tBranchDues)
+    {
+        List<TBranchDues> list = tBranchDuesService.selectTBranchDuesList(tBranchDues);
+        ExcelUtil<TBranchDues> util = new ExcelUtil<TBranchDues>(TBranchDues.class);
+        util.exportExcel(response, list, "支部党费收支管理数据");
+    }
+
+    /**
+     * 获取支部党费收支管理详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('branch:dues:query')")
+    @GetMapping(value = "/{duesId}")
+    public AjaxResult getInfo(@PathVariable("duesId") Long duesId)
+    {
+        return success(tBranchDuesService.selectTBranchDuesByDuesId(duesId));
+    }
+
+    /**
+     * 新增支部党费收支管理
+     */
+    @PreAuthorize("@ss.hasPermi('branch:dues:add')")
+    @Log(title = "支部党费收支管理", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody TBranchDues tBranchDues)
+    {
+        return toAjax(tBranchDuesService.insertTBranchDues(tBranchDues));
+    }
+
+    /**
+     * 修改支部党费收支管理
+     */
+    @PreAuthorize("@ss.hasPermi('branch:dues:edit')")
+    @Log(title = "支部党费收支管理", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody TBranchDues tBranchDues)
+    {
+        return toAjax(tBranchDuesService.updateTBranchDues(tBranchDues));
+    }
+
+    /**
+     * 删除支部党费收支管理
+     */
+    @PreAuthorize("@ss.hasPermi('branch:dues:remove')")
+    @Log(title = "支部党费收支管理", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{duesIds}")
+    public AjaxResult remove(@PathVariable Long[] duesIds)
+    {
+        return toAjax(tBranchDuesService.deleteTBranchDuesByDuesIds(duesIds));
+    }
+}

ruoyi-admin/src/main/java/com/ruoyi/web/controller/branch/vo/CalcVO.java

@@ -0,0 +1,101 @@
+package com.ruoyi.web.controller.branch.vo;
+
+import com.ruoyi.common.core.domain.BaseEntity;
+
+import java.math.BigDecimal;
+
+/**
+ * @author Wang Zi Wen
+ * @email wangggziwen@163.com
+ * @date 2023/07/17 12:59:21
+ */
+public class CalcVO extends BaseEntity {
+    /** 年度账面收入 */
+    private BigDecimal ndzmsr;
+
+    /** 年度账面支出 */
+    private BigDecimal ndzmzc;
+
+    /** 年度现金收入 */
+    private BigDecimal ndxjsr;
+
+    /** 年度现金支出 */
+    private BigDecimal ndxjzc;
+
+    /** 账面合计 */
+    private BigDecimal zmhj;
+
+    /** 现金合计 */
+    private BigDecimal xjhj;
+
+    /** 总合计 */
+    private BigDecimal zhj;
+
+    public BigDecimal getNdzmsr() {
+        return ndzmsr;
+    }
+
+    public void setNdzmsr(BigDecimal ndzmsr) {
+        this.ndzmsr = ndzmsr;
+    }
+
+    public BigDecimal getNdzmzc() {
+        return ndzmzc;
+    }
+
+    public void setNdzmzc(BigDecimal ndzmzc) {
+        this.ndzmzc = ndzmzc;
+    }
+
+    public BigDecimal getNdxjsr() {
+        return ndxjsr;
+    }
+
+    public void setNdxjsr(BigDecimal ndxjsr) {
+        this.ndxjsr = ndxjsr;
+    }
+
+    public BigDecimal getNdxjzc() {
+        return ndxjzc;
+    }
+
+    public void setNdxjzc(BigDecimal ndxjzc) {
+        this.ndxjzc = ndxjzc;
+    }
+
+    public BigDecimal getZmhj() {
+        return zmhj;
+    }
+
+    public void setZmhj(BigDecimal zmhj) {
+        this.zmhj = zmhj;
+    }
+
+    public BigDecimal getXjhj() {
+        return xjhj;
+    }
+
+    public void setXjhj(BigDecimal xjhj) {
+        this.xjhj = xjhj;
+    }
+
+    public BigDecimal getZhj() {
+        return zhj;
+    }
+
+    public void setZhj(BigDecimal zhj) {
+        this.zhj = zhj;
+    }
+
+    public CalcVO() {}
+
+    public CalcVO(BigDecimal ndzmsr, BigDecimal ndzmzc, BigDecimal ndxjsr, BigDecimal ndxjzc, BigDecimal zmhj, BigDecimal xjhj, BigDecimal zhj) {
+        this.ndzmsr = ndzmsr;
+        this.ndzmzc = ndzmzc;
+        this.ndxjsr = ndxjsr;
+        this.ndxjzc = ndxjzc;
+        this.zmhj = zmhj;
+        this.xjhj = xjhj;
+        this.zhj = zhj;
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/branch/domain/TBranchDues.java

@@ -0,0 +1,175 @@
+package com.ruoyi.branch.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 支部党费收支管理对象 t_branch_dues
+ * 
+ * @author ruoyi
+ * @date 2023-07-14
+ */
+public class TBranchDues extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键id */
+    @Excel(name = "主键id")
+    private Long duesId;
+
+    /** 年份 */
+    private String duesYear;
+
+    /** 时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date duesTime;
+
+    /** 项目 */
+    @Excel(name = "项目")
+    private String duesItem;
+
+    /** 党费进出，1收/0支 */
+    @Excel(name = "党费进出，1收/0支")
+    private String duesInOut;
+
+    /** 支付类型，1账面/0现金 */
+    @Excel(name = "支付类型，1账面/0现金")
+    private String duesType;
+
+    /** 金额 */
+    @Excel(name = "金额")
+    private Long duesAmount;
+
+    /** 备注 */
+    @Excel(name = "备注")
+    private String remarks;
+
+    /** 删除标志（0代表存在 2代表删除） */
+    private String delFlag;
+
+    /** 部门id */
+    @Excel(name = "部门id")
+    private Long deptId;
+
+    public void setDuesId(Long duesId) 
+    {
+        this.duesId = duesId;
+    }
+
+    public Long getDuesId() 
+    {
+        return duesId;
+    }
+
+    public void setDuesTime(Date duesTime) 
+    {
+        this.duesTime = duesTime;
+    }
+
+    public Date getDuesTime() 
+    {
+        return duesTime;
+    }
+
+    public void setDuesItem(String duesItem) 
+    {
+        this.duesItem = duesItem;
+    }
+
+    public String getDuesItem() 
+    {
+        return duesItem;
+    }
+
+    public void setDuesInOut(String duesInOut) 
+    {
+        this.duesInOut = duesInOut;
+    }
+
+    public String getDuesInOut() 
+    {
+        return duesInOut;
+    }
+
+    public void setDuesType(String duesType) 
+    {
+        this.duesType = duesType;
+    }
+
+    public String getDuesType() 
+    {
+        return duesType;
+    }
+
+    public void setDuesAmount(Long duesAmount) 
+    {
+        this.duesAmount = duesAmount;
+    }
+
+    public Long getDuesAmount() 
+    {
+        return duesAmount;
+    }
+
+    public void setRemarks(String remarks) 
+    {
+        this.remarks = remarks;
+    }
+
+    public String getRemarks() 
+    {
+        return remarks;
+    }
+
+    public void setDelFlag(String delFlag) 
+    {
+        this.delFlag = delFlag;
+    }
+
+    public String getDelFlag() 
+    {
+        return delFlag;
+    }
+
+    public void setDeptId(Long deptId) 
+    {
+        this.deptId = deptId;
+    }
+
+    public Long getDeptId() 
+    {
+        return deptId;
+    }
+
+    public String getDuesYear() {
+        return duesYear;
+    }
+
+    public void setDuesYear(String duesYear) {
+        this.duesYear = duesYear;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("duesId", getDuesId())
+            .append("duesTime", getDuesTime())
+            .append("duesItem", getDuesItem())
+            .append("duesInOut", getDuesInOut())
+            .append("duesType", getDuesType())
+            .append("duesAmount", getDuesAmount())
+            .append("remarks", getRemarks())
+            .append("delFlag", getDelFlag())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("deptId", getDeptId())
+            .toString();
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/branch/mapper/TBranchDuesMapper.java

@@ -0,0 +1,61 @@
+package com.ruoyi.branch.mapper;
+
+import java.util.List;
+import com.ruoyi.branch.domain.TBranchDues;
+
+/**
+ * 支部党费收支管理Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2023-07-14
+ */
+public interface TBranchDuesMapper 
+{
+    /**
+     * 查询支部党费收支管理
+     * 
+     * @param duesId 支部党费收支管理主键
+     * @return 支部党费收支管理
+     */
+    public TBranchDues selectTBranchDuesByDuesId(Long duesId);
+
+    /**
+     * 查询支部党费收支管理列表
+     * 
+     * @param tBranchDues 支部党费收支管理
+     * @return 支部党费收支管理集合
+     */
+    public List<TBranchDues> selectTBranchDuesList(TBranchDues tBranchDues);
+
+    /**
+     * 新增支部党费收支管理
+     * 
+     * @param tBranchDues 支部党费收支管理
+     * @return 结果
+     */
+    public int insertTBranchDues(TBranchDues tBranchDues);
+
+    /**
+     * 修改支部党费收支管理
+     * 
+     * @param tBranchDues 支部党费收支管理
+     * @return 结果
+     */
+    public int updateTBranchDues(TBranchDues tBranchDues);
+
+    /**
+     * 删除支部党费收支管理
+     * 
+     * @param duesId 支部党费收支管理主键
+     * @return 结果
+     */
+    public int deleteTBranchDuesByDuesId(Long duesId);
+
+    /**
+     * 批量删除支部党费收支管理
+     * 
+     * @param duesIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteTBranchDuesByDuesIds(Long[] duesIds);
+}

ruoyi-system/src/main/java/com/ruoyi/branch/service/ITBranchDuesService.java

@@ -0,0 +1,61 @@
+package com.ruoyi.branch.service;
+
+import java.util.List;
+import com.ruoyi.branch.domain.TBranchDues;
+
+/**
+ * 支部党费收支管理Service接口
+ * 
+ * @author ruoyi
+ * @date 2023-07-14
+ */
+public interface ITBranchDuesService 
+{
+    /**
+     * 查询支部党费收支管理
+     * 
+     * @param duesId 支部党费收支管理主键
+     * @return 支部党费收支管理
+     */
+    public TBranchDues selectTBranchDuesByDuesId(Long duesId);
+
+    /**
+     * 查询支部党费收支管理列表
+     * 
+     * @param tBranchDues 支部党费收支管理
+     * @return 支部党费收支管理集合
+     */
+    public List<TBranchDues> selectTBranchDuesList(TBranchDues tBranchDues);
+
+    /**
+     * 新增支部党费收支管理
+     * 
+     * @param tBranchDues 支部党费收支管理
+     * @return 结果
+     */
+    public int insertTBranchDues(TBranchDues tBranchDues);
+
+    /**
+     * 修改支部党费收支管理
+     * 
+     * @param tBranchDues 支部党费收支管理
+     * @return 结果
+     */
+    public int updateTBranchDues(TBranchDues tBranchDues);
+
+    /**
+     * 批量删除支部党费收支管理
+     * 
+     * @param duesIds 需要删除的支部党费收支管理主键集合
+     * @return 结果
+     */
+    public int deleteTBranchDuesByDuesIds(Long[] duesIds);
+
+    /**
+     * 删除支部党费收支管理信息
+     * 
+     * @param duesId 支部党费收支管理主键
+     * @return 结果
+     */
+    public int deleteTBranchDuesByDuesId(Long duesId);
+}

ruoyi-system/src/main/java/com/ruoyi/branch/service/impl/TBranchDuesServiceImpl.java

@@ -0,0 +1,99 @@
+package com.ruoyi.branch.service.impl;
+
+import java.util.List;
+
+import com.ruoyi.common.annotation.DataScope;
+import com.ruoyi.common.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.branch.mapper.TBranchDuesMapper;
+import com.ruoyi.branch.domain.TBranchDues;
+import com.ruoyi.branch.service.ITBranchDuesService;
+
+/**
+ * 支部党费收支管理Service业务层处理
+ * 
+ * @author ruoyi
+ * @date 2023-07-14
+ */
+@Service
+public class TBranchDuesServiceImpl implements ITBranchDuesService 
+{
+    @Autowired
+    private TBranchDuesMapper tBranchDuesMapper;
+
+    /**
+     * 查询支部党费收支管理
+     * 
+     * @param duesId 支部党费收支管理主键
+     * @return 支部党费收支管理
+     */
+    @Override
+    public TBranchDues selectTBranchDuesByDuesId(Long duesId)
+    {
+        return tBranchDuesMapper.selectTBranchDuesByDuesId(duesId);
+    }
+
+    /**
+     * 查询支部党费收支管理列表
+     * 
+     * @param tBranchDues 支部党费收支管理
+     * @return 支部党费收支管理
+     */
+    @Override
+    @DataScope(deptAlias = "d", userAlias = "u")
+    public List<TBranchDues> selectTBranchDuesList(TBranchDues tBranchDues)
+    {
+        return tBranchDuesMapper.selectTBranchDuesList(tBranchDues);
+    }
+
+    /**
+     * 新增支部党费收支管理
+     * 
+     * @param tBranchDues 支部党费收支管理
+     * @return 结果
+     */
+    @Override
+    public int insertTBranchDues(TBranchDues tBranchDues)
+    {
+        tBranchDues.setCreateTime(DateUtils.getNowDate());
+        return tBranchDuesMapper.insertTBranchDues(tBranchDues);
+    }
+
+    /**
+     * 修改支部党费收支管理
+     * 
+     * @param tBranchDues 支部党费收支管理
+     * @return 结果
+     */
+    @Override
+    public int updateTBranchDues(TBranchDues tBranchDues)
+    {
+        tBranchDues.setUpdateTime(DateUtils.getNowDate());
+        return tBranchDuesMapper.updateTBranchDues(tBranchDues);
+    }
+
+    /**
+     * 批量删除支部党费收支管理
+     * 
+     * @param duesIds 需要删除的支部党费收支管理主键
+     * @return 结果
+     */
+    @Override
+    public int deleteTBranchDuesByDuesIds(Long[] duesIds)
+    {
+        return tBranchDuesMapper.deleteTBranchDuesByDuesIds(duesIds);
+    }
+
+    /**
+     * 删除支部党费收支管理信息
+     * 
+     * @param duesId 支部党费收支管理主键
+     * @return 结果
+     */
+    @Override
+    public int deleteTBranchDuesByDuesId(Long duesId)
+    {
+        return tBranchDuesMapper.deleteTBranchDuesByDuesId(duesId);
+    }
+}

ruoyi-system/src/main/resources/mapper/branch/TBranchDuesMapper.xml

@@ -0,0 +1,117 @@
+<?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.branch.mapper.TBranchDuesMapper">
+    
+    <resultMap type="TBranchDues" id="TBranchDuesResult">
+        <result property="duesId"    column="dues_id"    />
+        <result property="duesTime"    column="dues_time"    />
+        <result property="duesItem"    column="dues_item"    />
+        <result property="duesInOut"    column="dues_in_out"    />
+        <result property="duesType"    column="dues_type"    />
+        <result property="duesAmount"    column="dues_amount"    />
+        <result property="remarks"    column="remarks"    />
+        <result property="delFlag"    column="del_flag"    />
+        <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="deptId"    column="dept_id"    />
+    </resultMap>
+
+    <sql id="selectTBranchDuesVo">
+        select u.dues_id, u.dues_time, u.dues_item, u.dues_in_out, u.dues_type, u.dues_amount, u.remarks, u.del_flag, u.create_by, u.create_time, u.update_by, u.update_time, u.dept_id from t_branch_dues u left join sys_dept d on u.dept_id = d.dept_id
+    </sql>
+
+    <select id="selectTBranchDuesList" parameterType="TBranchDues" resultMap="TBranchDuesResult">
+        <include refid="selectTBranchDuesVo"/>
+        <where>  
+            <if test="duesId != null "> and u.dues_id = #{duesId}</if>
+            <if test="duesYear != null "> and extract(year from u.dues_time) = #{duesYear}</if>
+            <if test="duesTime != null "> and u.dues_time = #{duesTime}</if>
+            <if test="duesItem != null  and duesItem != ''"> and u.dues_item like concat('%', #{duesItem}, '%')</if>
+            <if test="duesInOut != null  and duesInOut != ''"> and u.dues_in_out = #{duesInOut}</if>
+            <if test="duesType != null  and duesType != ''"> and u.dues_type = #{duesType}</if>
+            <if test="duesAmount != null "> and u.dues_amount = #{duesAmount}</if>
+            <if test="remarks != null  and remarks != ''"> and u.remarks like concat('%', #{remarks}, '%')</if>
+            <if test="deptId != null "> and u.dept_id = #{deptId}</if>
+            and u.del_flag = 0
+        </where>
+        <!-- 数据范围过滤 -->
+        ${params.dataScope}
+    </select>
+    
+    <select id="selectTBranchDuesByDuesId" parameterType="Long" resultMap="TBranchDuesResult">
+        <include refid="selectTBranchDuesVo"/>
+        where u.dues_id = #{duesId}
+        and u.del_flag = 0
+    </select>
+        
+    <insert id="insertTBranchDues" parameterType="TBranchDues">
+        <selectKey keyProperty="duesId" resultType="long" order="BEFORE">
+            SELECT seq_t_branch_dues.NEXTVAL as duesId FROM DUAL
+        </selectKey>
+        insert into t_branch_dues
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="duesId != null">dues_id,</if>
+            <if test="duesTime != null">dues_time,</if>
+            <if test="duesItem != null">dues_item,</if>
+            <if test="duesInOut != null">dues_in_out,</if>
+            <if test="duesType != null">dues_type,</if>
+            <if test="duesAmount != null">dues_amount,</if>
+            <if test="remarks != null">remarks,</if>
+            <if test="delFlag != null">del_flag,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="deptId != null">dept_id,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="duesId != null">#{duesId},</if>
+            <if test="duesTime != null">#{duesTime},</if>
+            <if test="duesItem != null">#{duesItem},</if>
+            <if test="duesInOut != null">#{duesInOut},</if>
+            <if test="duesType != null">#{duesType},</if>
+            <if test="duesAmount != null">#{duesAmount},</if>
+            <if test="remarks != null">#{remarks},</if>
+            <if test="delFlag != null">#{delFlag},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="deptId != null">#{deptId},</if>
+         </trim>
+    </insert>
+
+    <update id="updateTBranchDues" parameterType="TBranchDues">
+        update t_branch_dues
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="duesTime != null">dues_time = #{duesTime},</if>
+            <if test="duesItem != null">dues_item = #{duesItem},</if>
+            <if test="duesInOut != null">dues_in_out = #{duesInOut},</if>
+            <if test="duesType != null">dues_type = #{duesType},</if>
+            <if test="duesAmount != null">dues_amount = #{duesAmount},</if>
+            <if test="remarks != null">remarks = #{remarks},</if>
+            <if test="delFlag != null">del_flag = #{delFlag},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="deptId != null">dept_id = #{deptId},</if>
+        </trim>
+        where dues_id = #{duesId}
+    </update>
+
+    <update id="deleteTBranchDuesByDuesId" parameterType="Long">
+        update t_branch_dues set del_flag = 2 where dues_id = #{duesId}
+    </update>
+
+    <update id="deleteTBranchDuesByDuesIds" parameterType="String">
+        update t_branch_dues set del_flag = 2 where dues_id in
+        <foreach item="duesId" collection="array" open="(" separator="," close=")">
+            #{duesId}
+        </foreach>
+    </update>
+</mapper>

ruoyi-ui/src/api/branch/dues.js

@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询支部党费计算
+export function calcDues(query) {
+  return request({
+    url: '/branch/dues/calc',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询支部党费收支管理列表
+export function listDues(query) {
+  return request({
+    url: '/branch/dues/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询支部党费收支管理详细
+export function getDues(duesId) {
+  return request({
+    url: '/branch/dues/' + duesId,
+    method: 'get'
+  })
+}
+
+// 新增支部党费收支管理
+export function addDues(data) {
+  return request({
+    url: '/branch/dues',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改支部党费收支管理
+export function updateDues(data) {
+  return request({
+    url: '/branch/dues',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除支部党费收支管理
+export function delDues(duesId) {
+  return request({
+    url: '/branch/dues/' + duesId,
+    method: 'delete'
+  })
+}

ruoyi-ui/src/views/branch/dues/index.vue

@@ -0,0 +1,558 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" size="small" v-show="showSearch" label-width="68px">
+      <el-form-item label="时间" prop="duesTime">
+        <el-date-picker clearable size="small" style="width: 200px"
+                        v-model="queryParams.duesYear"
+                        type="year"
+                        placeholder="选择时间">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="归属部门" prop="deptId" style="width: 268px;">
+        <treeselect style="width: 200px;" v-model="queryParams.deptId" :options="deptOptions" :show-count="true" placeholder="请选择归属部门" />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['branch:dues:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['branch:dues:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['branch:dues:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="info"
+          plain
+          icon="el-icon-upload2"
+          size="mini"
+          @click="handleImport"
+          v-hasPermi="['branch:dues:edit']"
+        >导入</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['branch:dues:export']"
+        >导出</el-button>
+      </el-col>
+	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="duesList" @selection-change="handleSelectionChange" border>
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="时间" align="center" prop="duesTime" width="100">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.duesTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="项目" align="center" prop="duesItem" />
+      <el-table-column label="收/支" align="center" prop="duesInOut" :formatter="duesInOutFormat" />
+      <el-table-column label="账面/现金" align="center" prop="duesType" :formatter="duesTypeFormat" />
+      <el-table-column label="金额" align="center" prop="duesAmount" />
+      <el-table-column label="备注" align="center" prop="remarks" />
+      <el-table-column label="操作" align="center" fixed="right" width="120" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['branch:dues:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['branch:dues:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <el-descriptions direction="vertical" :column="4" border>
+      <el-descriptions-item label="年度账面收入">{{calVO.ndzmsr}}元</el-descriptions-item>
+      <el-descriptions-item label="年度账面支出">{{calVO.ndzmzc}}元</el-descriptions-item>
+      <el-descriptions-item label="年度现金收入">{{calVO.ndxjsr}}元</el-descriptions-item>
+      <el-descriptions-item label="年度现金支出">{{calVO.ndxjzc}}元</el-descriptions-item>
+      <el-descriptions-item label="账面合计" :span="2">{{calVO.zmhj}}元</el-descriptions-item>
+      <el-descriptions-item label="现金合计" :span="2">{{calVO.xjhj}}元</el-descriptions-item>
+      <el-descriptions-item label="总合计" :span="4">{{calVO.zhj}}元</el-descriptions-item>
+    </el-descriptions>
+
+    <!--<pagination-->
+      <!--v-show="total>0"-->
+      <!--:total="total"-->
+      <!--:page.sync="queryParams.pageNum"-->
+      <!--:limit.sync="queryParams.pageSize"-->
+      <!--@pagination="getList"-->
+    <!--/>-->
+
+    <!-- 添加或修改支部党费收支管理对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+        <el-form-item label="时间" prop="duesTime">
+          <el-date-picker clearable size="small" style="width: 200px"
+            v-model="form.duesTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="项目" prop="duesItem">
+          <el-input v-model="form.duesItem" placeholder="请输入项目" />
+        </el-form-item>
+        <el-form-item label="收/支" prop="duesInOut">
+          <el-select v-model="form.duesInOut" placeholder="请选择收/支">
+            <el-option
+              v-for="dict in duesInOutOptions"
+              :key="dict.dictValue"
+              :label="dict.dictLabel"
+              :value="dict.dictValue"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="账面/现金" prop="duesType">
+          <el-select v-model="form.duesType" placeholder="请选择账面/现金">
+            <el-option
+              v-for="dict in duesTypeOptions"
+              :key="dict.dictValue"
+              :label="dict.dictLabel"
+              :value="dict.dictValue"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="金额" prop="duesAmount">
+          <el-input v-model="form.duesAmount" placeholder="请输入金额" v-number />
+        </el-form-item>
+        <el-form-item label="备注" prop="remarks">
+          <el-input v-model="form.remarks" placeholder="请输入备注" />
+        </el-form-item>
+          <el-form-item label="归属部门" prop="deptId">
+              <treeselect v-model="form.deptId" :options="deptOptions" :show-count="true" placeholder="请选择归属部门" />
+          </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+    <!-- 用户导入对话框 -->
+    <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
+        <el-upload
+                ref="upload"
+                :limit="1"
+                accept=".xlsx, .xls"
+                :headers="upload.headers"
+                :action="upload.url + '?updateSupport=' + upload.updateSupport"
+                :disabled="upload.isUploading"
+                :on-progress="handleFileUploadProgress"
+                :on-success="handleFileSuccess"
+                :auto-upload="false"
+                drag
+        >
+            <i class="el-icon-upload"></i>
+            <div class="el-upload__text">
+                将文件拖到此处，或
+                <em>点击上传</em>
+            </div>
+            <div class="el-upload__tip" slot="tip">
+                <el-checkbox v-model="upload.updateSupport" />是否更新已经存在的用户数据
+                <el-link type="info" style="font-size:12px" @click="importTemplate">下载模板</el-link>
+            </div>
+            <div class="el-upload__tip" style="color:red" slot="tip">提示：仅允许导入“xls”或“xlsx”格式文件！</div>
+        </el-upload>
+        <div slot="footer" class="dialog-footer">
+            <el-button type="primary" @click="submitFileForm">确 定</el-button>
+            <el-button @click="upload.open = false">取 消</el-button>
+        </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { calcDues, listDues, getDues, delDues, addDues, updateDues, exportDues, importTemplate} from "@/api/branch/dues";
+import { treeselect } from "@/api/system/dept";
+import { getToken } from "@/utils/auth";
+import Treeselect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+
+export default {
+  name: "Dues",
+  components: { Treeselect },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 支部党费收支管理表格数据
+      duesList: [],
+      // 弹出层标题
+      title: "",
+      // 部门树选项
+      deptOptions: undefined,
+      clientHeight:300,
+      // 是否显示弹出层
+      open: false,
+      // 主键id字典
+      duesIdOptions: [],
+      // 时间字典
+      duesTimeOptions: [],
+      // 项目字典
+      duesItemOptions: [],
+      // 党费进出，1收/0支字典
+      duesInOutOptions: [],
+      // 支付类型，1账面/0现金字典
+      duesTypeOptions: [],
+      // 金额字典
+      duesAmountOptions: [],
+      // 备注字典
+      remarksOptions: [],
+      // 删除标志字典
+      delFlagOptions: [],
+      // 创建者字典
+      createByOptions: [],
+      // 创建时间字典
+      createTimeOptions: [],
+      // 更新者字典
+      updateByOptions: [],
+      // 更新时间字典
+      updateTimeOptions: [],
+      // 部门id字典
+      deptIdOptions: [],
+        // 用户导入参数
+        upload: {
+            // 是否显示弹出层（用户导入）
+            open: false,
+            // 弹出层标题（用户导入）
+            title: "",
+            // 是否禁用上传
+            isUploading: false,
+            // 是否更新已经存在的用户数据
+            updateSupport: 0,
+            // 设置上传的请求头部
+            headers: { Authorization: "Bearer " + getToken() },
+            // 上传的地址
+            url: process.env.VUE_APP_BASE_API + "/branch/dues/importData"
+        },
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 20,
+        duesId: null,
+        duesTime: null,
+        duesItem: null,
+        duesInOut: null,
+        duesType: null,
+        duesAmount: null,
+        remarks: null,
+        deptId: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        duesTime: [
+          { required: true, message: "时间不能为空", trigger: "blur" }
+        ],
+        duesItem: [
+          { required: true, message: "项目不能为空", trigger: "blur" }
+        ],
+        duesType: [
+          { required: true, message: "账面/现金不能为空", trigger: "blur" }
+        ],
+        duesInOut: [
+          { required: true, message: "收/支不能为空", trigger: "blur" }
+        ],
+        duesAmount: [
+          { required: true,  message: '金额不能为空', trigger: 'blur' },
+          { pattern: /^-?\d+\.?\d*$/, message: '金额不能为非数值', trigger: 'blur' }
+        ],
+        deptId: [
+          { required: true, message: "归属部门不能为空", trigger: "blur" }
+        ],
+      },
+      // 查询支部党费计算VO
+      calVO: null,
+    };
+  },
+  watch: {
+        // 根据名称筛选部门树
+        deptName(val) {
+            this.$refs.tree.filter(val);
+        }
+   },
+  created() {
+      //设置表格高度对应屏幕高度
+      this.$nextTick(() => {
+          this.clientHeight = document.body.clientHeight -250
+      })
+    // 设置搜索条件年份为当年
+    this.setYear();
+    this.getList();
+    this.getTreeselect();
+    this.getDicts("dues_in_out").then(response => {
+      this.duesInOutOptions = response.data;
+    });
+    this.getDicts("dues_type").then(response => {
+      this.duesTypeOptions = response.data;
+    });
+  },
+  methods: {
+    /** 查询支部党费计算 */
+    calcDues() {
+      calcDues({
+        "duesYear": this.queryParams.duesYear.getFullYear(),
+        "deptId": this.queryParams.deptId
+      }).then(response => {
+        this.calVO = response.data;
+      });
+    },
+    /** 计算总价方法 */
+    getSummaries(param) {
+      const { columns, data } = param;
+      const sums = [];
+      columns.forEach((column, index) => {
+        if (index === 0) {
+          sums[index] = '合计';
+          return;
+        } else if (index === 5) {
+          const values = data.map(item => Number(item[column.property]));
+          if (!values.every(value => isNaN(value))) {
+            sums[index] = values.reduce((prev, curr) => {
+              const value = Number(curr);
+              if (!isNaN(value)) {
+                return prev + curr;
+              } else {
+                return prev;
+              }
+            }, 0);
+            sums[index] += ' 元';
+          } else {
+            sums[index] = 'N/A';
+          }
+        } else {
+          sums[index] = 'N/A';
+        }
+      });
+      return sums;
+    },
+    /** 设置搜索条件年份 */
+    setYear() {
+      this.queryParams.duesYear = new Date();
+    },
+    /** 查询支部党费收支管理列表 */
+    getList() {
+      this.loading = true;
+      listDues({
+        "duesYear": this.queryParams.duesYear.getFullYear(),
+        "deptId": this.queryParams.deptId
+      }).then(response => {
+        this.duesList = response.data;
+        // this.total = response.total;
+        this.loading = false;
+      });
+      this.calcDues();
+    },
+     /** 查询部门下拉树结构 */
+     getTreeselect() {
+          treeselect().then(response => {
+              this.deptOptions = response.data;
+          });
+     },
+    // 党费进出，1收/0支字典翻译
+    duesInOutFormat(row, column) {
+      return this.selectDictLabel(this.duesInOutOptions, row.duesInOut);
+    },
+    // 支付类型，1账面/0现金字典翻译
+    duesTypeFormat(row, column) {
+      return this.selectDictLabel(this.duesTypeOptions, row.duesType);
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        duesId: null,
+        duesTime: null,
+        duesItem: null,
+        duesInOut: null,
+        duesType: null,
+        duesAmount: null,
+        remarks: null,
+        delFlag: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null,
+        deptId: null,
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.duesId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加支部党费收支条目";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const duesId = row.duesId || this.ids
+      getDues(duesId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改支部党费收支条目";
+      });
+    },
+      /** 提交按钮 */
+      submitForm() {
+          this.$refs["form"].validate(valid => {
+              if (valid) {
+                  if (this.form.duesId != null) {
+                      updateDues(this.form).then(response => {
+                          this.$modal.msgSuccess("修改成功");
+                          this.open = false;
+                          this.getList();
+                      });
+                  } else {
+                      addDues(this.form).then(response => {
+                          this.$modal.msgSuccess("新增成功");
+                          this.open = false;
+                          this.getList();
+                      });
+                  }
+              }
+          });
+      },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const duesIds = row.duesId || this.ids;
+      this.$confirm('是否确认删除?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return delDues(duesIds);
+        }).then(() => {
+          this.getList();
+          this.msgSuccess("删除成功");
+        })
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm('是否确认导出所有支部党费收支数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return exportDues(queryParams);
+        }).then(response => {
+          this.download(response.msg);
+        })
+    },
+      /** 导入按钮操作 */
+      handleImport() {
+          this.upload.title = "用户导入";
+          this.upload.open = true;
+      },
+      /** 下载模板操作 */
+      importTemplate() {
+          importTemplate().then(response => {
+              this.download(response.msg);
+          });
+      },
+      // 文件上传中处理
+      handleFileUploadProgress(event, file, fileList) {
+          this.upload.isUploading = true;
+      },
+      // 文件上传成功处理
+      handleFileSuccess(response, file, fileList) {
+          this.upload.open = false;
+          this.upload.isUploading = false;
+          this.$refs.upload.clearFiles();
+          this.$alert(response.msg, "导入结果", { dangerouslyUseHTMLString: true });
+          this.getList();
+      },
+      // 提交上传文件
+      submitFileForm() {
+          this.$refs.upload.submit();
+      }
+  }
+};
+</script>
+
+<style>
+    /** 文本换行符处理 */
+    .el-table .cell{
+        white-space: pre-wrap;
+    }
+    /** textarea字体 */
+    textarea {
+        font-family: "Helvetica Neue",Helvetica,"PingFang SC","Hiragino Sans GB","Microsoft YaHei","微软雅黑",Arial,sans-serif;
+    }
+</style>