Skip to content

T
traffic-front
Commit 50c786df authored by Eddie.Wu's avatar Eddie.Wu
Browse files
Options

Merge branch 'dev_mysql_chase_bug_1' into 'dev_mysql' 

fix bug

See merge request root/atms!443
parents d295d6fc 22508b10
Hide whitespace changes
Inline Side-by-side
Showing with 71 additions and 70 deletions
atms-dao/src/main/resources/pwc/taxtech/atms/vat/dao/extends/TrialBalanceFinalExtendsMapper.xml
View file @ 50c786df
...@@ -3,78 +3,79 @@ ...@@ -3,78 +3,79 @@
<mapper namespace="pwc.taxtech.atms.vat.dao.TrialBalanceFinalMapper"> <mapper namespace="pwc.taxtech.atms.vat.dao.TrialBalanceFinalMapper">
<select id="queryBalanceWithRevenueConfig" resultType="pwc.taxtech.atms.dpo.RevenueDetailDto"> <select id="queryBalanceWithRevenueConfig" resultType="pwc.taxtech.atms.dpo.RevenueDetailDto">
select detail.* select detail.*
from ( from (
select tbf.segment1 as subject, select tbf.segment1 as subject,
tbf.segment3 as account, tbf.segment3 as account,
tbf.segment5 profitCenter, tbf.segment5 profitCenter,
tbf.segment6 product, tbf.segment6 product,
tbf.segment1_name subjectExplain, tbf.segment1_name subjectExplain,
tbf.segment3_name accountExplain, tbf.segment3_name accountExplain,
tbf.segment5_name profitCenterExplain, tbf.segment5_name profitCenterExplain,
tbf.segment6_name productExplain, tbf.segment6_name productExplain,
tbf.period_cr_beq - tbf.period_dr_beq amount, tbf.period_cr_beq - tbf.period_dr_beq amount,
rc.name type, rc.name type,
rc.revenue_type category, rc.revenue_type category,
rc.tax_type taxOn, rc.tax_type taxOn,
case case
when tbf.segment3 like '4001%' and rc.id is null then 1 when tbf.segment3 like '4001%' and rc.id is null then 1
when tbf.segment3 like '4002%' and rc.id is null then 1 when tbf.segment3 like '4002%' and rc.id is null then 1
when tbf.segment3 like '4010%' and rc.id is null then 1 when tbf.segment3 like '4010%' and rc.id is null then 1
when tbf.segment3 like '800201%' and rc.id is null then 1 when tbf.segment3 like '800201%' and rc.id is null then 1
when tbf.segment3 like '800209%' and rc.id is null then 1 when tbf.segment3 like '800209%' and rc.id is null then 1
<![CDATA[WHEN rc.id IS NOT NULL and (rc.start_date > #{queryDate} or rc.end_date < #{queryDate}) then 1]]> <![CDATA[WHEN rc.id IS NOT NULL and rc.start_date <= #{queryDate} and rc.end_date >= #{queryDate} THEN 2]]>
<![CDATA[WHEN rc.id IS NOT NULL and rc.start_date <= #{queryDate} and rc.end_date >= #{queryDate} THEN 2]]> else 3 end as emptyCode
else 3 end as emptyCode from trial_balance_final as tbf
from trial_balance_final as tbf left join
left join revenue_config as rc
revenue_config as rc on
on rc.org_id = tbf.organization_id
rc.org_id = tbf.organization_id and
and rc.tb_segment3 = tbf.segment3
rc.tb_segment3 = tbf.segment3 and
and rc.tb_segment5 = tbf.segment5
rc.tb_segment5 = tbf.segment5 and
and rc.tb_segment6 = tbf.segment6
rc.tb_segment6 = tbf.segment6 <![CDATA[ and rc.start_date <= #{queryDate}]]>
where and rc.end_date >= #{queryDate}
tbf.project_id = #{projectId} where
and tbf.period = #{period} tbf.project_id = #{projectId}
<if test="accountCode != null and accountCode != ''"> and tbf.period = #{period}
and tbf.segment3 like concat('%',#{accountCode},'%') <if test="accountCode != null and accountCode != ''">
</if> and tbf.segment3 like concat('%',#{accountCode},'%')
<if test="accountName != null and accountName != ''"> </if>
and tbf.segment3_name like concat('%',#{accountName},'%') <if test="accountName != null and accountName != ''">
</if> and tbf.segment3_name like concat('%',#{accountName},'%')
<if test="profitCenterCode != null and profitCenterCode != ''"> </if>
and tbf.segment5 like concat('%',#{profitCenterCode},'%') <if test="profitCenterCode != null and profitCenterCode != ''">
</if> and tbf.segment5 like concat('%',#{profitCenterCode},'%')
<if test="profitCenterName != null and profitCenterName != ''"> </if>
and tbf.segment5_name like concat('%',#{profitCenterName},'%') <if test="profitCenterName != null and profitCenterName != ''">
</if> and tbf.segment5_name like concat('%',#{profitCenterName},'%')
<if test="productCode != null and productCode != ''"> </if>
and tbf.segment6 like concat('%',#{productCode},'%') <if test="productCode != null and productCode != ''">
</if> and tbf.segment6 like concat('%',#{productCode},'%')
<if test="productName != null and productName != ''"> </if>
and tbf.segment6_name like concat('%',#{productName},'%') <if test="productName != null and productName != ''">
</if> and tbf.segment6_name like concat('%',#{productName},'%')
<if test="type != null"> </if>
and rc.name = #{type} <if test="type != null">
</if> and rc.name = #{type}
<if test="category != null"> </if>
and rc.revenue_type = #{category} <if test="category != null">
</if> and rc.revenue_type = #{category}
<if test="taxOn != null"> </if>
and rc.tax_type = #{taxOn} <if test="taxOn != null">
</if> and rc.tax_type = #{taxOn}
) as detail </if>
where ) as detail
<![CDATA[detail.emptyCode < 3]]> where
order by detail.emptyCode <![CDATA[detail.emptyCode < 3]]>
order by detail.emptyCode
</select> </select>
<select id="queryGenerateFinalData" resultMap="BaseResultMap"> <select id="queryGenerateFinalData" resultMap="BaseResultMap">
select select
balance.id, balance.id,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment