Merge branch 'dev_oracle' of code.tech.tax.asia.pwcinternal.com:root/atms into neo_jpa_withoutgen

atms-web/src/main/webapp/app/common/controls/area-selector/area-selector.ctrl.js

@@ -36,7 +36,7 @@ controller('AreaSelectorController', ['$scope', 'areaService','$translate',
         $scope.selectArea = function (area) {
            
             $scope.selectedAreaName = area.name;
-            $scope.selectedAreaId = area.id;
+            $scope.selectedAreaId = area.ID;
             $scope.componentSelectedArea = area;
             $('.dropdown').removeClass('open');
            // $scope.onChange();

atms-web/src/main/webapp/app/common/controls/edit-organization-modal/edit-organization-modal.ctrl.js

@@ -45,6 +45,7 @@ controller('editOrganizationModalController', ['$scope', '$log', '$translate', '
             $scope.selectProvince = null;
             $scope.selectRegionID = null;
 
+            $scope.componentSelectedArea = null;
             $scope.selectRegion = defaultSelcectRegion;
             $scope.selectProjectIndustry = null;
             $scope.selectBusinessUnit = null;
@@ -53,7 +54,7 @@ controller('editOrganizationModalController', ['$scope', '$log', '$translate', '
                 // 默认事业部
                 if ($scope.newOrganization.businessUnitID) {
                     $scope.selectBusinessUnit = _.find($scope.businessUnitList, function (num) {
-                        return num.id === $scope.newOrganization.businessUnitID;
+                        return num.ID === $scope.newOrganization.businessUnitID;
                     });
                 }
 
@@ -158,8 +159,8 @@ controller('editOrganizationModalController', ['$scope', '$log', '$translate', '
                 editModel.businessUnitID = $scope.selectBusinessUnit.ID;
             }
             //区域
-            if ($scope.selectedArea) {
-                editModel.areaID = $scope.selectedArea.ID;
+            if ($scope.componentSelectedArea) {
+                editModel.areaID = $scope.selectedAreaId;
             }
 
             //账套
@@ -375,7 +376,7 @@ controller('editOrganizationModalController', ['$scope', '$log', '$translate', '
                 //设置事业部
                 var businessUnitList = $scope.businessUnitList;
                 $scope.selectBusinessUnit = _.find(businessUnitList, function (num) {
-                    return num.id === orgData.businessUnitID;
+                    return num.ID === orgData.businessUnitID;
                 });
 
                 if ($scope.selectBusinessUnit === undefined) {
@@ -384,6 +385,8 @@ controller('editOrganizationModalController', ['$scope', '$log', '$translate', '
                     // $('#selectBusinessUnit').append('<option disabled selected="selected">' + orgData.businessUnitName + '</option>');
                 }
 
+
+
                 $scope.orgAccountList = [];
                 $scope.serviceList = [];
                 $scope.OrgAccountRowIndex = 1;

atms-web/src/main/webapp/app/vat/preview/vat-preview-input-invoice/vat-preview-input-invoice.ctrl.js

@@ -104,7 +104,7 @@
                         v.taxAmount = PWC.round(v.taxAmount, 2);
                     });
                     $scope.gridOptions.data = data.list;
-                    $scope.queryIncomeInvoiceItemResult.pageInfo = data.pageInfo;
+                    $scope.queryIncomeInvoiceItemResult.pageInfo = data;
                     computeIncomeInvoiceItemPage();
                 }
             });
@@ -118,14 +118,14 @@
         //计算页数，创建分页栏
         var computeIncomeInvoiceItemPage = function () {
 
-            if ($scope.queryIncomeInvoiceItemResult.pageInfo && $scope.queryIncomeInvoiceItemResult.pageInfo.totalCount > 0) {
+            if ($scope.queryIncomeInvoiceItemResult.pageInfo && $scope.queryIncomeInvoiceItemResult.pageInfo.total > 0) {
 
-                var totalPage = parseInt($scope.queryIncomeInvoiceItemResult.pageInfo.totalCount / $scope.queryIncomeInvoiceItemResult.pageInfo.pageSize);
+                var totalPage = parseInt($scope.queryIncomeInvoiceItemResult.pageInfo.total / $scope.queryIncomeInvoiceItemResult.pageInfo.pageSize);
                 totalPage = $scope.queryIncomeInvoiceItemResult.pageInfo.totalCount % $scope.queryIncomeInvoiceItemResult.pageInfo.pageSize == 0 ? totalPage : totalPage + 1;
 
                 //计算本页记录数
-                if ($scope.queryIncomeInvoiceItemResult.pageInfo.pageIndex === totalPage) {
-                    $scope.curPageItemCount = $scope.queryIncomeInvoiceItemResult.pageInfo.totalCount % $scope.queryIncomeInvoiceItemResult.pageInfo.pageSize;
+                if ($scope.queryIncomeInvoiceItemResult.pageInfo.pageNum === totalPage) {
+                    $scope.curPageItemCount = $scope.queryIncomeInvoiceItemResult.pageInfo.total % $scope.queryIncomeInvoiceItemResult.pageInfo.pageSize;
                 }
                 else {
                     $scope.curPageItemCount = $scope.queryIncomeInvoiceItemResult.pageInfo.pageSize;
@@ -144,6 +144,8 @@
 
                 $('#totalInvoicePage').css('display', 'inline-block');
             } else {
+                //如果查询结果为0，则直接设置本页记录数为0
+                $scope.curPageItemCount = 0;
                 var createPage = $("#totalInvoicePage").createPage({
                     pageCount: 0,
                     current: $scope.curIncomeInvoiceItemPage,
@@ -153,9 +155,6 @@
                     }
                 });
 
-                //如果查询结果为0，则直接设置本页记录数为0
-                $scope.curPageItemCount = 0;
-
                 $('#totalInvoicePage').css('display', 'inline-block');
             }
         };

atms-web/src/main/webapp/app/vat/preview/vat-preview-input-invoice/vat-preview-input-invoice.html

@@ -38,7 +38,7 @@
             <div class="watermark" ng-show="!gridOptions.data.length"><span translate="NoDataAvailable"></span></div>
         </div>
         <div class="pagination-container">
-            <span>本页{{curPageItemCount}}条记录，共{{queryIncomeInvoiceItemResult.pageInfo.totalCount}}条记录</span>
+            <span>本页{{curPageItemCount}}条记录，共{{queryIncomeInvoiceItemResult.pageInfo.total}}条记录</span>
             <div id="totalInvoicePage" class="common-pagination" style="display:none;">
             </div>
         </div>

atms-web/src/main/webapp/app/vat/preview/vat-preview-output-invoice/vat-preview-output-invoice.ctrl.js

@@ -88,7 +88,7 @@
                         v.taxAmount = PWC.round(v.taxAmount, 2);
                     });
                     $scope.gridOptions.data = data.list;
-                    $scope.queryOutputInvoiceResult.pageInfo = data.pageInfo;
+                    $scope.queryOutputInvoiceResult.pageInfo = data;
                     computeOutputInvoiceItemPage();
                 }
             }).error(function () {
@@ -104,13 +104,13 @@
         //计算页数，创建分页栏
         var computeOutputInvoiceItemPage = function () {
 
-            if ($scope.queryOutputInvoiceResult.pageInfo && $scope.queryOutputInvoiceResult.pageInfo.totalCount > 0) {
+            if ($scope.queryOutputInvoiceResult.pageInfo && $scope.queryOutputInvoiceResult.pageInfo.total > 0) {
 
-                var totalPage = parseInt($scope.queryOutputInvoiceResult.pageInfo.totalCount / $scope.queryOutputInvoiceResult.pageInfo.pageSize);
-                totalPage = $scope.queryOutputInvoiceResult.pageInfo.totalCount % $scope.queryOutputInvoiceResult.pageInfo.pageSize == 0 ? totalPage : totalPage + 1;
+                var totalPage = parseInt($scope.queryOutputInvoiceResult.pageInfo.total / $scope.queryOutputInvoiceResult.pageInfo.pageSize);
+                totalPage = $scope.queryOutputInvoiceResult.pageInfo.total % $scope.queryOutputInvoiceResult.pageInfo.pageSize == 0 ? totalPage : totalPage + 1;
 
-                if ($scope.queryOutputInvoiceResult.pageInfo.pageIndex === totalPage) {
-                    $scope.curPageItemCount = $scope.queryOutputInvoiceResult.pageInfo.totalCount % $scope.queryOutputInvoiceResult.pageInfo.pageSize;
+                if ($scope.queryOutputInvoiceResult.pageInfo.pageNum === totalPage) {
+                    $scope.curPageItemCount = $scope.queryOutputInvoiceResult.pageInfo.total % $scope.queryOutputInvoiceResult.pageInfo.pageSize;
                 }
                 else {
                     $scope.curPageItemCount = $scope.queryOutputInvoiceResult.pageInfo.pageSize;

atms-web/src/main/webapp/app/vat/preview/vat-preview-output-invoice/vat-preview-output-invoice.html

@@ -39,7 +39,7 @@
             <div class="watermark" ng-show="!gridOptions.data.length"><span translate="NoDataAvailable"></span></div>
         </div>
         <div class="pagination-container">
-            <span >本页{{curPageItemCount}}条记录，共{{queryOutputInvoiceResult.pageInfo.totalCount}}条记录</span>
+            <span >本页{{curPageItemCount}}条记录，共{{queryOutputInvoiceResult.pageInfo.total}}条记录</span>
             <div id="totalInvoicePage" class="common-pagination" style="display:none;">
             </div>
         </div>