CITbug修改

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

@@ -179,6 +179,7 @@ public class AssetListServiceImpl extends BaseService {
         logger.debug("导入excel文件开始");
         //定义返回变量
         OperationResultDto<Object> importResult = new OperationResultDto<>();
+        importResult.setResult(true);
 
         //通过输入流获取当前workbook
         Workbook workbook = fileService.getWorkbook(inputStream, fileName, "citAsset");
@@ -367,7 +368,7 @@ public class AssetListServiceImpl extends BaseService {
      * @return
      */
     public ApiResultDto saveAssetGroupInfo(List<CitAssetGroupResult> assetGroupResults, Integer saveGroupType, String projectId) {
-
+        ApiResultDto resultDto = new ApiResultDto();
         for (CitAssetGroupResult assetGroupResult : assetGroupResults) {
             //根据主键修改资产类别有关数据，主要修改的字段为资产一级分类主键、资产二级分类主键
             assetGroupResultMapper.updateByPrimaryKeySelective(assetGroupResult);
@@ -385,7 +386,9 @@ public class AssetListServiceImpl extends BaseService {
 //
 //            }
 //        });
-        return null;
+        resultDto.setData(true);
+        resultDto.setCode(1);
+        return resultDto;
     }
 
 

atms-dao/src/main/resources/pwc/taxtech/atms/dao/extends/CitAssetsListExtendsMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="pwc.taxtech.atms.dao.CitAssetsListMapper">
 
   <insert id="insertBatch" parameterType="java.util.List">
-    insert into balance_sheet_final
+    insert into assets_list
     (<include refid="Base_Column_List"/>)
     values
     <foreach collection="list" item="item" index="index" separator=",">
@@ -96,6 +96,10 @@
           <when test="item.accountTotalDepreciationAmount != null">#{item.accountTotalDepreciationAmount,jdbcType=DECIMAL},</when>
           <otherwise>0,</otherwise>
         </choose>
+        <choose>
+          <when test="item.taxDepreciationPeriod != null">#{item.taxDepreciationPeriod,jdbcType=INTEGER},</when>
+          <otherwise>0,</otherwise>
+        </choose>
         <choose>
           <when test="item.taxToLastYearDepreciationPeriod != null">#{item.taxToLastYearDepreciationPeriod,jdbcType=INTEGER},</when>
           <otherwise>0,</otherwise>

atms-dao/src/main/resources/pwc/taxtech/atms/dao/extends/CitEAMADisposalExtendsMapper.xml

@@ -109,6 +109,10 @@
           <when test="item.gatheringCompanyAccount != null">#{item.gatheringCompanyAccount,jdbcType=VARCHAR},</when>
           <otherwise>'',</otherwise>
         </choose>
+        <choose>
+          <when test="item.remark != null">#{item.remark,jdbcType=VARCHAR},</when>
+          <otherwise>'',</otherwise>
+        </choose>
         <choose>
           <when test="item.createdBy != null">#{item.createdBy,jdbcType=VARCHAR},</when>
           <otherwise>'',</otherwise>

atms-web/src/main/webapp/app/cit/import/cit-import-asset-list/cit-import-asset-list.ctrl.js

@@ -59,21 +59,6 @@
                 projectId : projectId,
                 taxAccountCompare : 2
             };
-            //分页的设置
-            debugger;
-            $scope.pagingOptions2 = {
-                pageIndex: 1,  //当前页码
-                pageSize: constant.page.pageSizeArrary[3],  //每页多少条数据
-                totalItems: $scope.citAssetsListDto.pageInfo.totalCount,  //总数据
-                totalPages: 0,//总页数
-                pageSizeString: constant.page.pageSizeArrary[3].toString(),
-                firstPage: '<<', //$translate.instant('PagingFirstPage'),
-                previousPage: '<', //$translate.instant('PagingPreviousPage'),
-                nextPage:'>',// $translate.instant('PagingNextPage'),
-                lastPage: '>>', //$translate.instant('PagingLastPage'),
-            };
-            //赋值
-            $scope.pageOptions = $scope.pagingOptions2;
             $scope.refreshAssetResultListGrid = function () {
                     debugger;
                     $log.debug("refreshAssetResultListGrid");
@@ -123,6 +108,7 @@
 
             //上传文件
             var uploadfile = function (file) {
+
                 var url = uploadUrl;
                 
                 if (file) {
@@ -225,6 +211,7 @@
 
                 var token = $('input[name="__RequestVerificationToken"]').val();
                 // updateProgressToZero();
+                $('#busy-indicator-container').show();
                 Upload.upload({
                     url: uploadUrl,
                     data: {
@@ -241,7 +228,7 @@
                         withCredentials: true
                     }, withCredentials: true
                 }).then(function(resp){
-                    
+                    $('#busy-indicator-container').hide();
                     assetListService.getAssetGroupResultData(projectId).success(function (groupResultData) {
                         $scope.assetGroupResultDataSource = groupResultData.data;
                     });
@@ -293,8 +280,7 @@
                         $scope.TotalTaxCurrentYearDepreciationAmount = PWC.round($scope.TotalTaxCurrentYearDepreciationAmount, 2);
                         $scope.TotalYearDifferenceAmount = PWC.round($scope.TotalYearDifferenceAmount, 2);
                     }
-                    $scope.citAssetsListDto.pageInfo.totalCount = assetListData.data.total;
-                    $scope.pagingOptions2.totalItems = assetListData.data.total;
+                    $scope.pagingOptions.totalItems = assetListData.data.total;
                 });
             }
 
@@ -981,6 +967,19 @@
 
             //开始
             (function initialize() {
+                //分页的设置
+                debugger;
+                $scope.pagingOptions = {
+                    pageIndex: 1,  //当前页码
+                    pageSize: constant.page.pageSizeArrary[3],  //每页多少条数据
+                    totalItems: 0,  //总数据
+                    totalPages: 0,//总页数
+                    pageSizeString: constant.page.pageSizeArrary[3].toString(),
+                    firstPage: '<<', //$translate.instant('PagingFirstPage'),
+                    previousPage: '<', //$translate.instant('PagingPreviousPage'),
+                    nextPage:'>',// $translate.instant('PagingNextPage'),
+                    lastPage: '>>' //$translate.instant('PagingLastPage'),
+                };
                 /**************************************** function start*************************************************/
                 $scope.displayType = 2;
                 $scope.saveGroupType = 1;
@@ -989,10 +988,12 @@
                 $scope.incomeInvoiceTotalColumns = [];
                 $scope.initIncomeInvoiceTotalColumnsIndex = [];
                 $scope.changeSheet = changeSheet;
+                debugger;
                 initColumns();
                 initDxGrid();
                 initAssetResultDxGrid();              
                 getAssetResultList(1);
+                debugger;
                 getGroupList();
                 getGroupDetailList();
                 getUserPermission();

atms-web/src/main/webapp/app/cit/import/cit-import-asset-list/cit-import-asset-list.html

@@ -144,10 +144,10 @@
                     </button>
                 </div>
             </div>
-            <div class="page-footer">
-                <ack-pagination page-options="pagingOptions2"
-                                refresh-table="refreshAssetResultListGrid()"></ack-pagination>
-            </div>
+        </div>
+        <div class="page-footer">
+            <ack-pagination page-options="pagingOptions"
+                            refresh-table="refreshAssetResultListGrid()"></ack-pagination>
         </div>
     </div>
 

atms-web/src/main/webapp/app/cit/preview/cit-preview-journal-merge/cit-preview-journal-merge.html

@@ -13,12 +13,12 @@
         <span ng-click="downloadJE()" style="position: relative; top: -61px; left: 95%;"><i class="fa fa-file-excel-o" aria-hidden="true"></i>{{'ExportBtn' | translate}}</span>
     </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>
-    </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>-->
+    <!--</div>-->
 
     <div id="filterCriteriaDiv" style="max-width:98%;margin-bottom:2px;" ng-show="criteriaList.length>0">
         <span class="text-bold  margin-left20" translate="FilterCriteriaTags"></span>:

atms-web/src/main/webapp/app/cit/preview/cit-preview-tb-generate-ver/cit-preview-tb-generate-ver.html

@@ -13,12 +13,12 @@
         <span ng-click="downloadJE()" style="position: relative; top: -61px; left: 95%;"><i class="fa fa-file-excel-o" aria-hidden="true"></i>{{'ExportBtn' | translate}}</span>
     </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>
-    </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>-->
+    <!--</div>-->
 
     <div id="filterCriteriaDiv" style="max-width:98%;margin-bottom:2px;" ng-show="criteriaList.length>0">
         <span class="text-bold  margin-left20" translate="FilterCriteriaTags"></span>:

atms-web/src/main/webapp/app/cit/preview/cit-preview-tb-mapping-ver/cit-preview-tb-mapping-ver.html

@@ -13,12 +13,12 @@
         <span ng-click="downloadJE()" style="position: relative; top: -61px; left: 95%;"><i class="fa fa-file-excel-o" aria-hidden="true"></i>{{'ExportBtn' | translate}}</span>
     </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>
-    </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>-->
+    <!--</div>-->
 
     <div id="filterCriteriaDiv" style="max-width:98%;margin-bottom:2px;" ng-show="criteriaList.length>0">
         <span class="text-bold  margin-left20" translate="FilterCriteriaTags"></span>:

atms-web/src/main/webapp/app/common/controls/import/import-trialbalance/import-trialbalance.html

@@ -18,7 +18,7 @@
 
         <form class="form-inline" id="navigationForm" name="navigationForm">
             <div class="form-group" ng-style="setButtonWrapStyle()">
-                <div class="import-wrapper">chunkSize
+                <div class="import-wrapper">
                     <button type="button" atms-permission permission-code="{{$root.vatPermission.dataImport.balanceSheet.importCode}}"
                             ngf-select="" ng-model="fileNameWrapper" ngf-drag-over-class="'dragover'" accept=".xls,.xlsx" ngf-multiple="false"
                             ngf-allow-dir="false" class="btn btn-vat-third" style="margin-right:10px">