|
|
@@ -29,6 +29,7 @@ public class ExpenseCountsController extends CertifyApiController {
|
|
|
@RequestMapping(value = "/getCounts",method = RequestMethod.GET)
|
|
|
public Result<ExpenseCountsBo> getCounts(ExpenseCountsInput in){
|
|
|
Result res=new Result();
|
|
|
+ if (in.getEndTime() != null)in.setEndTime(in.getEndTime()+ " 23:59:59");
|
|
|
return res.data(expenseAccountService.getCounts(in));
|
|
|
}
|
|
|
|
|
|
@@ -36,7 +37,8 @@ public class ExpenseCountsController extends CertifyApiController {
|
|
|
@RequestMapping(value = "/getCounts/Export",method = RequestMethod.GET)
|
|
|
public Result<ExpenseCountsBo> getCountsExport(ExpenseCountsInput in){
|
|
|
NewExcelUtil excelUtil =null;
|
|
|
- List<ExpenseCountsBo> list = (List<ExpenseCountsBo>) expenseAccountService.getCounts(in);
|
|
|
+ if (in.getEndTime() != null)in.setEndTime(in.getEndTime()+ " 23:59:59");
|
|
|
+ List<ExpenseCountsBo> list = (List<ExpenseCountsBo>) expenseAccountService.getCounts(in);
|
|
|
if (in.getTargetType()==1){
|
|
|
excelUtil=new NewExcelUtil(ExpenseCountsOrder.class);
|
|
|
List<ExpenseCountsOrder>orderList = new ArrayList<>();
|