Skip to content

T
traffic-front
Commit 9d96d91b authored by gary's avatar gary
Browse files
Options

1、数据导入菜单添加中英文 

2、fixbug
parent f7a8d289
Hide whitespace changes
Inline Side-by-side
Showing with 155 additions and 36 deletions
atms-api/src/main/java/pwc/taxtech/atms/service/impl/OrganizationServiceImpl.java
View file @ 9d96d91b
......@@ -222,7 +222,7 @@ public class OrganizationServiceImpl extends BaseService{
// find rootOrg
List<Organization> rootOrgs = null;
if (useType == 1) {
rootOrgs = orgList.stream().filter(x -> x.getParentId() == null).collect(Collectors.toList());
rootOrgs = orgList.stream().filter(x -> StringUtils.isEmpty(x.getParentId())).collect(Collectors.toList());
} else {
rootOrgs = orgList.stream()
.filter(x -> x.getParentId() == null && CommonConstants.ACTIVE_STATUS.equals(x.getIsActive()))
......@@ -242,7 +242,7 @@ public class OrganizationServiceImpl extends BaseService{
private OrganizationDto genarateSubOrgs(OrganizationDto parentOrg, List<Organization> orgs,
List<ServiceType> serviceList, Integer useType) {
if (parentOrg.getParentId() != null) {
if (StringUtils.isNotEmpty(parentOrg.getParentId())) {
Organization organization = orgs.stream().filter(x -> x.getId().equals(parentOrg.getParentId()))
.collect(Collectors.toList()).get(0);
parentOrg.setParentName(organization == null ? null : organization.getName());
......@@ -1932,7 +1932,7 @@ public class OrganizationServiceImpl extends BaseService{
}
}
result.setOrganizationServiceTemplateGroupList(query2);
if (result.getParentId() == null) {
if (StringUtils.isEmpty(result.getParentId())) {
result.setParentName("");
} else {
Organization tParent = organizationMapper.selectByExample(null).stream()
......@@ -1948,7 +1948,9 @@ public class OrganizationServiceImpl extends BaseService{
OrganizationExtraDto organizationExtraDto = new OrganizationExtraDto();
OrganizationExtra organizationExtra = organizationExtraMapper.selectByOrgId(orgId).stream().findFirst()
.orElse(null);
beanUtil.copyProperties(organizationExtra,organizationExtraDto);
if(null!=organizationExtra){
beanUtil.copyProperties(organizationExtra,organizationExtraDto);
}
return organizationExtraDto;
}
......
atms-api/src/test/java/pwc/taxtech/atms/service/impl/DataInitTest.java
View file @ 9d96d91b
......@@ -100,6 +100,9 @@ public class DataInitTest extends CommonIT {
if (StringUtils.isNotEmpty(investmentRadio) && !StringUtils.equals("-", investmentRadio)) {
equityInfo.setInvestmentRadio(Float.valueOf((investmentRadio.replace("%", ""))));
}
if (equityInfo.getPayableContributionProportion()==null&&StringUtils.isNotEmpty(investmentRadio) && !StringUtils.equals("-", investmentRadio)) {
equityInfo.setPayableContributionProportion(Float.valueOf((investmentRadio.replace("%", ""))));
}
} else if ("payableCapitalContributionAmount".equals(OrgKV.Map.get(eK))) {
equityInfo.setPayableCapitalContributionAmount((long) Double.parseDouble(((String) eV).trim()));
} else if ("investorName".equals(OrgKV.Map.get(eK))) {
......@@ -109,14 +112,31 @@ public class DataInitTest extends CommonIT {
} else {
equityInfo.setInvestorEconomicNature("个人");
}
equityInfo.setInvestorName(investorName);
equityInfo.setPayableShareholderName(investorName);
} else if ("investmentAmount".equals(OrgKV.Map.get(eK))) {
String investmentAmountStr = ((String) eV).trim();
if(OrgKV.Map.get(eK).contains("美元")){
equityInfo.setPayableCapitalContributionCurrency("美元");
equityInfo.setInvestmentCurrency("美元");
}else{
equityInfo.setPayableCapitalContributionCurrency("人民币");
equityInfo.setInvestmentCurrency("人民币");
}
if(investmentAmountStr.contains(",")){
double res = Arrays.asList(investmentAmountStr.split(",")).stream().mapToDouble(Double::parseDouble).sum();
equityInfo.setInvestmentAmount((long) res);
}else{
equityInfo.setInvestmentAmount((long) Double.parseDouble(investmentAmountStr));
}
if(equityInfo.getPayableCapitalContributionAmount()==null){
if(investmentAmountStr.contains(",")){
double res = Arrays.asList(investmentAmountStr.split(",")).stream().mapToDouble(Double::parseDouble).sum();
equityInfo.setPayableCapitalContributionAmount((long) res);
}else{
equityInfo.setPayableCapitalContributionAmount((long) Double.parseDouble(investmentAmountStr));
}
}
} else if (null != OrgKV.Map.get(eK)) {
setProperty(equityInfo, OrgKV.Map.get(eK), eV);
}
......@@ -146,6 +166,9 @@ public class DataInitTest extends CommonIT {
if (StringUtils.isNotEmpty(investmentRadio) && !StringUtils.equals("-", investmentRadio)) {
equityInfo.setInvestmentRadio(Float.valueOf((investmentRadio.replace("%", ""))));
}
if (equityInfo.getPayableContributionProportion()==null&&StringUtils.isNotEmpty(investmentRadio) && !StringUtils.equals("-", investmentRadio)) {
equityInfo.setPayableContributionProportion(Float.valueOf((investmentRadio.replace("%", ""))));
}
} else if ("payableCapitalContributionAmount".equals(OrgKV.Map.get(eK))) {
equityInfo.setPayableCapitalContributionAmount((long) Double.parseDouble(((String) eV).trim()));
} else if ("investorName".equals(OrgKV.Map.get(eK))) {
......@@ -155,10 +178,31 @@ public class DataInitTest extends CommonIT {
} else {
equityInfo.setInvestorEconomicNature("个人");
}
equityInfo.setInvestorName(investorName);
equityInfo.setPayableShareholderName(investorName);
} else if ("investmentAmount".equals(OrgKV.Map.get(eK))) {
equityInfo.setInvestmentAmount((long) Double.parseDouble(((String) eV).trim()));
String investmentAmountStr = ((String) eV).trim();
if(OrgKV.Map.get(eK).contains("美元")){
equityInfo.setPayableCapitalContributionCurrency("美元");
equityInfo.setInvestmentCurrency("美元");
}else{
equityInfo.setPayableCapitalContributionCurrency("人民币");
equityInfo.setInvestmentCurrency("人民币");
}
if(investmentAmountStr.contains(",")){
double res = Arrays.asList(investmentAmountStr.split(",")).stream().mapToDouble(Double::parseDouble).sum();
equityInfo.setInvestmentAmount((long) res);
}else{
equityInfo.setInvestmentAmount((long) Double.parseDouble(investmentAmountStr));
}
if(equityInfo.getPayableCapitalContributionAmount()==null){
if(investmentAmountStr.contains(",")){
double res = Arrays.asList(investmentAmountStr.split(",")).stream().mapToDouble(Double::parseDouble).sum();
equityInfo.setPayableCapitalContributionAmount((long) res);
}else{
equityInfo.setPayableCapitalContributionAmount((long) Double.parseDouble(investmentAmountStr));
}
}
} else if (null != OrgKV.Map.get(eK)) {
setProperty(equityInfo, OrgKV.Map.get(eK), eV);
}
......@@ -273,7 +317,7 @@ public class DataInitTest extends CommonIT {
if (organizationExtraMapper.insertSelective(orgEx) < 0) {
failList.putIfAbsent(orgK, orgV);
}
if (organizationEmployeeMapper.insertSelective(orgEmp) < 0) {
if (orgEmp.getEmployeesNumEnd() > 0 && organizationEmployeeMapper.insertSelective(orgEmp) < 0) {
failList.putIfAbsent(orgK, orgV);
}
}
......
atms-dao/src/main/resources/pwc/taxtech/atms/vat/dao/extends/JournalEntryExtendsMapper.xml
View file @ 9d96d91b
......@@ -11,19 +11,19 @@
AND segment3= #{jeCondition.segment3,jdbcType=VARCHAR}
</if>
<if test="@com.github.pagehelper.util.StringUtil@isNotEmpty(jeCondition.segment3Name)">
AND segment3Name= #{jeCondition.segment3Name,jdbcType=VARCHAR}
AND segment3_name= #{jeCondition.segment3Name,jdbcType=VARCHAR}
</if>
<if test="@com.github.pagehelper.util.StringUtil@isNotEmpty(jeCondition.segment5)">
AND segment5= #{jeCondition.segment5,jdbcType=VARCHAR}
</if>
<if test="@com.github.pagehelper.util.StringUtil@isNotEmpty(jeCondition.segment5Name)">
AND segment5Name= #{jeCondition.segment5Name,jdbcType=VARCHAR}
AND segment5_name= #{jeCondition.segment5Name,jdbcType=VARCHAR}
</if>
<if test="@com.github.pagehelper.util.StringUtil@isNotEmpty(jeCondition.segment6)">
AND segment6= #{jeCondition.segment6,jdbcType=VARCHAR}
</if>
<if test="@com.github.pagehelper.util.StringUtil@isNotEmpty(jeCondition.segment6Name)">
AND segment6Name= #{jeCondition.segment6Name,jdbcType=VARCHAR}
AND segment6_name= #{jeCondition.segment6Name,jdbcType=VARCHAR}
</if>
<if test="@com.github.pagehelper.util.StringUtil@isNotEmpty(jeCondition.description)">
AND description= #{jeCondition.description,jdbcType=VARCHAR}
......
atms-dao/src/main/resources/pwc/taxtech/atms/vat/dao/extends/TrialBalanceMapper.xml
View file @ 9d96d91b
......@@ -11,19 +11,19 @@
AND segment2= #{tbCondition.segment2,jdbcType=VARCHAR}
</if>
<if test="@com.github.pagehelper.util.StringUtil@isNotEmpty(tbCondition.segment2Name)">
AND segment2Name= #{tbCondition.segment2Name,jdbcType=VARCHAR}
AND segment2_name= #{tbCondition.segment2Name,jdbcType=VARCHAR}
</if>
<if test="@com.github.pagehelper.util.StringUtil@isNotEmpty(tbCondition.segment3)">
AND segment3= #{tbCondition.segment3,jdbcType=VARCHAR}
</if>
<if test="@com.github.pagehelper.util.StringUtil@isNotEmpty(tbCondition.segment3Name)">
AND segment3Name= #{tbCondition.segment3Name,jdbcType=VARCHAR}
AND segment3_name= #{tbCondition.segment3Name,jdbcType=VARCHAR}
</if>
<if test="@com.github.pagehelper.util.StringUtil@isNotEmpty(tbCondition.segment6)">
AND segment6= #{tbCondition.segment6,jdbcType=VARCHAR}
</if>
<if test="@com.github.pagehelper.util.StringUtil@isNotEmpty(tbCondition.segment6Name)">
AND segment6Name= #{tbCondition.segment6Name,jdbcType=VARCHAR}
AND segment6_name= #{tbCondition.segment6Name,jdbcType=VARCHAR}
</if>
<if test="tbCondition.periodStart!=null">
AND period &gt;= #{tbCondition.periodStart,jdbcType=INTEGER}
......
atms-web/src/main/webapp/app-resources/i18n/en-us/app.json
View file @ 9d96d91b
......@@ -306,6 +306,37 @@
"RecordSize": "Record Size",
"TaxPayerIdNum": "纳税人识别号",
"ExtractDistribution": "Extract Distribution",
"Log":"Log",
"DataImportRecord":"Data Import Record",
"DataProcessingCheckRecord":"Data Process Check Record",
"BillingRecordAndRevenueTypeMappingConfiguration":"BR-RT Mapping Config",
"InputRollOutConfiguration":"Input RollOut Config",
"FinancialDataExtraction":"Financial Data Extraction",
"InvoiceDataExtraction":"Invoice Data Extraction",
"ImportDistribution":"Import Distribution",
"VATInvoiceRecord":"VAT Invoice Record",
"CertifiedInvoicesList":"Certified Invoices List",
"RedLetterVATSpecialInvoiceInfo":"Red Letter Invoice Info",
"InvoiceInformation":"Invoice Information",
"CoupaInvoiceReport":"Coupa Invoice Report",
"AdjustmentTable":"Adjustment Table",
"BalanceSheetPRC":"BalanceSheet PRC",
"IncomeStatementPRC":"Income Statement PRC",
"CashFlowStatement":"Cash Flow Statement",
"OwnerEquityChangeStatement":"Owner Equity Change Statement",
"InvoiceStatistics":"Invoice Statistics",
"CITAdjustmentJournal":"CIT Adjustment Journal",
"CITTrialBalance":"CIT TrialBalance",
"CITDocumentSubjectMappingTable":"CIT Document Subject Mapping Table",
"CITBalanceSheetPRC":"CIT Balance Sheet PRC",
"CITProfitStatementPRC":"CIT Profit Statement PRC",
"CITEAMAssetDisposalAmountRecord":"CIT EAM Asset Disposal Amount Record",
"CITPreClassifiedDataSource":"CIT PreClassified DataSource",
"Configuration":"Configuration",
"RevenueTypeConfiguration":"Revenue Type Config",
"~MustBeEndOneApp": "I Must be the End One, please!"
}
\ No newline at end of file
atms-web/src/main/webapp/app-resources/i18n/zh-CN/app.json
View file @ 9d96d91b
......@@ -854,7 +854,35 @@
"RecordSize": "记录条数",
"TaxPayerIdNum": "纳税人识别号",
"ExtractDistribution": "抽取分发",
"Log":"日志",
"DataImportRecord":"数据导入记录",
"DataProcessingCheckRecord":"数据处理校验记录",
"BillingRecordAndRevenueTypeMappingConfiguration":"开票记录与收入类型映射配置",
"InputRollOutConfiguration":"进项转出配置",
"FinancialDataExtraction":"财务数据抽取",
"InvoiceDataExtraction":"发票数据抽取",
"ImportDistribution":"导入分发",
"VATInvoiceRecord":"已开增值税发票记录",
"CertifiedInvoicesList":"已认证发票清单",
"RedLetterVATSpecialInvoiceInfo":"红字增值税专用发票信息表",
"InvoiceInformation":"发票资料",
"CoupaInvoiceReport":"Coupa发票报告",
"AdjustmentTable":"调整表",
"BalanceSheetPRC":"资产负债表PRC",
"IncomeStatementPRC":"利润表PRC",
"CashFlowStatement":"现金流量表",
"OwnerEquityChangeStatement":"所有者权益变动表",
"InvoiceStatistics":"发票统计资料",
"CITAdjustmentJournal":"CIT-调整日记账",
"CITTrialBalance":"CIT-试算平衡表",
"CITDocumentSubjectMappingTable":"CIT-底稿&科目Mapping表",
"CITBalanceSheetPRC":"CIT-资产负债表(单家PRC)",
"CITProfitStatementPRC":"CIT-利润表(单家PRC)",
"CITEAMAssetDisposalAmountRecord":"CIT-EAM资产处置金额记录表",
"CITPreClassifiedDataSource":"CIT-预提重分类数据源",
"Configuration":"配置",
"RevenueTypeConfiguration":"收入类型配置",
"~MustBeEndOneApp": "I Must be the End One, please!"
}
\ No newline at end of file
atms-web/src/main/webapp/app/admin/infrastructure/organizationListView/organization-list-view.html
View file @ 9d96d91b
......@@ -56,13 +56,14 @@
<div dx-data-grid="getDetailGridSettings(orgInfo)"></div>
</div>
</div>
<!--分页栏-->
</div>
<div class="form-group page-form-group">
<div class="page-footer">
<ack-pagination page-options="pagingOptions" refresh-table="pagingService.refreshOrgDataGrid()" hide-page-size-selector="true"></ack-pagination>
</div>
<!--分页栏 方便搜索机构，前台分页-->
<!--<div class="form-group page-form-group">
<div class="page-footer">
<ack-pagination page-options="pagingOptions" refresh-table="pagingService.refreshOrgDataGrid()" hide-page-size-selector="true"></ack-pagination>
</div>
</div>-->
</div>
</div>
</div>
......
atms-web/src/main/webapp/app/admin/infrastructure/organizationManage/organization-manage.ctrl.js
View file @ 9d96d91b
......@@ -2206,22 +2206,34 @@
};
var generalSelectCompanyExtraText = function(){
$scope.regFinancialAccountingTypeList.map(function(value,index){
if (value.code === $scope.selectCompanyExtra.regFinancialAccountingType) {
$scope.selectCompanyExtra.regFinancialAccountingType = value.type;
return;
}
});
$scope.selectCompanyExtra.smallMeagerProfit = $scope.selectCompanyExtra.smallMeagerProfit?"是":"否";
$scope.selectCompanyExtra.listedCompany = $scope.selectCompanyExtra.listedCompany?"是":"否";
$scope.selectCompanyExtra.signTripartiteAgreement =
$scope.selectCompanyExtra.signTripartiteAgreement?"是":"否";
$scope.selectCompanyExtra.completeRecordTotalInstitutions =
$scope.selectCompanyExtra.completeRecordTotalInstitutions?"是":"否";
if($scope.selectCompanyExtra.smallMeagerProfit!=null){
$scope.selectCompanyExtra.smallMeagerProfit = $scope.selectCompanyExtra.smallMeagerProfit?"是":"否";
}
if($scope.selectCompanyExtra.listedCompany!=null){
$scope.selectCompanyExtra.listedCompany = $scope.selectCompanyExtra.listedCompany?"是":"否";
}
if($scope.selectCompanyExtra.signTripartiteAgreement!=null){
$scope.selectCompanyExtra.signTripartiteAgreement =
$scope.selectCompanyExtra.signTripartiteAgreement?"是":"否";
}
if($scope.selectCompanyExtra.completeRecordTotalInstitutions!=null){
$scope.selectCompanyExtra.completeRecordTotalInstitutions =
$scope.selectCompanyExtra.completeRecordTotalInstitutions?"是":"否";
}
if($scope.selectCompanyExtra.regFinancialAccountingType!=null){
$scope.regFinancialAccountingTypeList.map(function(value,index){
if (value.code === $scope.selectCompanyExtra.regFinancialAccountingType) {
$scope.selectCompanyExtra.regFinancialAccountingType = value.type;
return;
}
});
}
};
var generalSelectCompanyText = function(){
$scope.selectCompany.engageNationalProhibitIndustry = $scope.selectCompany.engageNationalProhibitIndustry?"是":"否";
if($scope.selectCompany.engageNationalProhibitIndustry!=null){
$scope.selectCompany.engageNationalProhibitIndustry = $scope.selectCompany.engageNationalProhibitIndustry?"是":"否";
}
};
// 添加或者编辑机构成功之后，刷新当前页面的数据
......@@ -2232,7 +2244,6 @@
} else {
$scope.organizationId = null;
}
initOrg();
$scope.isOrgUpdate = false;
}
......
atms-web/src/main/webapp/app/framework/app-data-import/app-data-import.html
View file @ 9d96d91b
......@@ -27,7 +27,7 @@
<span ng-if="menuItem.parentID"
style="visibility:hidden">{{::convertTo2BitNumber($index + 1)}}</span>
</div>
<span class="side-menu-title">{{::menuItem.name}}</span>
<span class="side-menu-title">{{menuItem.name | translate}}</span>
<span class="fa arrow custom-arrow"
ng-hide="menuItem.parentID||menuItem.navigationUrl!==''"></span>
</a>
......
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