fix bug

atms-dao/src/main/resources/pwc/taxtech/atms/vat/dao/extends/TrialBalanceFinalExtendsMapper.xml

@@ -3,78 +3,79 @@
 <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.*
-    from (
-    select tbf.segment1 as   subject,
-    tbf.segment3 as   account,
-    tbf.segment5      profitCenter,
-    tbf.segment6      product,
-    tbf.segment1_name subjectExplain,
-    tbf.segment3_name accountExplain,
-    tbf.segment5_name profitCenterExplain,
-    tbf.segment6_name productExplain,
-    tbf.period_cr_beq - tbf.period_dr_beq     amount,
-    rc.name           type,
-    rc.revenue_type   category,
-    rc.tax_type       taxOn,
-    case
-    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 '4010%' 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
-    <![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]]>
-    else 3 end as   emptyCode
-    from trial_balance_final as tbf
-    left join
-    revenue_config as rc
-    on
-    rc.org_id = tbf.organization_id
-    and
-    rc.tb_segment3 = tbf.segment3
-    and
-    rc.tb_segment5 = tbf.segment5
-    and
-    rc.tb_segment6 = tbf.segment6
-    where
-    tbf.project_id = #{projectId}
-    and tbf.period = #{period}
-    <if test="accountCode != null and accountCode != ''">
-    and tbf.segment3 like concat('%',#{accountCode},'%')
-    </if>
-    <if test="accountName != null and accountName != ''">
-    and tbf.segment3_name like concat('%',#{accountName},'%')
-    </if>
-    <if test="profitCenterCode != null and profitCenterCode != ''">
-    and tbf.segment5  like concat('%',#{profitCenterCode},'%')
-    </if>
-    <if test="profitCenterName != null and profitCenterName != ''">
-    and tbf.segment5_name like concat('%',#{profitCenterName},'%')
-    </if>
-    <if test="productCode != null and productCode != ''">
-    and tbf.segment6  like concat('%',#{productCode},'%')
-    </if>
-    <if test="productName != null and productName != ''">
-    and tbf.segment6_name like concat('%',#{productName},'%')
-    </if>
-    <if test="type != null">
-    and rc.name = #{type}
-    </if>
-    <if test="category != null">
-    and rc.revenue_type = #{category}
-    </if>
-    <if test="taxOn != null">
-    and rc.tax_type = #{taxOn}
-    </if>
-    ) as detail
-    where
-    <![CDATA[detail.emptyCode < 3]]>
-    order by detail.emptyCode
+        select detail.*
+        from (
+        select tbf.segment1 as   subject,
+        tbf.segment3 as   account,
+        tbf.segment5      profitCenter,
+        tbf.segment6      product,
+        tbf.segment1_name subjectExplain,
+        tbf.segment3_name accountExplain,
+        tbf.segment5_name profitCenterExplain,
+        tbf.segment6_name productExplain,
+        tbf.period_cr_beq - tbf.period_dr_beq     amount,
+        rc.name           type,
+        rc.revenue_type   category,
+        rc.tax_type       taxOn,
+        case
+        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 '4010%' 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
+        <![CDATA[WHEN rc.id IS NOT NULL and rc.start_date <= #{queryDate} and rc.end_date >= #{queryDate} THEN 2]]>
+        else 3 end as   emptyCode
+        from trial_balance_final as tbf
+        left join
+        revenue_config as rc
+        on
+        rc.org_id = tbf.organization_id
+        and
+        rc.tb_segment3 = tbf.segment3
+        and
+        rc.tb_segment5 = tbf.segment5
+        and
+        rc.tb_segment6 = tbf.segment6
+        <![CDATA[ and rc.start_date <= #{queryDate}]]>
+        and rc.end_date >= #{queryDate}
+        where
+        tbf.project_id = #{projectId}
+        and tbf.period = #{period}
+        <if test="accountCode != null and accountCode != ''">
+            and tbf.segment3 like concat('%',#{accountCode},'%')
+        </if>
+        <if test="accountName != null and accountName != ''">
+            and tbf.segment3_name like concat('%',#{accountName},'%')
+        </if>
+        <if test="profitCenterCode != null and profitCenterCode != ''">
+            and tbf.segment5  like concat('%',#{profitCenterCode},'%')
+        </if>
+        <if test="profitCenterName != null and profitCenterName != ''">
+            and tbf.segment5_name like concat('%',#{profitCenterName},'%')
+        </if>
+        <if test="productCode != null and productCode != ''">
+            and tbf.segment6  like concat('%',#{productCode},'%')
+        </if>
+        <if test="productName != null and productName != ''">
+            and tbf.segment6_name like concat('%',#{productName},'%')
+        </if>
+        <if test="type != null">
+            and rc.name = #{type}
+        </if>
+        <if test="category != null">
+            and rc.revenue_type = #{category}
+        </if>
+        <if test="taxOn != null">
+            and rc.tax_type = #{taxOn}
+        </if>
+        ) as detail
+        where
+        <![CDATA[detail.emptyCode < 3]]>
+        order by detail.emptyCode
 
-  </select>
+    </select>
   <select id="queryGenerateFinalData" resultMap="BaseResultMap">
 select
        balance.id,