Skip to content

T
traffic-front
Commit 991678e6 authored by zhkwei's avatar zhkwei
Browse files
Options

CIT数据预览导入bug修改

parent f0f58b8d
Hide whitespace changes
Inline Side-by-side
Showing with 66 additions and 45 deletions
atms-api/src/main/java/pwc/taxtech/atms/common/util/DateUtils.java
View file @ 991678e6
......@@ -157,14 +157,14 @@ public class DateUtils {
* @return
*/
public static Integer strToPeriodYM(String dateStr) {
dateStr = dateStr.replace("-","");
dateStr = dateStr.replace("-","").replace(" ","").replace("年","").replace("月","");
Integer period = Integer.valueOf(dateStr);
return period;
}
/**
* 将yyyymm 字符串转换为区间格式 yyyyMM
* 将yyyymm 字\转换为区间格式 yyyyMM
*
* @param dateStr
* @return
......
atms-api/src/main/java/pwc/taxtech/atms/service/impl/AssetListServiceImpl.java
View file @ 991678e6
......@@ -335,7 +335,17 @@ public class AssetListServiceImpl extends BaseService {
citAsset.setResidualRate(residualRate);
//获取本年折旧额
citAsset.setYearDepreciationAmount(new BigDecimal(CitCommonUtil.getValue(rowData.getCell(24)).toString()));
value = CitCommonUtil.getValue(rowData.getCell(24));
if("".equals(value)){
citAsset.setYearDepreciationAmount(new BigDecimal("0"));
//获取财务本年折旧额
citAsset.setAccountYearDepreciationAmount(new BigDecimal("0"));
}else{
citAsset.setYearDepreciationAmount(new BigDecimal(value.toString()));
//获取财务本年折旧额
citAsset.setAccountYearDepreciationAmount(new BigDecimal(value.toString()));
}
// 获取本年调整额----列数待定 滴滴无本年调整额
// citAsset.setYearAdjustmentAmount(new BigDecimal(CitCommonUtil.getValue(rowData.getCell(25)).toString()));
......@@ -343,10 +353,13 @@ public class AssetListServiceImpl extends BaseService {
citAsset.setAccountAcquisitionValue(acquisitionValue);
//获取财务每月折旧额----（原值-残值额）/折旧期限
citAsset.setAccountMonthDepreciationAmount(acquisitionValue.subtract(residualRate).divide(new BigDecimal(depreciationPeriod), 2));
//获取财务本年折旧额
citAsset.setAccountYearDepreciationAmount(new BigDecimal(CitCommonUtil.getValue(rowData.getCell(24)).toString()));
//获取财务累计折旧额,接下来计算需要用到，所以赋给一个对象
BigDecimal accountTotalDepreciationAmount = new BigDecimal(CitCommonUtil.getValue(rowData.getCell(25)).toString());
value = CitCommonUtil.getValue(rowData.getCell(25));
if("".equals(value)){
value = "0";
}
BigDecimal accountTotalDepreciationAmount = new BigDecimal(value.toString());
citAsset.setAccountTotalDepreciationAmount(accountTotalDepreciationAmount);
//年终剩余价值,原值-累计折旧
citAsset.setYearEndValue(acquisitionValue.subtract(accountTotalDepreciationAmount));
......
atms-web/src/main/webapp/app/cit/cit-layout/cit-layout.ctrl.js
View file @ 991678e6
......@@ -271,18 +271,18 @@ citModule.controller('citLayoutController', ['$scope', '$rootScope', '$location'
permission: constant.citPermission.dataPreview.bsMappingVer.queryCode,
url: '#/cit/previewData/bsMappingVer'
});
} else if (data[constant.citPermission.dataPreview.assetsList.queryCode]) {
$scope.menus.push({
name: 'previewData', state: 'previewData', num: 2,
permission: constant.citPermission.dataPreview.dataPreviewCode, url: '#/cit/previewData'
});
subMenus.push({
name: 'previewData.assetsList',
state: 'previewData.assetsList',
num: 2,
permission: constant.citPermission.dataPreview.assetsList.queryCode,
url: '#/cit/previewData/assetsList'
});
// } else if (data[constant.citPermission.dataPreview.assetsList.queryCode]) {
// $scope.menus.push({
// name: 'previewData', state: 'previewData', num: 2,
// permission: constant.citPermission.dataPreview.dataPreviewCode, url: '#/cit/previewData'
// });
// subMenus.push({
// name: 'previewData.assetsList',
// state: 'previewData.assetsList',
// num: 2,
// permission: constant.citPermission.dataPreview.assetsList.queryCode,
// url: '#/cit/previewData/assetsList'
// });
} else if (data[constant.citPermission.dataPreview.salaryAdvance.queryCode]) {
$scope.menus.push({
name: 'previewData', state: 'previewData', num: 2,
......
atms-web/src/main/webapp/app/cit/import/cit-import-asset-list/cit-import-asset-list.ctrl.js
View file @ 991678e6
......@@ -305,6 +305,7 @@
}
$scope.TotalCount = assetListData.data.total;
$scope.pagingOptions.totalItems = assetListData.data.total;
$scope.pageOptions.totalItems = assetListData.data.total;
});
}
......
atms-web/src/main/webapp/app/cit/import/cit-import-layout/cit-import-layout.ctrl.js
View file @ 991678e6
......@@ -35,10 +35,10 @@ function ($scope, $q, $log, $translate, $location, loginContext, enums, vatSessi
name: 'bsMappingVer', permission: constant.citPermission.dataPreview.bsMappingVer.queryCode,
text: $translate.instant('bsMappingVer'), icon: 'fa fa-bank'
},
{
name: 'assetsList', permission: constant.citPermission.dataPreview.assetsList.queryCode,
text: $translate.instant('AssetList'), icon: 'fa fa-bank'
},
// {
// name: 'assetsList', permission: constant.citPermission.dataPreview.assetsList.queryCode,
// text: $translate.instant('AssetList'), icon: 'fa fa-bank'
// },
{
name: 'salaryAdvance', permission: constant.citPermission.dataPreview.salaryAdvance.queryCode,
text: $translate.instant('salaryAdvance'), icon: 'fa fa-bank'
......
atms-web/src/main/webapp/app/cit/preview/cit-preview-eamDisposal-list/cit-preview-eamDisposal-list.html
View file @ 991678e6
<div class="cit-import-asset-list">
<div class="top-area-wrapper" style="margin-top: 10px">
<button class="filter-button"
atms-popover ng-mouseenter="prepareSummary()" ng-click="showPopover()"
popover-container="body" popover-auto-hide="true" data-overwrite="true"
use-optimized-placement-algorithm="true"
data-placement="bottom"
data-templateurl="app/cit/preview/cit-preview-eamDisposal-list/vat-preview-eamDisposal-search.html">
<i class="fa fa-filter" aria-hidden="true"></i>
</button>
<span translate="EAMDisposal" 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: 210px; width: 200px;" id="input-invoice-period-picker" />
<div style="height: 58px">
<button class="filter-button"
atms-popover ng-mouseenter="prepareSummary()" ng-click="showPopover()"
popover-container="body" popover-auto-hide="true" data-overwrite="true"
use-optimized-placement-algorithm="true"
data-placement="bottom"
data-templateurl="app/cit/preview/cit-preview-eamDisposal-list/vat-preview-eamDisposal-search.html">
<i class="fa fa-filter" aria-hidden="true"></i>
</button>
<span translate="EAMDisposal" class="text-bold"></span> &nbsp;&nbsp;|&nbsp;&nbsp;
<span class="text-bold" translate="InvoiceQJ" style="display: none"></span>
</div>
<input type="text" class="form-control input-width-middle periodInput" style="position: relative; top: -30px; left: 210px;width: 200px;display: none" id="input-invoice-period-picker" />
<span ng-click="downloadTB()" style="position: relative; top: -61px; left: 95%;"><i class="fa fa-file-excel-o" aria-hidden="true"></i>{{'ExportBtn' | translate}}</span>
<div class="dt-init-wrapper" style=" position: relative; top: -41px;">
......
atms-web/src/main/webapp/app/cit/preview/cit-preview-journal-merge/cit-preview-journal-merge.ctrl.js
View file @ 991678e6
......@@ -281,7 +281,7 @@
$('#input-invoice-period-picker').focus(function () {
$('.filter-button').popover("hide");
});
//初始化month-picker
//初始化month-picker
$('#input-invoice-period-picker').rangePicker({
minDate: minDate,
maxDate: maxDate,
......@@ -372,7 +372,7 @@
initPeriods();
initJournalEntryPagination();
//初始化查询条件-期间范围
$scope.queryParams.periodStart = vatSessionService.year * 100 + vatSessionService.month;
$scope.queryParams.periodStart = vatSessionService.year * 100 + 1;
$scope.queryParams.periodEnd = vatSessionService.year * 100 + 12;
$scope.queryParams.organizationId = vatSessionService.project.organizationID;
// if($rootScope.currentLanguage === 'en-us'){
......
atms-web/src/main/webapp/app/cit/preview/cit-preview-salaryAdvance-list/cit-preview-salaryAdvance-list.html
View file @ 991678e6
<div class="cit-import-asset-list">
<div class="top-area-wrapper" style="margin-top: 10px">
<button class="filter-button"
atms-popover ng-mouseenter="prepareSummary()" ng-click="showPopover()"
popover-container="body" popover-auto-hide="true" data-overwrite="true"
use-optimized-placement-algorithm="true"
data-placement="bottom"
data-templateurl="app/cit/preview/cit-preview-salaryAdvance-list/vat-preview-salaryAdvance-search.html">
<i class="fa fa-filter" aria-hidden="true"></i>
</button>
<span translate="EAMDisposal" 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: 210px; width: 200px;" id="input-invoice-period-picker" />
<div style="height: 58px">
<button class="filter-button"
atms-popover ng-mouseenter="prepareSummary()" ng-click="showPopover()"
popover-container="body" popover-auto-hide="true" data-overwrite="true"
use-optimized-placement-algorithm="true"
data-placement="bottom"
data-templateurl="app/cit/preview/cit-preview-salaryAdvance-list/vat-preview-salaryAdvance-search.html">
<i class="fa fa-filter" aria-hidden="true"></i>
</button>
<span translate="EAMDisposal" class="text-bold"></span> &nbsp;&nbsp;|&nbsp;&nbsp;
<span class="text-bold" translate="InvoiceQJ" style="display: none"></span>
</div>
<input type="text" class="form-control input-width-middle periodInput" style="position: relative; top: -30px; left: 210px;width: 200px;display: none" id="input-invoice-period-picker" />
<span ng-click="downloadTB()" style=" position: absolute; z-index: 99999999; top: 14px; right: 2%;"><i class="fa fa-file-excel-o" aria-hidden="true"></i>{{'ExportBtn' | translate}}</span>
<div class="dt-init-wrapper" style=" position: relative; top: -20px;">
<div id="gridContainer" dx-data-grid="assetsResultGridOptions"></div>
......
atms-web/src/main/webapp/app/common/utils/constant.js
View file @ 991678e6
......@@ -939,7 +939,7 @@ constant.citMenuList = [
constant.citPermission.dataPreview.journalMerge.queryCode,
constant.citPermission.dataPreview.bsGenerateVer.queryCode,
constant.citPermission.dataPreview.bsMappingVer.queryCode,
constant.citPermission.dataPreview.assetsList.queryCode,
// constant.citPermission.dataPreview.assetsList.queryCode,
constant.citPermission.dataPreview.salaryAdvance.queryCode,
constant.citPermission.dataPreview.eamDisposal.queryCode,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment