anderx дней назад: 2
Родитель
Сommit
b3c1ff7ce5

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

@@ -667,8 +667,6 @@ public class AdminReleaseApiController extends CertifyApiController{
 	 */
 	@RequestMapping(value = "/listAssistExprot", method = RequestMethod.GET)
 	public Result listAssistExprot(InputListAssist in){
-		Result res =new Result();
-		res.setData(publicReleaseService.listAssistExprot(in));
-		return res;
+		return  publicReleaseService.listAssistExprot(in,uploadPath);
 	}
 }

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

@@ -1,5 +1,6 @@
 package com.goafanti.weChat.service;
 
+import com.goafanti.common.bo.Result;
 import com.goafanti.common.model.PublicConfig;
 import com.goafanti.weChat.bo.*;
 
@@ -100,5 +101,5 @@ public interface PublicReleaseService {
 
 	Object listAssist(InputListAssist in);
 
-	Object listAssistExprot(InputListAssist in);
+	Result listAssistExprot(InputListAssist in,String uploadPath);
 }

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

@@ -6,6 +6,7 @@ import com.goafanti.admin.bo.AdminPublicReviewerBo;
 import com.goafanti.admin.service.DepartmentService;
 import com.goafanti.business.bo.InputRestrictProject;
 import com.goafanti.common.bo.EmailBo;
+import com.goafanti.common.bo.Result;
 import com.goafanti.common.constant.AFTConstants;
 import com.goafanti.common.dao.*;
 import com.goafanti.common.enums.AssistContentType;
@@ -1771,14 +1772,13 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 	}
 
 	@Override
-	public Object listAssistExprot(InputListAssist in) {
+	public Result listAssistExprot(InputListAssist in,String uploadPath) {
 		List<OutListAssist> list = (List<OutListAssist>) findList("findAssistList", in);
 		for (OutListAssist e : list) {
 			pushTypeName(e);
 		}
 		NewExcelUtil<OutListAssist> excelExport = new NewExcelUtil<>(OutListAssist.class);
-
-		return excelExport.exportExcel(list,  "协单统计列表");
+		return excelExport.exportExcel(list,"协单统计列表",uploadPath);
 	}
 
 	private void pushTypeName(OutListAssist e) {