From 72d7372b8bfa0482474f44518f1cdfee31e2a53d Mon Sep 17 00:00:00 2001 From: baozhipeng <961815525@qq.com> Date: Thu, 16 Dec 2021 11:11:17 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BC=B4=E8=B4=B9=E5=AE=A1=E6=A0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../meeting/entity/PayMeetingSituation.java | 6 +++ .../entity/PayMemberProjectSubitem.java | 6 +++ .../member/entity/TbCertificatePayment.java | 6 +++ .../member/entity/TbMemberProjectSubitem.java | 6 +++ .../controller/PayPaymentCheckController.java | 23 +++++++++ .../PayPaymentRecordController.java | 4 +- .../jero/payment/entity/PayPaymentRecord.java | 5 ++ .../payment/entity/PayPaymentRecordSub.java | 6 +++ .../impl/PayPaymentCheckServiceImpl.java | 49 +++++++++++++------ .../impl/PayPaymentRecordServiceImpl.java | 11 ++++- .../jero/project/entity/PayCommonProject.java | 6 +++ .../entity/PayWorkingGroupSubItem.java | 6 +++ 12 files changed, 116 insertions(+), 18 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeetingSituation.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeetingSituation.java index fad3c4a0..42040be1 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeetingSituation.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeetingSituation.java @@ -376,6 +376,12 @@ public class PayMeetingSituation implements Serializable { @JsonFormat(shape = JsonFormat.Shape.STRING) private BigDecimal invoiceAmount; + /** + * toBeUploaded 待上传 + * toBeReviewed 待审核 + * rejected 已拒绝 + * completed 已完结 + */ @ApiModelProperty(value = "缴费状态") private String paymentStatus; diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/PayMemberProjectSubitem.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/PayMemberProjectSubitem.java index 931cb155..9cea77c5 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/PayMemberProjectSubitem.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/PayMemberProjectSubitem.java @@ -248,6 +248,12 @@ public class PayMemberProjectSubitem implements Serializable { @JsonFormat(shape = JsonFormat.Shape.STRING) private BigDecimal invoiceAmount; + /** + * toBeUploaded 待上传 + * toBeReviewed 待审核 + * rejected 已拒绝 + * completed 已完结 + */ @ApiModelProperty(value = "缴费状态") private String paymentStatus; diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/TbCertificatePayment.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/TbCertificatePayment.java index c7499e49..4ea7f00b 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/TbCertificatePayment.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/TbCertificatePayment.java @@ -130,6 +130,12 @@ public class TbCertificatePayment implements Serializable { /**缴费状态*/ @Excel(name = "缴费状态", width = 15) + /** + * toBeUploaded 待上传 + * toBeReviewed 待审核 + * rejected 已拒绝 + * completed 已完结 + */ @ApiModelProperty(value = "缴费状态") private String paymentStatus; diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/TbMemberProjectSubitem.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/TbMemberProjectSubitem.java index 15a67282..fe6b8c41 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/TbMemberProjectSubitem.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/TbMemberProjectSubitem.java @@ -188,6 +188,12 @@ public class TbMemberProjectSubitem implements Serializable { @JsonFormat(shape = JsonFormat.Shape.STRING) private BigDecimal invoiceAmount; + /** + * toBeUploaded 待上传 + * toBeReviewed 待审核 + * rejected 已拒绝 + * completed 已完结 + */ @ApiModelProperty(value = "缴费状态") private String paymentStatus; diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/payment/controller/PayPaymentCheckController.java b/jero-boot-incoming-payment/src/main/java/com/jero/payment/controller/PayPaymentCheckController.java index 1defc502..32aaf0e4 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/payment/controller/PayPaymentCheckController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/payment/controller/PayPaymentCheckController.java @@ -1,16 +1,21 @@ package com.jero.payment.controller; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.jero.common.api.vo.Result; +import com.jero.common.enums.PaymentStatusEnum; import com.jero.common.system.base.controller.JeroController; import com.jero.payment.entity.PayPaymentRecordSub; import com.jero.payment.entity.PayPaymentRecord; import com.jero.payment.service.IPayPaymentCheckService; +import com.jero.payment.service.IPayPaymentRecordService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.util.List; + @Api(tags="到账审核") @RestController @@ -19,6 +24,24 @@ import org.springframework.web.bind.annotation.*; public class PayPaymentCheckController extends JeroController { @Autowired private IPayPaymentCheckService payPaymentCheckService; + @Autowired + private IPayPaymentRecordService payPaymentRecordService; + + /** + * 来款列表 + * @return + */ + @ApiOperation(value="来款列表", notes="来款列表") + @PostMapping(value = "/amountReceivedList") + public Result amountReceivedList(String id) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(PayPaymentRecord::getProjectId, id); + wrapper.eq(PayPaymentRecord::getPaymentStatus, PaymentStatusEnum.COMPLETED.getCode()); + wrapper.orderByAsc(PayPaymentRecord::getPaymentDate); + List list = payPaymentRecordService.list(wrapper); + + return Result.OK(list); + } @ApiOperation(value="申请", notes="申请") @PostMapping(value = "/applicant") diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/payment/controller/PayPaymentRecordController.java b/jero-boot-incoming-payment/src/main/java/com/jero/payment/controller/PayPaymentRecordController.java index 87e8610a..b6f93fd6 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/payment/controller/PayPaymentRecordController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/payment/controller/PayPaymentRecordController.java @@ -13,6 +13,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.jero.common.api.vo.Result; import com.jero.common.aspect.annotation.AutoLog; import com.jero.common.common.ProjectCommon; +import com.jero.common.enums.PaymentStatusEnum; import com.jero.common.system.base.controller.JeroController; import com.jero.common.system.query.QueryGenerator; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -134,7 +135,8 @@ public class PayPaymentRecordController extends JeroController amountReceivedList(String id) { LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); wrapper.eq(PayPaymentRecord::getProjectId, id); - wrapper.orderByDesc(PayPaymentRecord::getPaymentDate); + wrapper.eq(PayPaymentRecord::getPaymentStatus, PaymentStatusEnum.COMPLETED.getCode()); + wrapper.orderByAsc(PayPaymentRecord::getPaymentDate); List list = payPaymentRecordService.list(wrapper); return Result.OK(list); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/payment/entity/PayPaymentRecord.java b/jero-boot-incoming-payment/src/main/java/com/jero/payment/entity/PayPaymentRecord.java index 65d55b36..0e97534f 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/payment/entity/PayPaymentRecord.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/payment/entity/PayPaymentRecord.java @@ -83,6 +83,11 @@ public class PayPaymentRecord implements Serializable { @ApiModelProperty(value = "申请人名字") private String applicantName; + /** + * TO_BE_REVIEWED("toBeReviewed"),//待审核 + * REJECTED("rejected"),//已拒绝 + * COMPLETED("completed");//已完结 + */ @ApiModelProperty(value = "缴费状态") private String paymentStatus; diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/payment/entity/PayPaymentRecordSub.java b/jero-boot-incoming-payment/src/main/java/com/jero/payment/entity/PayPaymentRecordSub.java index 4d9a32c1..e44df919 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/payment/entity/PayPaymentRecordSub.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/payment/entity/PayPaymentRecordSub.java @@ -81,6 +81,12 @@ public class PayPaymentRecordSub implements Serializable { @ApiModelProperty(value = "申请人名字") private String applicantName; + /** + * toBeUploaded 待上传 + * toBeReviewed 待审核 + * rejected 已拒绝 + * completed 已完结 + */ @ApiModelProperty(value = "缴费状态") private String paymentStatus; diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentCheckServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentCheckServiceImpl.java index 3baaab12..c9ecae96 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentCheckServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentCheckServiceImpl.java @@ -216,15 +216,20 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl