Explorar el Código

协单统计导出修改

anderx hace 4 días
padre
commit
8dc7fe42a7

+ 3 - 2
src/main/java/com/goafanti/weChat/controller/AdminReleaseApiController.java

@@ -666,8 +666,9 @@ public class AdminReleaseApiController extends CertifyApiController{
 	 * 协单统计列表-导出
 	 * 协单统计列表-导出
 	 */
 	 */
 	@RequestMapping(value = "/listAssistExprot", method = RequestMethod.GET)
 	@RequestMapping(value = "/listAssistExprot", method = RequestMethod.GET)
-	public void listAssistExprot(InputListAssist in,HttpServletResponse response){
+	public Result listAssistExprot(InputListAssist in){
 		Result res =new Result();
 		Result res =new Result();
-		publicReleaseService.listAssistExprot(in, response);
+		res.setData(publicReleaseService.listAssistExprot(in));
+		return res;
 	}
 	}
 }
 }

+ 1 - 2
src/main/java/com/goafanti/weChat/service/PublicReleaseService.java

@@ -3,7 +3,6 @@ package com.goafanti.weChat.service;
 import com.goafanti.common.model.PublicConfig;
 import com.goafanti.common.model.PublicConfig;
 import com.goafanti.weChat.bo.*;
 import com.goafanti.weChat.bo.*;
 
 
-import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 import java.util.List;
 import java.util.Map;
 import java.util.Map;
 
 
@@ -101,5 +100,5 @@ public interface PublicReleaseService {
 
 
 	Object listAssist(InputListAssist in);
 	Object listAssist(InputListAssist in);
 
 
-	void listAssistExprot(InputListAssist in, HttpServletResponse response);
+	Object listAssistExprot(InputListAssist in);
 }
 }

+ 3 - 2
src/main/java/com/goafanti/weChat/service/impl/PublicReleaseServiceImpl.java

@@ -1771,13 +1771,14 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 	}
 	}
 
 
 	@Override
 	@Override
-	public void listAssistExprot(InputListAssist in, HttpServletResponse response) {
+	public Object listAssistExprot(InputListAssist in) {
 		List<OutListAssist> list = (List<OutListAssist>) findList("findAssistList", in);
 		List<OutListAssist> list = (List<OutListAssist>) findList("findAssistList", in);
 		for (OutListAssist e : list) {
 		for (OutListAssist e : list) {
 			pushTypeName(e);
 			pushTypeName(e);
 		}
 		}
 		NewExcelUtil<OutListAssist> excelExport = new NewExcelUtil<>(OutListAssist.class);
 		NewExcelUtil<OutListAssist> excelExport = new NewExcelUtil<>(OutListAssist.class);
-		excelExport.exportExcel(list,  "协单统计列表",response);
+
+		return excelExport.exportExcel(list,  "协单统计列表");
 	}
 	}
 
 
 	private void pushTypeName(OutListAssist e) {
 	private void pushTypeName(OutListAssist e) {