Skip to content

T
traffic-front
Commit 7a144c21 authored by sherlock's avatar sherlock
Browse files
Options

Merge branch 'dev_oracle_sherlock' into 'dev_oracle' 

Dev oracle sherlock

See merge request root/atms!210
parents 79b3576e cba35824
Hide whitespace changes
Inline Side-by-side
Showing with 253 additions and 59 deletions
atms-api/src/main/java/pwc/taxtech/atms/vat/service/impl/InputInvoiceDataImportServiceImpl.java
View file @ 7a144c21
......@@ -63,8 +63,6 @@ public class InputInvoiceDataImportServiceImpl {
project.getYear(), paras.getPeriodStart(), Constant.DateFormat.YYYYMM), DateUtils.getPeriodEndFormat(project.getYear(),
paras.getPeriodEnd(), Constant.DateFormat.YYYYMM)).andRZJGEqualTo(INPUT_RZJG_SUCCESS).andRZZTEqualTo(INPUT_RZZT_OVER)
.andFPZTNotEqualTo("1");
List<InputInvoice> invoices = inputInvoiceMapper.selectByExample(invoiceExample);
DecimalFormat df = new DecimalFormat("#,###.00");
invoices.stream().forEach(x -> {
......@@ -77,8 +75,23 @@ public class InputInvoiceDataImportServiceImpl {
}
public PageInfo<InputInvoice> getInputInvoiceTreeViewData(InputInvoicePreviewQueryParam paras, String projectId) {
Project project = projectMapper.selectByPrimaryKey(projectId);
Organization organization = organizationMapper.selectByPrimaryKey(project.getOrganizationId());
InputInvoiceExample invoiceExample = new InputInvoiceExample();
invoiceExample.createCriteria().andGFSHEqualTo(organization.getTaxPayerNumber()).andRZSQBetween(DateUtils.getPeriodBeginFormat(
project.getYear(), paras.getPeriodStart(), Constant.DateFormat.YYYYMM), DateUtils.getPeriodEndFormat(project.getYear(),
paras.getPeriodEnd(), Constant.DateFormat.YYYYMM)).andRZJGEqualTo(INPUT_RZJG_SUCCESS).andRZZTEqualTo(INPUT_RZZT_OVER)
.andFPZTNotEqualTo("1");
PageHelper.startPage(paras.getPageInfo().getPageIndex(), paras.getPageInfo().getPageSize());
PageInfo<InputInvoice> pageInfo = new PageInfo<>(getInputInvoiceTree(paras, projectId));
List<InputInvoice> invoices = inputInvoiceMapper.selectByExample(invoiceExample);
DecimalFormat df = new DecimalFormat("#,###.00");
invoices.stream().forEach(x -> {
x.setHJJE(df.format(new BigDecimal(x.getHJJE())));
x.setHJSE(df.format(new BigDecimal(x.getHJSE())));
x.setRZJG(convertRzjg(x.getRZJG()));
}
);
PageInfo<InputInvoice> pageInfo = new PageInfo<>(invoices);
return pageInfo;
}
......
atms-api/src/main/java/pwc/taxtech/atms/vat/service/impl/OutputInvoiceServiceImpl.java
View file @ 7a144c21
......@@ -100,7 +100,31 @@ public class OutputInvoiceServiceImpl {
}
public PageInfo<OutputInvoice> queryOutputInvoiceList(QueryOutputDto queryDto, String projectId) {
PageInfo<OutputInvoice> pageInfo = new PageInfo<>(queryOutputInvoiceAllList(queryDto, projectId));
Project project = projectMapper.selectByPrimaryKey(projectId);
Organization organization = organizationMapper.selectByPrimaryKey(project.getOrganizationId());
OutputInvoiceExample outputInvoiceExample = new OutputInvoiceExample();
if (organization.getTaxPayerNumber() == null) {
outputInvoiceExample.createCriteria().andXFSHIsNull().andKPZTEqualTo(OUTPUT_KPZT_YES).
andKPRQBetween(DateUtils.getPeriodBegin(project.getYear(), queryDto.getPeriodStart()),
DateUtils.getPeriodEnd(project.getYear(), queryDto.getPeriodEnd()))
.andFPZTNotEqualTo("1");
} else {
outputInvoiceExample.createCriteria().andXFSHEqualTo(organization.getTaxPayerNumber()).andKPZTEqualTo(OUTPUT_KPZT_YES).
andKPRQBetween(DateUtils.getPeriodBegin(project.getYear(), queryDto.getPeriodStart()),
DateUtils.getPeriodEnd(project.getYear(), queryDto.getPeriodEnd()))
.andFPZTNotEqualTo("1");
}
PageHelper.startPage(queryDto.getPageInfo().getPageIndex(), queryDto.getPageInfo().getPageSize());
List<OutputInvoice> invoices = outputInvoiceMapper.selectByExample(outputInvoiceExample);
DecimalFormat df = new DecimalFormat("#,###.00");
invoices.stream().forEach(x -> {
x.setHJJE(df.format(new BigDecimal(x.getHJJE())));
x.setHJSE(df.format(new BigDecimal(x.getHJSE())));
}
);
PageInfo<OutputInvoice> pageInfo = new PageInfo<>(invoices);
return pageInfo;
}
......
atms-api/src/main/java/pwc/taxtech/atms/vat/service/impl/report/functions/DFFS.java
View file @ 7a144c21
......@@ -119,7 +119,7 @@ public class DFFS extends FunctionBase implements FreeRefFunction {
dto.setPeriod(period);
dto.setIsOnlyManualInput(Boolean.FALSE);
dto.setName(Constant.DataSourceName.ReportDataSource);
dto.setType( FormulaDataSourceType.TrialBalanceSource.getCode());
dto.setType(FormulaDataSourceType.TrialBalanceSource.getCode());
contain.add(dto);
}
return temp.stream().mapToDouble(a -> a.getPtdCr().doubleValue()).sum();
......
atms-api/src/main/java/pwc/taxtech/atms/vat/service/impl/report/functions/JFFS.java
View file @ 7a144c21
......@@ -12,10 +12,7 @@ import pwc.taxtech.atms.constant.Constant;
import pwc.taxtech.atms.constant.enums.FormulaDataSourceDetailType;
import pwc.taxtech.atms.constant.enums.FormulaDataSourceType;
import pwc.taxtech.atms.dto.vatdto.ReportCellDataSourceDto;
import pwc.taxtech.atms.entity.AccountMapping;
import pwc.taxtech.atms.entity.AccountMappingExample;
import pwc.taxtech.atms.entity.EnterpriseAccountSetOrg;
import pwc.taxtech.atms.entity.EnterpriseAccountSetOrgExample;
import pwc.taxtech.atms.entity.*;
import pwc.taxtech.atms.vat.entity.GlBalance;
import pwc.taxtech.atms.vat.entity.GlBalanceExample;
......@@ -68,7 +65,7 @@ public class JFFS extends FunctionBase implements FreeRefFunction {
double result = 0;
for(AccountMapping a : accountMappings){
result += count(a.getEnterpriseAccountCode(), dataSource, period, year);
result += count(a.getEnterpriseAccountCode(), dataSource, period, year,orgId);
}
Long dataSoureId = saveDataSource(ec, Collections.singletonList(dataSource),
FormulaDataSourceDetailType.FormulaDataSourceDto,
......@@ -78,7 +75,7 @@ public class JFFS extends FunctionBase implements FreeRefFunction {
return new NumberEval(result);
} else if(type == 1){
double result = count(code, dataSource, period, year);
double result = count(code, dataSource, period, year, orgId);
Long dataSoureId = saveDataSource(ec, Collections.singletonList(dataSource),
FormulaDataSourceDetailType.FormulaDataSourceDto,
new BigDecimal(result), period, formulaContext.getReportTemplateGroupId(), formulaContext.getProjectId());
......@@ -93,10 +90,16 @@ public class JFFS extends FunctionBase implements FreeRefFunction {
return year + "-" + (period > 9 ? period : ("0" + period));
}
private double count(String code, List<ReportCellDataSourceDto> contain, int period, int year){
private double count(String code, List<ReportCellDataSourceDto> contain, int period, int year, String orgId){
Organization organization = SpringContextUtil.organizationMapper.selectByPrimaryKey(orgId);
GlBalanceExample glBalanceExample = new GlBalanceExample();
GlBalanceExample.Criteria c1 = glBalanceExample.createCriteria().andSegment3EqualTo(code).andPeriodNameEqualTo(periodName(period, year));
GlBalanceExample.Criteria c2 = glBalanceExample.createCriteria().andSegment4EqualTo(code).andPeriodNameEqualTo(periodName(period, year));
if(organization != null){
c1.andSegment1EqualTo(organization.getClientCode());
c2.andSegment1EqualTo(organization.getClientCode());
}
glBalanceExample.or(c2);
List<GlBalance> list = SpringContextUtil.glBalanceMapper.selectByExample(glBalanceExample);
if(CollectionUtils.isEmpty(list)){
......
atms-web/src/main/webapp/app/common/controls/tax-report-cell-detail-modal/tax-report-cell-detail-modal.ctrl.js
View file @ 7a144c21
......@@ -542,7 +542,7 @@
var dataGridCommonOptions = {
bindingOptions: {
columns: 'dataGridColumns',
dataSource: 'detail.dataGridSource',
dataSource: 'detail.dataGridSourceBind',
height: 'dataGridHeight'
},
//添加合计（dx的合计行隐藏，用重写合计行替代，fixed bug 10941）
......@@ -709,59 +709,139 @@
var getDataGridColumns = function () {
var dataGridColumns;
switch ($scope.detail.cellType) {
case enums.formulaDataSourceType.InputInvoice:
//进项数据源
case enums.formulaDataSourceType.TrialBalanceSource:
//平衡表数据源
dataGridColumns = [
{
dataField: 'period',
calculateCellValue: function(){
return $scope.projectPeriod
},
// dataField: 'projectPeriod',
caption: $translate.instant('InvoiceQJ'),
alignment: 'center',
width: '9%'
width: '10%'
},
{
dataField: 'date',
caption: $translate.instant('InvoiceRZRQ'),
alignment: 'left',
width: '13%'
calculateCellValue: function(){
var formula = $scope.detail.config.formular;
if(formula.indexOf('DFFS') > -1){
return '贷方发生';
} else if(formula.indexOf('JFFS') > -1){
return '借方发生';
}
return '';
},
// dataField: 'type',
caption: $translate.instant('类型'),
alignment: 'center',
width: '30%'
},
{
dataField: 'invoiceCode',
caption: $translate.instant('InvoiceFPDM'),
alignment: 'left',
width: '13%'
calculateCellValue: function(){
var formula = $scope.detail.config.formular;
return formula.match(/\"\d+\"/);
},
// dataField: 'description',
caption: $translate.instant('描述'),
alignment: 'center',
width: '30%'
},
{
dataField: 'invoiceNumber',
caption: $translate.instant('InvoiceFPHM'),
alignment: 'left',
width: '13%'
},
calculateCellValue: function(){
return $scope.detail.cellInfo.money;
},
// dataField: 'value',
caption: $translate.instant('数值'),
alignment: 'center',
width: '30%'
}
];
break;
case enums.formulaDataSourceType.InputInvoice:
//进项数据源
dataGridColumns = [
{
dataField: 'saleId',
caption: $translate.instant('InvoiceXFSBH'),
alignment: 'left',
width: '13%'
calculateCellValue: function(){
return $scope.projectPeriod
},
// dataField: 'projectPeriod',
caption: $translate.instant('InvoiceQJ'),
alignment: 'center',
width: '10%'
},
{
dataField: 'money',
caption: $translate.instant('InvoiceJE'),
alignment: 'right',
format: {type: 'fixedPoint', precision: 2},
width: '13%'
calculateCellValue: function(){
return '进项发票';
},
// dataField: 'type',
caption: $translate.instant('类型'),
alignment: 'center',
width: '30%'
},
{
dataField: 'taxMoney',
caption: $translate.instant('InvoiceSE'),
alignment: 'right',
format: {type: 'fixedPoint', precision: 2},
width: '13%'
calculateCellValue: function(){
return '';
},
// dataField: 'description',
caption: $translate.instant('描述'),
alignment: 'center',
width: '30%'
},
{
dataField: 'invoiceType',
caption: $translate.instant('InvoiceFPLX'),
alignment: 'left',
width: '13%'
calculateCellValue: function(){
return $scope.detail.cellInfo.money;
},
// dataField: 'value',
caption: $translate.instant('数值'),
alignment: 'center',
width: '30%'
}
// {
// dataField: 'date',
// caption: $translate.instant('InvoiceRZRQ'),
// alignment: 'left',
// width: '13%'
// },
// {
// dataField: 'invoiceCode',
// caption: $translate.instant('InvoiceFPDM'),
// alignment: 'left',
// width: '13%'
// },
// {
// dataField: 'invoiceNumber',
// caption: $translate.instant('InvoiceFPHM'),
// alignment: 'left',
// width: '13%'
// },
// {
// dataField: 'saleId',
// caption: $translate.instant('InvoiceXFSBH'),
// alignment: 'left',
// width: '13%'
// },
// {
// dataField: 'money',
// caption: $translate.instant('InvoiceJE'),
// alignment: 'right',
// format: {type: 'fixedPoint', precision: 2},
// width: '13%'
// },
// {
// dataField: 'taxMoney',
// caption: $translate.instant('InvoiceSE'),
// alignment: 'right',
// format: {type: 'fixedPoint', precision: 2},
// width: '13%'
// },
// {
// dataField: 'invoiceType',
// caption: $translate.instant('InvoiceFPLX'),
// alignment: 'left',
// width: '13%'
// }
];
break;
case enums.formulaDataSourceType.InputInvoiceDetail:
......@@ -822,6 +902,43 @@
case enums.formulaDataSourceType.OutputInvoice:
//销项发票数据源
dataGridColumns = [
{
calculateCellValue: function(){
return $scope.projectPeriod
},
// dataField: 'projectPeriod',
caption: $translate.instant('InvoiceQJ'),
alignment: 'center',
width: '10%'
},
{
calculateCellValue: function(){
return '销项发票';
},
// dataField: 'type',
caption: $translate.instant('类型'),
alignment: 'center',
width: '30%'
},
{
calculateCellValue: function(){
return '';
},
// dataField: 'description',
caption: $translate.instant('描述'),
alignment: 'center',
width: '30%'
},
{
calculateCellValue: function(){
return $scope.detail.cellInfo.money;
},
// dataField: 'value',
caption: $translate.instant('数值'),
alignment: 'center',
width: '30%'
}/*
{
dataField: 'period',
caption: $translate.instant('InvoiceQJ'),
......@@ -877,7 +994,7 @@
caption: $translate.instant('InvoiceType'),
alignment: 'left',
width: '11%'
}
}*/
];
break;
case enums.formulaDataSourceType.Voucher:
......@@ -1943,16 +2060,30 @@
_.isEmpty($scope.selectedTypeName) || $scope.selectedTypeName === element.name)) {
$scope.detail.dataGridSource = element.dataSource;
$scope.selectedTypeName = element.name;
switch ($scope.detail.cellType) {
case enums.formulaDataSourceType.OutputInvoice:
$scope.detail.dataGridSourceBind = [$scope.detail.dataGridSource[0]];
break;
case enums.formulaDataSourceType.TrialBalanceSource:
$scope.detail.dataGridSourceBind = [$scope.detail.dataGridSource[0]];
break;
case enums.formulaDataSourceType.InputInvoice:
$scope.detail.dataGridSourceBind = [$scope.detail.dataGridSource[0]];
break;
default :
$scope.detail.dataGridSourceBind = $scope.detail.dataGridSource;
break;
}
//if (element.name === 'MaxConditionDataSource') {
// $scope.dataSourceOptions.summary.totalItems[4].summaryType = 'max';
//} else {
// $scope.dataSourceOptions.summary.totalItems[4].summaryType = 'min';
//}
return;
}
});
$scope.dataGridColumns = getDataGridColumns();
getConclusionVal();
......@@ -1961,6 +2092,7 @@
//当数据源数量变化是，重新排序数据源
$scope.$watch('detail.items.length', function (newVal, oldValue) {
if (newVal) {
$scope.detail.items = _.sortBy($scope.detail.items, function (item) {
if (item.type === enums.formulaDataSourceType.ModelDatasource ||
......@@ -1983,6 +2115,7 @@
$scope.$watch('detail.items', function (newVal, oldValue) {
$timeout(function () {
$scope.selectedTabIndex = $scope.detail.cellType;
$scope.selectedTabId = $scope.detail.cellTypeId;
$scope.selectedTypeName = null;
......@@ -2008,6 +2141,20 @@
//} else {
// $scope.dataSourceOptions.summary.totalItems[4].summaryType = 'min';
//}
switch ($scope.detail.cellType) {
case enums.formulaDataSourceType.OutputInvoice:
$scope.detail.dataGridSourceBind = [$scope.detail.dataGridSource[0]];
break;
case enums.formulaDataSourceType.TrialBalanceSource:
$scope.detail.dataGridSourceBind = [$scope.detail.dataGridSource[0]];
break;
case enums.formulaDataSourceType.InputInvoice:
$scope.detail.dataGridSourceBind = [$scope.detail.dataGridSource[0]];
break;
default :
$scope.detail.dataGridSourceBind = $scope.detail.dataGridSource;
break;
}
}
cellAmountValue += calculateFilterDatasourceAmount(element, true);
});
......@@ -2021,7 +2168,6 @@
$scope.detail.cellInfo.money = $scope.detail.cellInfo.money.formatAmount(2);
}
}
$scope.dataGridColumns = getDataGridColumns();
getConclusionVal();
......@@ -2120,9 +2266,12 @@
filterWay: 1
};
$scope.dataSourceOptions = dataGridCommonOptions;
$scope.allItemsDataSourceOptions = allItemsDataSourceOptions;
switch ($scope.detail.cellType) {
case 5:
//定义表头样式
$scope.dataSourceOptions.customizeColumns = function (columns) {
......
atms-web/src/main/webapp/app/common/controls/vat-report-view/vat-report-view.ctrl.js
View file @ 7a144c21
commonModule.controller('VatReportViewController', ['$scope', '$rootScope', '$log', '$translate', '$timeout', '$q', '$compile', '$state', '$stateParams',
commonModule.controller('VatReportViewController', ['$scope', '$rootScope', '$log', '$translate', '$timeout', '$q', '$compile', '$state', '$stateParams',
'apiInterceptor', 'vatExportService', 'SweetAlert', 'BSPLService', 'vatReportService', 'vatReportCacheService', 'vatSessionService',
'loginContext', 'enums', 'vatCommonService', 'vatWorkflowService', 'projectService', '$uibModal', '$cookies', 'Upload', 'vatImportService','vatApproveService',
function ($scope, $rootScope, $log, $translate, $timeout, $q, $compile, $state, $stateParams, apiInterceptor, vatExportService, SweetAlert, BSPLService,
......@@ -648,6 +648,7 @@ commonModule.controller('VatReportViewController', ['$scope', '$rootScope', '$lo
$scope.taxCellDetail.dataSourceCount++;
}
});
// $scope.taxCellDetail.items = [_.first($scope.taxCellDetail.items)];
}
else {
var flag = true;
......
atms-web/src/main/webapp/app/common/utils/enums.js
View file @ 7a144c21
......@@ -442,10 +442,11 @@ commonModule.factory('enums', ['$translate', function ($translate) {
////未开票数据源
//Unbilled: 9,
KeyInSource: 10,
QCYESource: 11,
QMYESource: 12,
TrialBalanceSource:11,
// QCYESource: 11,
// QMYESource: 12,
ModelSource: 13,
FSESource: 14,
// FSESource: 14,
RuleSource: 15,
//凭证筛选
......@@ -456,7 +457,10 @@ commonModule.factory('enums', ['$translate', function ($translate) {
ModelDatasource: 18,
// 用于存放特殊逻辑中获取的数据源数值与备注等信息，如未开票视同销售等
Special: 19,
BSPL: 20
BSPL: 20,
summary: 100
},
VatImportSubStatus: {
......
atms-web/src/main/webapp/app/vat/preview/vat-preview-output-invoice/vat-preview-output-invoice.ctrl.js
View file @ 7a144c21
......@@ -170,9 +170,9 @@
$scope.queryOutputInvoiceResult = {
list: [],
pageInfo: {
totalCount: 0,
totalCount: -1,
pageIndex: 1,
pageSize: 100,
pageSize: constant.pagesize,
totalPage: 0,
}
}
......
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