|
|
@@ -23,11 +23,12 @@
|
|
|
<result column="release_end" jdbcType="TIMESTAMP" property="releaseEnd" />
|
|
|
<result column="duration" jdbcType="DOUBLE" property="duration" />
|
|
|
<result column="examine_name" jdbcType="VARCHAR" property="examineName" />
|
|
|
+ <result column="settlement_amount" jdbcType="DECIMAL" property="settlementAmount" />
|
|
|
</resultMap>
|
|
|
<sql id="Base_Column_List">
|
|
|
id, prid, order_no, aid, aname, `type`, type_other, `status`, process_status, total_amount,
|
|
|
attachment_url, apply_dep, pay_dep, eaaid, create_time, district_name, user_names,
|
|
|
- release_start, release_end, duration, examine_name
|
|
|
+ release_start, release_end, duration, examine_name, settlement_amount
|
|
|
</sql>
|
|
|
<select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
|
|
|
select
|
|
|
@@ -46,14 +47,16 @@
|
|
|
attachment_url, apply_dep, pay_dep,
|
|
|
eaaid, create_time, district_name,
|
|
|
user_names, release_start, release_end,
|
|
|
- duration, examine_name)
|
|
|
+ duration, examine_name, settlement_amount
|
|
|
+ )
|
|
|
values (#{prid,jdbcType=INTEGER}, #{orderNo,jdbcType=VARCHAR}, #{aid,jdbcType=VARCHAR},
|
|
|
#{aname,jdbcType=VARCHAR}, #{type,jdbcType=INTEGER}, #{typeOther,jdbcType=VARCHAR},
|
|
|
#{status,jdbcType=INTEGER}, #{processStatus,jdbcType=INTEGER}, #{totalAmount,jdbcType=DECIMAL},
|
|
|
#{attachmentUrl,jdbcType=VARCHAR}, #{applyDep,jdbcType=VARCHAR}, #{payDep,jdbcType=VARCHAR},
|
|
|
#{eaaid,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{districtName,jdbcType=VARCHAR},
|
|
|
#{userNames,jdbcType=VARCHAR}, #{releaseStart,jdbcType=TIMESTAMP}, #{releaseEnd,jdbcType=TIMESTAMP},
|
|
|
- #{duration,jdbcType=DOUBLE}, #{examineName,jdbcType=VARCHAR})
|
|
|
+ #{duration,jdbcType=DOUBLE}, #{examineName,jdbcType=VARCHAR}, #{settlementAmount,jdbcType=DECIMAL}
|
|
|
+ )
|
|
|
</insert>
|
|
|
<insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.goafanti.common.model.ExpenseAccount" useGeneratedKeys="true">
|
|
|
insert into expense_account
|
|
|
@@ -118,6 +121,9 @@
|
|
|
<if test="examineName != null">
|
|
|
examine_name,
|
|
|
</if>
|
|
|
+ <if test="settlementAmount != null">
|
|
|
+ settlement_amount,
|
|
|
+ </if>
|
|
|
</trim>
|
|
|
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
|
|
<if test="prid != null">
|
|
|
@@ -180,6 +186,9 @@
|
|
|
<if test="examineName != null">
|
|
|
#{examineName,jdbcType=VARCHAR},
|
|
|
</if>
|
|
|
+ <if test="settlementAmount != null">
|
|
|
+ #{settlementAmount,jdbcType=DECIMAL},
|
|
|
+ </if>
|
|
|
</trim>
|
|
|
</insert>
|
|
|
<update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.ExpenseAccount">
|
|
|
@@ -245,6 +254,9 @@
|
|
|
<if test="examineName != null">
|
|
|
examine_name = #{examineName,jdbcType=VARCHAR},
|
|
|
</if>
|
|
|
+ <if test="settlementAmount != null">
|
|
|
+ settlement_amount = #{settlementAmount,jdbcType=DECIMAL},
|
|
|
+ </if>
|
|
|
</set>
|
|
|
where id = #{id,jdbcType=INTEGER}
|
|
|
</update>
|
|
|
@@ -269,7 +281,8 @@
|
|
|
release_start = #{releaseStart,jdbcType=TIMESTAMP},
|
|
|
release_end = #{releaseEnd,jdbcType=TIMESTAMP},
|
|
|
duration = #{duration,jdbcType=DOUBLE},
|
|
|
- examine_name = #{examineName,jdbcType=VARCHAR}
|
|
|
+ examine_name = #{examineName,jdbcType=VARCHAR},
|
|
|
+ settlement_amount = #{settlementAmount,jdbcType=DECIMAL}
|
|
|
where id = #{id,jdbcType=INTEGER}
|
|
|
</update>
|
|
|
|
|
|
@@ -278,7 +291,7 @@
|
|
|
a.type_other typeOther , a.status,a.process_status processStatus,a.total_amount totalAmount,
|
|
|
a.attachment_url attachmentUrl,a.apply_dep applyDep, a.pay_dep payDep, a.eaaid,a.district_name districtName,
|
|
|
a.user_names userNames,a.create_time, a.release_start,a.release_end, a.duration,b.name appDepName,
|
|
|
- c.name payDepName,d.name ,d.bank ,d.accounts ,
|
|
|
+ c.name payDepName,d.name ,d.bank ,d.accounts ,a.settlement_amount settlementAmount,
|
|
|
date_format(a.create_time,'%Y-%m-%d %H:%i:%S')createTimeStr,
|
|
|
date_format(a.release_start,'%Y-%m-%d %H:%i:%S')releaseStartStr,
|
|
|
date_format(a.release_end,'%Y-%m-%d %H:%i:%S')releaseEndStr
|
|
|
@@ -386,7 +399,7 @@
|
|
|
left join expense_account_private d on a.eaaid=d.id left join t_order_new o on a.order_no =o.order_no
|
|
|
left join t_order_mid tm on a.order_no =tm.order_no
|
|
|
WHERE a.status=2
|
|
|
- and a.aid= #{aid} and a.type= #{type}
|
|
|
+ and a.aid= #{aid} and a.type= #{type} and a.pay_dep= #{depId}
|
|
|
</select>
|
|
|
<select id="selectStatistics" resultType="com.goafanti.expenseAccount.bo.OutExpenseAccount">
|
|
|
SELECT
|