Просмотр исходного кода

公出&报销表与导出开发

anderx 1 год назад
Родитель
Сommit
1e0656ea02

+ 11 - 0
src/main/java/com/goafanti/weChat/controller/AdminReleaseApiController.java

@@ -8,6 +8,7 @@ import com.goafanti.common.controller.CertifyApiController;
 import com.goafanti.common.error.BusinessException;
 import com.goafanti.common.error.BusinessException;
 import com.goafanti.common.utils.StringUtils;
 import com.goafanti.common.utils.StringUtils;
 import com.goafanti.common.utils.excel.NewExcelUtil;
 import com.goafanti.common.utils.excel.NewExcelUtil;
+import com.goafanti.expenseAccount.bo.ExpenseCountsOrder;
 import com.goafanti.weChat.bo.*;
 import com.goafanti.weChat.bo.*;
 import com.goafanti.weChat.service.PublicReleaseService;
 import com.goafanti.weChat.service.PublicReleaseService;
 import org.apache.commons.beanutils.BeanUtils;
 import org.apache.commons.beanutils.BeanUtils;
@@ -451,6 +452,16 @@ public class AdminReleaseApiController extends CertifyApiController{
 		return res.data(publicReleaseService.releaseAndExpenseCount(in));
 		return res.data(publicReleaseService.releaseAndExpenseCount(in));
 	}
 	}
 
 
+	/**
+	 * 公出&报销表
+	 */
+	@RequestMapping(value = "/releaseAndExpenseCount/Export",method = RequestMethod.GET)
+	public Result releaseAndExpenseCountExport (InputreleaseAndExpenseCount in){
+		List<ExpenseCountsOrder> list = publicReleaseService.releaseAndExpenseCount(in);
+		NewExcelUtil<ExpenseCountsOrder> excelUtil=new NewExcelUtil<>(ExpenseCountsOrder.class);
+		return excelUtil.exportExcel(list,"公出&报销表",uploadPath);
+	}
+
 
 
 
 
 }
 }

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

@@ -1,5 +1,6 @@
 package com.goafanti.weChat.service;
 package com.goafanti.weChat.service;
 
 
+import com.goafanti.expenseAccount.bo.ExpenseCountsOrder;
 import com.goafanti.weChat.bo.*;
 import com.goafanti.weChat.bo.*;
 
 
 import java.util.List;
 import java.util.List;
@@ -72,5 +73,5 @@ public interface PublicReleaseService {
 
 
 	Object pushDateClock();
 	Object pushDateClock();
 
 
-	Object releaseAndExpenseCount(InputreleaseAndExpenseCount in);
+	List<ExpenseCountsOrder> releaseAndExpenseCount(InputreleaseAndExpenseCount in);
 }
 }

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

@@ -1958,7 +1958,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 
 
 
 
 	@Override
 	@Override
-	public Object releaseAndExpenseCount(InputreleaseAndExpenseCount in) {
+	public List<ExpenseCountsOrder> releaseAndExpenseCount(InputreleaseAndExpenseCount in) {
 		List<ExpenseCountsOrder> expenseCountsOrders = publicReleaseMapper.releaseAndExpenseCount(in);
 		List<ExpenseCountsOrder> expenseCountsOrders = publicReleaseMapper.releaseAndExpenseCount(in);
 		expenseCountsOrders.forEach(e->{
 		expenseCountsOrders.forEach(e->{
 			if (e.getExceedDuration()!=null){
 			if (e.getExceedDuration()!=null){