Skip to content

T
traffic-front
Commit 675b89bc authored by eddie.woo's avatar eddie.woo
Browse files
Options

Merge branch 'dev_oracle' of http://code.tech.tax.asia.pwcinternal.com/root/atms into dev_oracle

parents ffe48f13 bdb6d685
Hide whitespace changes
Inline Side-by-side
Showing with 98 additions and 33 deletions
atms-api/src/main/java/pwc/taxtech/atms/constant/enums/FormulaDataSourceType.java
View file @ 675b89bc
......@@ -56,10 +56,12 @@ public enum FormulaDataSourceType {
TrialBalanceSource(11),
//QMYESource(12),
ModelSource(13),
WPSRSource(33),
TrialBalance(20),
AssetListSource(21);
// FSESource(14),
private Integer code;
FormulaDataSourceType(Integer code) {
......@@ -98,6 +100,8 @@ public enum FormulaDataSourceType {
return FormulaDataSourceType.TrialBalance;
case 21:
return FormulaDataSourceType.AssetListSource;
case 33:
return FormulaDataSourceType.WPSRSource;
default:
return FormulaDataSourceType.Other;
}
......
atms-api/src/main/java/pwc/taxtech/atms/service/impl/OrganizationServiceImpl.java
View file @ 675b89bc
......@@ -2402,7 +2402,14 @@ public class OrganizationServiceImpl {
newRule.setTaxPayerType(newTaxPayerType); // Use tax payer type related to template group
newRule.setCreateTime(now);
newRule.setUpdateTime(now);
taxPayerReportRuleMapper.insertSelective(newRule);
TaxPayerReportRuleExample exam = new TaxPayerReportRuleExample();
exam.createCriteria().andOrganizationIdEqualTo(orgDto.getId()).andTemplateGroupIdEqualTo(vatSetting.getTemplateGroupId());
List<TaxPayerReportRule> rules = taxPayerReportRuleMapper.selectByExample(exam);
if (!rules.isEmpty()) {
newRule.setId(rules.get(0).getId());
taxPayerReportRuleMapper.updateByPrimaryKeySelective(newRule);
} else
taxPayerReportRuleMapper.insertSelective(newRule);
} else {
activeRule.setTemplateGroupId(vatSetting.getTemplateGroupId());
activeRule.setTaxPayerType(newTaxPayerType);
......@@ -2417,7 +2424,15 @@ public class OrganizationServiceImpl {
newRule.setTaxPayerType(newTaxPayerType); // Use tax payer type related to template group
newRule.setCreateTime(now);
newRule.setUpdateTime(now);
taxPayerReportRuleMapper.insertSelective(newRule);
TaxPayerReportRuleExample exam = new TaxPayerReportRuleExample();
exam.createCriteria().andOrganizationIdEqualTo(orgDto.getId()).andTemplateGroupIdEqualTo(vatSetting.getTemplateGroupId());
List<TaxPayerReportRule> rules = taxPayerReportRuleMapper.selectByExample(exam);
if (!rules.isEmpty()) {
newRule.setId(rules.get(0).getId());
taxPayerReportRuleMapper.updateByPrimaryKeySelective(newRule);
} else
taxPayerReportRuleMapper.insertSelective(newRule);
}
} else if (activeRule != null) { // If no setting, remove non-default rule
taxPayerReportRuleMapper.deleteByPrimaryKey(activeRule.getId());
......
atms-api/src/main/java/pwc/taxtech/atms/vat/service/impl/ReportServiceImpl.java
View file @ 675b89bc
......@@ -694,13 +694,16 @@ public class ReportServiceImpl {
if (z.getItem2().getItems() != null && !z.getItem2().getItems().isEmpty() && z.getItem2().getItems().get(0).contains("tag")) {
z.getItem2().getItems().forEach(m -> {
ReportCellDataSourceDto dto = JSON.parseObject(m, ReportCellDataSourceDto.class);
PeriodTemplateExample periodTemplateExample1 = new PeriodTemplateExample();
periodTemplateExample1.createCriteria().andTemplateIdEqualTo(a.getReportTemplateId())
.andPeriodEqualTo(report.getPeriod());
Optional<PeriodTemplate> optional = periodTemplateMapper.selectByExample(periodTemplateExample1).stream().findFirst();
if(optional.isPresent()){
dto.setReportName(optional.get().getName());
if(dto != null && dto.getReportTemplateId() != null && !Pattern.compile("\\D").matcher(dto.getReportTemplateId()).find()){
PeriodTemplateExample periodTemplateExample1 = new PeriodTemplateExample();
periodTemplateExample1.createCriteria().andTemplateIdEqualTo(Long.parseLong(dto.getReportTemplateId()))
.andPeriodEqualTo(report.getPeriod());
Optional<PeriodTemplate> optional = periodTemplateMapper.selectByExample(periodTemplateExample1).stream().findFirst();
if(optional.isPresent()){
dto.setReportName(optional.get().getName());
}
}
dataSourceDtoList.add(dto);
});
} else
......
atms-api/src/main/java/pwc/taxtech/atms/vat/service/impl/report/functions/WPSR.java
View file @ 675b89bc
......@@ -127,7 +127,7 @@ public class WPSR extends FunctionBase implements FreeRefFunction {
dto.setColumnName("");
dto.setRowName("");
dto.setReportName(ec.getWorkbook().getSheetName(ec.getSheetIndex()));
dto.setType(FormulaDataSourceType.TrialBalanceSource.getCode());
dto.setType(FormulaDataSourceType.WPSRSource.getCode());
Long dataSourceId = saveDataSource(ec, Lists.newArrayList(dto), FormulaDataSourceDetailType.InputInvoiceDataSourceDto, val, formulaContext.getPeriod(),
formulaContext.getReportTemplateGroupId(), formulaContext.getProjectId());
saveFormulaBlock(formulaContext.getPeriod(), ec, formulaExpression, val, dataSourceId,
......
atms-web/src/main/webapp/app/admin/infrastructure/userManage/user-manage.html
View file @ 675b89bc
......@@ -122,16 +122,16 @@
</div>
<div class="modal-body">
<form class="form-horizontal" role="form" id="userForm">
<div class="form-group">
<label class="control-label col-sm-3" for="checkIsAdmin" translate="Admin"></label>
<div class="col-sm-9">
<div class="checkbox">
<label>
<input type="checkbox" ng-model="editUserModel.IsAdmin"> Admin
</label>
</div>
</div>
</div>
<!--<div class="form-group">-->
<!--<label class="control-label col-sm-3" for="checkIsAdmin" translate="Admin"></label>-->
<!--<div class="col-sm-9">-->
<!--<div class="checkbox">-->
<!--<label>-->
<!--<input type="checkbox" ng-model="editUserModel.IsAdmin"> Admin-->
<!--</label>-->
<!--</div>-->
<!--</div>-->
<!--</div>-->
<div class="form-group">
<label class="control-label col-sm-3" for="inputUserName" translate="UserName"></label>
<div class="col-sm-9">
......
atms-web/src/main/webapp/app/common/controls/edit-user-modal/edit-user-modal.html
View file @ 675b89bc
......@@ -8,17 +8,17 @@
</div>
<div class="modal-body">
<form class="form-horizontal" role="form" id="userForm">
<div class="form-group">
<!--<div class="form-group">-->
<label class="control-label col-sm-3" for="checkIsAdmin" translate="Admin"></label>
<div class="col-sm-9">
<div class="checkbox">
<label>
<input type="checkbox" ng-model="editUserModel.isAdmin"> Admin
</label>
</div>
</div>
</div>
<!--<label class="control-label col-sm-3" for="checkIsAdmin" translate="Admin"></label>-->
<!--<div class="col-sm-9">-->
<!--<div class="checkbox">-->
<!--<label>-->
<!--<input type="checkbox" ng-model="editUserModel.isAdmin"> Admin-->
<!--</label>-->
<!--</div>-->
<!--</div>-->
<!--</div>-->
<div class="form-group">
<label class="control-label col-sm-3" for="inputUserName"><span class="red-color">*</span><span translate="UserNameColon"></span></label>
<div class="col-sm-9">
......
atms-web/src/main/webapp/app/common/controls/role-multi-selector/role-multi-selector.ctrl.js
View file @ 675b89bc
......@@ -6,7 +6,7 @@ controller('roleMultiSelectorController', ['$scope', 'roleService',
});
$scope.toggleRoleSpan = function(role){
if (!role.data.roleCategoryID){
if (!role.data.roleCategoryId){
return;
}
if (role.isChecked){
......
atms-web/src/main/webapp/app/common/controls/tax-report-cell-detail-modal/tax-report-cell-detail-modal.ctrl.js
View file @ 675b89bc
......@@ -767,8 +767,6 @@
return '贷方发生';
} else if(formula.indexOf('JFFS') > -1){
return '借方发生';
} else if(formula.indexOf('WPSR') > -1){
return 'WPSR';
}
return '';
},
......@@ -799,6 +797,48 @@
}
];
break;
case enums.formulaDataSourceType.WPSR:
//平衡表数据源
dataGridColumns = [
{
calculateCellValue: function(){
return $scope.projectPeriod
},
// dataField: 'projectPeriod',
caption: $translate.instant('InvoiceQJ'),
alignment: 'center',
width: '10%'
},
{
calculateCellValue: function(){
return 'WPSR';
},
// 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%'
}
];
break;
case enums.formulaDataSourceType.InputInvoice:
//进项数据源
dataGridColumns = [
......@@ -2105,6 +2145,9 @@
case enums.formulaDataSourceType.OutputInvoice:
$scope.detail.dataGridSourceBind = [$scope.detail.dataGridSource[0]];
break;
case enums.formulaDataSourceType.WPSR:
$scope.detail.dataGridSourceBind = [$scope.detail.dataGridSource[0]];
break;
case enums.formulaDataSourceType.TrialBalanceSource:
$scope.detail.dataGridSourceBind = [$scope.detail.dataGridSource[0]];
break;
......
atms-web/src/main/webapp/app/common/utils/enums.js
View file @ 675b89bc
......@@ -459,7 +459,7 @@ commonModule.factory('enums', ['$translate', function ($translate) {
Special: 19,
BSPL: 20,
summary: 100
WPSR: 33
},
......
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