1、VAT日记账预览导出去掉多余列

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

@@ -44,175 +44,175 @@ public class JournalEntryExportDto {
     @ExcelCell(index=8)
     private String lineNum;
 
-    @ExcelCell(index=9)
-    private String approvalStatus;
-
-    @ExcelCell(index=10)
-    private String postedStatus;
+//    @ExcelCell(index=9)
+//    private String approvalStatus;
+//
+//    @ExcelCell(index=10)
+//    private String postedStatus;
 
-    @ExcelCell(index=11)
+    @ExcelCell(index=9)
     private Integer period;
 
-    @ExcelCell(index=12)
+    @ExcelCell(index=10)
     private Date accountingDate;
 
-    @ExcelCell(index=13)
-    private String journalSource;
+//    @ExcelCell(index=13)
+//    private String journalSource;
+//
+//    @ExcelCell(index=14)
+//    private String category;
 
-    @ExcelCell(index=14)
-    private String category;
-
-    @ExcelCell(index=15)
+    @ExcelCell(index=11)
     private String name;
 
-    @ExcelCell(index=16)
+    @ExcelCell(index=12)
     private String voucherNum;
 
-    @ExcelCell(index=17)
+    @ExcelCell(index=13)
     private String description;
 
-    @ExcelCell(index=18)
+    @ExcelCell(index=14)
     private String segment1;
 
-    @ExcelCell(index=19)
+    @ExcelCell(index=15)
     private String segment2;
 
-    @ExcelCell(index=20)
+    @ExcelCell(index=16)
     private String segment3;
 
-    @ExcelCell(index=21)
+    @ExcelCell(index=17)
     private String segment4;
 
-    @ExcelCell(index=22)
+    @ExcelCell(index=18)
     private String segment5;
 
-    @ExcelCell(index=23)
+    @ExcelCell(index=19)
     private String segment6;
 
-    @ExcelCell(index=24)
+    @ExcelCell(index=20)
     private String segment7;
 
-    @ExcelCell(index=25)
+    @ExcelCell(index=21)
     private String segment8;
 
-    @ExcelCell(index=26)
+    @ExcelCell(index=22)
     private String segment9;
 
-    @ExcelCell(index=27)
+    @ExcelCell(index=23)
     private String segment10;
 
-    @ExcelCell(index=28)
+    @ExcelCell(index=24)
     private String segment1Name;
 
-    @ExcelCell(index=29)
+    @ExcelCell(index=25)
     private String segment2Name;
 
-    @ExcelCell(index=30)
+    @ExcelCell(index=26)
     private String segment3Name;
 
-    @ExcelCell(index=31)
+    @ExcelCell(index=27)
     private String segment4Name;
 
-    @ExcelCell(index=32)
+    @ExcelCell(index=28)
     private String segment5Name;
 
-    @ExcelCell(index=33)
+    @ExcelCell(index=29)
     private String segment6Name;
 
-    @ExcelCell(index=34)
+    @ExcelCell(index=30)
     private String segment7Name;
 
-    @ExcelCell(index=35)
+    @ExcelCell(index=31)
     private String segment8Name;
 
-    @ExcelCell(index=36)
+    @ExcelCell(index=32)
     private String segment9Name;
 
-    @ExcelCell(index=37)
+    @ExcelCell(index=33)
     private String segment10Name;
 
-    @ExcelCell(index=38)
+    @ExcelCell(index=34)
     private String journalCurrencyCode;
 
-    @ExcelCell(index=39)
+    @ExcelCell(index=35)
     private String sobCurrencyCode;
 
-    @ExcelCell(index=40)
+    @ExcelCell(index=36)
     private BigDecimal accountedDr;
 
-    @ExcelCell(index=41)
+    @ExcelCell(index=37)
     private BigDecimal accountedCr;
 
-    @ExcelCell(index=42)
+    @ExcelCell(index=38)
     private BigDecimal enteredDr;
 
-    @ExcelCell(index=43)
+    @ExcelCell(index=39)
     private BigDecimal enteredCr;
 
-    @ExcelCell(index=44)
+    @ExcelCell(index=40)
     private String cfItem;
 
-    @ExcelCell(index=45)
+    @ExcelCell(index=41)
     private String attribute1;
 
-    @ExcelCell(index=46)
+    @ExcelCell(index=42)
     private Date attribute2;
 
-    @ExcelCell(index=47)
+    @ExcelCell(index=43)
     private String attribute3;
 
-    @ExcelCell(index=48)
+    @ExcelCell(index=44)
     private String attribute4;
 
-    @ExcelCell(index=49)
+    @ExcelCell(index=45)
     private String attribute5;
 
-    @ExcelCell(index=50)
+    @ExcelCell(index=46)
     private String attribute6;
 
-    @ExcelCell(index=51)
+    @ExcelCell(index=47)
     private String attribute7;
 
-    @ExcelCell(index=52)
+    @ExcelCell(index=48)
     private String attribute8;
 
-    @ExcelCell(index=53)
+    @ExcelCell(index=49)
     private String attribute9;
 
-    @ExcelCell(index=54)
+    @ExcelCell(index=50)
     private String attribute10;
 
-    @ExcelCell(index=55)
+    @ExcelCell(index=51)
     private String attribute11;
 
-    @ExcelCell(index=56)
+    @ExcelCell(index=52)
     private String attribute12;
 
-    @ExcelCell(index=57)
+    @ExcelCell(index=53)
     private String attribute13;
 
-    @ExcelCell(index=58)
+    @ExcelCell(index=54)
     private String attribute14;
 
-    @ExcelCell(index=59)
+    @ExcelCell(index=55)
     private String attribute15;
 
-    @ExcelCell(index=60)
+    @ExcelCell(index=56)
     private String attribute16;
 
-    @ExcelCell(index=61)
+    @ExcelCell(index=57)
     private String createdBy;
 
-    @ExcelCell(index=62)
+    @ExcelCell(index=58)
     private Date createdDate;
 
-    @ExcelCell(index=63)
+    @ExcelCell(index=59)
     private String lateUpdatedBy;
 
-    @ExcelCell(index=64)
+    @ExcelCell(index=60)
     private Date lateUpdatedDate;
 
-    @ExcelCell(index=65)
+    @ExcelCell(index=61)
     private Integer tmsPeriod;
 
     private Date createTime;
@@ -491,54 +491,6 @@ public class JournalEntryExportDto {
         this.lineNum = lineNum == null ? null : lineNum.trim();
     }
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column journal_entry.approval_status
-     *
-     * @return the value of journal_entry.approval_status
-     *
-     * @mbg.generated
-     */
-    public String getApprovalStatus() {
-        return approvalStatus;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column journal_entry.approval_status
-     *
-     * @param approvalStatus the value for journal_entry.approval_status
-     *
-     * @mbg.generated
-     */
-    public void setApprovalStatus(String approvalStatus) {
-        this.approvalStatus = approvalStatus == null ? null : approvalStatus.trim();
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column journal_entry.posted_status
-     *
-     * @return the value of journal_entry.posted_status
-     *
-     * @mbg.generated
-     */
-    public String getPostedStatus() {
-        return postedStatus;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column journal_entry.posted_status
-     *
-     * @param postedStatus the value for journal_entry.posted_status
-     *
-     * @mbg.generated
-     */
-    public void setPostedStatus(String postedStatus) {
-        this.postedStatus = postedStatus == null ? null : postedStatus.trim();
-    }
-
     /**
      * This method was generated by MyBatis Generator.
      * This method returns the value of the database column journal_entry.period
@@ -587,54 +539,6 @@ public class JournalEntryExportDto {
         this.accountingDate = accountingDate;
     }
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column journal_entry.journal_source
-     *
-     * @return the value of journal_entry.journal_source
-     *
-     * @mbg.generated
-     */
-    public String getJournalSource() {
-        return journalSource;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column journal_entry.journal_source
-     *
-     * @param journalSource the value for journal_entry.journal_source
-     *
-     * @mbg.generated
-     */
-    public void setJournalSource(String journalSource) {
-        this.journalSource = journalSource == null ? null : journalSource.trim();
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column journal_entry.category
-     *
-     * @return the value of journal_entry.category
-     *
-     * @mbg.generated
-     */
-    public String getCategory() {
-        return category;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column journal_entry.category
-     *
-     * @param category the value for journal_entry.category
-     *
-     * @mbg.generated
-     */
-    public void setCategory(String category) {
-        this.category = category == null ? null : category.trim();
-    }
-
     /**
      * This method was generated by MyBatis Generator.
      * This method returns the value of the database column journal_entry.name
@@ -1906,12 +1810,8 @@ public class JournalEntryExportDto {
         sb.append(", status=").append(status);
         sb.append(", headerId=").append(headerId);
         sb.append(", lineNum=").append(lineNum);
-        sb.append(", approvalStatus=").append(approvalStatus);
-        sb.append(", postedStatus=").append(postedStatus);
         sb.append(", period=").append(period);
         sb.append(", accountingDate=").append(accountingDate);
-        sb.append(", journalSource=").append(journalSource);
-        sb.append(", category=").append(category);
         sb.append(", name=").append(name);
         sb.append(", voucherNum=").append(voucherNum);
         sb.append(", description=").append(description);

atms-api/src/main/java/pwc/taxtech/atms/service/impl/DataPreviewSerivceImpl.java

@@ -626,20 +626,20 @@ public class DataPreviewSerivceImpl extends BaseService {
     private Map<String, String> generalJEHeader() {
         Map<String, String> header = new LinkedHashMap<>();
         header.put("Date","数据日期");
-        header.put("Source","来源");
+//        header.put("Source","来源");
         header.put("LedgerId","账套ID");
         header.put("LedgerName","账套名称");
         header.put("CurrencyCode","账套币种");
         header.put("Status","关账标识");
         header.put("HeaderId","日记账头ID");
         header.put("LineNum","日记账行号");
-        header.put("ApprovalStatus","审批状态");
-        header.put("PostedStatus","过账");
+//        header.put("ApprovalStatus","审批状态");
+//        header.put("PostedStatus","过账");
 
         header.put("Period","会计期间");
         header.put("AccountingDate","凭证日期");
         header.put("JournalSource","日记账来源");
-        header.put("Category","日记账类别");
+//        header.put("Category","日记账类别");
         header.put("Name","日记账名称");
         header.put("VoucherNum","凭证编号");
         header.put("Description","摘要");