From 032e1803fa524302c14284a807ac7918fdd47f37 Mon Sep 17 00:00:00 2001 From: "15989082884@163.com" <15989082884@163.com> Date: Mon, 11 Sep 2023 15:04:04 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B4=B9=E7=94=A8=E5=AF=BC=E5=87=BA=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../excel/entity/DataCheckApplyMainInfo.java | 4 +- .../serve/modules/pay/entity/PayPayment.java | 5 ++ .../modules/pay/entity/PayPaymentItem.java | 19 ++++++++ .../mapper/TbsCostApplySumAmountMapper.java | 3 ++ .../tbs/TbsCostApplySumAmountMapper.xml | 48 ++++++++++++++++--- 5 files changed, 71 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/qs/serve/modules/excel/entity/DataCheckApplyMainInfo.java b/src/main/java/com/qs/serve/modules/excel/entity/DataCheckApplyMainInfo.java index 60c85b09..eb542a76 100644 --- a/src/main/java/com/qs/serve/modules/excel/entity/DataCheckApplyMainInfo.java +++ b/src/main/java/com/qs/serve/modules/excel/entity/DataCheckApplyMainInfo.java @@ -44,12 +44,12 @@ public class DataCheckApplyMainInfo { private BigDecimal payAmt; /** - * 待支付 + * 不再支付 */ private BigDecimal unPayAmt; /** - * 不再支付 + * 待支付 */ private BigDecimal notPayAmt; diff --git a/src/main/java/com/qs/serve/modules/pay/entity/PayPayment.java b/src/main/java/com/qs/serve/modules/pay/entity/PayPayment.java index f221e2aa..3d5bc063 100644 --- a/src/main/java/com/qs/serve/modules/pay/entity/PayPayment.java +++ b/src/main/java/com/qs/serve/modules/pay/entity/PayPayment.java @@ -124,6 +124,11 @@ public class PayPayment implements Serializable { @TableField(fill = FieldFill.UPDATE) private LocalDateTime updateTime; + private Long costApplyId; + + @TableField(condition = SqlCondition.LIKE) + private String erpId; + /** 所属租户 */ @JsonIgnore @JsonProperty diff --git a/src/main/java/com/qs/serve/modules/pay/entity/PayPaymentItem.java b/src/main/java/com/qs/serve/modules/pay/entity/PayPaymentItem.java index 669dc299..a7e23243 100644 --- a/src/main/java/com/qs/serve/modules/pay/entity/PayPaymentItem.java +++ b/src/main/java/com/qs/serve/modules/pay/entity/PayPaymentItem.java @@ -126,6 +126,25 @@ public class PayPaymentItem implements Serializable { @JsonProperty private String delFlag; + @TableField(condition = SqlCondition.LIKE) + private String erpId; + + @TableField(condition = SqlCondition.LIKE) + private String billNumber; + + /** 支付时间 */ + @NotNull(message = "支付时间不能为空") + @Length(max = 0,message = "支付时间长度不能超过0字") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + private LocalDateTime payTime; + + /** 支付时间 */ + @NotNull(message = "支付日期不能为空") + @Length(max = 0,message = "支付时间长度不能超过0字") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + private LocalDateTime payDate; /** * 后端参数，请忽略 diff --git a/src/main/java/com/qs/serve/modules/tbs/mapper/TbsCostApplySumAmountMapper.java b/src/main/java/com/qs/serve/modules/tbs/mapper/TbsCostApplySumAmountMapper.java index d2ea4251..b6b013a8 100644 --- a/src/main/java/com/qs/serve/modules/tbs/mapper/TbsCostApplySumAmountMapper.java +++ b/src/main/java/com/qs/serve/modules/tbs/mapper/TbsCostApplySumAmountMapper.java @@ -1,5 +1,6 @@ package com.qs.serve.modules.tbs.mapper; +import com.baomidou.mybatisplus.annotation.InterceptorIgnore; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.qs.serve.modules.excel.entity.DataCheckApplyDetailItem; import com.qs.serve.modules.excel.entity.DataCheckApplyMainInfo; @@ -19,9 +20,11 @@ import java.util.List; */ public interface TbsCostApplySumAmountMapper { + @InterceptorIgnore(tenantLine = "1") List selectDataCheckApplyDetailItem(@Param("supplierId")String supplierId, @Param("costApplyIds")List costApplyIds); + @InterceptorIgnore(tenantLine = "1") DataCheckApplyMainInfo selectDataCheckApplyMainInfo(@Param("supplierId")String supplierId, @Param("costApplyIds")List costApplyIds); } diff --git a/src/main/resources/mapper/tbs/TbsCostApplySumAmountMapper.xml b/src/main/resources/mapper/tbs/TbsCostApplySumAmountMapper.xml index 45eb7e6f..fda17e0c 100644 --- a/src/main/resources/mapper/tbs/TbsCostApplySumAmountMapper.xml +++ b/src/main/resources/mapper/tbs/TbsCostApplySumAmountMapper.xml @@ -28,9 +28,9 @@ IFNULL(verification_totals.checking_amt, 0) AS checking_amt, IFNULL(activity_totals.dont_check_amt, 0) AS dont_check_amt, IFNULL(payment_totals.pay_amt, 0) AS pay_amt, - IFNULL(payment_totals.not_pay_amt, 0) AS not_pay_amt, - IFNULL(activity_totals.cost_apply_amt - verification_totals.checked_amt - verification_totals.checking_amt - activity_totals.dont_check_amt,0) as not_check_amt, - IFNULL(verification_totals.checked_amt - payment_totals.pay_amt - payment_totals.not_pay_amt,0) as un_pay_amt + IFNULL(payment_totals.not_pay_amt, 0) AS un_pay_amt, + IFNULL(activity_totals.cost_apply_amt,0) - IFNULL(verification_totals.checked_amt,0) - IFNULL(verification_totals.checking_amt,0) - IFNULL(activity_totals.dont_check_amt,0) as not_check_amt, + IFNULL(verification_totals.checked_amt,0) - IFNULL(payment_totals.pay_amt,0) - IFNULL(payment_totals.not_pay_amt,0) as not_pay_amt FROM tbs_cost_apply c LEFT JOIN ( @@ -42,6 +42,12 @@ tbs_activity WHERE del_flag = 0 + + and cost_apply_id in + + #{selectId} + + GROUP BY cost_apply_id ) activity_totals ON activity_totals.cost_apply_id = c.id @@ -54,6 +60,12 @@ vtb_verification WHERE del_flag = 0 + + and cost_apply_id in + + #{selectId} + + GROUP BY cost_apply_id ) verification_totals ON verification_totals.cost_apply_id = c.id @@ -66,6 +78,12 @@ pay_payment_item WHERE del_flag = 0 + + and cost_apply_id in + + #{selectId} + + GROUP BY cost_apply_id ) payment_totals ON payment_totals.cost_apply_id = c.id @@ -106,9 +124,9 @@ IFNULL(SUM(verification_totals.checking_amt), 0) AS checking_amt, IFNULL(SUM(activity_totals.dont_check_amt), 0) AS dont_check_amt, IFNULL(SUM(payment_totals.pay_amt), 0) AS pay_amt, - IFNULL(SUM(payment_totals.not_pay_amt), 0) AS not_pay_amt, - IFNULL(SUM(activity_totals.cost_apply_amt - verification_totals.checked_amt - verification_totals.checking_amt - activity_totals.dont_check_amt),0) as not_check_amt, - IFNULL(SUM(verification_totals.checked_amt - payment_totals.pay_amt - payment_totals.not_pay_amt),0) as un_pay_amt + IFNULL(SUM(payment_totals.not_pay_amt), 0) AS un_pay_amt, + IFNULL( SUM( activity_totals.cost_apply_amt) - SUM(verification_totals.checked_amt) - SUM(verification_totals.checking_amt) - SUM(activity_totals.dont_check_amt ), 0 ) AS not_check_amt, + IFNULL( SUM( verification_totals.checked_amt) - SUM(payment_totals.pay_amt) - SUM(payment_totals.not_pay_amt ), 0 ) AS un_pay_amt FROM tbs_cost_apply c LEFT JOIN ( @@ -120,6 +138,12 @@ tbs_activity WHERE del_flag = 0 + + and cost_apply_id in + + #{selectId} + + GROUP BY cost_apply_id ) activity_totals ON activity_totals.cost_apply_id = c.id @@ -132,6 +156,12 @@ vtb_verification WHERE del_flag = 0 + + and cost_apply_id in + + #{selectId} + + GROUP BY cost_apply_id ) verification_totals ON verification_totals.cost_apply_id = c.id @@ -144,6 +174,12 @@ pay_payment_item WHERE del_flag = 0 + + and cost_apply_id in + + #{selectId} + + GROUP BY cost_apply_id ) payment_totals ON payment_totals.cost_apply_id = c.id