From aa4a9c1aa4d6d0f986b108c20aee53e1dbae6183 Mon Sep 17 00:00:00 2001
From: wujianwei <wjw@11.com>
Date: 星期一, 26 一月 2026 14:17:06 +0800
Subject: [PATCH] 修改新增科目代码
---
service/src/main/resources/mapper/cwgl/FundFlowMapper.xml | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/service/src/main/resources/mapper/cwgl/FundFlowMapper.xml b/service/src/main/resources/mapper/cwgl/FundFlowMapper.xml
index 1d07f97..440d2ff 100644
--- a/service/src/main/resources/mapper/cwgl/FundFlowMapper.xml
+++ b/service/src/main/resources/mapper/cwgl/FundFlowMapper.xml
@@ -20,15 +20,17 @@
<result property="summary" column="summary" />
<result property="remarks" column="remarks" />
<result property="status" column="status" />
+ <result property="claimedAmount" column="claimed_amount" />
<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="delFlag" column="del_flag" />
+ <result property="billType" column="bill_type" />
</resultMap>
<sql id="selectFundFlowVo">
- select thisTab.id, thisTab.bank_flow_no, thisTab.company, thisTab.our_account, thisTab.our_bank_name, thisTab.income_expense_flag, thisTab.transaction_amount, thisTab.currency, thisTab.counterparty_account, thisTab.counterparty_name, thisTab.transaction_date, thisTab.purpose, thisTab.summary, thisTab.remarks, thisTab.status, thisTab.create_by, thisTab.create_time, thisTab.update_by, thisTab.update_time, thisTab.del_flag from fund_flow AS thisTab
+ select thisTab.id, thisTab.bank_flow_no, thisTab.company, thisTab.our_account, thisTab.our_bank_name, thisTab.income_expense_flag, thisTab.transaction_amount, thisTab.currency, thisTab.counterparty_account, thisTab.counterparty_name, thisTab.transaction_date, thisTab.purpose, thisTab.summary, thisTab.remarks, thisTab.status, thisTab.claimed_amount, thisTab.create_by, thisTab.create_time, thisTab.update_by, thisTab.update_time, thisTab.del_flag , thisTab.bill_type from fund_flow AS thisTab
</sql>
<sql id="selectFundFlowVoCount">
select count(0) from fund_flow as thisTab
@@ -45,6 +47,7 @@
<if test="counterpartyAccount != null and counterpartyAccount != ''"> and thisTab.counterparty_account = #{counterpartyAccount}</if>
<if test="counterpartyName != null and counterpartyName != ''"> and thisTab.counterparty_name like concat('%', #{counterpartyName}, '%')</if>
<if test="transactionDate != null "> and thisTab.transaction_date = #{transactionDate}</if>
+ <if test="billType != null "> and thisTab.bill_type = #{billType}</if>
<if test="purpose != null and purpose != ''"> and thisTab.purpose = #{purpose}</if>
<if test="summary != null and summary != ''"> and thisTab.summary = #{summary}</if>
<if test="remarks != null and remarks != ''"> and thisTab.remarks = #{remarks}</if>
@@ -90,11 +93,13 @@
<if test="summary != null">summary,</if>
<if test="remarks != null">remarks,</if>
<if test="status != null">status,</if>
+ <if test="claimedAmount != null">claimed_amount,</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="delFlag != null">del_flag,</if>
+ <if test="billType != null">bill_type,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="bankFlowNo != null and bankFlowNo != ''">#{bankFlowNo},</if>
@@ -111,22 +116,24 @@
<if test="summary != null">#{summary},</if>
<if test="remarks != null">#{remarks},</if>
<if test="status != null">#{status},</if>
+ <if test="claimedAmount != null">#{claimedAmount},</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="delFlag != null">#{delFlag},</if>
+ <if test="billType != null">#{billType},</if>
</trim>
</insert>
<insert id="insertFundFlowBatch" parameterType="java.util.List" useGeneratedKeys="true" keyProperty="id">
insert into fund_flow
<trim prefix="(" suffix=") values" suffixOverrides=",">
- id,bank_flow_no,company,our_account,our_bank_name,income_expense_flag,transaction_amount,currency,counterparty_account,counterparty_name,transaction_date,purpose,summary,remarks,status,create_by,create_time,update_by,update_time,del_flag,
+ id,bank_flow_no,company,our_account,our_bank_name,income_expense_flag,transaction_amount,currency,counterparty_account,counterparty_name,transaction_date,purpose,summary,remarks,status,claimed_amount,create_by,create_time,update_by,update_time,del_flag,
</trim>
<foreach item="item" index="index" collection="list" separator=",">
<trim prefix="(" suffix=")" suffixOverrides=",">
- #{item.id},#{item.bankFlowNo},#{item.company},#{item.ourAccount},#{item.ourBankName},#{item.incomeExpenseFlag},#{item.transactionAmount},#{item.currency},#{item.counterpartyAccount},#{item.counterpartyName},#{item.transactionDate},#{item.purpose},#{item.summary},#{item.remarks},#{item.status},#{item.createBy},#{item.createTime},#{item.updateBy},#{item.updateTime},#{item.delFlag},
+ #{item.id},#{item.bankFlowNo},#{item.company},#{item.ourAccount},#{item.ourBankName},#{item.incomeExpenseFlag},#{item.transactionAmount},#{item.currency},#{item.counterpartyAccount},#{item.counterpartyName},#{item.transactionDate},#{item.purpose},#{item.summary},#{item.remarks},#{item.status},#{item.claimedAmount},#{item.createBy},#{item.createTime},#{item.updateBy},#{item.updateTime},#{item.delFlag},
</trim>
</foreach>
</insert>
@@ -149,11 +156,13 @@
<if test="summary != null">summary = #{summary},</if>
<if test="remarks != null">remarks = #{remarks},</if>
<if test="status != null">status = #{status},</if>
+ <if test="claimedAmount != null">claimed_amount = #{claimedAmount},</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="delFlag != null">del_flag = #{delFlag},</if>
+ <if test="billType != null">bill_type = #{billType},</if>
</trim>
where id = #{id}
</update>
--
Gitblit v1.8.0