From 0a38562076c5a68b8cfb6ffd634ede1164b1fbf0 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期六, 03 七月 2021 09:57:52 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
java110-db/src/main/resources/mapper/acct/AccountBondObjServiceDaoImplMapper.xml | 23 ++++++++++++++++-------
1 files changed, 16 insertions(+), 7 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/acct/AccountBondObjServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/acct/AccountBondObjServiceDaoImplMapper.xml
index aafa99f..d292ed5 100644
--- a/java110-db/src/main/resources/mapper/acct/AccountBondObjServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/acct/AccountBondObjServiceDaoImplMapper.xml
@@ -11,9 +11,9 @@
<!-- 淇濆瓨淇濊瘉閲戝璞′俊鎭� add by wuxw 2018-07-03 -->
<insert id="saveAccountBondObjInfo" parameterType="Map">
insert into account_bond_obj(
-bond_id,bobj_id,obj_id,bond_type,receivable_amount,remark,start_time,received_amount,state,end_time
+bond_id,bobj_id,obj_id,bond_type,receivable_amount,remark,start_time,received_amount,state,end_time,obj_name
) values (
-#{bondId},#{bobjId},#{objId},#{bondType},#{receivableAmount},#{remark},#{startTime},#{receivedAmount},#{state},#{endTime}
+#{bondId},#{bobjId},#{objId},#{bondType},#{receivableAmount},#{remark},#{startTime},#{receivedAmount},#{state},#{endTime},#{objName}
)
</insert>
@@ -21,7 +21,10 @@
<!-- 鏌ヨ淇濊瘉閲戝璞′俊鎭� add by wuxw 2018-07-03 -->
<select id="getAccountBondObjInfo" parameterType="Map" resultType="Map">
- select t.bond_id,t.bond_id bondId,t.bobj_id,t.bobj_id bobjId,t.create_time,t.create_time createTime,t.obj_id,t.obj_id objId,t.bond_type,t.bond_type bondType,t.receivable_amount,t.receivable_amount receivableAmount,t.remark,t.start_time,t.start_time startTime,t.status_cd,t.status_cd statusCd,t.received_amount,t.received_amount receivedAmount,t.state,t.end_time,t.end_time endTime
+ select t.bond_id,t.bond_id bondId,t.bobj_id,t.bobj_id bobjId,t.create_time,t.create_time createTime,t.obj_id,
+ t.obj_id objId,t.bond_type,t.bond_type bondType,t.receivable_amount,t.receivable_amount receivableAmount,t.remark,
+ t.start_time,t.start_time startTime,t.status_cd,t.status_cd statusCd,t.received_amount,t.received_amount receivedAmount,
+ t.state,t.end_time,t.end_time endTime,t.obj_name objName
from account_bond_obj t
where 1 =1
<if test="bondId !=null and bondId != ''">
@@ -35,8 +38,11 @@
</if>
<if test="objId !=null and objId != ''">
and t.obj_id= #{objId}
-</if>
-<if test="bondType !=null and bondType != ''">
+</if>
+ <if test="objName !=null and objName != ''">
+ and t.obj_name= #{objName}
+ </if>
+ <if test="bondType !=null and bondType != ''">
and t.bond_type= #{bondType}
</if>
<if test="receivableAmount !=null and receivableAmount != ''">
@@ -84,8 +90,11 @@
</if>
<if test="objId !=null and objId != ''">
, t.obj_id= #{objId}
-</if>
-<if test="bondType !=null and bondType != ''">
+</if>
+ <if test="objName !=null and objName != ''">
+ , t.obj_name= #{objName}
+ </if>
+ <if test="bondType !=null and bondType != ''">
, t.bond_type= #{bondType}
</if>
<if test="receivableAmount !=null and receivableAmount != ''">
--
Gitblit v1.8.0