Browse Source

收付费明细修改

lazhaoqian 3 years ago
parent
commit
bd842fafb7

+ 5 - 5
blade-service/trade-finance/src/main/java/org/springblade/finance/controller/AccController.java

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