From 35d5697e03cc74c95cd7e89c653e9d0b6ab6b5bf Mon Sep 17 00:00:00 2001 From: donqi Date: Mon, 28 Nov 2022 01:27:09 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B4=A6=E5=8D=95=E7=9B=B8=E5=85=B3=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../payment/FinancialDetailController.java | 2 +- .../web/pojo/vo/FinancialCountRequest.java | 5 +++++ .../ghy/payment/domain/FinancialDetail.java | 3 +++ .../response/FinancialCountResponse.java | 6 ++++++ .../service/FinancialDetailService.java | 4 +++- .../impl/FinancialDetailServiceImpl.java | 4 +++- .../financial/FinancialDetailMapper.xml | 19 +++++++++++++++++++ 7 files changed, 40 insertions(+), 3 deletions(-) diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/payment/FinancialDetailController.java b/ghy-admin/src/main/java/com/ghy/web/controller/payment/FinancialDetailController.java index 746c0df7..8e9eb5cb 100644 --- a/ghy-admin/src/main/java/com/ghy/web/controller/payment/FinancialDetailController.java +++ b/ghy-admin/src/main/java/com/ghy/web/controller/payment/FinancialDetailController.java @@ -44,7 +44,7 @@ public class FinancialDetailController extends BaseController { @ResponseBody public AjaxResult count(@RequestBody FinancialCountRequest request){ try { - return AjaxResult.success(financialDetailService.count(request.getCountTime())); + return AjaxResult.success(financialDetailService.count(request.getCountTime(), request.getFinancialDetailTypes(), request.getWorkerId())); }catch (Exception e){ e.printStackTrace(); return AjaxResult.error(ExceptionUtil.getExceptionMessage(e)); diff --git a/ghy-admin/src/main/java/com/ghy/web/pojo/vo/FinancialCountRequest.java b/ghy-admin/src/main/java/com/ghy/web/pojo/vo/FinancialCountRequest.java index d8a96267..ca146930 100644 --- a/ghy-admin/src/main/java/com/ghy/web/pojo/vo/FinancialCountRequest.java +++ b/ghy-admin/src/main/java/com/ghy/web/pojo/vo/FinancialCountRequest.java @@ -2,9 +2,14 @@ package com.ghy.web.pojo.vo; import lombok.Data; +import java.util.List; + @Data public class FinancialCountRequest { private String countTime; + private List financialDetailTypes; + + private Integer workerId; } diff --git a/ghy-payment/src/main/java/com/ghy/payment/domain/FinancialDetail.java b/ghy-payment/src/main/java/com/ghy/payment/domain/FinancialDetail.java index 839a14c8..eae78ee4 100644 --- a/ghy-payment/src/main/java/com/ghy/payment/domain/FinancialDetail.java +++ b/ghy-payment/src/main/java/com/ghy/payment/domain/FinancialDetail.java @@ -7,6 +7,7 @@ import lombok.EqualsAndHashCode; import java.math.BigDecimal; import java.util.Date; +import java.util.List; /** * @author clunt @@ -79,6 +80,8 @@ public class FinancialDetail extends BaseEntity { private String endTime; + private List financialDetailTypes; + public FinancialDetail() { } diff --git a/ghy-payment/src/main/java/com/ghy/payment/response/FinancialCountResponse.java b/ghy-payment/src/main/java/com/ghy/payment/response/FinancialCountResponse.java index 49489ce5..22dc1007 100644 --- a/ghy-payment/src/main/java/com/ghy/payment/response/FinancialCountResponse.java +++ b/ghy-payment/src/main/java/com/ghy/payment/response/FinancialCountResponse.java @@ -2,6 +2,8 @@ package com.ghy.payment.response; import lombok.Data; +import java.util.List; + @Data public class FinancialCountResponse { @@ -12,4 +14,8 @@ public class FinancialCountResponse { private String incomeCount; private String flag; + + private Integer payeeId; + + private List financialDetailTypes; } diff --git a/ghy-payment/src/main/java/com/ghy/payment/service/FinancialDetailService.java b/ghy-payment/src/main/java/com/ghy/payment/service/FinancialDetailService.java index 16bcaaaa..1343d020 100644 --- a/ghy-payment/src/main/java/com/ghy/payment/service/FinancialDetailService.java +++ b/ghy-payment/src/main/java/com/ghy/payment/service/FinancialDetailService.java @@ -15,9 +15,11 @@ public interface FinancialDetailService { /** * @param countTime 是否查询准确时间 + * @param financialDetailTypes 子财务单类型 + * @param payeeId 收款人id * @return 月份集合 */ - List count(String countTime); + List count(String countTime, List financialDetailTypes, Integer payeeId); /** * @param orderDetailId 细单id diff --git a/ghy-payment/src/main/java/com/ghy/payment/service/impl/FinancialDetailServiceImpl.java b/ghy-payment/src/main/java/com/ghy/payment/service/impl/FinancialDetailServiceImpl.java index a85bbd79..bf954f56 100644 --- a/ghy-payment/src/main/java/com/ghy/payment/service/impl/FinancialDetailServiceImpl.java +++ b/ghy-payment/src/main/java/com/ghy/payment/service/impl/FinancialDetailServiceImpl.java @@ -37,10 +37,12 @@ public class FinancialDetailServiceImpl implements FinancialDetailService { @Override - public List count(String countTime) { + public List count(String countTime, List financialDetailTypes, Integer payeeId) { FinancialCountResponse request = new FinancialCountResponse(); request.setCreateTime(countTime); request.setFlag("true"); + request.setFinancialDetailTypes(financialDetailTypes); + request.setPayeeId(payeeId); // 查询各月含有收入的费用 List list = financialDetailMapper.count(request); list.forEach(financialCountResponse -> { diff --git a/ghy-payment/src/main/resources/mapper/financial/FinancialDetailMapper.xml b/ghy-payment/src/main/resources/mapper/financial/FinancialDetailMapper.xml index 3efe8ecd..2ae8a5f7 100644 --- a/ghy-payment/src/main/resources/mapper/financial/FinancialDetailMapper.xml +++ b/ghy-payment/src/main/resources/mapper/financial/FinancialDetailMapper.xml @@ -72,7 +72,17 @@ and date_format(create_time,'%y%m%d') < date_format(#{endTime},'%y%m%d') + + and payee_id = #{payeeId} + + + and financial_detail_type in + + #{item} + + + order by create_time desc