WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of http://git.hzwlsoft.com/laws-nio/laws-weilai

Browse Source
This commit is contained in:
qq787203167
2022-03-31 11:50:29 +08:00
parent 3f050d33ec 11b057244d
commit 681851eaef
2 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java
+13 -5
View File
@@ -2923,7 +2923,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
public void exportTemplate(Map<String, Object> map, HttpServletResponse response, HttpServletRequest request) { public void exportTemplate(Map<String, Object> map, HttpServletResponse response, HttpServletRequest request) {
OutputStream os = null; OutputStream os = null;
HSSFWorkbook workbook = new HSSFWorkbook(); HSSFWorkbook workbook = new HSSFWorkbook();
String fileOriName = "导入模板"; String fileOriName = "文档库导入模板.xls";
String filePath = uploadpath + File.separator + fileOriName; String filePath = uploadpath + File.separator + fileOriName;
try { try {
List<String> list = getWorkbookTitle((String) map.get("cut")); List<String> list = getWorkbookTitle((String) map.get("cut"));
@@ -2933,7 +2933,6 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
nowFile.delete(); nowFile.delete();
} }
nowFile.mkdirs(); nowFile.mkdirs();
String fileName = "导入模板.xls";
HSSFSheet sheet = workbook.createSheet("文档库导入模板"); HSSFSheet sheet = workbook.createSheet("文档库导入模板");
sheet.setDefaultColumnWidth(16);//列宽 sheet.setDefaultColumnWidth(16);//列宽
HSSFCellStyle cellStyle = workbook.createCellStyle(); HSSFCellStyle cellStyle = workbook.createCellStyle();
@@ -2967,7 +2966,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
} }
response.setHeader("Content-Disposition", response.setHeader("Content-Disposition",
"attachment; filename=\"" + fileOriName + ".xlsx"); "attachment; filename=\"" + fileOriName + ".xls");
response.setContentType("application/force-download"); response.setContentType("application/force-download");
response.flushBuffer(); response.flushBuffer();
os = response.getOutputStream(); os = response.getOutputStream();
@@ -3419,7 +3418,13 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
} }
// 校验头部是否符合模板 // 校验头部是否符合模板
String fields = list.get(0); String fields = list.get(0);
String substring = headerSb.substring(0, headerSb.length() - 1);
//判断结尾为逗号，则减1个字符
String substring = headerSb.toString();
if (substring.endsWith(",") || substring.endsWith("，")){
substring = headerSb.substring(0, headerSb.length() - 1);
}
String excelHeader = substring.toString(); String excelHeader = substring.toString();
if (!fields.equals(excelHeader)) { if (!fields.equals(excelHeader)) {
workbook.close(); workbook.close();
@@ -3722,7 +3727,10 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
} }
} }
if (ObjectUtils.isNotEmpty(sb)) { if (ObjectUtils.isNotEmpty(sb)) {
String substring = sb.substring(0, sb.length() - 1); String substring = sb.toString();
if (substring.endsWith(",") || substring.endsWith("，")){
substring = substring.substring(0, substring.length() - 1);
}
value = substring; value = substring;
} }
} }
jero-web/src/views/documentManage/library/index.vue
+1 -1
View File
@@ -162,7 +162,7 @@
}, },
//下载模板 //下载模板
handleModule() { handleModule() {
downloadFile('document/bussDocumentLibraryEO/exportTemplate', '文档库.xls', {}) downloadFile('document/bussDocumentLibraryEO/exportTemplate', '文档库导入模板.xls', {})
}, },
//批量删除 //批量删除
handleDel() { handleDel() {