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

修改bug:
私有应收 跟单开票记录中,开票时间不对,不是开票填写框中填的日期

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

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

@@ -1,11 +1,13 @@
 package com.jzg.commons.entity.finance.vo;
 
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
+import java.time.LocalDateTime;
 import java.util.List;
 
 @Data
@@ -21,6 +23,10 @@ public class FollowInvoiceVo implements Serializable {
     @Schema(description = "开票类型")
     private String invoiceType;
 
+    @Schema(description = "开票时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private LocalDateTime invoiceTime;
+
     @Schema(description = "开票方")
     @ExcelProperty(value = "开票方")
     private String invoiceParty;

+ 5 - 0
commons/src/main/java/com/jzg/commons/entity/finance/vo/InvoiceRecordResult.java

@@ -45,6 +45,11 @@ public class InvoiceRecordResult extends PageRequest {
      */
     private String invoiceParty;
 
+    /**
+     * 开票时间
+     */
+    private String invoiceTime;
+
     /**
      * 开票类型  1、手续费  2、跟单费  3、驾意险手续费 4、驾意险跟单费 5、平台应收-车险 6、平台应收-非车险
      */

+ 1 - 1
tenant/organization/src/main/java/com/jzg/organization/service/impl/ReceivableServiceImpl.java

@@ -4079,7 +4079,7 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
         invoice.setPaymentReason(vo.getPaymentReason());
         invoice.setReceivableSupervisePremium(vo.getReceivableSupervisePremium());
         invoice.setTaxPoint(vo.getTaxPoint());
-        invoice.setInvoiceTime(LocalDateTime.now());
+        invoice.setInvoiceTime(vo.getInvoiceTime());
         // 初始状态:0-待处理
         invoice.setStatus("0");
         return invoice;

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

@@ -1552,6 +1552,7 @@
         ipii.overinflated_amount,
         ipii.receivable_supervise_premium,
         ipii.tax_point,
+        ipii.invoice_time,
         ipii.create_time,
         ipii.create_by,
         ipii.update_time,