|
|
@@ -671,7 +671,7 @@
|
|
|
select a.aid,a.aname ,a.type,a.status ,a.total_amount totalAmount ,ifnull(a.debit_id,0) debitId ,a.target_type targetType ,ifnull(a2.total_amount,0) bxdkAmount
|
|
|
from expense_account a
|
|
|
left join expense_account a2 on a.debit_id =a2.id left join admin ad on a.aid=ad.id
|
|
|
- where 1=1
|
|
|
+ where 1=1 and a.expense_main=0
|
|
|
<if test="name != null">
|
|
|
and a.aname like concat('%',#{name},'%')
|
|
|
</if>
|
|
|
@@ -723,7 +723,7 @@
|
|
|
select b.id,b.check_no,b.total_amount,b.order_no,o.contract_no,b.aname,b.apply_dep,b.pay_dep,
|
|
|
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.district_name districtName,c.user_names userNames
|
|
|
+ c.district_name districtName,c.user_names userNames,
|
|
|
d.id detId,d.`type` detType,d.amount,d.real_amount realAmount ,d.start_district ,d.end_district
|
|
|
from expense_relationship a left join expense_account b on a.id =b.id
|
|
|
left join department dep on b.apply_dep =dep.id left join department dep2 on b.pay_dep =dep2.id
|
|
|
@@ -759,7 +759,6 @@
|
|
|
<association property="sonList" resultMap="SonExpenseAccountMap"></association>
|
|
|
</resultMap>
|
|
|
|
|
|
-<!--c.total_amount sonAmount,c.`type` ,c.type_other ,c.user_names ,c.release_start ,c.release_end ,-->
|
|
|
<resultMap id="SonExpenseAccountMap" type="com.goafanti.expenseAccount.bo.SonExpenseAccount">
|
|
|
<id column="sonId" jdbcType="INTEGER" property="id" />
|
|
|
<result column="sonAmount" jdbcType="DECIMAL" property="totalAmount" />
|
|
|
@@ -771,7 +770,7 @@
|
|
|
<result column="districtName" jdbcType="VARCHAR" property="districtName" />
|
|
|
<association property="detList" resultMap="ExpenseAccountDetailsMap"></association>
|
|
|
</resultMap>
|
|
|
-<!--d.`type` detType,d.amount ,d.start_district ,d.end_district-->
|
|
|
+
|
|
|
<resultMap id="ExpenseAccountDetailsMap" type="com.goafanti.expenseAccount.bo.SonExpenseAccountDetails">
|
|
|
<id column="detId" jdbcType="INTEGER" property="id" />
|
|
|
<result column="detType" jdbcType="INTEGER" property="type" />
|