|
|
@@ -3102,7 +3102,7 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
|
|
|
return param;
|
|
|
}
|
|
|
@Override
|
|
|
- public Object importExcel(MultipartFile file) {
|
|
|
+ public Result importExcel(MultipartFile file) {
|
|
|
NewExcelUtil<InputExcelUser> newExcelUtil=new NewExcelUtil<>(InputExcelUser.class);
|
|
|
List<InputExcelUser> list = null;
|
|
|
try {
|
|
|
@@ -3110,7 +3110,9 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
|
|
|
} catch (Exception e) {
|
|
|
throw new BusinessException(e.getMessage());
|
|
|
}
|
|
|
- return pushUserName(list);
|
|
|
+ List<InputExcelUser> inputExcelUsers = pushUserName(list);
|
|
|
+
|
|
|
+ return newExcelUtil.exportExcel(inputExcelUsers,"客户数据查询",uploadPath);
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
@@ -3120,7 +3122,7 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
|
|
|
|
|
|
|
|
|
|
|
|
- private Object pushUserName(List<InputExcelUser> list) {
|
|
|
+ private List<InputExcelUser> pushUserName(List<InputExcelUser> list) {
|
|
|
List<InputExcelUser> res=new ArrayList<>();
|
|
|
List<InputExcelUser> list2=new ArrayList<>();
|
|
|
int i = 0;
|
|
|
@@ -3136,18 +3138,17 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
|
|
|
if (ex2.getName()!=null&&excelUser!=null&&excelUser.getName()!=null){
|
|
|
if (ex2.getName().equals(excelUser.getName())){
|
|
|
excelUser.setType(1);
|
|
|
+ excelUser.setAname(ex2.getAname());
|
|
|
+ excelUser.setStatus(ex2.getStatus());
|
|
|
break;
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
- if(excelUser.getType()==null){
|
|
|
- excelUser.setType(0);
|
|
|
- }
|
|
|
- if (excelUser.getType()==1){
|
|
|
- res.add(excelUser);
|
|
|
- }
|
|
|
-
|
|
|
+ if (excelUser != null && excelUser.getType() == null) {
|
|
|
+ excelUser.setType(0);
|
|
|
+ }
|
|
|
+ res.add(excelUser);
|
|
|
}
|
|
|
}
|
|
|
list2.clear();
|