Merge branch '0613-入账发票数据才可以认证' of http://192.168.12.182/invoice/pt into test

 Conflicts:

	dxhy-core/src/main/resources/mapper/FpZhMapper.xml

dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml

@@ -105,13 +105,12 @@
 <!--            #{companyCode}-->
 <!--        </foreach>-->
         <if test="companyCode != null and companyCode != '' and companyCode != 'null' and companyCode == '99'">
-            and (t.comp_code in
+            and t.comp_code in
             <foreach collection="companyCodes" index="index" item="companyCode" separator="," open="(" close=")">
                 #{companyCode}
             </foreach>
-            or t.comp_code is null or t.comp_code = ''
-            )
         </if>
+        <!--or t.comp_code is null or t.comp_code = ''-->
         <if test="companyCode != null and companyCode != '99' and companyCode != '88' and companyCode != '' and companyCode != 'null'" >
             and t.comp_code = #{companyCode}
         </if>

dxhy-core/src/main/resources/mapper/FpZhMapper.xml

@@ -258,12 +258,6 @@
         <if test="accountPeriod != null and accountPeriod != '' and accountPeriod != 'null' and accountPeriod != '99'">
             and t.account_period = #{accountPeriod}
         </if>
-        <if test="taxRate!=null and taxRate!='' and taxRate!='多税率' and taxRate != null and taxRate !='99'">
-            and t.tax_rate = #{taxRate}
-        </if>
-        <if test="taxRate=='多税率'">
-            and t.tax_rate like '%,%'
-        </if>
         order by t.rzh_date desc,t.invoice_date desc
     </select>
     <select id="selectByPramsMap" parameterType="java.util.Map"
@@ -610,12 +604,14 @@
         <!--            #{companyCode}-->
         <!--        </foreach>-->
         <if test="companyCode != null and companyCode != '' and companyCode != 'null' and companyCode == '99'">
-            and t.comp_code in
+            and (t.comp_code in
             <foreach collection="companyCodes" index="index" item="companyCode" separator="," open="(" close=")">
                 #{companyCode}
             </foreach>
+            or t.comp_code is null or t.comp_code = ''
+            )
         </if>
-        <!--or t.comp_code is null or t.comp_code = '' -->
+
         <if test="companyCode != null and companyCode != '99' and companyCode != '88' and companyCode != '' and companyCode != 'null'" >
             and t.comp_code = #{companyCode}
         </if>
@@ -628,9 +624,6 @@
         <if test="bzdh != null and bzdh != '' and bzdh != 'null' and bzdh != '99'">
             and t.bzdh = #{bzdh}
         </if>
-        <if test="bzdh == null or bzdh == '' or bzdh == 'null' or bzdh == '99'">
-            and t.bzdh is not null and t.inaccount_status = '1'
-        </if>
         <if test="bzr != null and bzr != '' and bzr != 'null'">
             and t.bzr like concat('%',#{bzr},'%')
         </if>
@@ -724,12 +717,6 @@
         <if test="accountPeriod != null and accountPeriod != '' and accountPeriod != 'null' and accountPeriod != '99'">
             and t.account_period = #{accountPeriod}
         </if>
-        <if test="taxRate!=null and taxRate!='' and taxRate!='多税率' and taxRate != null and taxRate !='99'">
-            and t.tax_rate = #{taxRate}
-        </if>
-        <if test="taxRate=='多税率'">
-            and t.tax_rate like '%,%'
-        </if>
         <if test="qsksrq != null and qsksrq != '' and qsksrq != 'null' and qsjsrq != null and qsjsrq != '' and qsjsrq != 'null'">
             order by t.qs_date desc,t.invoice_date desc
         </if>