|
@@ -137,7 +137,10 @@ public class MileageController {
|
|
|
if(file != null&&Func.isNotEmpty(partId)) {
|
|
|
if(Pattern.matches(".+(\\.xls)x?$", Objects.requireNonNull(file.getOriginalFilename()).toLowerCase(Locale.ROOT))) {
|
|
|
List<MileageExcel> data = ExcelUtil.read(file,MileageExcel.class);
|
|
|
- return R.success(this.service.importMileagexy(file,AuthUtil.getUserId(),projectId,contractId,partId));
|
|
|
+ if("导入成功".equals(this.service.importMileagexy(file,AuthUtil.getUserId(),projectId,contractId,partId))){
|
|
|
+ R.success("导入成功");
|
|
|
+ }
|
|
|
+ return R.fail("数据错误");
|
|
|
} else {
|
|
|
return R.fail("文件格式不正确,请上传Excel文件");
|
|
|
}
|