ZQ/laws-sinotruk-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix:78440

Browse Source
This commit is contained in:
梁琦涛
2023-11-10 18:32:22 +08:00
parent a3c999c342
commit e99e01afe2
1 changed files with 19 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/sys/controller/LawsWorkingGroupUserController.java
+19 -18
View File
@@ -162,7 +162,7 @@ public class LawsWorkingGroupUserController extends JeroController<LawsWorkingGr
@AutoLog(value = "内部工作组人员关联表-导入")
@ApiOperation(value = "内部工作组人员关联表-导入", notes = "内部工作组人员关联表-导入")
@PostMapping(value = "/importExcel")
public Result<String> importFile(MultipartFile file, String workingGroupId) throws Exception {
public Result<?> importFile(MultipartFile file, String workingGroupId) throws Exception {
String fileName = file.getOriginalFilename();
// 上传文件为空
if (StringUtils.isEmpty(fileName)) {
@@ -192,28 +192,30 @@ public class LawsWorkingGroupUserController extends JeroController<LawsWorkingGr
}
List<LawsWorkingGroupUser> all = new ArrayList<>();
List<LawsWorkingGroupUserImport> list;
try {
ImportParams params = new ImportParams();
params.setTitleRows(0);
params.setHeadRows(1);
params.setNeedSave(true);
List<LawsWorkingGroupUserImport> list = ExcelImportUtil.importExcel(file.getInputStream(), LawsWorkingGroupUserImport.class, params);
if (CollectionUtils.isEmpty(list)) {
throw new JeroBootException(ResultCommon.IMPORT_DATA_CANNOT_BE_EMPTY);
}
for (LawsWorkingGroupUserImport lawsWorkingGroupUserImport : list) {
LawsWorkingGroupUser lawsWorkingGroupUser = new LawsWorkingGroupUser();
lawsWorkingGroupUser.setUsername(lawsWorkingGroupUserImport.getUsername());
lawsWorkingGroupUser.setRealname(lawsWorkingGroupUserImport.getRealname());
all.add(lawsWorkingGroupUser);
}
list = ExcelImportUtil.importExcel(file.getInputStream(), LawsWorkingGroupUserImport.class, params);
} catch (Exception e) {
throw new JeroBootException(ResultCommon.ERROR);
throw new JeroBootException(e.getMessage());
}
if (CollectionUtils.isEmpty(list)) {
throw new JeroBootException(ResultCommon.IMPORT_DATA_CANNOT_BE_EMPTY);
}
for (LawsWorkingGroupUserImport lawsWorkingGroupUserImport : list) {
LawsWorkingGroupUser lawsWorkingGroupUser = new LawsWorkingGroupUser();
lawsWorkingGroupUser.setUsername(lawsWorkingGroupUserImport.getUsername());
lawsWorkingGroupUser.setRealname(lawsWorkingGroupUserImport.getRealname());
all.add(lawsWorkingGroupUser);
}
//校验导入正确性，msg是错误信息
String msg = importExcelCheck(all,workingGroupId);
if (StringUtils.isNotBlank(msg)) {
return Result.error(msg);
List<String> msg = importExcelCheck(all,workingGroupId);
if (!CollectionUtils.isEmpty(msg)) {
return Result.error(MessageUtils.getMessage(ResultCommon.ERROR),msg);
}
for (LawsWorkingGroupUser groupUser : all) {
String username = groupUser.getUsername();
@@ -240,9 +242,8 @@ public class LawsWorkingGroupUserController extends JeroController<LawsWorkingGr
/**
* 导入数据校验错误信息
*/
public String importExcelCheck(List<LawsWorkingGroupUser> all,String workingGroupId) {
List<String> errorMessages = validateWorkNo(all,workingGroupId);
return String.join(";", errorMessages);
public List<String> importExcelCheck(List<LawsWorkingGroupUser> all,String workingGroupId) {
return validateWorkNo(all,workingGroupId);
}
private List<String> validateWorkNo(List<LawsWorkingGroupUser> all,String workingGroupId) {