diff --git a/dxhy-base/src/main/java/com/dxhy/base/service/tdxrecordinvoice/BaseRzTDxRecordInvoiceServiceImpl.java b/dxhy-base/src/main/java/com/dxhy/base/service/tdxrecordinvoice/BaseRzTDxRecordInvoiceServiceImpl.java index c6477147..67f3d18f 100644 --- a/dxhy-base/src/main/java/com/dxhy/base/service/tdxrecordinvoice/BaseRzTDxRecordInvoiceServiceImpl.java +++ b/dxhy-base/src/main/java/com/dxhy/base/service/tdxrecordinvoice/BaseRzTDxRecordInvoiceServiceImpl.java @@ -249,14 +249,17 @@ public class BaseRzTDxRecordInvoiceServiceImpl extends MpBaseServiceImpl taxList = new ArrayList<>(); List orgList = new ArrayList<>(); List dkList = new ArrayList<>(); @@ -267,6 +270,11 @@ public class BaseRzTDxRecordInvoiceServiceImpl extends MpBaseServiceImpl curMap = new HashMap<>(); List shList = new ArrayList<>(); shList.add(recordInvoice.getGfTaxNo()); @@ -390,6 +398,9 @@ public class BaseRzTDxRecordInvoiceServiceImpl extends MpBaseServiceImpl and t.bzdh = #{bzdh} + + and t.bzdh is not null + and t.inaccount_status = #{inAccountStatus} diff --git a/dxhy-oss/src/main/java/com/dxhy/oss/service/FtpService.java b/dxhy-oss/src/main/java/com/dxhy/oss/service/FtpService.java index 2e842804..de591237 100644 --- a/dxhy-oss/src/main/java/com/dxhy/oss/service/FtpService.java +++ b/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; diff --git a/dxhy-oss/src/main/java/com/dxhy/oss/service/SshService.java b/dxhy-oss/src/main/java/com/dxhy/oss/service/SshService.java index 5f371227..d1d63331 100644 --- a/dxhy-oss/src/main/java/com/dxhy/oss/service/SshService.java +++ b/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; diff --git a/dxhy-oss/src/main/java/com/dxhy/oss/service/impl/FileServiceImpl.java b/dxhy-oss/src/main/java/com/dxhy/oss/service/impl/FileServiceImpl.java index 81b3b839..fc6d6563 100644 --- a/dxhy-oss/src/main/java/com/dxhy/oss/service/impl/FileServiceImpl.java +++ b/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();} diff --git a/dxhy-oss/src/main/java/com/dxhy/oss/utils/SftpConfig.java b/dxhy-oss/src/main/java/com/dxhy/oss/utils/SftpConfig.java index 603752ca..9dba4130 100644 --- a/dxhy-oss/src/main/java/com/dxhy/oss/utils/SftpConfig.java +++ b/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; diff --git a/dxhy-oss/src/main/java/com/dxhy/oss/utils/SftpProperties.java b/dxhy-oss/src/main/java/com/dxhy/oss/utils/SftpProperties.java index adafac69..912e9296 100644 --- a/dxhy-oss/src/main/java/com/dxhy/oss/utils/SftpProperties.java +++ b/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;