|
|
@@ -213,7 +213,7 @@ public class AccController extends BladeController {
|
|
|
@GetMapping("/getAccMessage")
|
|
|
@ApiOperationSupport(order = 9)
|
|
|
@ApiOperation(value = "统计收付费明细", notes = "传入ids")
|
|
|
- public R<List<Acc>> getAccMessage(@Valid @RequestBody Acc acc) {
|
|
|
+ public R getAccMessage(Acc acc, Query query) {
|
|
|
if (StringUtils.isBlank(acc.getTradeType())){
|
|
|
throw new SecurityException("请选择查询的类型");
|
|
|
}
|
|
|
@@ -232,14 +232,14 @@ public class AccController extends BladeController {
|
|
|
.ge(Func.isNotEmpty(acc.getAccDateStart()), Acc::getAccDate, acc.getAccDateStart())//订单日期开始
|
|
|
.le(Func.isNotEmpty(acc.getAccDateEnd()), Acc::getAccDate, acc.getAccDateEnd());//订单日期结束
|
|
|
|
|
|
- List<Acc> list = accService.list(accLambdaQueryWrapper);
|
|
|
- if (CollectionUtils.isNotEmpty(list)){
|
|
|
- list.forEach(e -> {
|
|
|
+ IPage<Acc> page = accService.page(Condition.getPage(query), accLambdaQueryWrapper);
|
|
|
+ if (CollectionUtils.isNotEmpty(page.getRecords())){
|
|
|
+ page.getRecords().forEach(e -> {
|
|
|
//客户名称
|
|
|
e.setCorpName(corpsDescClient.getCorpMessage(e.getCorpId()).getData().getCname());
|
|
|
});
|
|
|
}
|
|
|
- return R.data(list);
|
|
|
+ return R.data(page);
|
|
|
}
|
|
|
@GetMapping("/exportAccMessage")
|
|
|
@ApiOperationSupport(order = 10)
|