Просмотр исходного кода

修改bug:
私有应收-跟单,开票的差额原因输入后没有在开票记录或者是开票虚增金额显示

jiakai 2 месяцев назад
Родитель
Сommit
8dafe91830

+ 8 - 0
commons/src/main/java/com/jzg/commons/entity/finance/dto/ExportSuperviseSettlementExcelDto.java

@@ -61,6 +61,14 @@ public class ExportSuperviseSettlementExcelDto {
     @ExcelProperty(value = "应收金额")
     private String receivableSupervisePremium;
 
+    @Schema(description = "回款差额")
+    @ExcelProperty(value = "回款差额")
+    private String settlementPaymentDifference;
+
+    @Schema(description = "回款原因")
+    @ExcelProperty(value = "回款原因")
+    private String settlementPaymentReason;
+
     @Schema(description = "收款日期")
     @ExcelProperty(value = "收款日期")
     private String receivePaymentDate;

+ 6 - 0
commons/src/main/java/com/jzg/commons/entity/finance/vo/FollowInvoiceAndSettlementVo.java

@@ -34,6 +34,12 @@ public class FollowInvoiceAndSettlementVo {
     @Schema(description = "差额原因")
     private String paymentReason;
 
+    @Schema(description = "回款差额")
+    private BigDecimal settlementPaymentDifference;
+
+    @Schema(description = "回款原因")
+    private String settlementPaymentReason;
+
     @Schema(description = "附加id")
     private List<String> attachmentIds;
 }

+ 2 - 0
tenant/organization/src/main/resources/mapper/ReceivableMapper.xml

@@ -728,6 +728,8 @@
         GROUP_CONCAT(DISTINCT ipii.invoice_type SEPARATOR ',') AS invoice_type,
         GROUP_CONCAT(DISTINCT ipii.invoice_party SEPARATOR ',') AS invoice_party,
         GROUP_CONCAT(DISTINCT ipii.tax_point SEPARATOR ',') AS tax_point,
+        GROUP_CONCAT(DISTINCT ipiis.settlement_payment_reason SEPARATOR ',') AS settlement_payment_reason,
+        MAX(ipiis.settlement_payment_difference) AS settlement_payment_difference,
         MAX(ipiis.actual_received_amount) AS actual_received_amount,
         MAX(ipiis.receive_payment_date) AS receive_payment_date,
         MAX(ipiis.create_by) AS create_by,