|
@@ -22,11 +22,12 @@
|
|
|
<result column="release_start" jdbcType="TIMESTAMP" property="releaseStart" />
|
|
<result column="release_start" jdbcType="TIMESTAMP" property="releaseStart" />
|
|
|
<result column="release_end" jdbcType="TIMESTAMP" property="releaseEnd" />
|
|
<result column="release_end" jdbcType="TIMESTAMP" property="releaseEnd" />
|
|
|
<result column="duration" jdbcType="DOUBLE" property="duration" />
|
|
<result column="duration" jdbcType="DOUBLE" property="duration" />
|
|
|
|
|
+ <result column="examine_name" jdbcType="VARCHAR" property="examineName" />
|
|
|
</resultMap>
|
|
</resultMap>
|
|
|
<sql id="Base_Column_List">
|
|
<sql id="Base_Column_List">
|
|
|
id, prid, order_no, aid, aname, `type`, type_other, `status`, process_status, total_amount,
|
|
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,
|
|
attachment_url, apply_dep, pay_dep, eaaid, create_time, district_name, user_names,
|
|
|
- release_start, release_end, duration
|
|
|
|
|
|
|
+ release_start, release_end, duration, examine_name
|
|
|
</sql>
|
|
</sql>
|
|
|
<select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
|
|
<select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
|
|
|
select
|
|
select
|
|
@@ -34,7 +35,6 @@
|
|
|
from expense_account
|
|
from expense_account
|
|
|
where id = #{id,jdbcType=INTEGER}
|
|
where id = #{id,jdbcType=INTEGER}
|
|
|
</select>
|
|
</select>
|
|
|
-
|
|
|
|
|
<delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
|
|
<delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
|
|
|
delete from expense_account
|
|
delete from expense_account
|
|
|
where id = #{id,jdbcType=INTEGER}
|
|
where id = #{id,jdbcType=INTEGER}
|
|
@@ -46,14 +46,14 @@
|
|
|
attachment_url, apply_dep, pay_dep,
|
|
attachment_url, apply_dep, pay_dep,
|
|
|
eaaid, create_time, district_name,
|
|
eaaid, create_time, district_name,
|
|
|
user_names, release_start, release_end,
|
|
user_names, release_start, release_end,
|
|
|
- duration)
|
|
|
|
|
|
|
+ duration, examine_name)
|
|
|
values (#{prid,jdbcType=INTEGER}, #{orderNo,jdbcType=VARCHAR}, #{aid,jdbcType=VARCHAR},
|
|
values (#{prid,jdbcType=INTEGER}, #{orderNo,jdbcType=VARCHAR}, #{aid,jdbcType=VARCHAR},
|
|
|
#{aname,jdbcType=VARCHAR}, #{type,jdbcType=INTEGER}, #{typeOther,jdbcType=VARCHAR},
|
|
#{aname,jdbcType=VARCHAR}, #{type,jdbcType=INTEGER}, #{typeOther,jdbcType=VARCHAR},
|
|
|
#{status,jdbcType=INTEGER}, #{processStatus,jdbcType=INTEGER}, #{totalAmount,jdbcType=DECIMAL},
|
|
#{status,jdbcType=INTEGER}, #{processStatus,jdbcType=INTEGER}, #{totalAmount,jdbcType=DECIMAL},
|
|
|
#{attachmentUrl,jdbcType=VARCHAR}, #{applyDep,jdbcType=VARCHAR}, #{payDep,jdbcType=VARCHAR},
|
|
#{attachmentUrl,jdbcType=VARCHAR}, #{applyDep,jdbcType=VARCHAR}, #{payDep,jdbcType=VARCHAR},
|
|
|
#{eaaid,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{districtName,jdbcType=VARCHAR},
|
|
#{eaaid,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{districtName,jdbcType=VARCHAR},
|
|
|
#{userNames,jdbcType=VARCHAR}, #{releaseStart,jdbcType=TIMESTAMP}, #{releaseEnd,jdbcType=TIMESTAMP},
|
|
#{userNames,jdbcType=VARCHAR}, #{releaseStart,jdbcType=TIMESTAMP}, #{releaseEnd,jdbcType=TIMESTAMP},
|
|
|
- #{duration,jdbcType=DOUBLE})
|
|
|
|
|
|
|
+ #{duration,jdbcType=DOUBLE}, #{examineName,jdbcType=VARCHAR})
|
|
|
</insert>
|
|
</insert>
|
|
|
<insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.goafanti.common.model.ExpenseAccount" useGeneratedKeys="true">
|
|
<insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.goafanti.common.model.ExpenseAccount" useGeneratedKeys="true">
|
|
|
insert into expense_account
|
|
insert into expense_account
|
|
@@ -115,6 +115,9 @@
|
|
|
<if test="duration != null">
|
|
<if test="duration != null">
|
|
|
duration,
|
|
duration,
|
|
|
</if>
|
|
</if>
|
|
|
|
|
+ <if test="examineName != null">
|
|
|
|
|
+ examine_name,
|
|
|
|
|
+ </if>
|
|
|
</trim>
|
|
</trim>
|
|
|
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
|
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
|
|
<if test="prid != null">
|
|
<if test="prid != null">
|
|
@@ -174,6 +177,9 @@
|
|
|
<if test="duration != null">
|
|
<if test="duration != null">
|
|
|
#{duration,jdbcType=DOUBLE},
|
|
#{duration,jdbcType=DOUBLE},
|
|
|
</if>
|
|
</if>
|
|
|
|
|
+ <if test="examineName != null">
|
|
|
|
|
+ #{examineName,jdbcType=VARCHAR},
|
|
|
|
|
+ </if>
|
|
|
</trim>
|
|
</trim>
|
|
|
</insert>
|
|
</insert>
|
|
|
<update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.ExpenseAccount">
|
|
<update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.ExpenseAccount">
|
|
@@ -236,6 +242,9 @@
|
|
|
<if test="duration != null">
|
|
<if test="duration != null">
|
|
|
duration = #{duration,jdbcType=DOUBLE},
|
|
duration = #{duration,jdbcType=DOUBLE},
|
|
|
</if>
|
|
</if>
|
|
|
|
|
+ <if test="examineName != null">
|
|
|
|
|
+ examine_name = #{examineName,jdbcType=VARCHAR},
|
|
|
|
|
+ </if>
|
|
|
</set>
|
|
</set>
|
|
|
where id = #{id,jdbcType=INTEGER}
|
|
where id = #{id,jdbcType=INTEGER}
|
|
|
</update>
|
|
</update>
|
|
@@ -259,7 +268,8 @@
|
|
|
user_names = #{userNames,jdbcType=VARCHAR},
|
|
user_names = #{userNames,jdbcType=VARCHAR},
|
|
|
release_start = #{releaseStart,jdbcType=TIMESTAMP},
|
|
release_start = #{releaseStart,jdbcType=TIMESTAMP},
|
|
|
release_end = #{releaseEnd,jdbcType=TIMESTAMP},
|
|
release_end = #{releaseEnd,jdbcType=TIMESTAMP},
|
|
|
- duration = #{duration,jdbcType=DOUBLE}
|
|
|
|
|
|
|
+ duration = #{duration,jdbcType=DOUBLE},
|
|
|
|
|
+ examine_name = #{examineName,jdbcType=VARCHAR}
|
|
|
where id = #{id,jdbcType=INTEGER}
|
|
where id = #{id,jdbcType=INTEGER}
|
|
|
</update>
|
|
</update>
|
|
|
|
|
|
|
@@ -284,7 +294,7 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
<select id="selectExpenseAccountList" resultType="com.goafanti.expenseAccount.bo.OutExpenseAccountBo">
|
|
<select id="selectExpenseAccountList" resultType="com.goafanti.expenseAccount.bo.OutExpenseAccountBo">
|
|
|
- select a.id,a.total_amount totalAmount,a.`type`,a.process_status processStatus,a.status,
|
|
|
|
|
|
|
+ select a.id,a.total_amount totalAmount,a.`type`,a.process_status processStatus,a.status,a.examine_name examineName,
|
|
|
date_format(a.create_time,'%Y-%m-%d %H:%i:%S')createTimeStr
|
|
date_format(a.create_time,'%Y-%m-%d %H:%i:%S')createTimeStr
|
|
|
from expense_account a
|
|
from expense_account a
|
|
|
<if test="processStatus ==1">
|
|
<if test="processStatus ==1">
|