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

dxhy-base/src/main/java/com/dxhy/base/service/tdxrecordinvoice/BaseRzTDxRecordInvoiceServiceImpl.java

@@ -249,14 +249,17 @@ public class BaseRzTDxRecordInvoiceServiceImpl extends MpBaseServiceImpl<BaseTDx
         StringBuilder sb1 = new StringBuilder();
         StringBuilder sb2 = new StringBuilder();
         StringBuilder sb3 = new StringBuilder();
+        StringBuilder sb4 = new StringBuilder();
         boolean flag = false;
         boolean flag1 = false;
         boolean flag2 = false;
         boolean flag3 = false;
+        boolean flag4 = false;//只有同步报账信息的发票才可以认证
         sb.append("以下发票号码的抵扣税额大于税额不可勾选认证： \n ");
         sb1.append("以下税号已被锁定不可勾选认证： \n ");
         sb2.append("以下税号已申请抵扣统计，请撤销统计后重新操作： \n ");
         sb3.append("以下税号本月发票可认证总税额超限：\n");
+        sb4.append("以下发票号码的报账信息没有同步：\n");
         List<String> taxList = new ArrayList<>();
         List<String> orgList = new ArrayList<>();
         List<String> dkList = new ArrayList<>();
@@ -267,6 +270,11 @@ public class BaseRzTDxRecordInvoiceServiceImpl extends MpBaseServiceImpl<BaseTDx
                 queryWrapper1.eq("uuid", uuidArray[i]);
                 DynamicContextHolder.push(pramsMap.get("dbName") + DbConstant.BUSINESS_READ);
                 BaseTDxRecordInvoice recordInvoice = this.baseMapper.selectOne(queryWrapper1);
+                if(StringUtils.isEmpty(recordInvoice.getBzdh())){
+                    flag4 = true;
+                    sb4.append(recordInvoice.getUuid()).append(" \n ");
+                    continue;
+                }
                 Map<String, Object> curMap = new HashMap<>();
                 List<String> shList = new ArrayList<>();
                 shList.add(recordInvoice.getGfTaxNo());
@@ -390,6 +398,9 @@ public class BaseRzTDxRecordInvoiceServiceImpl extends MpBaseServiceImpl<BaseTDx
         if (flag3) {
             message = message + sb3.toString();
         }
+        if(flag4) {
+            message = message + sb4.toString();
+        }
         json.put("message", message);
         rzts = String.valueOf(cgsl);
         json.put("rzts", rzts);

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>
@@ -136,6 +135,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 and t.inaccount_status = '1'
+        </if>
         <if test="inAccountStatus != null and inAccountStatus != '' and inAccountStatus != 'null' and inAccountStatus != '99' and inAccountStatus == '1'.toString()">
             and t.inaccount_status = #{inAccountStatus}
         </if>
@@ -509,6 +511,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"));

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

@@ -605,14 +605,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>