Merge branch 'dev_mysql_ken' into 'dev_mysql'

fix Vat view bug ---Ken

See merge request root/atms!392

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

@@ -385,11 +385,6 @@ public class DataPreviewSerivceImpl extends BaseService {
         ProfitLossStatementCondition condition = new ProfitLossStatementCondition();
         beanUtil.copyProperties(param, condition);
         List<ProfitLossStatementPrc> profitLossStatements = profitLossStatementPrcManualMapper.selectByCondition1(condition);
-        //List<ProfitLossStatementExportDto> exportDtos = Lists.newArrayList();
-//        profitLossStatements.forEach(id -> {
-//            ProfitLossStatementExportDto exportDto = beanUtil.copyProperties(id, new ProfitLossStatementExportDto());
-//            exportDtos.add(exportDto);
-//        });
         ProfitLossHeader header=new ProfitLossHeader();
         if(profitLossStatements.size()>0){
             Organization org = organizationMapper.selectByPrimaryKey(param.getOrgId());

atms-web/src/main/webapp/app/vat/preview/vat-preview-adjustment-tab/vat-preview-adjustment-tab.ctrl.js

@@ -209,8 +209,8 @@
             $scope.queryParams.periodStart = $scope.startMonth;
             //$scope.queryParams.periodEnd = $scope.endMonth;
             $scope.queryParams.orgId = vatSessionService.project.organizationID;
-            loadTrialBalanceDataFromDB(1);
-            $('.filter-button').popover("hide");
+            //loadTrialBalanceDataFromDB(1);
+            //$('.filter-button').popover("hide");
         };
 
         var prepareSummary = function () {
@@ -251,6 +251,7 @@
             }).on('changeDate', function (e) {
                 // 开始月份
                 var startMonth = vatSessionService.project.year * 100 + e.date.getMonth() + 1;
+                $scope.startMonth = startMonth;
                 $scope.queryParams.periodStart = startMonth;
                 loadTrialBalanceDataFromDB(1);
             });

atms-web/src/main/webapp/app/vat/preview/vat-preview-cash-flow-manual/vat-preview-cash-flow-manual.ctrl.js

@@ -174,7 +174,7 @@
                 autoclose: true,//选中之后自动隐藏日期选择框
                 clearBtn: true,//清除按钮
                 todayBtn: false,//今日按钮
-                format: $scope.dateFormat//日期格式，详见 http://bootstrap-datepicker.readthedocs.org/en/release/options.html#format
+                format: $scope.dateFormatMomth//日期格式，详见 http://bootstrap-datepicker.readthedocs.org/en/release/options.html#format
             }).on('changeDate', function (e) {
                 // 开始月份
                 var startMonth = vatSessionService.project.year * 100 + e.date.getMonth() + 1;

atms-web/src/main/webapp/app/vat/preview/vat-preview-cash-flow-manual/vat-preview-cash-flow-manual.html

@@ -9,8 +9,10 @@
     </div>
 
     <div style="margin-bottom: 10px;margin-left: 20px;margin-top: 10px;">
-        {{'EnterpriseAccountSetName' | translate }}：<span class="numAmount">{{ledgerNameFirst}}</span>&nbsp;&nbsp;&nbsp;
+<!--        {{'EnterpriseAccountSetName' | translate }}：<span class="numAmount">{{ledgerNameFirst}}</span>&nbsp;&nbsp;&nbsp;-->
         {{'ImportTime' | translate }}：<span class="numAmount">{{importDate| date:'yyyy-MM-dd hh:mm:ss'}}</span>
+<!--        {{'ImportTime' | translate }}：<span class="numAmount">{{ importDate| date:'yyyy-MM'}}</span>-->
+
     </div>
 
     <div id="mainAreaDiv" class="main-area">

atms-web/src/main/webapp/app/vat/preview/vat-preview-off-balance-sheet-prc-manual/vat-preview-off-balance-sheet-prc-manual.ctrl.js

@@ -9,7 +9,7 @@
         $scope.endMonth = vatSessionService.month;
         $scope.totalMoneyAmount = 0;
         $scope.totalTaxAmount = 0;
-        $scope.pageSize = constant.vatPagesize;
+        $scope.pageSize = constant.page.pageSizeArrary[3];
 
         $scope.selectedDate = new Date(vatSessionService.year, vatSessionService.month - 1, 1);
         $scope.dateFormatMomth = $translate.instant('dateFormat4YearMonth');
@@ -104,7 +104,6 @@
                     $scope.queryBalanceSheetResult.pageInfo = data;
                     computeBalanceSheetPage();
                     if(data.size>0){
-                        $scope.ledgerName = data.list[0].ledgerName;
                         $scope.currencyCode = data.list[0].ledgerCurrencyCode;
                         $scope.status = data.list[0].status;
                         $scope.importDate = $filter('date')(data.list[0].date, "yyyy-MM-dd hh:mm:ss");
@@ -170,7 +169,7 @@
                 pageInfo: {
                     totalCount: -1,
                     pageIndex: 1,
-                    pageSize: constant.pagesize,
+                    pageSize: constant.page.pageSizeArrary[3],
                     totalPage: 0,
                 }
             }

atms-web/src/main/webapp/app/vat/preview/vat-preview-off-balance-sheet-prc-manual/vat-preview-off-balance-sheet-prc-manual.html

@@ -15,7 +15,6 @@
     </div>
 
     <div style="margin-bottom: 8px;margin-left: 30px">
-        {{'EnterpriseAccountSetName' | translate}}<span class="numAmount">{{ledgerName}}</span>&nbsp;&nbsp;&nbsp;
         {{'EnterpriseAccountSetCurrency' | translate}}<span class="numAmount">{{currencyCode}}</span>&nbsp;&nbsp;&nbsp;
         {{'IsCloseAccount' | translate}}<span class="numAmount">{{status}}</span>
         {{'ImportTime' | translate}}<span class="numAmount">{{importDate| date:'yyyy-MM-dd hh:mm:ss'}}</span>

atms-web/src/main/webapp/app/vat/preview/vat-preview-profit-loss-prc-manual/vat-preview-profit-loss-prc-manual.ctrl.js

@@ -103,7 +103,6 @@
                     $scope.queryProfitLossResult.pageInfo = data;
                     computeProfitLossPage();
                     if(data.size>0){
-                        $scope.ledgerName = data.list[0].ledgerName;
                         $scope.currencyCode = data.list[0].ledgerCurrencyCode;
                         $scope.status = data.list[0].status;
                         $scope.importDate = $filter('date')(data.list[0].date, "yyyy-MM-dd hh:mm:ss");

atms-web/src/main/webapp/app/vat/preview/vat-preview-profit-loss-prc-manual/vat-preview-profit-loss-prc-manual.html

@@ -15,7 +15,6 @@
     </div>
 
     <div style="margin-bottom: 8px;margin-left: 30px">
-        {{'EnterpriseAccountSetName' | translate}}<span class="numAmount">{{ledgerName}}</span>&nbsp;&nbsp;&nbsp;
         {{'EnterpriseAccountSetCurrency' | translate}}<span class="numAmount">{{currencyCode}}</span>&nbsp;&nbsp;&nbsp;
         {{'IsCloseAccount' | translate}}<span class="numAmount">{{status}}</span>
         {{'ImportTime' | translate}}<span class="numAmount">{{importDate| date:'yyyy-MM-dd hh:mm:ss'}}</span>