Skip to content

T
traffic-front
Commit a4e708e9 authored by weizhikai's avatar weizhikai
Browse files
Options

1、导入分发细致划分；2、各个预览页面重置按钮不刷新数据；3、VAT科目余额查询条件bug修改；4、CIT预提查询条件bug；

parent 1121fbda
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 122 additions and 40 deletions
atms-api/src/main/java/pwc/taxtech/atms/dto/vatdto/TrialBalanceParam.java
View file @ a4e708e9
......@@ -20,12 +20,32 @@ public class TrialBalanceParam {
private String segment3Name;
private String segment5;
private String segment5Name;
private String segment6;
private String segment6Name;
private Boolean containsAdjustmentTable;
public String getSegment5() {
return segment5;
}
public void setSegment5(String segment5) {
this.segment5 = segment5;
}
public String getSegment5Name() {
return segment5Name;
}
public void setSegment5Name(String segment5Name) {
this.segment5Name = segment5Name;
}
public Integer getPeriodStart() {
return periodStart;
}
......
atms-api/src/main/java/pwc/taxtech/atms/service/impl/DataPreviewSerivceImpl.java
View file @ a4e708e9
......@@ -73,6 +73,11 @@ public class DataPreviewSerivceImpl extends BaseService {
@Resource
private CommonDocumentHelper commonDocumentHelper;
/**
* 查询科目余额表
* @param param
* @return
*/
public PageInfo<TrialBalanceDto> getTBDataForDisplay(TrialBalanceParam param) {
TrialBalanceCondition condition = beanUtil.copyProperties(param, new TrialBalanceCondition());
......@@ -94,6 +99,11 @@ public class DataPreviewSerivceImpl extends BaseService {
return pageInfo;
}
/**
* 查询利润表PRC
* @param param
* @return
*/
public PageInfo<ProfitLossStatementDto> getPLDataForDisplay(ProfitLossStatementParam param) {
ProfitLossStatementCondition condition = beanUtil.copyProperties(param, new ProfitLossStatementCondition());
......
atms-dao/src/main/java/pwc/taxtech/atms/vat/dpo/TrialBalanceCondition.java
View file @ a4e708e9
......@@ -24,8 +24,28 @@ public class TrialBalanceCondition {
private String segment6Name;
private String segment5;
private String segment5Name;
private Boolean containsAdjustmentTable;
public String getSegment5() {
return segment5;
}
public void setSegment5(String segment5) {
this.segment5 = segment5;
}
public String getSegment5Name() {
return segment5Name;
}
public void setSegment5Name(String segment5Name) {
this.segment5Name = segment5Name;
}
public Integer getPeriodStart() {
return periodStart;
}
......
atms-dao/src/main/resources/pwc/taxtech/atms/vat/dao/extends/TrialBalanceMapper.xml
View file @ a4e708e9
......@@ -19,6 +19,18 @@
<if test="@com.github.pagehelper.util.StringUtil@isNotEmpty(tbCondition.segment3Name)">
AND segment3_name= #{tbCondition.segment3Name,jdbcType=VARCHAR}
</if>
<if test="@com.github.pagehelper.util.StringUtil@isNotEmpty(tbCondition.segment2)">
AND segment2= #{tbCondition.segment2,jdbcType=VARCHAR}
</if>
<if test="@com.github.pagehelper.util.StringUtil@isNotEmpty(tbCondition.segment2Name)">
AND segment2_name= #{tbCondition.segment2Name,jdbcType=VARCHAR}
</if>
<if test="@com.github.pagehelper.util.StringUtil@isNotEmpty(tbCondition.segment5)">
AND segment5= #{tbCondition.segment5,jdbcType=VARCHAR}
</if>
<if test="@com.github.pagehelper.util.StringUtil@isNotEmpty(tbCondition.segment5Name)">
AND segment5_name= #{tbCondition.segment5Name,jdbcType=VARCHAR}
</if>
<if test="@com.github.pagehelper.util.StringUtil@isNotEmpty(tbCondition.segment6)">
AND segment6= #{tbCondition.segment6,jdbcType=VARCHAR}
</if>
......
atms-web/src/main/webapp/app-resources/i18n/en-us/app.json
View file @ a4e708e9
......@@ -825,7 +825,9 @@
"InputRollOutConfiguration":"Input RollOut Config",
"FinancialDataExtraction":"Financial Data Extraction",
"InvoiceDataExtraction":"Invoice Data Extraction",
"ImportDistribution":"Import Distribution",
"ImportDistribution":"Invoice Import Distribution",
"FinancialImportDistribution":"Financial Import Distribution",
"CitImportDistribution":"CIT Import Distribution",
"VATInvoiceRecord":"VAT Invoice Record",
"CertifiedInvoicesList":"Certified Invoices List",
"RedLetterVATSpecialInvoiceInfo":"Red Letter Invoice Info",
......
atms-web/src/main/webapp/app-resources/i18n/zh-CN/app.json
View file @ a4e708e9
......@@ -869,7 +869,9 @@
"InputRollOutConfiguration":"进项转出配置",
"FinancialDataExtraction":"财务数据抽取",
"InvoiceDataExtraction":"发票数据抽取",
"ImportDistribution":"导入分发",
"ImportDistribution":"发票导入分发",
"FinancialImportDistribution":"财务导入分发",
"CitImportDistribution":"CIT导入分发",
"VATInvoiceRecord":"已开增值税发票记录",
"CertifiedInvoicesList":"已认证发票清单",
"RedLetterVATSpecialInvoiceInfo":"红字增值税专用发票信息表",
......
atms-web/src/main/webapp/app/cit/import/cit-import-asset-list/cit-import-asset-list.ctrl.js
View file @ a4e708e9
......@@ -315,7 +315,6 @@
//根据分类获取数据
function getAssetResultList(assetType) {
debugger;
$scope.citAssetsListDto.assetType = assetType;
$scope.citAssetsListDto.pageInfo = {
pageIndex: $scope.pagingOptions.pageIndex,
......@@ -328,7 +327,6 @@
$scope.TotalTaxCurrentYearDepreciationAmount = 0;
$scope.TotalYearDifferenceAmount = 0;
assetListService.getAssetResultListPage($scope.citAssetsListDto).success(function (assetListData) {
debugger;
var data = assetListData.data.list;
$('.filter-button').popover("hide");
if (data) {
......@@ -1259,10 +1257,11 @@
// initParamFilter();
$scope.citAssetsListDto.taxAccountCompare = 2;
$scope.taxAccountDifferenceOptions.value = 2;
$scope.citAssetsListDto.assetGroupName = null;
$scope.citAssetsListDto.depreciationPeriod = null;
$scope.citAssetsListDto.taxGroupType = null;
getAssetResultList($scope.citAssetsListDto.assetType);
// getAssetResultList($scope.citAssetsListDto.assetType);
};
......
atms-web/src/main/webapp/app/cit/preview/cit-preview-eamDisposal-list/cit-preview-eamDisposal-list.ctrl.js
View file @ a4e708e9
......@@ -123,7 +123,7 @@
$scope.queryParams.period = vatSessionService.year;
$scope.queryParams.compensationSaleAmount = null;
$scope.queryParams.assetLabelNumber = null;
$scope.refreshConfigGrid();
// $scope.refreshConfigGrid();
}
$scope.doSearch = function () {
$scope.refreshConfigGrid();
......
atms-web/src/main/webapp/app/cit/preview/cit-preview-journal-merge/cit-preview-journal-merge.ctrl.js
View file @ a4e708e9
......@@ -106,8 +106,8 @@
};
$scope.queryParams.periodStart = vatSessionService.year * 100 + 1;
$scope.queryParams.periodEnd = vatSessionService.year * 100 + 12;
loadJournalEntryDataFromDB();
$('.filter-button').popover("hide");
// loadJournalEntryDataFromDB();
// $('.filter-button').popover("hide");
};
var prepareSummary = function () {
......@@ -254,7 +254,7 @@
{caption: $translate.instant('Alternate1Description'), dataField: "segment9Name",width: 200},
{caption: $translate.instant('Alternate2Description'), dataField: "segment10Name",width: 200},
{caption: $translate.instant('currency'), dataField: "journalCurrencyCode",width: 200},
{caption: $translate.instant('LocalCurrency'), dataField: "sobCurrencyCode",width: 200},
{caption: $translate.instant('LocalCurrency'), dataField: "currencyCode",width: 200},
{
caption: $translate.instant('JournalDebitAmount'),
dataField: "accountedDr",
......@@ -312,6 +312,7 @@
// $scope.totalCount = totalCount;
// }
// },
allowColumnResizing: true,
loadPanel: {
enabled: true
},
......
atms-web/src/main/webapp/app/cit/preview/cit-preview-salaryAdvance-list/cit-preview-salaryAdvance-list.ctrl.js
View file @ a4e708e9
......@@ -132,7 +132,7 @@
$scope.doDataReset = function () {
$scope.queryParams.period = vatSessionService.year;
$scope.queryParams.poSubjectName = null;
$scope.refreshConfigGrid();
// $scope.refreshConfigGrid();
}
$scope.doSearch = function () {
$scope.refreshConfigGrid();
......
atms-web/src/main/webapp/app/cit/preview/cit-preview-tb-generate-ver/cit-preview-tb-generate-ver.ctrl.js
View file @ a4e708e9
......@@ -59,7 +59,6 @@
$scope.getDataFromDatabase = function (queryParams){
citPreviewService.getTbGeneVerData(queryParams).success(function (data) {
debugger;
if (data) {
// minDate = data.
var index = 1;
......@@ -91,8 +90,8 @@
};
$scope.queryParams.periodStart = $scope.startMonth;
$scope.queryParams.periodEnd = $scope.endMonth;
loadJournalEntryDataFromDB();
$('.filter-button').popover("hide");
// loadJournalEntryDataFromDB();
// $('.filter-button').popover("hide");
};
var prepareSummary = function () {
......@@ -235,6 +234,7 @@
paging: {
pageSize: 50,
},
allowColumnResizing: true,
showBorders: true,
hoverStateEnabled: true,
height: '99%',
......
atms-web/src/main/webapp/app/cit/preview/cit-preview-tb-mapping-ver/cit-preview-tb-mapping-ver.ctrl.js
View file @ a4e708e9
......@@ -95,8 +95,8 @@
};
$scope.queryParams.periodStart = $scope.startMonth;
$scope.queryParams.periodEnd = $scope.endMonth;
loadJournalEntryDataFromDB();
$('.filter-button').popover("hide");
// loadJournalEntryDataFromDB();
// $('.filter-button').popover("hide");
};
var prepareSummary = function () {
......@@ -241,6 +241,7 @@
paging: {
pageSize: 50,
},
allowColumnResizing: true,
showBorders: true,
hoverStateEnabled: true,
height: '99%',
......
atms-web/src/main/webapp/app/common/webservices/citPreviewData.svc.js
View file @ a4e708e9
......@@ -8,6 +8,7 @@ webservices.factory('citPreviewDataService', ['$http', 'apiConfig', function ($h
pageInfo : params.pagingOptions,
periodStart : params.periodStart,
periodEnd : params.periodEnd,
poSubjectName : params.poSubjectName,
period : params.period,
projectId: params.projectId
}, apiConfig.createVat());
......
atms-web/src/main/webapp/app/vat/preview/vat-preview-journal/vat-preview-journal.ctrl.js
View file @ a4e708e9
......@@ -5,8 +5,8 @@
$scope.startDate = new Date(vatSessionService.project.year, 0, 1);
$scope.endDate = new Date(vatSessionService.project.year, 11, 31);
$scope.dateFormat = $translate.instant('dateFormat4YearMonthDay');
$scope.startMonth = vatSessionService.year + '' + vatSessionService.month;
$scope.endMonth = vatSessionService.year + '' + vatSessionService.month;
$scope.startMonth = vatSessionService.year * 100 + vatSessionService.month;
$scope.endMonth = vatSessionService.year * 100 + vatSessionService.month;
$scope.totalMoneyAmount = 0;
$scope.totalTaxAmount = 0;
$scope.pageSize = constant.vatPagesize;
......@@ -218,8 +218,8 @@
$scope.queryParams.periodStart = $scope.startMonth;
$scope.queryParams.periodEnd = $scope.endMonth;
$scope.queryParams.orgId = vatSessionService.project.organizationID;
loadJournalEntryDataFromDB(1);
$('.filter-button').popover("hide");
// loadJournalEntryDataFromDB(1);
// $('.filter-button').popover("hide");
};
var prepareSummary = function () {
......@@ -415,7 +415,7 @@
{
name: $translate.instant('LocalCurrency'),
width: 200,
cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.sobCurrencyCode}}</span></div>'
cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.currencyCode}}</span></div>'
},
{
name: $translate.instant('JournalDebitAmount'),
......@@ -429,12 +429,6 @@
width: 200,
cellTemplate: '<div class="ui-grid-cell-contents" style="text-align: right"><span>{{row.entity.accountedCr | number:2}}</span></div>'
},
{
name: $translate.instant('Amount'),
headerCellClass: 'rightHeader',
width: 200,
cellTemplate: '<div class="ui-grid-cell-contents" style="text-align: right"><span></span></div>'
},
{
name: $translate.instant('LocalCurrencyDebitAmount'),
headerCellClass: 'rightHeader',
......
atms-web/src/main/webapp/app/vat/preview/vat-preview-off-balance-sheet/vat-preview-off-balance-sheet.ctrl.js
View file @ a4e708e9
......@@ -9,7 +9,7 @@
$scope.endMonth = vatSessionService.month;
$scope.totalMoneyAmount = 0;
$scope.totalTaxAmount = 0;
$scope.pageSize = constant.vatPagesize;
$scope.pageSize = constant.page.pageSizeArrary[3];
var minDate = [1, vatSessionService.project.year];
// var minDate = moment().startOf('month').subtract(0, 'months');
......@@ -105,7 +105,7 @@
$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");
$scope.importDate = $filter('date')(data.list[0].createTime, "yyyy-MM-dd HH:mm:ss");
}
});
};
......@@ -167,7 +167,7 @@
pageInfo: {
totalCount: -1,
pageIndex: 1,
pageSize: constant.pagesize,
pageSize: constant.page.pageSizeArrary[3],
totalPage: 0,
}
}
......@@ -533,7 +533,7 @@
rowHeight: constant.UIGrid.rowHeight,
selectionRowHeaderWidth: constant.UIGrid.rowHeight,
// expandableRowTemplate: '<div ui-grid="row.entity.subGridOptions" style="height:150px;"></div>',
virtualizationThreshold: 50,//默认加载50条数据，避免在数据展示时，只显示前面4条
virtualizationThreshold: 100,//默认加载50条数据，避免在数据展示时，只显示前面4条
enableSorting: false,
enableColumnMenus: false,
enableHorizontalScrollbar : 1,
......
atms-web/src/main/webapp/app/vat/preview/vat-preview-off-balance-sheet/vat-preview-off-balance-sheet.html
View file @ a4e708e9
......@@ -17,7 +17,7 @@
{{'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>
{{'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">
......
atms-web/src/main/webapp/app/vat/preview/vat-preview-trial-balance/vat-preview-trial-balance-search.html
View file @ a4e708e9
......@@ -17,16 +17,28 @@
</tr>
<tr>
<td>
<span translate="ProfitCenterCode"></span>
<span translate="CostCenter"></span>
<input class="form-control input-width-middle" type="text" id="segment2" ng-model="queryParams.segment2" />
</td>
</tr>
<tr>
<td>
<span translate="ProfitCenterName"></span>
<span translate="CostCenterDescription"></span>
<input class="form-control input-width-middle" type="text" id="segment2Name" ng-model="queryParams.segment2Name" />
</td>
</tr>
<tr>
<td>
<span translate="ProfitCenter"></span>
<input class="form-control input-width-middle" type="text" id="segment5" ng-model="queryParams.segment5" />
</td>
</tr>
<tr>
<td>
<span translate="ProfitCenterDescription"></span>
<input class="form-control input-width-middle" type="text" id="segment5Name" ng-model="queryParams.segment5Name" />
</td>
</tr>
<tr>
<td>
<span translate="ProductCode"></span>
......
atms-web/src/main/webapp/app/vat/preview/vat-preview-trial-balance/vat-preview-trial-balance.ctrl.js
View file @ a4e708e9
......@@ -5,8 +5,8 @@
$scope.startDate = new Date(vatSessionService.project.year, 0, 1);
$scope.endDate = new Date(vatSessionService.project.year, 11, 31);
$scope.dateFormat = $translate.instant('dateFormat4YearMonthDay');
$scope.startMonth =vatSessionService.year+''+vatSessionService.month;
$scope.endMonth = vatSessionService.year+''+vatSessionService.month;
$scope.startMonth =vatSessionService.year * 100 + vatSessionService.month;
$scope.endMonth = vatSessionService.year * 100 + vatSessionService.month;
$scope.totalMoneyAmount = 0;
$scope.totalTaxAmount = 0;
$scope.pageSize = constant.vatPagesize;
......@@ -46,6 +46,8 @@
segment3Name : null,
segment2 : null,
segment2Name : null,
segment5 : null,
segment5Name : null,
segment6 : null,
segment6Name : null,
containsAdjustmentTable : null
......@@ -84,7 +86,7 @@
$scope.ledgerName = data.list[0].ledgerName;
$scope.currencyCode = data.list[0].currencyCode;
$scope.status = data.list[0].status;
$scope.importDate = $filter('date')(data.list[0].date, "yyyy-MM-dd hh:mm:ss");
$scope.importDate = $filter('date')(data.list[0].createTime, "yyyy-MM-dd HH:mm:ss");
}
});
};
......@@ -178,6 +180,12 @@
if ($scope.queryParams.segment2Name === null) {
$scope.queryParams.segment2Name = '';
}
if ($scope.queryParams.segment5 === null) {
$scope.queryParams.segment5 = '';
}
if ($scope.queryParams.segment5Name === null) {
$scope.queryParams.segment5Name = '';
}
if ($scope.queryParams.segment6 === null) {
$scope.queryParams.segment6 = '';
}
......@@ -200,13 +208,13 @@
var doDataFilterReset = function () {
$scope.queryParams = {
pageInfo: {},
periodStart: '',
periodEnd: '',
orgId:'',
segment3 : null,
segment3Name : null,
segment2 : null,
segment2Name : null,
segment5 : null,
segment5Name : null,
segment6 : null,
segment6Name : null,
containsAdjustmentTable : null
......@@ -214,8 +222,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 () {
......
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