|
|
@@ -766,14 +766,14 @@
|
|
|
</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,
|
|
|
+ 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 ,
|
|
|
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` ,c.type_other ,c.user_names ,c.release_start ,c.release_end ,
|
|
|
+ c.id sonId,c.total_amount sonAmount,c.`type` sonType,c.type_other sonTypeOther,c.user_names ,c.release_start ,c.release_end ,
|
|
|
c.district_name districtName,c.user_names userNames,c.secondary_type ,c.secondary_type_other,c.attachment_url,
|
|
|
c.duration,pr.plan,pro.contract_no sonContractNo,
|
|
|
d.id detId,d.`type` detType,d.amount,d.real_amount realAmount ,d.start_district ,d.end_district,d.vehicle,d.vehicle_other,
|
|
|
- d.pay_type ,d.invoice_type ,d.invoice_no,d.payer_name ,d.open_bank ,d.bank_accounts ,d.open_bank_address,
|
|
|
+ d.pay_type ,d.invoice_type ,d.invoice_no,d.payer_name ,d.open_bank ,d.bank_accounts ,d.open_bank_address,d.type_other detTypeOther,
|
|
|
date_format(d.start_time,'%Y-%m-%d %H:%i:%S')startTime,date_format(d.end_time,'%Y-%m-%d %H:%i:%S')endTime,
|
|
|
date_format(d.agree_time,'%Y-%m-%d')agreeTime
|
|
|
from expense_relationship a left join expense_account b on a.id =b.id
|
|
|
@@ -792,6 +792,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="type_other" jdbcType="VARCHAR" property="typeOther" />
|
|
|
<result column="total_amount" jdbcType="DECIMAL" property="totalAmount" />
|
|
|
<result column="real_amount" jdbcType="DECIMAL" property="realAmount" />
|
|
|
<result column="order_no" jdbcType="VARCHAR" property="orderNo" />
|
|
|
@@ -816,8 +817,8 @@
|
|
|
<resultMap id="SonExpenseAccountMap" type="com.goafanti.expenseAccount.bo.SonExpenseAccount">
|
|
|
<id column="sonId" jdbcType="INTEGER" property="id" />
|
|
|
<result column="sonAmount" jdbcType="DECIMAL" property="totalAmount" />
|
|
|
- <result column="type" jdbcType="INTEGER" property="type" />
|
|
|
- <result column="type_other" jdbcType="VARCHAR" property="typeOther" />
|
|
|
+ <result column="sonType" jdbcType="INTEGER" property="type" />
|
|
|
+ <result column="sonTypeOther" jdbcType="VARCHAR" property="typeOther" />
|
|
|
<result column="secondary_type" jdbcType="INTEGER" property="secondaryType" />
|
|
|
<result column="secondary_type_other" jdbcType="INTEGER" property="secondaryTypeOther" />
|
|
|
<result column="attachment_url" jdbcType="INTEGER" property="attachmentUrl" />
|
|
|
@@ -834,6 +835,7 @@
|
|
|
<resultMap id="ExpenseAccountDetailsMap" type="com.goafanti.expenseAccount.bo.SonExpenseAccountDetails">
|
|
|
<id column="detId" jdbcType="INTEGER" property="id" />
|
|
|
<result column="detType" jdbcType="INTEGER" property="type" />
|
|
|
+ <result column="detTypeOther" jdbcType="INTEGER" property="typeOther" />
|
|
|
<result column="amount" jdbcType="DECIMAL" property="amount" />
|
|
|
<result column="start_district" jdbcType="VARCHAR" property="startDistrict" />
|
|
|
<result column="end_district" jdbcType="VARCHAR" property="endDistrict" />
|
|
|
@@ -915,6 +917,7 @@
|
|
|
<foreach collection="deps" item="dep" open="(" close=")" separator=",">
|
|
|
#{dep}
|
|
|
</foreach>
|
|
|
+ order by a.status ,a.create_time desc
|
|
|
</if>
|
|
|
${page_sql}
|
|
|
</select>
|
|
|
@@ -1050,5 +1053,11 @@
|
|
|
#{id}
|
|
|
</foreach>
|
|
|
</select>
|
|
|
+ <select id="selectAllMain" resultMap="BaseResultMap">
|
|
|
+ select
|
|
|
+ <include refid="Base_Column_List" />
|
|
|
+ from expense_account
|
|
|
+ where expense_main=1
|
|
|
+ </select>
|
|
|
|
|
|
</mapper>
|