Merge branches '0613-入账发票数据才可以认证' 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

@@ -518,6 +518,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>

dxhy-core/src/main/java/com/dxhy/core/thread/ManualAthensThread.java

@@ -140,6 +140,7 @@ public class ManualAthensThread extends BaseThread {
                 String gfsh = prams.getString("gfsh");
                 String fpzt = prams.getString("invoiceStatus");
                 String invoiceType = prams.getString("invoiceType");
+                String invoiceNo = prams.getString("invoiceNo");
                 String qszt = prams.getString("qszt");
                 String qsr = prams.getString("qsr");
                 String qsfs = prams.getString("qsfs");
@@ -224,6 +225,7 @@ public class ManualAthensThread extends BaseThread {
                 pramsMap.put("inAccountStatus", inAccountStatus);
                 pramsMap.put("company", company);
                 pramsMap.put("invoiceSource",prams.getString("invoiceSource"));
+                pramsMap.put("invoiceNo",invoiceNo);
                 pramsMap.put("companyCodes",companyCodes);
                 pramsMap.put("companyCode",companyCode);
                 pramsMap.put("snVoucherNumber", prams.getString("snVoucherNumber"));