导出空数据404 bug

src/com/ejweb/modules/airport/api/OilAnalysisController.java

@@ -32,19 +32,18 @@ public class OilAnalysisController {
 
     @ResponseBody
     @RequestMapping(value = "/oilAnalysis")
-    public ResponseBean getOilAnalysisData(RequestBean requestBean)
-    {
+    public ResponseBean getOilAnalysisData(RequestBean requestBean) {
         PageEntity<OilAnalysisEntity> list = null;
         ResponseBean responseBean = new ResponseBean();
         OilAnalysisBean bean = requestBean.getObjectBean(OilAnalysisBean.class);
-        list = oilAnalysisService.getAnalysisData(bean,true);
+        list = oilAnalysisService.getAnalysisData(bean, true);
 
         if (list == null)// 查询结果为空
         {
             responseBean.setMessage(GConstants.EMPTY);
             responseBean.setStatus(ErrorCode.STATUS_CODE_2001);
             return responseBean;
-        }else {
+        } else {
             responseBean.setData(list);
             responseBean.setMessage(GConstants.OK);
             responseBean.setStatus(ErrorCode.STATUS_CODE_2000);
@@ -56,11 +55,11 @@ public class OilAnalysisController {
     public ResponseBean newExport(RequestBean requestBean, HttpServletResponse response) {
         ResponseBean responseBean = new ResponseBean();
         OilAnalysisBean bean = requestBean.getObjectBean(OilAnalysisBean.class);
-        PageEntity<OilAnalysisEntity> page = oilAnalysisService.getAnalysisData(bean,false);
-        List<OilAnalysisEntity> list = new ArrayList<OilAnalysisEntity>();
-        if (page != null)
-        {
+        PageEntity<OilAnalysisEntity> page = oilAnalysisService.getAnalysisData(bean, false);
+        List<OilAnalysisEntity> list = new ArrayList<>();
+        if (page != null) {
             list = page.getList();
+        }
         //自定义导出序号
         String fileName = "油量分析统计（油量单位：KGS）.xlsx";
         try {
@@ -69,9 +68,6 @@ public class OilAnalysisController {
             responseBean.setMessage("导出数据失败" + e.getMessage());
             return responseBean;
         }
-            return null;
-        }
-
 
         return responseBean;
     }