|
|
|
@ -19,6 +19,7 @@ import com.dxhy.oss.service.FileService; |
|
|
|
|
|
|
|
|
|
import cn.hutool.core.date.DateUtil; |
|
|
|
|
import lombok.extern.slf4j.Slf4j; |
|
|
|
|
import org.apache.commons.lang.StringUtils; |
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
* @author user |
|
|
|
@ -168,17 +169,21 @@ public class PoolOtherThread extends BaseThread { |
|
|
|
|
ftpFileName.append(fileSplit); |
|
|
|
|
if ("99".equals(gfTaxNo)) { |
|
|
|
|
if (gfshList.size() > 0) { |
|
|
|
|
if (StringUtils.isNotEmpty(gfshList.get(0))){ |
|
|
|
|
ftpFileName.append(poolPaperService.getblocName(gfshList.get(0))); |
|
|
|
|
ftpFileName.append(fileSplit); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
} else { |
|
|
|
|
if (gfshList.size() > 0) { |
|
|
|
|
for (String s : gfshList) { |
|
|
|
|
if (StringUtils.isNotEmpty(s)){ |
|
|
|
|
ftpFileName.append(poolPaperService.getGfName(s)); |
|
|
|
|
ftpFileName.append(fileSplit); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
ftpFileName.append(DateUtils.getNowTimeStamp()); |
|
|
|
|
title = ftpFileName.toString(); |
|
|
|
|