add English support

754356226 · Aug 1, 2024 · 4912e72 · 4912e72
1 parent b8a16b4
commit 4912e72
Show file tree

Hide file tree

Showing 16 changed files with 1,070 additions and 369 deletions.
diff --git a/core/domain/src/main/java/com/wansenai/vo/financial/CollectionVO.java b/core/domain/src/main/java/com/wansenai/vo/financial/CollectionVO.java
@@ -15,7 +15,6 @@
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.wansenai.bo.BigDecimalSerializerBO;
-import com.wansenai.utils.excel.ExcelExport;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -33,37 +32,27 @@ public class CollectionVO {
     @JsonFormat(shape = JsonFormat.Shape.STRING)
     private Long id;
 
-    @ExcelExport(value = "客户")
     private String customerName;
 
-    @ExcelExport(value = "单据编号")
     private String receiptNumber;
 
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @ExcelExport(value = "单据日期")
     private LocalDateTime receiptDate;
 
-    @ExcelExport(value = "财务人员")
     private String financialPerson;
 
-    @ExcelExport(value = "收款账户")
     private String collectionAccountName;
 
     @JsonSerialize(using = BigDecimalSerializerBO.class)
-    @ExcelExport(value = "合计收款")
     private BigDecimal totalCollectionAmount;
 
     @JsonSerialize(using = BigDecimalSerializerBO.class)
-    @ExcelExport(value = "优惠金额")
     private BigDecimal discountAmount;
 
     @JsonSerialize(using = BigDecimalSerializerBO.class)
-    @ExcelExport(value = "实际收款")
     private BigDecimal actualCollectionAmount;
 
-    @ExcelExport(value = "备注")
     private String remark;
 
-    @ExcelExport(value = "状态", kv = "0:未审核;1:已审核")
     private Integer status;
 }
diff --git a/core/domain/src/main/java/com/wansenai/vo/financial/ExpenseVO.java b/core/domain/src/main/java/com/wansenai/vo/financial/ExpenseVO.java
@@ -15,7 +15,6 @@
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.wansenai.bo.BigDecimalSerializerBO;
-import com.wansenai.utils.excel.ExcelExport;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -34,29 +33,21 @@ public class ExpenseVO {
     private Long id;
 
     // supplier or customer or member
-    @ExcelExport(value = "往来单位/人员")
     private String name;
 
-    @ExcelExport(value = "单据编号")
     private String receiptNumber;
 
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @ExcelExport(value = "单据日期")
     private LocalDateTime receiptDate;
 
-    @ExcelExport(value = "财务人员")
     private String financialPerson;
 
-    @ExcelExport(value = "支出账户")
     private String expenseAccountName;
 
     @JsonSerialize(using = BigDecimalSerializerBO.class)
-    @ExcelExport(value = "支出金额")
     private BigDecimal expenseAmount;
 
-    @ExcelExport(value = "备注")
     private String remark;
 
-    @ExcelExport(value = "状态", kv = "0-未审核;1-已审核")
     private Integer status;
 }
diff --git a/core/domain/src/main/java/com/wansenai/vo/financial/IncomeVO.java b/core/domain/src/main/java/com/wansenai/vo/financial/IncomeVO.java
@@ -34,29 +34,21 @@ public class IncomeVO {
     private Long id;
 
     // supplier or customer or member
-    @ExcelExport(value = "往来单位/人员")
     private String name;
 
-    @ExcelExport(value = "单据编号")
     private String receiptNumber;
 
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @ExcelExport(value = "单据日期")
     private LocalDateTime receiptDate;
 
-    @ExcelExport(value = "财务人员")
     private String financialPerson;
 
-    @ExcelExport(value = "收入账户")
     private String incomeAccountName;
 
     @JsonSerialize(using = BigDecimalSerializerBO.class)
-    @ExcelExport(value = "收入金额")
     private BigDecimal incomeAmount;
 
-    @ExcelExport(value = "备注")
     private String remark;
 
-    @ExcelExport(value = "状态", kv = "0-未审核;1-已审核")
     private Integer status;
 }
diff --git a/core/domain/src/main/java/com/wansenai/vo/financial/PaymentVO.java b/core/domain/src/main/java/com/wansenai/vo/financial/PaymentVO.java
@@ -15,7 +15,6 @@
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.wansenai.bo.BigDecimalSerializerBO;
-import com.wansenai.utils.excel.ExcelExport;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -33,37 +32,27 @@ public class PaymentVO {
     @JsonFormat(shape = JsonFormat.Shape.STRING)
     private Long id;
 
-    @ExcelExport(value = "供应商")
     private String supplierName;
 
-    @ExcelExport(value = "单据编号")
     private String receiptNumber;
 
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @ExcelExport(value = "单据日期")
     private LocalDateTime receiptDate;
 
-    @ExcelExport(value = "财务人员")
     private String financialPerson;
 
-    @ExcelExport(value = "付款账户")
     private String paymentAccountName;
 
     @JsonSerialize(using = BigDecimalSerializerBO.class)
-    @ExcelExport(value = "合计付款")
     private BigDecimal totalPaymentAmount;
 
     @JsonSerialize(using = BigDecimalSerializerBO.class)
-    @ExcelExport(value = "优惠金额")
     private BigDecimal discountAmount;
 
     @JsonSerialize(using = BigDecimalSerializerBO.class)
-    @ExcelExport(value = "实际付款")
     private BigDecimal actualPaymentAmount;
 
-    @ExcelExport(value = "备注")
     private String remark;
 
-    @ExcelExport(value = "状态", kv = "0:未审核;1:已审核")
     private Integer status;
 }
diff --git a/core/domain/src/main/java/com/wansenai/vo/financial/TransferVO.java b/core/domain/src/main/java/com/wansenai/vo/financial/TransferVO.java
@@ -15,7 +15,6 @@
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.wansenai.bo.BigDecimalSerializerBO;
-import com.wansenai.utils.excel.ExcelExport;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -33,26 +32,19 @@ public class TransferVO {
     @JsonFormat(shape = JsonFormat.Shape.STRING)
     private Long id;
 
-    @ExcelExport(value = "单据编号")
     private String receiptNumber;
 
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @ExcelExport(value = "单据日期")
     private LocalDateTime receiptDate;
 
-    @ExcelExport(value = "财务人员")
     private String financialPerson;
 
-    @ExcelExport(value = "付款账户")
     private String paymentAccountName;
 
     @JsonSerialize(using = BigDecimalSerializerBO.class)
-    @ExcelExport(value = "付款金额")
     private BigDecimal paymentAmount;
 
-    @ExcelExport(value = "备注")
     private String remark;
 
-    @ExcelExport(value = "状态", kv = "0:未审核;1:已审核")
     private Integer status;
 }
diff --git a/core/domain/src/main/kotlin/com/wansenai/vo/financial/AdvanceChargeVO.kt b/core/domain/src/main/kotlin/com/wansenai/vo/financial/AdvanceChargeVO.kt
@@ -16,7 +16,6 @@ import com.fasterxml.jackson.annotation.JsonFormat
 import com.fasterxml.jackson.databind.annotation.JsonSerialize
 import com.wansenai.NoArg
 import com.wansenai.bo.BigDecimalSerializerBO
-import com.wansenai.utils.excel.ExcelExport
 import lombok.Data
 import java.math.BigDecimal
 import java.time.LocalDateTime
@@ -28,33 +27,24 @@ data class AdvanceChargeVO (
     @JsonFormat(shape = JsonFormat.Shape.STRING)
     var id: Long? = null,
 
-    @ExcelExport(value = "会员")
     var memberName: String,
 
-    @ExcelExport(value = "单据编号")
     var receiptNumber: String,
 
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @ExcelExport(value = "单据日期")
     var receiptDate: LocalDateTime,
 
     @JsonSerialize(using = BigDecimalSerializerBO::class)
-    @ExcelExport(value = "收款金额")
     var collectedAmount : BigDecimal,
 
     @JsonSerialize(using = BigDecimalSerializerBO::class)
-    @ExcelExport(value = "合计金额")
     var totalAmount : BigDecimal,
 
-    @ExcelExport(value = "财务人员")
     var financialPersonnel: String,
 
-    @ExcelExport(value = "操作员")
     var operator: String,
 
-    @ExcelExport(value = "备注")
     var remark: String? = null,
 
-    @ExcelExport(value = "状态", kv = "0:未审核;1:已审核")
     var status: Int,
 )