|
@@ -159,7 +159,6 @@ public class MaterialProvidedController extends BaseController {
|
|
|
|
|
|
/**
|
|
/**
|
|
* 导入Excel数据
|
|
* 导入Excel数据
|
|
-
|
|
|
|
*/
|
|
*/
|
|
@ResponseBody
|
|
@ResponseBody
|
|
@RequiresPermissions("managementcenter:materialProvided:import")
|
|
@RequiresPermissions("managementcenter:materialProvided:import")
|
|
@@ -169,6 +168,12 @@ public class MaterialProvidedController extends BaseController {
|
|
try {
|
|
try {
|
|
StringBuilder failureMsg = new StringBuilder();
|
|
StringBuilder failureMsg = new StringBuilder();
|
|
ImportUtil importUtil = new ImportUtil(file,1,0);
|
|
ImportUtil importUtil = new ImportUtil(file,1,0);
|
|
|
|
+ Boolean judgeProvided = ImportPro.getJudgeProvided(importUtil);
|
|
|
|
+ if (judgeProvided){
|
|
|
|
+ j.setSuccess(false);
|
|
|
|
+ j.setMsg("导入失败:表格不符合规范!");
|
|
|
|
+ return j;
|
|
|
|
+ }
|
|
List<MaterialProvided> materProUtil = ImportPro.getMaterProUtil(importUtil);
|
|
List<MaterialProvided> materProUtil = ImportPro.getMaterProUtil(importUtil);
|
|
Integer maxVersion = materialProvidedService.findMaxVersion();
|
|
Integer maxVersion = materialProvidedService.findMaxVersion();
|
|
materialProvidedService.saveList(materProUtil,maxVersion);
|
|
materialProvidedService.saveList(materProUtil,maxVersion);
|