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

 Conflicts:

	dxhy-oss/src/main/java/com/dxhy/oss/service/FtpService.java

	dxhy-oss/src/main/java/com/dxhy/oss/service/SshService.java

	dxhy-oss/src/main/java/com/dxhy/oss/service/impl/FileServiceImpl.java

	dxhy-oss/src/main/java/com/dxhy/oss/utils/SftpConfig.java

	dxhy-oss/src/main/java/com/dxhy/oss/utils/SftpProperties.java

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

@@ -508,6 +508,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-oss/src/main/java/com/dxhy/oss/service/FtpService.java

@@ -13,6 +13,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 @Slf4j
+@Service
 public class FtpService {
 
     private final SftpPool pool;

dxhy-oss/src/main/java/com/dxhy/oss/service/SshService.java

@@ -15,6 +15,7 @@ import java.nio.file.Files;
  * @author jiaohongyang
  */
 @Slf4j
+@Service
 public class SshService {
 
     private final SshPool pool;

dxhy-oss/src/main/java/com/dxhy/oss/service/impl/FileServiceImpl.java

@@ -199,7 +199,7 @@ public class FileServiceImpl implements FileService {
             FileInputStream fis = null;
             FileOutputStream fos = null;
             try {
-                File download = new File(downloadFile);
+                File download = new File(downloadFile.substring(0, downloadFile.lastIndexOf("/")));
                 fis = new FileInputStream(download);
                 fos = new FileOutputStream(file);
                 //复制文件
@@ -210,7 +210,7 @@ public class FileServiceImpl implements FileService {
                 fos.flush();
                 b = true;
             } catch (IOException e) {
-                log.error("本地导出异常：{}",e);
+                e.printStackTrace();
             }finally {
                 try {
                     if(fis != null){fis.close();}

dxhy-oss/src/main/java/com/dxhy/oss/utils/SftpConfig.java

@@ -1,7 +1,6 @@
 package com.dxhy.oss.utils;
 
 import com.dxhy.oss.service.FtpService;
-import com.dxhy.oss.service.SshService;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

dxhy-oss/src/main/java/com/dxhy/oss/utils/SftpProperties.java

@@ -1,5 +1,6 @@
 package com.dxhy.oss.utils;
 
+import com.jcraft.jsch.ChannelSftp;
 import lombok.Data;
 import org.apache.commons.net.ftp.FTPClient;
 import org.apache.commons.pool2.impl.GenericObjectPoolConfig;