Prechádzať zdrojové kódy

物流库,项目信息 修改

[user3] 3 rokov pred
rodič
commit
f44e9318bb

+ 2 - 0
src/main/java/com/jeeplus/modules/supply/materialLibrary/service/MaterialLibraryService.java

@@ -94,6 +94,7 @@ public class MaterialLibraryService extends CrudService<MaterialLibraryMapper, M
             returnMap.put("filePath",filePath);
             returnMap.keySet().removeIf(key -> key == "repeat");
             returnMap.put("repeat","3");
+            returnMap.put("success",true);
             returnMap.keySet().removeIf(key -> key == "msg");
             returnMap.put("msg","已存在物料数据,是否覆盖?");
             return returnMap;
@@ -117,6 +118,7 @@ public class MaterialLibraryService extends CrudService<MaterialLibraryMapper, M
             modifyHandmadeVindicateList(list);
         }
         returnMap.keySet().removeIf(key -> key == "msg");
+        returnMap.put("success",true);
         returnMap.put("msg","已成功导入 "+list.size()+" 条项目表单记录");
         return returnMap;
     }

+ 1 - 1
src/main/java/com/jeeplus/modules/supply/materialLibrary/web/MaterialLibraryController.java

@@ -106,7 +106,7 @@ public class MaterialLibraryController extends BaseController {
         AjaxJson j = new AjaxJson();
         try {
             String repeat = "0";  //repeat:0:第一次交互,1:覆盖,2:不覆盖
-            ImportExcel ei = new ImportExcel(file, 2, 0);
+            ImportExcel ei = new ImportExcel(file, 1, 0);
             List<MaterialLibrary> list = ei.getDataList(MaterialLibrary.class);   //直接用就好了吗,格式啥的用设置吗?
             LinkedHashMap returnMap = materialLibraryService.disposeImportMaterialLibrary(list,file,repeat);
             //放要放的值

+ 2 - 0
src/main/java/com/jeeplus/modules/supply/projectInformation/service/ProjectInformationService.java

@@ -112,6 +112,7 @@ public class ProjectInformationService extends CrudService<ProjectInformationMap
             returnMap.keySet().removeIf(key -> key == "repeat");
             returnMap.put("repeat","3");
             returnMap.keySet().removeIf(key -> key == "msg");
+            returnMap.put("success",true);
             returnMap.put("msg","已存在物料数据,是否覆盖?");
             return returnMap;
         }
@@ -143,6 +144,7 @@ public class ProjectInformationService extends CrudService<ProjectInformationMap
         }
 
         returnMap.keySet().removeIf(key -> key == "msg");
+        returnMap.put("success",true);
         returnMap.put("msg","已成功导入 "+list.size()+" 条项目表单记录");
         return returnMap;
     }

+ 1 - 1
src/main/java/com/jeeplus/modules/supply/projectInformation/web/ProjectInformationController.java

@@ -107,7 +107,7 @@ public class ProjectInformationController extends BaseController {
         try {
 //            projectInformationService.deleteFileByCron();
             String repeat = "0";  //repeat:0:第一次交互,1:覆盖,2:不覆盖,3:询问
-            ImportExcel ei = new ImportExcel(file, 2, 0);
+            ImportExcel ei = new ImportExcel(file, 1, 0);
             List<ProjectInformation> list = ei.getDataList(ProjectInformation.class);   //直接用就好了吗,格式啥的用设置吗?
             LinkedHashMap returnMap = projectInformationService.disposeImportProjectInformation(list,file,repeat);
             //放要放的值