Commit 2653d1c7 authored by hongguangwu's avatar hongguangwu

Merge branch 'MVP1.6.5' into MVP1.6.6

parents 76d27c93 5168041d
......@@ -611,8 +611,8 @@ public class TSocialSoldierServiceImpl extends ServiceImpl<TSocialSoldierMapper,
pathName = pathName + pname;
File file = new File(pathName);
FileUtils.copyInputStreamToFile(inputStream, file);
/*String fileName = System.currentTimeMillis() + "_" + file.getName();
boolean flag = ossUtil.uploadFileByFile(file, fileName, null);*/
/*String fileName = System.currentTimeMillis() + "_" + file.getName()
boolean flag = ossUtil.uploadFileByFile(file, fileName, null)*/
zipFile = new ZipFile(file, CharsetUtil.CHARSET_GBK);
Enumeration<?> entries = zipFile.entries();
......@@ -790,7 +790,8 @@ public class TSocialSoldierServiceImpl extends ServiceImpl<TSocialSoldierMapper,
// 如果是文件夹,就创建个文件夹
if (!entry.isDirectory()) {
name = entry.getName();
if (Common.isNotNull(name) && (name.endsWith(".xls") || name.endsWith(".xlsx")) && (name.contains("全部") || name.contains("汇总"))) {
if (Common.isNotNull(name) && (name.endsWith(".xls") || name.endsWith(".xlsx")) &&
((type != 2 && (name.contains("全部") || name.contains("汇总"))) || (type == 2 && name.contains("单位个人缴费信息")))) {
is = zipFile.getInputStream(entry);
workbook = WorkbookFactory.create(is);
sheet = workbook.getSheetAt(0);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment