Merge branch 'dev_oracle_sherlock' into 'dev_oracle'

Dev oracle sherlock

See merge request root/atms!195

atms-api/src/main/java/pwc/taxtech/atms/dto/vatdto/InputInvoiceDetailExportDto.java

@@ -7,22 +7,22 @@ import java.math.BigDecimal;
 
 public class InputInvoiceDetailExportDto implements Serializable {
 
-    @ExcelCell(index=5)
+    @ExcelCell(index=1)
     private Integer periodId;
 
-    @ExcelCell(index=4)
+    @ExcelCell(index=2)
     private String invoiceCode;
 
-    @ExcelCell(index=6)
+    @ExcelCell(index=3)
     private String invoiceNumber;
 
-    @ExcelCell(index=2)
+    @ExcelCell(index=4)
     private BigDecimal amount;
 
-    @ExcelCell(index=1)
+    @ExcelCell(index=5)
     private BigDecimal taxAmount;
 
-    @ExcelCell(index=3)
+    @ExcelCell(index=6)
     private String taxRate;
 
     @ExcelCell(index=7)

atms-api/src/main/java/pwc/taxtech/atms/dto/vatdto/InputInvoiceExportDto.java

@@ -7,31 +7,31 @@ import java.math.BigDecimal;
 
 public class InputInvoiceExportDto implements Serializable {
 
-    @ExcelCell(index=6)
+    @ExcelCell(index=1)
     private Integer periodId;
 
-    @ExcelCell(index=7)
+    @ExcelCell(index=2)
     private String invoiceDate;
 
-    @ExcelCell(index=5)
+    @ExcelCell(index=3)
     private String invoiceCode;
 
-    @ExcelCell(index=8)
+    @ExcelCell(index=4)
     private String invoiceNumber;
 
-    @ExcelCell(index=9)
+    @ExcelCell(index=5)
     private String sellerTaxNumber;
 
-    @ExcelCell(index=3)
+    @ExcelCell(index=6)
     private String invoiceTypeName;
 
-    @ExcelCell(index=4)
+    @ExcelCell(index=7)
     private BigDecimal amount;
 
-    @ExcelCell(index=1)
+    @ExcelCell(index=8)
     private BigDecimal taxAmount;
 
-    @ExcelCell(index=2)
+    @ExcelCell(index=9)
     private String certificationDate;
 
     public Integer getPeriodId() {

atms-api/src/main/java/pwc/taxtech/atms/dto/vatdto/OutputVATInvoiceInfoDto.java

@@ -12,43 +12,43 @@ public class OutputVATInvoiceInfoDto {
     private String invoiceId;
 
     private Integer invoiceType;
-    @ExcelCell(index=13)
+    @ExcelCell(index=1)
     private String invoiceTypeName;
-    @ExcelCell(index=11)
+    @ExcelCell(index=2)
     private String classCode;
-    @ExcelCell(index=18)
+    @ExcelCell(index=3)
     private String invoiceNumber;
-    @ExcelCell(index=17)
+    @ExcelCell(index=4)
     private String buyerName;
-    @ExcelCell(index=1)
-    private String buyerTaxNumber;
     @ExcelCell(index=5)
+    private String buyerTaxNumber;
+    @ExcelCell(index=6)
     private String bankAccount;
-    @ExcelCell(index=12)
+    @ExcelCell(index=7)
     private String phoneNum;
-    @ExcelCell(index=19)
+    @ExcelCell(index=8)
     private Date invoiceDate;
-    @ExcelCell(index=16)
+    @ExcelCell(index=9)
     private String codeVersion;
-    @ExcelCell(index=2)
+    @ExcelCell(index=11)
     private String productName;
-    @ExcelCell(index=14)
+    @ExcelCell(index=10)
     private String documentNum;
-    @ExcelCell(index=7)
+    @ExcelCell(index=12)
     private String productStandard;
-    @ExcelCell(index=6)
+    @ExcelCell(index=13)
     private String unit;
-    @ExcelCell(index=4)
+    @ExcelCell(index=14)
     private Integer quantity;
-    @ExcelCell(index=9)
+    @ExcelCell(index=15)
     private Double unitPrice;
-    @ExcelCell(index=3)
+    @ExcelCell(index=16)
     private BigDecimal amount;
-    @ExcelCell(index=15)
+    @ExcelCell(index=17)
     private BigDecimal taxRate;
-    @ExcelCell(index=10)
+    @ExcelCell(index=18)
     private BigDecimal taxAmount;
-    @ExcelCell(index=8)
+    @ExcelCell(index=19)
     private String taxClassCode;
     @JsonProperty("periodID")
     private int periodId;

atms-api/src/main/java/pwc/taxtech/atms/thirdparty/ExcelUtil.java

@@ -49,7 +49,8 @@ public class ExcelUtil {
 
     private static Logger LG = LoggerFactory.getLogger(ExcelUtil.class);
 
-    private static final DecimalFormat DECIMAL_FORMAT = new DecimalFormat("###,###.00");
+    private static final DecimalFormat DECIMAL_FORMAT = new DecimalFormat("###,##0.00");
+
     /**
      * 用来验证excel与Vo中的类型是否一致 <br>
      * Map<栏位类型,只能是哪些Cell类型>