modify

atms-api/src/main/java/pwc/taxtech/atms/controller/DataImportController.java

 package pwc.taxtech.atms.controller;
 
 import com.alibaba.fastjson.JSON;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 import pwc.taxtech.atms.dpo.PagingDto;
 import pwc.taxtech.atms.dto.PagingResultDto;
 import pwc.taxtech.atms.dto.vatdto.TrialBalanceDto;
@@ -22,7 +19,7 @@ public class DataImportController extends BaseController {
     private DataImportService dataImportService;
 
     @PostMapping("GetBalanceDataForDisplay")
-    public String getBalanceDataForDisplay(@RequestBody TrialBalanceParam param) {
+    public PagingResultDto<TrialBalanceDto> getBalanceDataForDisplay(@RequestBody TrialBalanceParam param) {
         PagingResultDto<TrialBalanceDto> resultDto = new PagingResultDto<>();
         List<TrialBalanceDto> list = dataImportService.getBalanceDataForDisplay(param);
         PagingDto pagingDto = new PagingDto();
@@ -33,6 +30,6 @@ public class DataImportController extends BaseController {
         resultDto.setList(list);
         resultDto.setCalculateData(dataImportService.calculateData(list));
         // 直接返回对象，jackson解析不全
-        return JSON.toJSONString(resultDto);
+        return resultDto;
     }
 }

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

@@ -2,6 +2,7 @@ package pwc.taxtech.atms.dto.vatdto;
 
 import javax.annotation.Nullable;
 import java.math.BigDecimal;
+import java.util.List;
 
 public class TrialBalanceDto {
     private String balanceId;
@@ -34,9 +35,10 @@ public class TrialBalanceDto {
     private boolean isDuplicate;
     private Integer acctProp;
     private int direction;
+    private List<TrialBalanceDto> children;
 
     public String getBalanceId() {
-        return balanceId;
+        return this.balanceId;
     }
 
     public void setBalanceId(String balanceId) {
@@ -44,7 +46,7 @@ public class TrialBalanceDto {
     }
 
     public Integer getPeriodId() {
-        return periodId;
+        return this.periodId;
     }
 
     public void setPeriodId(Integer periodId) {
@@ -52,11 +54,7 @@ public class TrialBalanceDto {
     }
 
     public String getAcctCode() {
-        return acctCode;
-    }
-
-    public int getAccotCodeLength() {
-        return acctCode.length();
+        return this.acctCode;
     }
 
     public void setAcctCode(String acctCode) {
@@ -64,7 +62,7 @@ public class TrialBalanceDto {
     }
 
     public String getCustomerCode() {
-        return customerCode;
+        return this.customerCode;
     }
 
     public void setCustomerCode(String customerCode) {
@@ -73,7 +71,7 @@ public class TrialBalanceDto {
 
     @Nullable
     public BigDecimal getBegDebitBal() {
-        return begDebitBal;
+        return this.begDebitBal;
     }
 
     public void setBegDebitBal(@Nullable BigDecimal begDebitBal) {
@@ -82,7 +80,7 @@ public class TrialBalanceDto {
 
     @Nullable
     public BigDecimal getBegCreditBal() {
-        return begCreditBal;
+        return this.begCreditBal;
     }
 
     public void setBegCreditBal(@Nullable BigDecimal begCreditBal) {
@@ -91,7 +89,7 @@ public class TrialBalanceDto {
 
     @Nullable
     public BigDecimal getBegBal() {
-        return begBal;
+        return this.begBal;
     }
 
     public void setBegBal(@Nullable BigDecimal begBal) {
@@ -100,7 +98,7 @@ public class TrialBalanceDto {
 
     @Nullable
     public BigDecimal getEndBal() {
-        return endBal;
+        return this.endBal;
     }
 
     public void setEndBal(@Nullable BigDecimal endBal) {
@@ -109,7 +107,7 @@ public class TrialBalanceDto {
 
     @Nullable
     public BigDecimal getEndDebitBal() {
-        return endDebitBal;
+        return this.endDebitBal;
     }
 
     public void setEndDebitBal(@Nullable BigDecimal endDebitBal) {
@@ -118,7 +116,7 @@ public class TrialBalanceDto {
 
     @Nullable
     public BigDecimal getEndCreditBal() {
-        return endCreditBal;
+        return this.endCreditBal;
     }
 
     public void setEndCreditBal(@Nullable BigDecimal endCreditBal) {
@@ -127,7 +125,7 @@ public class TrialBalanceDto {
 
     @Nullable
     public BigDecimal getDebitBal() {
-        return debitBal;
+        return this.debitBal;
     }
 
     public void setDebitBal(@Nullable BigDecimal debitBal) {
@@ -136,7 +134,7 @@ public class TrialBalanceDto {
 
     @Nullable
     public BigDecimal getCreditBal() {
-        return creditBal;
+        return this.creditBal;
     }
 
     public void setCreditBal(@Nullable BigDecimal creditBal) {
@@ -144,16 +142,25 @@ public class TrialBalanceDto {
     }
 
     public Integer getMonthId() {
-        return monthId;
+        return this.monthId;
     }
 
     public void setMonthId(Integer monthId) {
         this.monthId = monthId;
     }
 
+    @Nullable
+    public BigDecimal getYearDebitBal() {
+        return this.yearDebitBal;
+    }
+
+    public void setYearDebitBal(@Nullable BigDecimal yearDebitBal) {
+        this.yearDebitBal = yearDebitBal;
+    }
+
     @Nullable
     public BigDecimal getYearCreditBal() {
-        return yearCreditBal;
+        return this.yearCreditBal;
     }
 
     public void setYearCreditBal(@Nullable BigDecimal yearCreditBal) {
@@ -161,7 +168,7 @@ public class TrialBalanceDto {
     }
 
     public String getParentCode() {
-        return parentCode;
+        return this.parentCode;
     }
 
     public void setParentCode(String parentCode) {
@@ -169,23 +176,23 @@ public class TrialBalanceDto {
     }
 
     public String getAccountName() {
-        return accountName;
+        return this.accountName;
     }
 
     public void setAccountName(String accountName) {
         this.accountName = accountName;
     }
 
-    public boolean isDuplicate() {
-        return isDuplicate;
+    public boolean getIsDuplicate() {
+        return this.isDuplicate;
     }
 
-    public void setDuplicate(boolean duplicate) {
-        isDuplicate = duplicate;
+    public void setIsDuplicate(boolean duplicate) {
+        this.isDuplicate = duplicate;
     }
 
     public Integer getAcctProp() {
-        return acctProp;
+        return this.acctProp;
     }
 
     public void setAcctProp(Integer acctProp) {
@@ -193,19 +200,18 @@ public class TrialBalanceDto {
     }
 
     public int getDirection() {
-        return direction;
+        return this.direction;
     }
 
     public void setDirection(int direction) {
         this.direction = direction;
     }
 
-    @Nullable
-    public BigDecimal getYearDebitBal() {
-        return yearDebitBal;
+    public List<TrialBalanceDto> getChildren() {
+        return this.children;
     }
 
-    public void setYearDebitBal(@Nullable BigDecimal yearDebitBal) {
-        this.yearDebitBal = yearDebitBal;
+    public void setChildren(List<TrialBalanceDto> children) {
+        this.children = children;
     }
 }

atms-web/src/main/webapp/app/common/controls/preview-trial-balance/preview-trial-balance.html

@@ -3,33 +3,33 @@
     <div class="leftFilter">
         <div class="form-inline" style="height:35px;">
             <div class="pull-left" style="display:inline-block">
-                <button id="filterButton" class="filter-button margin-left20"
-                        atms-popover ng-mouseenter="prepareSummary()" ng-click="showPopover()"
-                        popover-container="body" popover-auto-hide="true" data-overwrite="true"
-                        use-optimized-placement-algorithm="true"
-                        data-placement="bottom"
-                        data-templateurl="/app/common/controls/preview-trial-balance/preview-trial-balance-search.html">
-                    <i class="fa fa-filter" aria-hidden="true"></i>
-                </button>
+                <!--<button id="filterButton" class="filter-button margin-left20"-->
+                        <!--atms-popover ng-mouseenter="prepareSummary()" ng-click="showPopover()"-->
+                        <!--popover-container="body" popover-auto-hide="true" data-overwrite="true"-->
+                        <!--use-optimized-placement-algorithm="true"-->
+                        <!--data-placement="bottom"-->
+                        <!--data-templateurl="/app/common/controls/preview-trial-balance/preview-trial-balance-search.html">-->
+                    <!--<i class="fa fa-filter" aria-hidden="true"></i>-->
+                <!--</button>-->
 
                 <div class="marginBottom" style="display:inline-block">
-                    <span class="text-bold margin-left20" translate="TrialBalanceTitle"></span> |
+                    <!--<span class="text-bold margin-left20" translate="TrialBalanceTitle"></span> |-->
                     <span class="text-bold margin-left20" translate="JournalQJ"></span>:
                     <input type="text" class="form-control input-width-middle" id="input-invoice-period-picker"  ng-disabled="{{isReadOnly}}" />
                 </div>
-                <span class="text-bold margin-left20" translate="Display"></span>:
-                <div class="ui-select-no-border">
-                    <ui-select ng-model="currentCategory.selected" on-select="doCategoryChange()" search-enabled="false" style="width:120px;">
-                        <ui-select-match>{{$select.selected.name}}</ui-select-match>
-                        <ui-select-choices repeat="cat in categoryList | propsFilter: {name: $select.search}">
-                            <div title="{{cat.name}}" ng-bind-html="cat.name"></div>
-                        </ui-select-choices>
-                    </ui-select>
-                </div>
-                <div class="ui-select-no-border margin-left20">
-                    <input type="checkbox" id="ckbHideAllZeroRecords" ng-click="hideAllZeroRecords()">
-                </div>
-                <span class="text-bold" translate="HideAllZeroRecords"></span>
+                <!--<span class="text-bold margin-left20" translate="Display"></span>:-->
+                <!--<div class="ui-select-no-border">-->
+                    <!--<ui-select ng-model="currentCategory.selected" on-select="doCategoryChange()" search-enabled="false" style="width:120px;">-->
+                        <!--<ui-select-match>{{$select.selected.name}}</ui-select-match>-->
+                        <!--<ui-select-choices repeat="cat in categoryList | propsFilter: {name: $select.search}">-->
+                            <!--<div title="{{cat.name}}" ng-bind-html="cat.name"></div>-->
+                        <!--</ui-select-choices>-->
+                    <!--</ui-select>-->
+                <!--</div>-->
+                <!--<div class="ui-select-no-border margin-left20">-->
+                    <!--<input type="checkbox" id="ckbHideAllZeroRecords" ng-click="hideAllZeroRecords()">-->
+                <!--</div>-->
+                <!--<span class="text-bold" translate="HideAllZeroRecords"></span>-->
             </div>
             <!--导出-->
             <div class="pull-right margin-right30">