open
/
open-dbtool
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Excel导入Bug修复

Browse Source
master
wangbing 4 years ago
parent 7add5394ed
commit d50723ec74
12 changed files with 31 additions and 22 deletions
Show Stats Download Patch File Download Diff File

12
src/main/resources/modules/SpringBoot/java/action/ajax/Ajax.java
Unescape View File

@ -128,7 +128,15 @@ public class ${table.getCName()}Ajax{
public Object imports(MultipartFile file) { public Object imports(MultipartFile file) {
BaseResponse baseResponse = new BaseResponse(); BaseResponse baseResponse = new BaseResponse();
try { try {
WExcel sheet = new WExcel<>(${table.getCName()}.class).read(file.getBytes(), new WExcel.Processor<${table.getCName()}>() { // 检查文件格式
String originalFilename = file.getOriginalFilename() != null ? file.getOriginalFilename() : "";
if (!originalFilename.matches("\\.xlsx?")) {
baseResponse.addError(ErrorType.BUSINESS_ERROR, "上传文件格式错误！");
return baseResponse;
}
// 兼容2003以前老版本.xls
ExcelTypeEnum excelTypeEnum = file.getOriginalFilename().endsWith(".xlsx") ? ExcelTypeEnum.XLSX : ExcelTypeEnum.XLS;
WExcel sheet = new WExcel<>(${table.getCName()}.class).read(file.getBytes(), excelTypeEnum, new WExcel.Processor<${table.getCName()}>() {
@Override @Override
public List<String> exec(${table.getCName()} o, int index) { public List<String> exec(${table.getCName()} o, int index) {
${table.getCName()}CreateRequest request = MapperUtil.map(o, ${table.getCName()}CreateRequest.class); ${table.getCName()}CreateRequest request = MapperUtil.map(o, ${table.getCName()}CreateRequest.class);
@ -144,7 +152,7 @@ public class ${table.getCName()}Ajax{
return validate; return validate;
} }
}); });
// 当导入出现错误时可以将存在标注错误的Excel返回给用户改正
if (sheet.hasError()) { if (sheet.hasError()) {
return ResponseUtil.apply(sheet.getBytes(), sheet.getName() + "-检查.xlsx"); return ResponseUtil.apply(sheet.getBytes(), sheet.getName() + "-检查.xlsx");
} else { } else {

4
src/main/resources/modules/SpringBoot/java/action/ajax/wsys/DeptAjax.java
Unescape View File

@ -73,7 +73,7 @@ public class DeptAjax {
try { try {
// 检查文件格式 // 检查文件格式
String originalFilename = file.getOriginalFilename() != null ? file.getOriginalFilename() : ""; String originalFilename = file.getOriginalFilename() != null ? file.getOriginalFilename() : "";
if (originalFilename.matches("\\.xlsx?")) { if (!originalFilename.matches("\\.xlsx?")) {
baseResponse.addError(ErrorType.BUSINESS_ERROR, "上传文件格式错误！"); baseResponse.addError(ErrorType.BUSINESS_ERROR, "上传文件格式错误！");
return baseResponse; return baseResponse;
} }
@ -86,7 +86,7 @@ public class DeptAjax {
return ValidationUtil.validate(request); return ValidationUtil.validate(request);
} }
}); });
// 当导入出现错误时可以将存在标注错误的Excel返回给用户改正
if (sheet.hasError()) { if (sheet.hasError()) {
return ResponseUtil.apply(sheet.getBytes(), sheet.getName() + "-检查.xlsx"); return ResponseUtil.apply(sheet.getBytes(), sheet.getName() + "-检查.xlsx");
} else { } else {

4
src/main/resources/modules/SpringBoot/java/action/ajax/wsys/DictAjax.java
Unescape View File

@ -73,7 +73,7 @@ public class DictAjax {
try { try {
// 检查文件格式 // 检查文件格式
String originalFilename = file.getOriginalFilename() != null ? file.getOriginalFilename() : ""; String originalFilename = file.getOriginalFilename() != null ? file.getOriginalFilename() : "";
if (originalFilename.matches("\\.xlsx?")) { if (!originalFilename.matches("\\.xlsx?")) {
baseResponse.addError(ErrorType.BUSINESS_ERROR, "上传文件格式错误！"); baseResponse.addError(ErrorType.BUSINESS_ERROR, "上传文件格式错误！");
return baseResponse; return baseResponse;
} }
@ -86,7 +86,7 @@ public class DictAjax {
return ValidationUtil.validate(request); return ValidationUtil.validate(request);
} }
}); });
// 当导入出现错误时可以将存在标注错误的Excel返回给用户改正
if (sheet.hasError()) { if (sheet.hasError()) {
return ResponseUtil.apply(sheet.getBytes(), sheet.getName() + "-检查.xlsx"); return ResponseUtil.apply(sheet.getBytes(), sheet.getName() + "-检查.xlsx");
} else { } else {

4
src/main/resources/modules/SpringBoot/java/action/ajax/wsys/DictItemAjax.java
Unescape View File

@ -67,7 +67,7 @@ public class DictItemAjax {
try { try {
// 检查文件格式 // 检查文件格式
String originalFilename = file.getOriginalFilename() != null ? file.getOriginalFilename() : ""; String originalFilename = file.getOriginalFilename() != null ? file.getOriginalFilename() : "";
if (originalFilename.matches("\\.xlsx?")) { if (!originalFilename.matches("\\.xlsx?")) {
baseResponse.addError(ErrorType.BUSINESS_ERROR, "上传文件格式错误！"); baseResponse.addError(ErrorType.BUSINESS_ERROR, "上传文件格式错误！");
return baseResponse; return baseResponse;
} }
@ -80,7 +80,7 @@ public class DictItemAjax {
return ValidationUtil.validate(request); return ValidationUtil.validate(request);
} }
}); });
// 当导入出现错误时可以将存在标注错误的Excel返回给用户改正
if (sheet.hasError()) { if (sheet.hasError()) {
return ResponseUtil.apply(sheet.getBytes(), sheet.getName() + "-检查.xlsx"); return ResponseUtil.apply(sheet.getBytes(), sheet.getName() + "-检查.xlsx");
} else { } else {

4
src/main/resources/modules/SpringBoot/java/action/ajax/wsys/FileAjax.java
Unescape View File

@ -67,7 +67,7 @@ public class FileAjax {
try { try {
// 检查文件格式 // 检查文件格式
String originalFilename = file.getOriginalFilename() != null ? file.getOriginalFilename() : ""; String originalFilename = file.getOriginalFilename() != null ? file.getOriginalFilename() : "";
if (originalFilename.matches("\\.xlsx?")) { if (!originalFilename.matches("\\.xlsx?")) {
baseResponse.addError(ErrorType.BUSINESS_ERROR, "上传文件格式错误！"); baseResponse.addError(ErrorType.BUSINESS_ERROR, "上传文件格式错误！");
return baseResponse; return baseResponse;
} }
@ -80,7 +80,7 @@ public class FileAjax {
return ValidationUtil.validate(request); return ValidationUtil.validate(request);
} }
}); });
// 当导入出现错误时可以将存在标注错误的Excel返回给用户改正
if (sheet.hasError()) { if (sheet.hasError()) {
return ResponseUtil.apply(sheet.getBytes(), sheet.getName() + "-检查.xlsx"); return ResponseUtil.apply(sheet.getBytes(), sheet.getName() + "-检查.xlsx");
} else { } else {

4
src/main/resources/modules/SpringBoot/java/action/ajax/wsys/ProfilesAjax.java
Unescape View File

@ -67,7 +67,7 @@ public class ProfilesAjax {
try { try {
// 检查文件格式 // 检查文件格式
String originalFilename = file.getOriginalFilename() != null ? file.getOriginalFilename() : ""; String originalFilename = file.getOriginalFilename() != null ? file.getOriginalFilename() : "";
if (originalFilename.matches("\\.xlsx?")) { if (!originalFilename.matches("\\.xlsx?")) {
baseResponse.addError(ErrorType.BUSINESS_ERROR, "上传文件格式错误！"); baseResponse.addError(ErrorType.BUSINESS_ERROR, "上传文件格式错误！");
return baseResponse; return baseResponse;
} }
@ -80,7 +80,7 @@ public class ProfilesAjax {
return ValidationUtil.validate(request); return ValidationUtil.validate(request);
} }
}); });
// 当导入出现错误时可以将存在标注错误的Excel返回给用户改正
if (sheet.hasError()) { if (sheet.hasError()) {
return ResponseUtil.apply(sheet.getBytes(), sheet.getName() + "-检查.xlsx"); return ResponseUtil.apply(sheet.getBytes(), sheet.getName() + "-检查.xlsx");
} else { } else {

4
src/main/resources/modules/SpringBoot/java/action/ajax/wsys/ResAjax.java
Unescape View File

@ -73,7 +73,7 @@ public class ResAjax {
try { try {
// 检查文件格式 // 检查文件格式
String originalFilename = file.getOriginalFilename() != null ? file.getOriginalFilename() : ""; String originalFilename = file.getOriginalFilename() != null ? file.getOriginalFilename() : "";
if (originalFilename.matches("\\.xlsx?")) { if (!originalFilename.matches("\\.xlsx?")) {
baseResponse.addError(ErrorType.BUSINESS_ERROR, "上传文件格式错误！"); baseResponse.addError(ErrorType.BUSINESS_ERROR, "上传文件格式错误！");
return baseResponse; return baseResponse;
} }
@ -86,7 +86,7 @@ public class ResAjax {
return ValidationUtil.validate(request); return ValidationUtil.validate(request);
} }
}); });
// 当导入出现错误时可以将存在标注错误的Excel返回给用户改正
if (sheet.hasError()) { if (sheet.hasError()) {
return ResponseUtil.apply(sheet.getBytes(), sheet.getName() + "-检查.xlsx"); return ResponseUtil.apply(sheet.getBytes(), sheet.getName() + "-检查.xlsx");
} else { } else {

4
src/main/resources/modules/SpringBoot/java/action/ajax/wsys/RoleAjax.java
Unescape View File

@ -73,7 +73,7 @@ public class RoleAjax {
try { try {
// 检查文件格式 // 检查文件格式
String originalFilename = file.getOriginalFilename() != null ? file.getOriginalFilename() : ""; String originalFilename = file.getOriginalFilename() != null ? file.getOriginalFilename() : "";
if (originalFilename.matches("\\.xlsx?")) { if (!originalFilename.matches("\\.xlsx?")) {
baseResponse.addError(ErrorType.BUSINESS_ERROR, "上传文件格式错误！"); baseResponse.addError(ErrorType.BUSINESS_ERROR, "上传文件格式错误！");
return baseResponse; return baseResponse;
} }
@ -86,7 +86,7 @@ public class RoleAjax {
return ValidationUtil.validate(request); return ValidationUtil.validate(request);
} }
}); });
// 当导入出现错误时可以将存在标注错误的Excel返回给用户改正
if (sheet.hasError()) { if (sheet.hasError()) {
return ResponseUtil.apply(sheet.getBytes(), sheet.getName() + "-检查.xlsx"); return ResponseUtil.apply(sheet.getBytes(), sheet.getName() + "-检查.xlsx");
} else { } else {

4
src/main/resources/modules/SpringBoot/java/action/ajax/wsys/TaskSqlAjax.java
Unescape View File

@ -67,7 +67,7 @@ public class TaskSqlAjax {
try { try {
// 检查文件格式 // 检查文件格式
String originalFilename = file.getOriginalFilename() != null ? file.getOriginalFilename() : ""; String originalFilename = file.getOriginalFilename() != null ? file.getOriginalFilename() : "";
if (originalFilename.matches("\\.xlsx?")) { if (!originalFilename.matches("\\.xlsx?")) {
baseResponse.addError(ErrorType.BUSINESS_ERROR, "上传文件格式错误！"); baseResponse.addError(ErrorType.BUSINESS_ERROR, "上传文件格式错误！");
return baseResponse; return baseResponse;
} }
@ -80,7 +80,7 @@ public class TaskSqlAjax {
return ValidationUtil.validate(request); return ValidationUtil.validate(request);
} }
}); });
// 当导入出现错误时可以将存在标注错误的Excel返回给用户改正
if (sheet.hasError()) { if (sheet.hasError()) {
return ResponseUtil.apply(sheet.getBytes(), sheet.getName() + "-检查.xlsx"); return ResponseUtil.apply(sheet.getBytes(), sheet.getName() + "-检查.xlsx");
} else { } else {

4
src/main/resources/modules/SpringBoot/java/action/ajax/wsys/UserAjax.java
Unescape View File

@ -124,7 +124,7 @@ public class UserAjax {
try { try {
// 检查文件格式 // 检查文件格式
String originalFilename = file.getOriginalFilename() != null ? file.getOriginalFilename() : ""; String originalFilename = file.getOriginalFilename() != null ? file.getOriginalFilename() : "";
if (originalFilename.matches("\\.xlsx?")) { if (!originalFilename.matches("\\.xlsx?")) {
baseResponse.addError(ErrorType.BUSINESS_ERROR, "上传文件格式错误！"); baseResponse.addError(ErrorType.BUSINESS_ERROR, "上传文件格式错误！");
return baseResponse; return baseResponse;
} }
@ -137,7 +137,7 @@ public class UserAjax {
return ValidationUtil.validate(request); return ValidationUtil.validate(request);
} }
}); });
// 当导入出现错误时可以将存在标注错误的Excel返回给用户改正
if (sheet.hasError()) { if (sheet.hasError()) {
return ResponseUtil.apply(sheet.getBytes(), sheet.getName() + "-检查.xlsx"); return ResponseUtil.apply(sheet.getBytes(), sheet.getName() + "-检查.xlsx");
} else { } else {

4
src/main/resources/modules/SpringBoot/java/action/ajax/wsys/VisitorAjax.java
Unescape View File

@ -67,7 +67,7 @@ public class VisitorAjax {
try { try {
// 检查文件格式 // 检查文件格式
String originalFilename = file.getOriginalFilename() != null ? file.getOriginalFilename() : ""; String originalFilename = file.getOriginalFilename() != null ? file.getOriginalFilename() : "";
if (originalFilename.matches("\\.xlsx?")) { if (!originalFilename.matches("\\.xlsx?")) {
baseResponse.addError(ErrorType.BUSINESS_ERROR, "上传文件格式错误！"); baseResponse.addError(ErrorType.BUSINESS_ERROR, "上传文件格式错误！");
return baseResponse; return baseResponse;
} }
@ -80,7 +80,7 @@ public class VisitorAjax {
return ValidationUtil.validate(request); return ValidationUtil.validate(request);
} }
}); });
// 当导入出现错误时可以将存在标注错误的Excel返回给用户改正
if (sheet.hasError()) { if (sheet.hasError()) {
return ResponseUtil.apply(sheet.getBytes(), sheet.getName() + "-检查.xlsx"); return ResponseUtil.apply(sheet.getBytes(), sheet.getName() + "-检查.xlsx");
} else { } else {

1
src/main/resources/modules/SpringBoot/resources/static/css/base.css
Unescape View File

@ -717,6 +717,7 @@ code {
[class^=el-tooltip], [class^=el-tooltip],
[class^=el-dropdown], [class^=el-dropdown],
[class^=el-drawer], [class^=el-drawer],
[class^=el-card],
[class^=el-button]{ [class^=el-button]{
border-radius: 0!important; border-radius: 0!important;
} }

Write Preview
Loading…
Cancel
Save

Powered by TurnKey Linux.