|
@@ -273,8 +273,7 @@ public class PersonService {
|
|
List<Long> personIdList = new ArrayList<>();
|
|
List<Long> personIdList = new ArrayList<>();
|
|
try {
|
|
try {
|
|
String excelFileName = file.getOriginalFilename();
|
|
String excelFileName = file.getOriginalFilename();
|
|
- System.out.println("file.getName()==" + excelFileName);
|
|
|
|
- System.out.println("file.getName()2==" + excelFileName.substring(excelFileName.length() - 4));
|
|
|
|
|
|
+ logger.info("excelFileName ==" + excelFileName);
|
|
if (!excelFileName.substring(excelFileName.length() - 4).equals("xlsx")) {
|
|
if (!excelFileName.substring(excelFileName.length() - 4).equals("xlsx")) {
|
|
throw new BDException("导入Excel只支持xlsx格式");
|
|
throw new BDException("导入Excel只支持xlsx格式");
|
|
}
|
|
}
|
|
@@ -452,6 +451,10 @@ public class PersonService {
|
|
personVO.setRemark(value);
|
|
personVO.setRemark(value);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
+ if (!StringUtils.isBlank(msg.toString())) {
|
|
|
|
+ logger.error("第\t" + i + "行: " + msg.toString());
|
|
|
|
+ throw new BDException("第\\t" + i + "行: " + msg.toString());
|
|
|
|
+ }
|
|
|
|
|
|
PictureData picData = picMap.get(i);
|
|
PictureData picData = picMap.get(i);
|
|
if(picData != null){
|
|
if(picData != null){
|
|
@@ -465,10 +468,7 @@ public class PersonService {
|
|
|
|
|
|
}
|
|
}
|
|
|
|
|
|
- if (!StringUtils.isBlank(msg.toString())) {
|
|
|
|
- logger.error("第\t" + i + "行: " + msg.toString());
|
|
|
|
- throw new BDException("第\\t" + i + "行: " + msg.toString());
|
|
|
|
- }
|
|
|
|
|
|
+
|
|
|
|
|
|
personVOList.add(personVO);
|
|
personVOList.add(personVO);
|
|
|
|
|