|
@@ -261,6 +261,11 @@ public class ExpenseAccountController extends CertifyApiController {
|
|
|
return newExcelUtil.exportExcel(list,"报销统计",uploadPath);
|
|
return newExcelUtil.exportExcel(list,"报销统计",uploadPath);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
+ /**
|
|
|
|
|
+ * 合并报销
|
|
|
|
|
+ * @param ids
|
|
|
|
|
+ * @return
|
|
|
|
|
+ */
|
|
|
@RequestMapping(value = "/merge",method = RequestMethod.GET)
|
|
@RequestMapping(value = "/merge",method = RequestMethod.GET)
|
|
|
public Result merge(String ids){
|
|
public Result merge(String ids){
|
|
|
Result res =new Result();
|
|
Result res =new Result();
|