From 279366f14d6e1361b6caf7c05b74f0cea4227a36 Mon Sep 17 00:00:00 2001
From: wujianwei <wjw@11.com>
Date: 星期五, 27 三月 2026 10:53:28 +0800
Subject: [PATCH] 新增推送
---
service/src/main/resources/mapper/cwgl/ReceivableFeeManagementMapper.xml | 55 +++++++++++++++++++++++++++++++++++--------------------
1 files changed, 35 insertions(+), 20 deletions(-)
diff --git a/service/src/main/resources/mapper/cwgl/ReceivableFeeManagementMapper.xml b/service/src/main/resources/mapper/cwgl/ReceivableFeeManagementMapper.xml
index 4d1a067..fb48d06 100644
--- a/service/src/main/resources/mapper/cwgl/ReceivableFeeManagementMapper.xml
+++ b/service/src/main/resources/mapper/cwgl/ReceivableFeeManagementMapper.xml
@@ -1,7 +1,7 @@
<?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">
+ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+ "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.cwgl.mapper.ReceivableFeeManagementMapper">
<resultMap type="com.ruoyi.cwgl.domain.ReceivableFeeManagement" id="ReceivableFeeManagementResult">
@@ -15,11 +15,11 @@
<result property="isInternalSettlement" column="is_internal_settlement" />
<result property="internalSettlementUnit" column="internal_settlement_unit" />
<result property="customerName" column="customer_name" />
- <result property="customerId" column="customer_id" />
<result property="projectName" column="project_name" />
<result property="businessTime" column="business_time" />
<result property="receivableConfirmTime" column="receivable_confirm_time" />
<result property="receivableAmount" column="receivable_amount" />
+ <result property="receivableAmountStr" column="receivable_amount_str" />
<result property="status" column="status" />
<result property="remark" column="remark" />
<result property="createBy" column="create_by" />
@@ -27,10 +27,11 @@
<result property="updateBy" column="update_by" />
<result property="updateTime" column="update_time" />
<result property="deleted" column="deleted" />
+ <result property="customerId" column="customer_id" />
</resultMap>
<sql id="selectReceivableFeeManagementVo">
- select thisTab.id, thisTab.system_no, thisTab.related_bill_no, thisTab.source_system, thisTab.business_sector, thisTab.document_type, thisTab.document_no, thisTab.is_internal_settlement, thisTab.internal_settlement_unit, thisTab.customer_name, thisTab.customer_id, thisTab.project_name, thisTab.business_time, thisTab.receivable_confirm_time, thisTab.receivable_amount, thisTab.status, thisTab.remark, thisTab.create_by, thisTab.create_time, thisTab.update_by, thisTab.update_time, thisTab.deleted from receivable_fee_management AS thisTab
+ select thisTab.id, thisTab.system_no, thisTab.related_bill_no, thisTab.source_system, thisTab.business_sector, thisTab.document_type, thisTab.document_no, thisTab.is_internal_settlement, thisTab.internal_settlement_unit, thisTab.customer_name, thisTab.project_name, thisTab.business_time, thisTab.receivable_confirm_time, thisTab.receivable_amount, thisTab.receivable_amount_str, thisTab.status, thisTab.remark, thisTab.create_by, thisTab.create_time, thisTab.update_by, thisTab.update_time, thisTab.deleted, thisTab.customer_id from receivable_fee_management AS thisTab
</sql>
<sql id="selectReceivableFeeManagementVoCount">
select count(0) from receivable_fee_management as thisTab
@@ -46,13 +47,13 @@
<if test="isInternalSettlement != null and isInternalSettlement != ''"> and thisTab.is_internal_settlement = #{isInternalSettlement}</if>
<if test="internalSettlementUnit != null and internalSettlementUnit != ''"> and thisTab.internal_settlement_unit = #{internalSettlementUnit}</if>
<if test="customerName != null and customerName != ''"> and thisTab.customer_name like concat('%', #{customerName}, '%')</if>
- <if test="customerId != null and customerId != ''"> and thisTab.customer_id = #{customerId}</if>
<if test="projectName != null and projectName != ''"> and thisTab.project_name like concat('%', #{projectName}, '%')</if>
<if test="businessTime != null "> and thisTab.business_time = #{businessTime}</if>
<if test="receivableConfirmTime != null "> and thisTab.receivable_confirm_time = #{receivableConfirmTime}</if>
<if test="receivableAmount != null "> and thisTab.receivable_amount = #{receivableAmount}</if>
<if test="status != null and status != ''"> and thisTab.status = #{status}</if>
<if test="deleted != null "> and thisTab.deleted = #{deleted}</if>
+ <if test="customerId != null "> and thisTab.customer_id = #{customerId}</if>
</sql>
<!--鏌ヨ-->
@@ -89,11 +90,11 @@
<if test="isInternalSettlement != null and isInternalSettlement != ''">is_internal_settlement,</if>
<if test="internalSettlementUnit != null">internal_settlement_unit,</if>
<if test="customerName != null and customerName != ''">customer_name,</if>
- <if test="customerId != null">customer_id,</if>
<if test="projectName != null">project_name,</if>
<if test="businessTime != null">business_time,</if>
<if test="receivableConfirmTime != null">receivable_confirm_time,</if>
<if test="receivableAmount != null">receivable_amount,</if>
+ <if test="receivableAmountStr != null and receivableAmountStr != ''">receivable_amount_str,</if>
<if test="status != null">status,</if>
<if test="remark != null">remark,</if>
<if test="createBy != null">create_by,</if>
@@ -101,7 +102,8 @@
<if test="updateBy != null">update_by,</if>
<if test="updateTime != null">update_time,</if>
<if test="deleted != null">deleted,</if>
- </trim>
+ <if test="customerId != null">customer_id,</if>
+ </trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="systemNo != null and systemNo != ''">#{systemNo},</if>
<if test="relatedBillNo != null and relatedBillNo != ''">#{relatedBillNo},</if>
@@ -112,11 +114,11 @@
<if test="isInternalSettlement != null and isInternalSettlement != ''">#{isInternalSettlement},</if>
<if test="internalSettlementUnit != null">#{internalSettlementUnit},</if>
<if test="customerName != null and customerName != ''">#{customerName},</if>
- <if test="customerId != null">#{customerId},</if>
<if test="projectName != null">#{projectName},</if>
<if test="businessTime != null">#{businessTime},</if>
<if test="receivableConfirmTime != null">#{receivableConfirmTime},</if>
<if test="receivableAmount != null">#{receivableAmount},</if>
+ <if test="receivableAmountStr != null and receivableAmountStr != ''">#{receivableAmountStr},</if>
<if test="status != null">#{status},</if>
<if test="remark != null">#{remark},</if>
<if test="createBy != null">#{createBy},</if>
@@ -124,15 +126,19 @@
<if test="updateBy != null">#{updateBy},</if>
<if test="updateTime != null">#{updateTime},</if>
<if test="deleted != null">#{deleted},</if>
- </trim>
+ <if test="customerId != null">#{customerId},</if>
+ </trim>
</insert>
- <!-- 鎵归噺鏂板 -->
- <insert id="insertReceivableFeeManagementBatch" parameterType="com.ruoyi.cwgl.domain.ReceivableFeeManagement" useGeneratedKeys="true" keyProperty="id">
- insert into receivable_fee_management (system_no, related_bill_no, source_system, business_sector, document_type, document_no, is_internal_settlement, internal_settlement_unit, customer_name, customer_id, project_name, business_time, receivable_confirm_time, receivable_amount, status, remark, create_by, create_time, update_by, update_time, deleted)
- values
+ <insert id="insertReceivableFeeManagementBatch" parameterType="java.util.List" useGeneratedKeys="true" keyProperty="id">
+ insert into receivable_fee_management
+ <trim prefix="(" suffix=") values" suffixOverrides=",">
+ system_no,related_bill_no,source_system,business_sector,document_type,document_no,is_internal_settlement,internal_settlement_unit,customer_name,project_name,business_time,receivable_confirm_time,receivable_amount,receivable_amount_str,status,remark,create_by,create_time,update_by,update_time,deleted,customer_id,
+ </trim>
<foreach item="item" index="index" collection="list" separator=",">
- (#{item.systemNo}, #{item.relatedBillNo}, #{item.sourceSystem}, #{item.businessSector}, #{item.documentType}, #{item.documentNo}, #{item.isInternalSettlement}, #{item.internalSettlementUnit}, #{item.customerName}, #{item.customerId}, #{item.projectName}, #{item.businessTime}, #{item.receivableConfirmTime}, #{item.receivableAmount}, #{item.status}, #{item.remark}, #{item.createBy}, #{item.createTime}, #{item.updateBy}, #{item.updateTime}, #{item.deleted})
+ <trim prefix="(" suffix=") " suffixOverrides=",">
+ #{item.systemNo},#{item.relatedBillNo},#{item.sourceSystem},#{item.businessSector},#{item.documentType},#{item.documentNo},#{item.isInternalSettlement},#{item.internalSettlementUnit},#{item.customerName},#{item.projectName},#{item.businessTime},#{item.receivableConfirmTime},#{item.receivableAmount},#{item.receivableAmountStr},#{item.status},#{item.remark},#{item.createBy},#{item.createTime},#{item.updateBy},#{item.updateTime},#{item.deleted},#{item.customerId},
+ </trim>
</foreach>
</insert>
@@ -149,11 +155,11 @@
<if test="isInternalSettlement != null and isInternalSettlement != ''">is_internal_settlement = #{isInternalSettlement},</if>
<if test="internalSettlementUnit != null">internal_settlement_unit = #{internalSettlementUnit},</if>
<if test="customerName != null and customerName != ''">customer_name = #{customerName},</if>
- <if test="customerId != null">customer_id = #{customerId},</if>
<if test="projectName != null">project_name = #{projectName},</if>
<if test="businessTime != null">business_time = #{businessTime},</if>
<if test="receivableConfirmTime != null">receivable_confirm_time = #{receivableConfirmTime},</if>
<if test="receivableAmount != null">receivable_amount = #{receivableAmount},</if>
+ <if test="receivableAmountStr != null and receivableAmountStr != ''">receivable_amount_str = #{receivableAmountStr},</if>
<if test="status != null">status = #{status},</if>
<if test="remark != null">remark = #{remark},</if>
<if test="createBy != null">create_by = #{createBy},</if>
@@ -161,12 +167,13 @@
<if test="updateBy != null">update_by = #{updateBy},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
<if test="deleted != null">deleted = #{deleted},</if>
+ <if test="customerId != null">customer_id = #{customerId},</if>
</trim>
where id = #{id}
</update>
<!-- 淇敼 -->
<update id="updateReceivableFeeManagementBatch" parameterType="java.util.List">
- <foreach collection="list" item="item" index="index" separator=",">
+ <foreach collection="list" item="item" index="index" separator=";">
update receivable_fee_management
<trim prefix="SET" suffixOverrides=",">
<if test="item.systemNo != null and item.systemNo != ''">system_no = #{item.systemNo},</if>
@@ -178,11 +185,11 @@
<if test="item.isInternalSettlement != null and item.isInternalSettlement != ''">is_internal_settlement = #{item.isInternalSettlement},</if>
<if test="item.internalSettlementUnit != null">internal_settlement_unit = #{item.internalSettlementUnit},</if>
<if test="item.customerName != null and item.customerName != ''">customer_name = #{item.customerName},</if>
- <if test="item.customerId != null">customer_id = #{item.customerId},</if>
<if test="item.projectName != null">project_name = #{item.projectName},</if>
<if test="item.businessTime != null">business_time = #{item.businessTime},</if>
<if test="item.receivableConfirmTime != null">receivable_confirm_time = #{item.receivableConfirmTime},</if>
<if test="item.receivableAmount != null">receivable_amount = #{item.receivableAmount},</if>
+ <if test="item.receivableAmountStr != null and item.receivableAmountStr != ''">receivable_amount_str = #{item.receivableAmountStr},</if>
<if test="item.status != null">status = #{item.status},</if>
<if test="item.remark != null">remark = #{item.remark},</if>
<if test="item.createBy != null">create_by = #{item.createBy},</if>
@@ -190,8 +197,9 @@
<if test="item.updateBy != null">update_by = #{item.updateBy},</if>
<if test="item.updateTime != null">update_time = #{item.updateTime},</if>
<if test="item.deleted != null">deleted = #{item.deleted},</if>
+ <if test="item.customerId != null">customer_id = #{item.customerId},</if>
</trim>
- where id = #{item.id}
+ where id = #{item.id}
</foreach>
</update>
@@ -205,7 +213,6 @@
#{id}
</foreach>
</delete>
-
<!--鏍规嵁ID鏁扮粍鏌ヨ-->
<select id="selectReceivableFeeManagementByIds" parameterType="Integer" resultMap="ReceivableFeeManagementResult">
<include refid="selectReceivableFeeManagementVo"/>
@@ -214,5 +221,13 @@
#{id}
</foreach>
</select>
-
+
+ <!-- 鏍规嵁鍏宠仈璐﹀崟缂栧彿鎵归噺鏇存柊搴旀敹璐圭敤绠＄悊璁板綍 -->
+ <update id="updateReceivableFeeManagementByRelatedBillNo" parameterType="String">
+ update receivable_fee_management
+ set related_bill_no = null,
+ status = '0',
+ update_time = now()
+ where related_bill_no = #{relatedBillNo}
+ </update>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0