From 84897f28662a94a6caec972c543538c2c9fdf0f5 Mon Sep 17 00:00:00 2001
From: sen <sen@qq.com>
Date: 星期一, 22 十二月 2025 11:22:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cwxt_master' into cwxt_master
---
service/src/main/resources/mapper/cwgl/ReceivableFeeManagementMapper.xml | 23 +++++++++++++----------
1 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/service/src/main/resources/mapper/cwgl/ReceivableFeeManagementMapper.xml b/service/src/main/resources/mapper/cwgl/ReceivableFeeManagementMapper.xml
index 3c3512c..4d1a067 100644
--- a/service/src/main/resources/mapper/cwgl/ReceivableFeeManagementMapper.xml
+++ b/service/src/main/resources/mapper/cwgl/ReceivableFeeManagementMapper.xml
@@ -15,6 +15,7 @@
<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" />
@@ -29,7 +30,7 @@
</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.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
</sql>
<sql id="selectReceivableFeeManagementVoCount">
select count(0) from receivable_fee_management as thisTab
@@ -45,6 +46,7 @@
<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>
@@ -87,6 +89,7 @@
<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>
@@ -109,6 +112,7 @@
<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>
@@ -123,15 +127,12 @@
</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,
- </trim>
+ <!-- 鎵归噺鏂板 -->
+ <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
<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},
- </trim>
+ (#{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})
</foreach>
</insert>
@@ -148,6 +149,7 @@
<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>
@@ -164,7 +166,7 @@
</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>
@@ -176,6 +178,7 @@
<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>
--
Gitblit v1.8.0