GL bug

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

@@ -79,8 +79,11 @@ public class DataImportService extends BaseService {
 
             GlBalanceExample example2 = new GlBalanceExample();
             //明细段
-            example2.createCriteria().andSegment1EqualTo(organization.getClientCode())
-                    .andPeriodNameEqualTo(dateFormat.format(calendar.getTime())).andSegment4In(etCodeList);
+            GlBalanceExample.Criteria c = example2.createCriteria().andSegment1EqualTo(organization.getClientCode())
+                    .andPeriodNameEqualTo(dateFormat.format(calendar.getTime()));
+            if(CollectionUtils.isNotEmpty(etCodeList)){
+                 c.andSegment4In(etCodeList);
+            }
             List<GlBalance> sg4List = glBalanceMapper.selectByExample(example2);
 
             for (StandardAccount standardAccount : stdAccountList) {

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

@@ -99,14 +99,14 @@
                     <td><span translate="EndBal"></span><span translate="Creditor"></span></td>
                 </tr>
                 <tr ng-repeat="exportData in exportDataList" on-finish-render="ngRepeatFinished">
-                    <td>{{exportData.accountCode}}</td>
+                    <td>{{exportData.acctCode}}</td>
                     <td>{{exportData.accountName}}</td>
-                    <td>{{exportData.debitOpeningBalance}}</td>
-                    <td>{{exportData.creditOpeningBalance}}</td>
-                    <td>{{exportData.accumulatedDebitAmount}}</td>
-                    <td>{{exportData.accumulatedCreditAmount}}</td>
-                    <td>{{exportData.debitClosingBalance}}</td>
-                    <td>{{exportData.creditClosingBalance}}</td>
+                    <td>{{exportData.begDebitBal}}</td>
+                    <td>{{exportData.begCreditBal}}</td>
+                    <td>{{exportData.debitBal}}</td>
+                    <td>{{exportData.creditBal}}</td>
+                    <td>{{exportData.endDebitBal}}</td>
+                    <td>{{exportData.endCreditBal}}</td>
                 </tr>
             </table>
         </div>