From 08b030a4cb662725c4f73e3b8a531de2c593369b Mon Sep 17 00:00:00 2001
From: sen <sen@qq.com>
Date: 星期一, 22 十二月 2025 16:01:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cwxt_master' into cwxt_master
---
service/src/main/resources/mapper/cwgl/ReceivableFeeManagementMapper.xml | 31 ++++++++++++++++++++++---------
1 files changed, 22 insertions(+), 9 deletions(-)
diff --git a/service/src/main/resources/mapper/cwgl/ReceivableFeeManagementMapper.xml b/service/src/main/resources/mapper/cwgl/ReceivableFeeManagementMapper.xml
index fe51739..421070e 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">
@@ -26,10 +26,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.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.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
@@ -51,6 +52,7 @@
<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>
<!--鏌ヨ-->
@@ -98,7 +100,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>
@@ -120,17 +123,18 @@
<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="java.util.List" useGeneratedKeys="true" keyProperty="id">
insert into receivable_fee_management
<trim prefix="(" suffix=") values" suffixOverrides=",">
- id,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,status,remark,create_by,create_time,update_by,update_time,deleted,
+ id,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,status,remark,create_by,create_time,update_by,update_time,deleted,customer_id,
</trim>
<foreach item="item" index="index" collection="list" separator=",">
<trim prefix="(" suffix=") " suffixOverrides=",">
- #{item.id},#{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.status},#{item.remark},#{item.createBy},#{item.createTime},#{item.updateBy},#{item.updateTime},#{item.deleted},
+ #{item.id},#{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.status},#{item.remark},#{item.createBy},#{item.createTime},#{item.updateBy},#{item.updateTime},#{item.deleted},#{item.customerId},
</trim>
</foreach>
</insert>
@@ -159,6 +163,7 @@
<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>
@@ -187,8 +192,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>
@@ -202,5 +208,12 @@
#{id}
</foreach>
</delete>
-
+ <!--鏍规嵁ID鏁扮粍鏌ヨ-->
+ <select id="selectReceivableFeeManagementByIds" parameterType="Integer" resultMap="ReceivableFeeManagementResult">
+ <include refid="selectReceivableFeeManagementVo"/>
+ where thisTab.id in
+ <foreach item="id" collection="array" open="(" separator="," close=")">
+ #{id}
+ </foreach>
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0