综合查询导出添加条件

release
yishiqihuasheng 2 years ago
parent cb253f0e0d
commit 529c7629c7
  1. 4
      dxhy-core/src/main/resources/mapper/BbfpzhmxMapper.xml
  2. 5
      dxhy-core/src/main/resources/mapper/BbfpzhslMapper.xml

@ -30,7 +30,7 @@
<result column="sl" property="sl"/>
<result column="bz" property="bz"/>
<result column="uuid" property="uuid"/>
<result column="in_account_status" property="inAccountStatus"/>
<result column="inaccount_status" property="inAccountStatus"/>
<result column="cph" property="cph"/>
<result column="lx" property="lx"/>
<result column="txrqq" property="txrqq"/>
@ -47,7 +47,7 @@
xfkhhzh,t.tax_amount,t.invoice_amount,t.rzh_belong_date skssq,
t.total_amount jshj,t.remark bz,t.uuid,b.goods_name hlmc,b.model ggxh,b.unit dw,b.num num,b.unit_price
dj,b.detail_amount je,b.tax_amount se,b.tax_rate sl,
t.in_account_status,b.cph,b.lx,b.txrqq,b.txrqz
t.inaccount_status,b.cph,b.lx,b.txrqq,b.txrqz
from
${dxhyTertiary}.t_dx_record_invoice t
left JOIN ${dxhyDetail}.t_dx_record_invoice_detail b ON t.uuid = b.uuid

@ -11,7 +11,7 @@
<result column="invoiceAmount" property="invoiceAmount"/>
<result column="taxAmount" property="taxAmount"/>
<result column="taxRate" property="sl"/>
<result column="in_account_status" property="inAccountStatus"/>
<result column="inaccount_status" property="inAccountStatus"/>
</resultMap>
<select id="selectByPramsMap" parameterType="java.util.Map"
@ -23,13 +23,14 @@
case when tdis.detail_amount is null then t.invoice_amount else tdis.detail_amount end as invoiceAmount,
case when tdis.tax_amount is null then t.tax_amount else tdis.tax_amount end as taxAmount,
tdis.tax_rate taxRate,
t.in_account_status
t.inaccount_status
from t_dx_record_invoice t
left join t_dx_record_invoice_statistics tdis
<!--on t.invoice_code = tdis.invoice_code and t.invoice_no = tdis.invoice_no-->
on t.invoice_no = tdis.invoice_no
where
t.invoice_date between #{kpksrq} and #{kpjsrq}
and t.company = #{company}
and t.gf_tax_no in
<foreach collection="gfsh" index="index" item="item" open="(" separator="," close=")">
#{item}

Loading…
Cancel
Save