FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev_20230216' into dev_20230216

Browse Source
This commit is contained in:
gaojiabao
2023-03-22 13:50:15 +08:00
parent 23659c18a7 1e23919f46
commit 19d7befd82
1 changed files with 19 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java
+19 -14
View File
@@ -2043,6 +2043,7 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
}
//将文件写入到指定路径中
FileUtils.copyInputStreamToFile(file.getInputStream(),new File(path + "/" + fileNameStr));
int countSuccess = 0;
try {
//解压缩
String zipEntryName = FileUnZip.unZipFiles(path + "/" + fileNameStr, path);
@@ -2233,21 +2234,23 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
sarBussStandAttrInfo.setKcvppscnbuss(kcvppscnbuss);
String qtwjbuss = rowList.get("附件");
String[] split = qtwjbuss.split(",");
String s = "";
if (split.length != 0){
for (int j = 0;j < split.length;j++){
String name = fileInfo.getName();
String[] split1 = fileInfo.toString().split(name);
File files = new File(split1[0]+split[j]);
AttFileVo attFileVo = attFileEOService.saveFileInfo(files);
if (StringUtils.isNotBlank(attFileVo.getId())){
s += "," + attFileVo.getAttId();
}else {
s = attFileVo.getAttId();
if (qtwjbuss != null && !qtwjbuss.equals("")) {
String[] split = qtwjbuss.split(",");
String s = "";
if (split.length != 0) {
for (int j = 0; j < split.length; j++) {
String name = fileInfo.getName();
String[] split1 = fileInfo.toString().split(name);
File files = new File(split1[0] + split[j]);
AttFileVo attFileVo = attFileEOService.saveFileInfo(files);
if (StringUtils.isNotBlank(attFileVo.getId())) {
s += "," + attFileVo.getAttId();
} else {
s = attFileVo.getAttId();
}
}
sarBussStandAttrInfo.setQtwjbuss(s);
}
sarBussStandAttrInfo.setQtwjbuss(s);
}
String standSort = rowList.get("企标类型");
@@ -2278,6 +2281,7 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
//入库
processCreateBuss(infoJson);
countSuccess++;
}
}
}
@@ -2297,11 +2301,12 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
}
}
}
String msg = "成功导入" + countSuccess + "条";
return Result.success("",msg,null);
}catch (Exception e){
FileUnZip.deleteDir(saveDirectory);
return Result.error("导入失败,没有可导入的数据,请检查!");
}
return Result.success("","导入完成",true);
}
private static List<File> readImpExcelFile(String path) {