2019——12——16

src/main/java/com/jeeplus/core/persistence/Page.java

@@ -3,6 +3,7 @@
  */
 package com.jeeplus.core.persistence;
 
+import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.regex.Pattern;
@@ -22,7 +23,7 @@ import com.jeeplus.common.utils.CookieUtils;
  * @version 2016-7-2
  * @param <T>
  */
-public class Page<T> {
+public class Page<T> implements Serializable {
 	
 	protected int pageNo = 1; // 当前页码
 	protected int pageSize = Integer.valueOf(Global.getConfig("page.pageSize")); // 页面大小，设置为“-1”表示不进行分页（分页无效）

src/main/java/com/jeeplus/modules/sg/managementcenter/materialproject/entity/MaterialProject.java

@@ -3,7 +3,10 @@ package com.jeeplus.modules.sg.managementcenter.materialproject.entity;
 import com.jeeplus.common.utils.excel.annotation.ExcelField;
 import com.jeeplus.core.persistence.DataEntity;
 
-public class MaterialProject extends DataEntity<MaterialProject> {
+import java.io.Externalizable;
+import java.io.Serializable;
+
+public class MaterialProject extends DataEntity<MaterialProject>{
     private String reserveProjectName;   //储备项目名称
     private String projectName;       //项目名称
     private String reserveCode;        //储备编码

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

@@ -21,6 +21,7 @@ import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
 import org.apache.shiro.authz.annotation.Logical;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpRequest;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.ModelAttribute;
@@ -183,11 +184,11 @@ public class MaterialProjectController extends BaseController {
     @RequestMapping(value = "export")
     public AjaxJson exportFile(MaterialProject materialProject, HttpServletRequest request, HttpServletResponse response) throws IOException {
 		AjaxJson j = new AjaxJson();
+		HttpSession session = request.getSession();
+		MaterialProject materialProject1 = (MaterialProject)session.getAttribute("materialPro");
 		try {
-			HttpSession session = request.getSession();
-			MaterialProject materialProject1 = (MaterialProject)session.getAttribute("materialPro");
             String fileName = "物料"+DateUtils.getDate("yyyyMMddHHmmss")+".xlsx";
-			List<MaterialProject> list = null;
+			List<MaterialProject> list = new ArrayList<MaterialProject>();
 			if (!materialProject1.getReserveProjectName().equals("")||!materialProject1.getProjectName().equals("")||!materialProject1.getProjectCode().equals("")||
 					!materialProject1.getReserveCode().equals("")||!materialProject1.getProjectAttribute().equals("")||!materialProject1.getProjectDefine().equals("")){
 				list = materialProjectService.findList(materialProject1);