Merge branches '0625-发票入库时存储整数税率' and 'test' of http://192.168.12.182/invoice/pt into test

 Conflicts:

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

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

@@ -77,6 +77,7 @@
         and t.rzh_yesorno = '0'
         and t.auth_status in('0','5','6')
         and t.export_mark = '0'
+        and t.inaccount_status = '1'
         and t.company = #{company}
         <if test="sfkrz != '99' and sfkrz != null and sfkrz != '' and sfkrz != 'null' and sfkrz == '1'.toString()">
             and t.invoice_status in ('0','7')
@@ -136,7 +137,7 @@
             and t.bzdh = #{bzdh}
         </if>
         <if test=" bzdh == ''">
-            and t.bzdh is not null and t.inaccount_status = '1'
+            and t.bzdh is not null
         </if>
         <if test="inAccountStatus != null and inAccountStatus != '' and inAccountStatus != 'null' and inAccountStatus != '99' and inAccountStatus == '1'.toString()">
             and t.inaccount_status = #{inAccountStatus}
@@ -219,12 +220,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>-->
@@ -517,6 +512,9 @@
         <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
+        </if>
         <if test="inAccountStatus != null and inAccountStatus != '' and inAccountStatus != 'null' and inAccountStatus != '99' and inAccountStatus == '1'.toString()">
             and t.inaccount_status = #{inAccountStatus}
         </if>
@@ -1414,12 +1412,12 @@
         <if test="eleInvoiceNo!=null and eleInvoiceNo!='' and eleInvoiceNo!='null'">
             and t.ele_invoice_no = #{eleInvoiceNo}
         </if>
-        <if test="taxRate!=null and taxRate!='' and taxRate != null and taxRate !='99'">
+        <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="taxRate=='多税率'">
+            and t.tax_rate like '%,%'
+        </if>
 
     </select>
     <select id="selectRzhAllHj" parameterType="java.util.Map"

dxhy-erp/src/main/java/com/dxhy/erp/service/SNPushCheckRecordService.java

@@ -617,20 +617,20 @@ public class SNPushCheckRecordService extends AbstractServiceAdapter {
                                     int index = taxRateDetail.indexOf("%");
                                     if (index > 0) {
                                         taxRateDetail = taxRateDetail.substring(0, taxRateDetail.length() - 1);
-                                        Float num = Float.parseFloat(taxRateDetail);
-                                        if (num > 9) {
-                                            taxRateDetail = "0." + taxRateDetail;
-                                        } else {
-                                            if (!taxRateDetail.startsWith("0")) {
-                                                taxRateDetail = "0.0" + taxRateDetail;
-                                            }
-                                        }
+//                                        Float num = Float.parseFloat(taxRateDetail);
+//                                        if (num > 9) {
+//                                            taxRateDetail = "0." + taxRateDetail;
+//                                        } else {
+//                                            if (!taxRateDetail.startsWith("0")) {
+//                                                taxRateDetail = "0.0" + taxRateDetail;
+//                                            }
+//                                        }
                                     }
                                 }
                             }
 
                             if ("11".equals(invoiceType)) {
-                                taxRateDetail = "0.000";
+                                taxRateDetail = "0";
                             }
                             log.info("明细-发票税率为:{}", taxRateDetail);
                             snDetailMap.put("taxRate", taxRateDetail);