|
|
@@ -672,7 +672,7 @@
|
|
|
</select>
|
|
|
|
|
|
<sql id="mainAllSql">
|
|
|
- select b.id,b.check_no,b.total_amount,b.order_no,o.contract_no,b.aname,b.apply_dep,b.pay_dep,b.real_amount,b.type_other ,
|
|
|
+ select b.id,b.check_no,b.total_amount,b.order_no,o.contract_no,b.aname,b.apply_dep,b.pay_dep,b.real_amount,b.type_other ,b.aid,
|
|
|
date_format(b.create_time,'%Y-%m-%d %H:%i:%S')createTimeStr,b.examine_name, dep.name applyDepName,dep2.name payDepName,
|
|
|
b.remarks,b.eaaid ,eap.name ,eap.bank ,eap.accounts ,b.status,b.process_status,
|
|
|
c.id sonId,c.total_amount sonAmount,c.`type` sonType,c.type_other sonTypeOther,c.user_names ,c.release_start ,c.release_end ,
|
|
|
@@ -698,6 +698,7 @@
|
|
|
<resultMap id="MainMap" type="com.goafanti.expenseAccount.bo.MainExpenseAccount">
|
|
|
<id column="id" jdbcType="INTEGER" property="id" />
|
|
|
<result column="check_no" jdbcType="VARCHAR" property="checkNo" />
|
|
|
+ <result column="aid" jdbcType="VARCHAR" property="aid" />
|
|
|
<result column="type_other" jdbcType="VARCHAR" property="typeOther" />
|
|
|
<result column="total_amount" jdbcType="DECIMAL" property="totalAmount" />
|
|
|
<result column="real_amount" jdbcType="DECIMAL" property="realAmount" />
|