CIT--fixbug

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

@@ -90,6 +90,9 @@ public class TemplateController extends BaseController {
             Sheet sheet = workbook.getSheetAt(i);
             for (int r = sheet.getFirstRowNum(); r <= sheet.getLastRowNum(); r++) {
                 Row row = sheet.getRow(r);
+                if(row == null){
+                    continue;
+                }
                 for (int c = row.getFirstCellNum(); c <= row.getLastCellNum(); c++) {
                     if(c < 0){
                         continue;

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

@@ -1277,6 +1277,7 @@ public class CitImportExcelServiceImpl extends BaseService {
                 beanUtil.copyProperties(trialBalance,citTbam);
                 citTbam.setId(idService.nextId());
                 citTbam.setAttribute(daMapping.getAttribute());
+                citTbam.setAccountDescription(citJournal.getSubjectName());
                 citTbamList.add(citTbam);
             }
 //            citDraftAccountMappings.stream().forEach(daMapping -> {

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

@@ -370,6 +370,9 @@ public class TemplateGroupServiceImpl extends AbstractService {
                 Sheet temp = wtemp.getSheetAt(0);
                 for(int j = temp.getFirstRowNum(); j < temp.getLastRowNum(); j ++){
                     Row row = temp.getRow(j);
+                    if(row == null){
+                        continue;
+                    }
                     for(int k = row.getFirstCellNum(); k < row.getLastCellNum(); k++){
                         Cell cell = row.getCell(k);
                         if (cell == null) {
@@ -405,6 +408,9 @@ public class TemplateGroupServiceImpl extends AbstractService {
                 List<PeriodDataSource> periodDataSourceList = Lists.newArrayList();
                 for (int r = sheet.getFirstRowNum(); r <= sheet.getLastRowNum(); r++) {
                     Row row = sheet.getRow(r);
+                    if(row == null){
+                        continue;
+                    }
                     for (int c = row.getFirstCellNum(); c <= row.getLastCellNum(); c++) {
                         if(c<0){
                             continue;

atms-web/src/main/webapp/app-resources/i18n/en-us/cit.json

@@ -34,8 +34,10 @@
     "AssetGroupName": "Asset GroupName",
     "AssetGroupNameValidation": "Pleas Enter Asset GroupName",
     "AssetDescription": "Asset Description",
+    "AssetName": "Asset Name",
     "BuyDate": "Buy Date",
     "DepreciationDate": "Depreciation Start Date",
+    "DepreciationDate2": "Depreciation Date",
     "DepreciationPeriod": "Depreciation Period",
     "AcquisitionValue": "Acquisition Value",
     "TotalAccountAcquisitionValue": "Total Account Acquisition Value:",
@@ -45,6 +47,7 @@
     "AdjustmentValue": "Adjustment Value",
     "DisposedDate": "Disposed Date",
     "ResidualRate": "Residual Rate",
+    "ResidualValue": "Residual Value",
     "TaxMonthDepreciationAmount": "Monthly Depreciation Amount(Tax)",
     "TaxToCurrentYearDepreciationAmount": "Up To Current Year Depreciation Amount(Tax)",
     "ReportExportConfirm": "The Report Data Has not Been Saved, and the Operation Result May be Inconsistent With the Actual.Confirm to perform this operation?？",

atms-web/src/main/webapp/app-resources/i18n/zh-CN/cit.json

@@ -34,8 +34,10 @@
     "AssetGroupName": "资产类别",
     "AssetGroupNameValidation": "请输入资产类别",
     "AssetDescription": "资产描述",
+    "AssetName": "资产名称",
     "BuyDate": "购入日期",
     "DepreciationDate": "开始折旧日期",
+    "DepreciationDate2": "报废日期",
     "DepreciationPeriod": "折旧期限",
     "AcquisitionValue": "原值",
     "TotalAccountAcquisitionValue": "资产原值：",
@@ -45,6 +47,7 @@
     "AdjustmentValue": "原值调整值",
     "DisposedDate": "报废日期",
     "ResidualRate": "残值率",
+    "ResidualValue": "残值",
     "TaxMonthDepreciationAmount": "每月折旧额(税务)",
     "TaxToCurrentYearDepreciationAmount": "截止本年累计折旧额(税务)",
     "ReportExportConfirm": "报表数据还未保存，操作结果可能和实际不一致，确定要执行这个操作吗？",

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

@@ -92,26 +92,26 @@ function ($scope, $q, $log, $translate, $location, loginContext, enums, vatSessi
             $scope.nodeDicKey = constant.DictionaryDictKey.DataImport;
             $scope.linkShort = enums.linkShort.ImportData;
             $scope.menus = [
-                {
-                name: 'balanceSheet', permission: constant.citPermission.dataImport.balanceSheet.queryCode,
-                text: $translate.instant('balanceSheet'), icon: 'fa fa-bank'
-                },
-                {
-                    name: 'documentList', permission: constant.citPermission.dataImport.documentList.queryCode,
-                    text: $translate.instant('documentList'), icon: 'fa fa-file-text-o'
-                },
-                {
-                    name: 'journalEntry', permission: constant.citPermission.dataImport.journalEntry.queryCode,
-                    text: $translate.instant('journalEntry'), icon: 'fa fa-align-left'
-                },
-                {
-                    name: 'erpData', permission: constant.citPermission.dataImport.erpImport.queryCode,
-                    text: $translate.instant('erpData'), icon: 'fa fa-list-ul'
-                }, 
-                {
-                    name: 'auditAdjust', permission: constant.citPermission.dataImport.auditAdjust.queryCode,
-                    text: $translate.instant('auditAdjust'), icon: 'fa fa-adjust'
-                }, 
+                // {
+                // name: 'balanceSheet', permission: constant.citPermission.dataImport.balanceSheet.queryCode,
+                // text: $translate.instant('balanceSheet'), icon: 'fa fa-bank'
+                // },
+                // {
+                //     name: 'documentList', permission: constant.citPermission.dataImport.documentList.queryCode,
+                //     text: $translate.instant('documentList'), icon: 'fa fa-file-text-o'
+                // },
+                // {
+                //     name: 'journalEntry', permission: constant.citPermission.dataImport.journalEntry.queryCode,
+                //     text: $translate.instant('journalEntry'), icon: 'fa fa-align-left'
+                // },
+                // {
+                //     name: 'erpData', permission: constant.citPermission.dataImport.erpImport.queryCode,
+                //     text: $translate.instant('erpData'), icon: 'fa fa-list-ul'
+                // },
+                // {
+                //     name: 'auditAdjust', permission: constant.citPermission.dataImport.auditAdjust.queryCode,
+                //     text: $translate.instant('auditAdjust'), icon: 'fa fa-adjust'
+                // },
                 {
                     name: 'assetList', permission: constant.citPermission.dataImport.assetList.queryCode,
                     text: $translate.instant('AssetList'), icon: 'fa fa-list-ul'

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

@@ -312,7 +312,7 @@
                     { name: $translate.instant('AccountCode'), width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.accountCode}}<span></div>' },
                     { name: $translate.instant('AccountDescription'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.accountDescription}}<span></div>' },
                     { name: $translate.instant('AccountPeriod'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span >{{row.entity.accountPeriod}}</span></div>' },
-                    { name: $translate.instant('DebitAmount'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span >{{row.entity.debitAmount | date:"yyyy-MM-dd"}}</span></div>' },
+                    { name: $translate.instant('DebitAmount'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span >{{row.entity.debitAmount}}</span></div>' },
                     { name: $translate.instant('CreditAmount'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span >{{row.entity.creditAmount}}</span></div>' },
                     { name: $translate.instant('BeginningBalance'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span >{{row.entity.beginningBalance}}</span></div>' },
                     { name: $translate.instant('EndingBalance'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span >{{row.entity.endingBalance}}</span></div>' },

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

@@ -316,7 +316,7 @@
                     { name: $translate.instant('AccountCode'), width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.accountCode}}<span></div>' },
                     { name: $translate.instant('AccountDescription'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.accountDescription}}<span></div>' },
                     { name: $translate.instant('AccountPeriod'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span >{{row.entity.accountPeriod}}</span></div>' },
-                    { name: $translate.instant('DebitAmount'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span >{{row.entity.debitAmount | date:"yyyy-MM-dd"}}</span></div>' },
+                    { name: $translate.instant('DebitAmount'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span >{{row.entity.debitAmount}}</span></div>' },
                     { name: $translate.instant('CreditAmount'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span >{{row.entity.creditAmount}}</span></div>' },
                     { name: $translate.instant('BeginningBalance'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span >{{row.entity.beginningBalance}}</span></div>' },
                     { name: $translate.instant('EndingBalance'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span >{{row.entity.endingBalance}}</span></div>' },

atms-web/src/main/webapp/app/cit/reduction/cit-asset-eam-mapping/cit-asset-eam-mapping.ctrl.js

@@ -284,12 +284,12 @@
                 columnDefs: [
                     { name: $translate.instant('AssetType'), width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.assetType}}<span></div>' },
                     { name: $translate.instant('AssetNumber'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.assetNumber}}<span></div>' },
-                    { name: $translate.instant('AssetDescription'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span >{{row.entity.assetDescription}}</span></div>' },
+                    { name: $translate.instant('AssetName'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span >{{row.entity.assetDescription}}</span></div>' },
                     { name: $translate.instant('BuyDate'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span >{{row.entity.buyDate | date:"yyyy-MM-dd"}}</span></div>' },
-                    { name: $translate.instant('DepreciationDate'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span >{{row.entity.depreciationDate | date:"yyyy-MM-dd"}}</span></div>' },
+                    { name: $translate.instant('DepreciationDate2'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span >{{row.entity.depreciationDate | date:"yyyy-MM-dd"}}</span></div>' },
                     { name: $translate.instant('AssetGroupName'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span >{{row.entity.assetGroupName}}</span></div>' },
                     { name: $translate.instant('AcquisitionValue'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span >{{row.entity.acquisitionValue}}</span></div>' },
-                    { name: $translate.instant('ResidualRate'),  width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span >{{row.entity.residualRate}}</span></div>' },
+                    { name: $translate.instant('ResidualValue'),  width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span >{{row.entity.residualRate}}</span></div>' },
                     { name: $translate.instant('YearEndValue'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.yearEndValue}}</span></div>' },
                     { name: $translate.instant('CompensationSaleAmount'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.compensationSaleAmount}}</span></div>' },
 

atms-web/src/main/webapp/app/cit/reduction/cit-asset-eam-mapping/cit-asset-eam-mapping.html

 <div class="cit-asset-eam-mapping" id="mainPreviewDiv">
     <div class="top-area-wrapper" style="margin-top: 10px">
-        <span translate="JournalTitle" class="text-bold"></span> &nbsp;&nbsp;|&nbsp;&nbsp;<span class="text-bold" translate="InvoiceQJ"></span>：
-        <input type="text" class="form-control input-width-middle periodInput" style="position: relative; top: -30px; left: 180px;" id="input-invoice-period-picker" />
+        <span translate="JournalTitle" class="text-bold"></span> &nbsp;&nbsp;|&nbsp;&nbsp;
+        <span class="text-bold" translate="InvoiceQJ" style="display: none"></span>
+        <input type="text" class="form-control input-width-middle periodInput" style="position: relative; top: -30px; left: 180px;display: none" id="input-invoice-period-picker" />
         <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>
 

atms-web/src/main/webapp/app/cit/report/cit-report-view/cit-report-view.html

@@ -2,14 +2,14 @@
     <!--Report SpreadJS-->
     <div ng-if="!isDocumentList" class="row">
         <span ng-if="!isBSPL" ng-click="openExportPop('export');"><i class="fa fa-download"></i>&nbsp;{{'ExportExcel' | translate}}</span>
-        <span ng-if="!isBSPL" ng-click="commitApprove();"><i
-                class="fa fa-floppy-o"></i>&nbsp;{{'报表提审'}}</span>
-        <span ng-if="!isBSPL" ng-click="doApprove();"><i
-                class="fa fa-floppy-o"></i>&nbsp;{{'报表审批'}}</span>
-        <span ng-if="!isBSPL" ng-click="upLoadManual();"><i
-                class="fa fa-floppy-o"></i>&nbsp;{{'上传手工数据'}}
-           </span>
-        <span ng-if="!isBSPL" ng-click="openExportPop('upload');"><i class="fa fa-upload"></i>&nbsp;{{'UploadExcel' | translate}}</span>
+        <!--<span ng-if="!isBSPL" ng-click="commitApprove();"><i-->
+                <!--class="fa fa-floppy-o"></i>&nbsp;{{'报表提审'}}</span>-->
+        <!--<span ng-if="!isBSPL" ng-click="doApprove();"><i-->
+                <!--class="fa fa-floppy-o"></i>&nbsp;{{'报表审批'}}</span>-->
+        <!--<span ng-if="!isBSPL" ng-click="upLoadManual();"><i-->
+                <!--class="fa fa-floppy-o"></i>&nbsp;{{'上传手工数据'}}-->
+           <!--</span>-->
+        <!--<span ng-if="!isBSPL" ng-click="openExportPop('upload');"><i class="fa fa-upload"></i>&nbsp;{{'UploadExcel' | translate}}</span>-->
         <!--<span ng-if="!isBSPL" ng-click="saveReportCache();"><i-->
                 <!--class="fa fa-floppy-o"></i>&nbsp;{{'Save' | translate}}</span>-->
     </div>

atms-web/src/main/webapp/app/common/utils/constant.js

@@ -597,23 +597,23 @@ constant.citPermission = {
         dataImportCode: '03.001',
         balanceSheet: {
             queryCode: '03.001.001',
-            importCode: '03.001.002'
+            // importCode: '03.001.002'
         },
         journalEntry: {
             queryCode: '03.001.003',
-            importCode: '03.001.004'
+            // importCode: '03.001.004'
         },
         erpImport: {
             queryCode: '03.001.005',
-            importCode: '03.001.006'
+            // importCode: '03.001.006'
         }, 
         auditAdjust: {
             queryCode: '03.001.007',
-            importCode: '03.001.008'
+            // importCode: '03.001.008'
         },
         documentList: {
             queryCode: '03.001.009',
-            importCode: '03.001.010'
+            // importCode: '03.001.010'
         },
         assetList: {
             queryCode: '03.001.011',
@@ -914,11 +914,11 @@ constant.analysisPermisson = {
 };
 
 constant.citMenuList = [
-    constant.citPermission.dataImport.balanceSheet.queryCode,
-    constant.citPermission.dataImport.journalEntry.queryCode,
-    constant.citPermission.dataImport.erpImport.queryCode,
-    constant.citPermission.dataImport.auditAdjust.queryCode,
-    constant.citPermission.dataImport.documentList.queryCode,
+    // constant.citPermission.dataImport.balanceSheet.queryCode,
+    // constant.citPermission.dataImport.journalEntry.queryCode,
+    // constant.citPermission.dataImport.erpImport.queryCode,
+    // constant.citPermission.dataImport.auditAdjust.queryCode,
+    // constant.citPermission.dataImport.documentList.queryCode,
     constant.citPermission.dataImport.assetList.queryCode,
 
     constant.citPermission.dataPreview.balanceSheet.queryCode,