新增实际回款表

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcContractPaidController.java

@@ -0,0 +1,97 @@
+package com.ruoyi.oa.controller;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+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.oa.domain.CmcContractPaid;
+import com.ruoyi.oa.service.ICmcContractPaidService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 实际回款Controller
+ * 
+ * @author cmc
+ * @date 2025-02-12
+ */
+@RestController
+@RequestMapping("/oa/contractPaid")
+public class CmcContractPaidController extends BaseController
+{
+    @Autowired
+    private ICmcContractPaidService cmcContractPaidService;
+
+    /**
+     * 查询实际回款列表
+     */
+    @GetMapping("/list")
+    public TableDataInfo list(CmcContractPaid cmcContractPaid)
+    {
+        startPage();
+        List<CmcContractPaid> list = cmcContractPaidService.selectCmcContractPaidList(cmcContractPaid);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出实际回款列表
+     */
+    @Log(title = "实际回款", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, CmcContractPaid cmcContractPaid)
+    {
+        List<CmcContractPaid> list = cmcContractPaidService.selectCmcContractPaidList(cmcContractPaid);
+        ExcelUtil<CmcContractPaid> util = new ExcelUtil<CmcContractPaid>(CmcContractPaid.class);
+        util.exportExcel(response, list, "实际回款数据");
+    }
+
+    /**
+     * 获取实际回款详细信息
+     */
+    @GetMapping(value = "/{paidId}")
+    public AjaxResult getInfo(@PathVariable("paidId") Long paidId)
+    {
+        return success(cmcContractPaidService.selectCmcContractPaidByPaidId(paidId));
+    }
+
+    /**
+     * 新增实际回款
+     */
+    @Log(title = "实际回款", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody CmcContractPaid cmcContractPaid)
+    {
+        return toAjax(cmcContractPaidService.insertCmcContractPaid(cmcContractPaid));
+    }
+
+    /**
+     * 修改实际回款
+     */
+    @Log(title = "实际回款", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody CmcContractPaid cmcContractPaid)
+    {
+        return toAjax(cmcContractPaidService.updateCmcContractPaid(cmcContractPaid));
+    }
+
+    /**
+     * 删除实际回款
+     */
+    @Log(title = "实际回款", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{contractIds}")
+    public AjaxResult remove(@PathVariable String[] contractIds)
+    {
+        return toAjax(cmcContractPaidService.deleteCmcContractPaidByContractIds(contractIds));
+    }
+}

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/domain/CmcContractPaid.java

@@ -0,0 +1,96 @@
+package com.ruoyi.oa.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;
+
+/**
+ * 实际回款对象 cmc_contract_paid
+ * 
+ * @author cmc
+ * @date 2025-02-12
+ */
+public class CmcContractPaid extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 合同实际回款id */
+    private Long paidId;
+
+    /** 合同id */
+    @Excel(name = "合同id")
+    private String contractId;
+
+    /** 实际回款比例 */
+    @Excel(name = "实际回款比例")
+    private String paidPercentage;
+
+    /** 实际回款金额 */
+    @Excel(name = "实际回款金额")
+    private String paidAmount;
+
+    /** 实际回款时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "实际回款时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date paidTime;
+
+    public void setPaidId(Long paidId) 
+    {
+        this.paidId = paidId;
+    }
+
+    public Long getPaidId() 
+    {
+        return paidId;
+    }
+    public void setContractId(String contractId) 
+    {
+        this.contractId = contractId;
+    }
+
+    public String getContractId() 
+    {
+        return contractId;
+    }
+    public void setPaidPercentage(String paidPercentage) 
+    {
+        this.paidPercentage = paidPercentage;
+    }
+
+    public String getPaidPercentage() 
+    {
+        return paidPercentage;
+    }
+    public void setPaidAmount(String paidAmount) 
+    {
+        this.paidAmount = paidAmount;
+    }
+
+    public String getPaidAmount() 
+    {
+        return paidAmount;
+    }
+    public void setPaidTime(Date paidTime) 
+    {
+        this.paidTime = paidTime;
+    }
+
+    public Date getPaidTime() 
+    {
+        return paidTime;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("paidId", getPaidId())
+            .append("contractId", getContractId())
+            .append("paidPercentage", getPaidPercentage())
+            .append("paidAmount", getPaidAmount())
+            .append("paidTime", getPaidTime())
+            .toString();
+    }
+}

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/mapper/CmcContractPaidMapper.java

@@ -0,0 +1,61 @@
+package com.ruoyi.oa.mapper;
+
+import java.util.List;
+import com.ruoyi.oa.domain.CmcContractPaid;
+
+/**
+ * 实际回款Mapper接口
+ * 
+ * @author cmc
+ * @date 2025-02-12
+ */
+public interface CmcContractPaidMapper 
+{
+    /**
+     * 查询实际回款
+     * 
+     * @param paidId 实际回款主键
+     * @return 实际回款
+     */
+    public CmcContractPaid selectCmcContractPaidByPaidId(Long paidId);
+
+    /**
+     * 查询实际回款列表
+     * 
+     * @param cmcContractPaid 实际回款
+     * @return 实际回款集合
+     */
+    public List<CmcContractPaid> selectCmcContractPaidList(CmcContractPaid cmcContractPaid);
+
+    /**
+     * 新增实际回款
+     * 
+     * @param cmcContractPaid 实际回款
+     * @return 结果
+     */
+    public int insertCmcContractPaid(CmcContractPaid cmcContractPaid);
+
+    /**
+     * 修改实际回款
+     * 
+     * @param cmcContractPaid 实际回款
+     * @return 结果
+     */
+    public int updateCmcContractPaid(CmcContractPaid cmcContractPaid);
+
+    /**
+     * 删除实际回款
+     * 
+     * @param contractId 实际回款主键
+     * @return 结果
+     */
+    public int deleteCmcContractPaidByContractId(String contractId);
+
+    /**
+     * 批量删除实际回款
+     * 
+     * @param contractIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteCmcContractPaidByContractIds(String[] contractIds);
+}

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/service/ICmcContractPaidService.java

@@ -0,0 +1,61 @@
+package com.ruoyi.oa.service;
+
+import java.util.List;
+import com.ruoyi.oa.domain.CmcContractPaid;
+
+/**
+ * 实际回款Service接口
+ * 
+ * @author cmc
+ * @date 2025-02-12
+ */
+public interface ICmcContractPaidService 
+{
+    /**
+     * 查询实际回款
+     * 
+     * @param paidId 实际回款主键
+     * @return 实际回款
+     */
+    public CmcContractPaid selectCmcContractPaidByPaidId(Long paidId);
+
+    /**
+     * 查询实际回款列表
+     * 
+     * @param cmcContractPaid 实际回款
+     * @return 实际回款集合
+     */
+    public List<CmcContractPaid> selectCmcContractPaidList(CmcContractPaid cmcContractPaid);
+
+    /**
+     * 新增实际回款
+     * 
+     * @param cmcContractPaid 实际回款
+     * @return 结果
+     */
+    public int insertCmcContractPaid(CmcContractPaid cmcContractPaid);
+
+    /**
+     * 修改实际回款
+     * 
+     * @param cmcContractPaid 实际回款
+     * @return 结果
+     */
+    public int updateCmcContractPaid(CmcContractPaid cmcContractPaid);
+
+    /**
+     * 批量删除实际回款
+     * 
+     * @param contractIds 需要删除的实际回款主键集合
+     * @return 结果
+     */
+    public int deleteCmcContractPaidByContractIds(String[] contractIds);
+
+    /**
+     * 删除实际回款信息
+     * 
+     * @param contractId 实际回款主键
+     * @return 结果
+     */
+    public int deleteCmcContractPaidByContractId(String contractId);
+}

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/service/impl/CmcContractPaidServiceImpl.java

@@ -0,0 +1,93 @@
+package com.ruoyi.oa.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.oa.mapper.CmcContractPaidMapper;
+import com.ruoyi.oa.domain.CmcContractPaid;
+import com.ruoyi.oa.service.ICmcContractPaidService;
+
+/**
+ * 实际回款Service业务层处理
+ * 
+ * @author cmc
+ * @date 2025-02-12
+ */
+@Service
+public class CmcContractPaidServiceImpl implements ICmcContractPaidService 
+{
+    @Autowired
+    private CmcContractPaidMapper cmcContractPaidMapper;
+
+    /**
+     * 查询实际回款
+     * 
+     * @param paidId 实际回款主键
+     * @return 实际回款
+     */
+    @Override
+    public CmcContractPaid selectCmcContractPaidByPaidId(Long paidId)
+    {
+        return cmcContractPaidMapper.selectCmcContractPaidByPaidId(paidId);
+    }
+
+    /**
+     * 查询实际回款列表
+     * 
+     * @param cmcContractPaid 实际回款
+     * @return 实际回款
+     */
+    @Override
+    public List<CmcContractPaid> selectCmcContractPaidList(CmcContractPaid cmcContractPaid)
+    {
+        return cmcContractPaidMapper.selectCmcContractPaidList(cmcContractPaid);
+    }
+
+    /**
+     * 新增实际回款
+     * 
+     * @param cmcContractPaid 实际回款
+     * @return 结果
+     */
+    @Override
+    public int insertCmcContractPaid(CmcContractPaid cmcContractPaid)
+    {
+        return cmcContractPaidMapper.insertCmcContractPaid(cmcContractPaid);
+    }
+
+    /**
+     * 修改实际回款
+     * 
+     * @param cmcContractPaid 实际回款
+     * @return 结果
+     */
+    @Override
+    public int updateCmcContractPaid(CmcContractPaid cmcContractPaid)
+    {
+        return cmcContractPaidMapper.updateCmcContractPaid(cmcContractPaid);
+    }
+
+    /**
+     * 批量删除实际回款
+     * 
+     * @param contractIds 需要删除的实际回款主键
+     * @return 结果
+     */
+    @Override
+    public int deleteCmcContractPaidByContractIds(String[] contractIds)
+    {
+        return cmcContractPaidMapper.deleteCmcContractPaidByContractIds(contractIds);
+    }
+
+    /**
+     * 删除实际回款信息
+     * 
+     * @param contractId 实际回款主键
+     * @return 结果
+     */
+    @Override
+    public int deleteCmcContractPaidByContractId(String contractId)
+    {
+        return cmcContractPaidMapper.deleteCmcContractPaidByContractId(contractId);
+    }
+}

oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcContractPaidMapper.xml

@@ -0,0 +1,71 @@
+<?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.oa.mapper.CmcContractPaidMapper">
+    
+    <resultMap type="CmcContractPaid" id="CmcContractPaidResult">
+        <result property="paidId"    column="paid_id"    />
+        <result property="contractId"    column="contract_id"    />
+        <result property="paidPercentage"    column="paid_percentage"    />
+        <result property="paidAmount"    column="paid_amount"    />
+        <result property="paidTime"    column="paid_time"    />
+    </resultMap>
+
+    <sql id="selectCmcContractPaidVo">
+        select paid_id, contract_id, paid_percentage, paid_amount, paid_time from cmc_contract_paid
+    </sql>
+
+    <select id="selectCmcContractPaidList" parameterType="CmcContractPaid" resultMap="CmcContractPaidResult">
+        <include refid="selectCmcContractPaidVo"/>
+        <where>  
+            <if test="contractId != null  and contractId != ''"> and contract_id = #{contractId}</if>
+            <if test="paidPercentage != null  and paidPercentage != ''"> and paid_percentage = #{paidPercentage}</if>
+            <if test="paidAmount != null  and paidAmount != ''"> and paid_amount = #{paidAmount}</if>
+            <if test="paidTime != null "> and paid_time = #{paidTime}</if>
+        </where>
+    </select>
+    
+    <select id="selectCmcContractPaidByPaidId" parameterType="Long" resultMap="CmcContractPaidResult">
+        <include refid="selectCmcContractPaidVo"/>
+        where paid_id = #{paidId}
+    </select>
+        
+    <insert id="insertCmcContractPaid" parameterType="CmcContractPaid" useGeneratedKeys="true" keyProperty="paidId">
+        insert into cmc_contract_paid
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="contractId != null">contract_id,</if>
+            <if test="paidPercentage != null">paid_percentage,</if>
+            <if test="paidAmount != null">paid_amount,</if>
+            <if test="paidTime != null">paid_time,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="contractId != null">#{contractId},</if>
+            <if test="paidPercentage != null">#{paidPercentage},</if>
+            <if test="paidAmount != null">#{paidAmount},</if>
+            <if test="paidTime != null">#{paidTime},</if>
+         </trim>
+    </insert>
+
+    <update id="updateCmcContractPaid" parameterType="CmcContractPaid">
+        update cmc_contract_paid
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="contractId != null">contract_id = #{contractId},</if>
+            <if test="paidPercentage != null">paid_percentage = #{paidPercentage},</if>
+            <if test="paidAmount != null">paid_amount = #{paidAmount},</if>
+            <if test="paidTime != null">paid_time = #{paidTime},</if>
+        </trim>
+        where paid_id = #{paidId}
+    </update>
+
+    <delete id="deleteCmcContractPaidByContractId" parameterType="String">
+        delete from cmc_contract_paid where contract_id = #{contractId}
+    </delete>
+
+    <delete id="deleteCmcContractPaidByContractIds" parameterType="String">
+        delete from cmc_contract_paid where contract_id in
+        <foreach item="contractId" collection="array" open="(" separator="," close=")">
+            #{contractId}
+        </foreach>
+    </delete>
+</mapper>

oa-ui/src/api/oa/contract/contractPaid.js

@@ -0,0 +1,50 @@
+/*
+ * @Author: wrh
+ * @Date: 2025-02-12 10:55:08
+ * @LastEditors: wrh
+ * @LastEditTime: 2025-02-12 11:10:34
+ */
+import request from '@/utils/request'
+
+// 查询实际回款列表
+export function listContractPaid(query) {
+  return request({
+    url: '/oa/contractPaid/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询实际回款详细
+export function getContractPaid(paidId) {
+  return request({
+    url: '/oa/contractPaid/' + paidId,
+    method: 'get'
+  })
+}
+
+// 新增实际回款
+export function addContractPaid(data) {
+  return request({
+    url: '/oa/contractPaid',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改实际回款
+export function updateContractPaid(data) {
+  return request({
+    url: '/oa/contractPaid',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除实际回款
+export function delContractPaid(contractId) {
+  return request({
+    url: '/oa/contractPaid/' + contractId,
+    method: 'delete'
+  })
+}