Merge remote-tracking branch 'origin/master'

src/main/java/com/jeeplus/modules/sg/managementcenter/materialinfo/web/MaterialInfoController.java

@@ -173,6 +173,25 @@ public class MaterialInfoController extends BaseController {
 		return "modules/sg/managementcenter/materialinfo/importexcel";
 	}
 
+
+	/**
+	 * 多文件导出页面
+	 */
+	@RequestMapping(value = "/importMore/Form")
+	public String importMoreForm(Model model){
+		return "modules/sg/managementcenter/materialinfo/importmore";
+	}
+
+
+	/**
+	 * 项目验证
+	 * @param file
+	 * @param batch
+	 * @return
+	 * @throws IOException
+	 * @throws InvalidFormatException
+	 */
+
 	@ResponseBody
 	@RequestMapping(value = "importValidation")
 	public AjaxJson importValidation(@RequestParam("file")MultipartFile file,String batch) throws IOException, InvalidFormatException {

src/main/java/com/jeeplus/modules/sg/managementcenter/materialproject/web/MaterialProjectController.java

@@ -142,7 +142,7 @@ public class MaterialProjectController extends BaseController {
 	}
 	
 	/**
-	 * 导出excel文件
+	 * 物料列表导出
 	 */
 	@ResponseBody
 	@RequiresPermissions("managementcenter:materialproject:export")
@@ -164,7 +164,13 @@ public class MaterialProjectController extends BaseController {
 			return j;
     }
 
-
+	/**
+	 * 项目列表导出
+	 * @param materialProject
+	 * @param request
+	 * @param response
+	 * @return
+	 */
 	@ResponseBody
 	@RequiresPermissions("managementcenter:materialproject:export")
 	@RequestMapping(value = "exportpro")
@@ -172,8 +178,9 @@ public class MaterialProjectController extends BaseController {
 		AjaxJson j = new AjaxJson();
 		try {
 			String fileName = "项目列表"+DateUtils.getDate("yyyyMMddHHmmss")+".xlsx";
-			Page<MaterialProject> page = materialProjectService.findPage(new Page<MaterialProject>(request, response, -1), materialProject);
-			new ExportExcel(null, MaterialProject.class).setDataList(page.getList()).write(response, fileName).dispose();
+//			Page<MaterialProject> page = materialProjectService.findPage(new Page<MaterialProject>(request, response, -1), materialProject);
+			List<MaterialProject> list = materialProjectService.findList(materialProject);
+			new ExportExcel(null, MaterialProject.class).setDataList(list).write(response, fileName).dispose();
 			j.setSuccess(true);
 			j.setMsg("导出成功！");
 			return j;