From a323f1489361a8008ef30aff92e0e87e6a317135 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Wed, 7 Aug 2024 14:37:07 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E5=B7=A5=E4=BD=9C=E7=BB=84=E6=88=90?= =?UTF-8?q?=E5=91=98=E5=AF=BC=E5=87=BA=E5=A2=9E=E5=8A=A0=E4=BC=81=E4=B8=9A?= =?UTF-8?q?=E7=BC=B4=E8=B4=B9=E5=87=AD=E8=AF=81=EF=BC=88=E6=9C=80=E6=96=B0?= =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E7=9A=84=E7=BC=B4=E8=B4=B9=E5=87=AD=E8=AF=81?= =?UTF-8?q?=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/PayPaymentCheckController.java | 7 +------ .../service/IPayPaymentCheckService.java | 7 +++++++ .../impl/PayPaymentCheckServiceImpl.java | 10 ++++++++++ .../PayWorkingGroupSubItemController.java | 18 ++++++++++++++++++ .../project/entity/PayWorkingGroupSubItem.java | 2 +- .../vo/excel/PayWorkingGroupSubItemExcel.java | 9 +++++++++ 6 files changed, 46 insertions(+), 7 deletions(-) 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 1c81741b..e9c4c544 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 @@ -133,12 +133,7 @@ public class PayPaymentCheckController extends JeroController getLastProof(String projectId) { - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(PayPaymentRecordSub::getProjectId, projectId); - wrapper.isNotNull(PayPaymentRecordSub::getProof); - wrapper.orderByDesc(PayPaymentRecordSub::getCreateTime); - wrapper.last("limit 1"); - PayPaymentRecordSub sub = payPaymentCheckService.getOne(wrapper); + PayPaymentRecordSub sub = payPaymentCheckService.getLastProof(projectId); if (sub == null) { return Result.OK("无数据"); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/IPayPaymentCheckService.java b/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/IPayPaymentCheckService.java index 6e11d349..54d6e2e3 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/IPayPaymentCheckService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/IPayPaymentCheckService.java @@ -55,4 +55,11 @@ public interface IPayPaymentCheckService extends IService { * @return */ String getPaymentStatus(BigDecimal amountReceivable, BigDecimal paidAmount, String paymentStatus, boolean changeReceivableAmountFlag); + + /** + * 获取最新一条缴费凭证 + * @param projectId + * @return + */ + PayPaymentRecordSub getLastProof(String projectId); } 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 092d640b..be52d209 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 @@ -782,4 +782,14 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(PayPaymentRecordSub::getProjectId, projectId); + wrapper.isNotNull(PayPaymentRecordSub::getProof); + wrapper.orderByDesc(PayPaymentRecordSub::getCreateTime); + wrapper.last("limit 1"); + return payPaymentCheckService.getOne(wrapper); + } } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java index 8684763f..f38cdfba 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java @@ -26,12 +26,16 @@ import com.jero.mail.entity.PayMailBill; import com.jero.mail.entity.PayMailBillProject; import com.jero.mail.service.IPayMailBillProjectService; import com.jero.mail.service.IPayMailBillService; +import com.jero.modules.oss.entity.OSSFile; +import com.jero.modules.oss.service.IOSSFileService; import com.jero.modules.system.entity.SysUser; import com.jero.modules.system.service.ISysUserService; import com.jero.pack.entity.PayPackCompany; import com.jero.pack.entity.PayPackCompanyProject; import com.jero.pack.service.IPayPackCompanyProjectService; import com.jero.pack.service.IPayPackCompanyService; +import com.jero.payment.entity.PayPaymentRecordSub; +import com.jero.payment.service.IPayPaymentCheckService; import com.jero.project.common.PayProjectCommon; import com.jero.project.entity.AnnualDataLocking; import com.jero.project.entity.PayWorkingGroup; @@ -54,6 +58,7 @@ import org.apache.commons.lang3.StringUtils; import org.apache.shiro.SecurityUtils; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; import org.springframework.web.servlet.ModelAndView; @@ -108,6 +113,10 @@ public class PayWorkingGroupSubItemController extends JeroController listPayWorkingGroupSubItemContacts = payWorkingGroupSubItemContactsList.stream().filter(o->Objects.equals(workingGroupSubItem.getId(),o.getWorkingGroupSubId())).collect(Collectors.toList()); if(!CollectionUtils.isEmpty(listPayWorkingGroupSubItemContacts)){ listPayWorkingGroupSubItemContacts.sort(Comparator.comparing(PayWorkingGroupSubItemContacts::getOrderNum)); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSubItem.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSubItem.java index d54c5cb7..0a06a4fe 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSubItem.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSubItem.java @@ -618,6 +618,6 @@ public class PayWorkingGroupSubItem implements Serializable { @ApiModelProperty(value = "是否审核（1：是，0：否") private Integer checkPaymentStatus; - @ApiModelProperty(value = "是否确认凭证（1：是，0：否") + @ApiModelProperty(value = "是否查看凭证（1：是，0：否") private Integer confirmVoucher; } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/vo/excel/PayWorkingGroupSubItemExcel.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/vo/excel/PayWorkingGroupSubItemExcel.java index a0c45376..d525679e 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/vo/excel/PayWorkingGroupSubItemExcel.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/vo/excel/PayWorkingGroupSubItemExcel.java @@ -40,6 +40,11 @@ public class PayWorkingGroupSubItemExcel implements Serializable { @Excel(name = "来款方式", width = 15, dicCode = "payment_type") @ApiModelProperty(value = "来款方式（1：无，2：合同，3：收费通知）") private Integer chargeWay; + + /**缴费凭证*/ + @Excel(name = "缴费凭证", type = 2 ,width = 40 , height = 20) + private String paymentRecord; + /** * 待确收金额（元） */ @@ -86,6 +91,10 @@ public class PayWorkingGroupSubItemExcel implements Serializable { @Excel(name = "需要发票", width = 15, dicCode = "invoice_type") @ApiModelProperty(value = "需要发票（1：增值税普通发票，2：增值税专用发票，0：否）") private Integer needInvoice; + + @ApiModelProperty(value = "是否查看凭证（1：是，0：否") + @Excel(name = "是否查看凭证", width = 15, dicCode = "yn") + private Integer confirmVoucher; /** * 备注 */