Skip to content

T
traffic-front
Commit 565b1c69 authored by zhkwei's avatar zhkwei
Browse files
Options

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

# Conflicts:
#	atms-web/src/main/webapp/app/framework/app-nav/app-nav.html
parents b5a9d4d0 cbf41afd
Show whitespace changes
Inline Side-by-side
Showing with 61 additions and 11 deletions
atms-api/src/main/java/pwc/taxtech/atms/dto/vatdto/DataImportErrorDto.java
View file @ 565b1c69
...@@ -19,6 +19,9 @@ public class DataImportErrorDto { ...@@ -19,6 +19,9 @@ public class DataImportErrorDto {
@JSONField(name="开票金额") @JSONField(name="开票金额")
private String amount; private String amount;
@JSONField(name="开票日期")
private String openDate;
@JSONField(name="确认/认证日期") @JSONField(name="确认/认证日期")
private String confirmTime; private String confirmTime;
...@@ -27,6 +30,14 @@ public class DataImportErrorDto { ...@@ -27,6 +30,14 @@ public class DataImportErrorDto {
@JSONField(name="Sheet") @JSONField(name="Sheet")
private Integer sheet; private Integer sheet;
public String getOpenDate() {
return openDate;
}
public void setOpenDate(String openDate) {
this.openDate = openDate;
}
public Integer getSheet() { public Integer getSheet() {
return sheet; return sheet;
} }
......
atms-api/src/main/java/pwc/taxtech/atms/service/impl/AnalysisServiceImpl.java
View file @ 565b1c69
...@@ -322,6 +322,8 @@ public class AnalysisServiceImpl extends BaseService { ...@@ -322,6 +322,8 @@ public class AnalysisServiceImpl extends BaseService {
return null; return null;
} }
public Organization getOrgByCompanyName(String companyName) { public Organization getOrgByCompanyName(String companyName) {
OrganizationExample organizationExample = new OrganizationExample(); OrganizationExample organizationExample = new OrganizationExample();
organizationExample.createCriteria().andNameEqualTo(companyName); organizationExample.createCriteria().andNameEqualTo(companyName);
...@@ -649,6 +651,7 @@ public class AnalysisServiceImpl extends BaseService { ...@@ -649,6 +651,7 @@ public class AnalysisServiceImpl extends BaseService {
continue; continue;
} }
model.setGmv(getCellBigDecimalValue(cell1)); model.setGmv(getCellBigDecimalValue(cell1));
model.setCompanyName(getOrgById(organizationId).getName());
model.setTrips(getCellBigDecimalValue(sheet.getRow(j).getCell(1))); model.setTrips(getCellBigDecimalValue(sheet.getRow(j).getCell(1)));
model.setSubsidyB(getCellBigDecimalValue(sheet.getRow(j).getCell(2))); model.setSubsidyB(getCellBigDecimalValue(sheet.getRow(j).getCell(2)));
model.setSubsidyC(getCellBigDecimalValue(sheet.getRow(j).getCell(3))); model.setSubsidyC(getCellBigDecimalValue(sheet.getRow(j).getCell(3)));
...@@ -682,11 +685,11 @@ public class AnalysisServiceImpl extends BaseService { ...@@ -682,11 +685,11 @@ public class AnalysisServiceImpl extends BaseService {
List<Object> objects = new ArrayList<>(); List<Object> objects = new ArrayList<>();
Integer period = DateUtils.strToPeriod(param.getPeriod()); Integer period = DateUtils.strToPeriod(param.getPeriod());
String country = param.getCountry(); String country = param.getCountry();
String companyName = param.getCompanyName(); String organizationId = param.getCompanyName();
switch (param.getType()) { switch (param.getType()) {
case 100: case 100:
AnalysisInternationalBusinessDataExample analysisInternationalBusinessDataExample = new AnalysisInternationalBusinessDataExample(); AnalysisInternationalBusinessDataExample analysisInternationalBusinessDataExample = new AnalysisInternationalBusinessDataExample();
analysisInternationalBusinessDataExample.createCriteria().andPeriodEqualTo(period).andCompanyNameEqualTo(companyName).andCountryEqualTo(country); analysisInternationalBusinessDataExample.createCriteria().andPeriodEqualTo(period).andOrganizationIdEqualTo(organizationId).andCountryEqualTo(country);
List<AnalysisInternationalBusinessData> list = analysisInternationalBusinessDataMapper.selectByExample(analysisInternationalBusinessDataExample); List<AnalysisInternationalBusinessData> list = analysisInternationalBusinessDataMapper.selectByExample(analysisInternationalBusinessDataExample);
/*List<AnalysisInternationalBUDataDto> dtos = Lists.newArrayList(); /*List<AnalysisInternationalBUDataDto> dtos = Lists.newArrayList();
...@@ -726,7 +729,7 @@ public class AnalysisServiceImpl extends BaseService { ...@@ -726,7 +729,7 @@ public class AnalysisServiceImpl extends BaseService {
return objects; return objects;
case 101: case 101:
AnalysisInternationalTaxDataExample analysisInternationalTaxDataExample = new AnalysisInternationalTaxDataExample(); AnalysisInternationalTaxDataExample analysisInternationalTaxDataExample = new AnalysisInternationalTaxDataExample();
analysisInternationalTaxDataExample.createCriteria().andPeriodEqualTo(period).andCompanyNameEqualTo(companyName).andCountryEqualTo(country); analysisInternationalTaxDataExample.createCriteria().andPeriodEqualTo(period).andOrganizationIdEqualTo(organizationId).andCountryEqualTo(country);
List<AnalysisInternationalTaxData> list2 = analysisInternationalTaxDataMapper.selectByExample(analysisInternationalTaxDataExample); List<AnalysisInternationalTaxData> list2 = analysisInternationalTaxDataMapper.selectByExample(analysisInternationalTaxDataExample);
List<AnalysisInternationalTaxDataDto> dtos2 = Lists.newArrayList(); List<AnalysisInternationalTaxDataDto> dtos2 = Lists.newArrayList();
list2.forEach(l2 -> { list2.forEach(l2 -> {
......
atms-web/src/main/webapp/WEB-INF/templates/index.html
View file @ 565b1c69
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
<base href="/"/> <base href="/"/>
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
<meta charset="utf-8" http-equiv="X-UA-Compatible" content="chrome=1; IE=11; IE=10; IE=9; IE=EDGE"> <meta charset="utf-8" http-equiv="X-UA-Compatible" content="chrome=1; IE=11; IE=10; IE=9; IE=EDGE">
<title>Apex+ ATMS</title> <title>DTS</title>
<style> <style>
[ng\:cloak], [ng-cloak], [data-ng-cloak], [x-ng-cloak], .ng-cloak, .x-ng-cloak { [ng\:cloak], [ng-cloak], [data-ng-cloak], [x-ng-cloak], .ng-cloak, .x-ng-cloak {
display: none !important; display: none !important;
......
atms-web/src/main/webapp/app-resources/i18n/zh-CN/cit.json
View file @ 565b1c69
...@@ -1215,7 +1215,7 @@ ...@@ -1215,7 +1215,7 @@
"ImportNotMatch" : "导入文件与选择机构或期间不匹配", "ImportNotMatch" : "导入文件与选择机构或期间不匹配",
"ProjectDescription": "项目描述", "ProjectDescription": "项目描述",
"ProductDescription": "产品描述", "ProductDescription": "产品描述",
"Company":"公司间", "Company":"公司",
"CompanyDescription": "公司间描述", "CompanyDescription": "公司间描述",
"Segment1":"备用段", "Segment1":"备用段",
"Segment1Description": "备用段描述", "Segment1Description": "备用段描述",
......
atms-web/src/main/webapp/app-resources/images/didi-icon.svg 0 → 100644
View file @ 565b1c69
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 1187.5 850.4" style="enable-background:new 0 0 1187.5 850.4;" xml:space="preserve">
<style type="text/css">
.st0{fill:#FF7D41;}
.st1{fill:#FFFFFF;}
</style>
<g>
<path class="st0" d="M320,504.6c59.8-1.9,107.2-49.5,107.9-108.6v-50.8h65.8v56.2C492.4,492.8,413,564.9,320,566.9v0
c-94.6-0.6-174.6-73.2-175.9-165.6v-101c-0.1-10.3,6.6-17,16.7-16.9l267.1,0v61.7l-209.4,0.1c-5.4,0-8.6,3.3-8.6,8.6V395
C210.6,454.9,258.8,504,320,504.6L320,504.6z"/>
<g>
<path class="st1" d="M567.1,528l19.2,6.9c12.5-27.9,22.8-54.2,32.1-80.7l-19.2-6.8C589.8,472.1,576,508,567.1,528z"/>
<path class="st1" d="M615.8,355.1c-9.2-8.1-23.6-19.1-33.7-26.6l-12.4,16.2c8.4,6.8,24.9,19,33.5,26.4L615.8,355.1z"/>
<path class="st1" d="M615.8,410.9c-11.8-10.1-25.6-21-38.8-30.7l-12.3,16.2c13.6,9.9,27.1,20.7,38.5,30.4L615.8,410.9z"/>
<path class="st1" d="M717.8,312h-22.6v24.9h-73.6V355l33.3,0l9.1,25.9l-36.1,0v157.7h20.4V399h48v18.6h-36.7v18.1h36.7v18.6h-30.5
v56.4H733c7.8,0,14.2-6.3,14.2-14.2v-42.3h-30.5v-18.6H751v-18.1h-34.3V399h48v110.2c0,6.3-5.1,11.3-11.3,11.3h-24.1l5.3,18.1
l22.2,0c15.6,0,28.3-12.7,28.3-28.3V380.8h-36.1L758,355h33.3v-18.1h-73.6V312z M729.1,472.4V487c0,3.1-2.5,5.7-5.7,5.7h-39.6
v-20.2H729.1z M735.8,355l-7.7,25.9h-43.3l-7.7-25.9H735.8z"/>
<path class="st1" d="M821.5,528l19.2,6.9c12.5-27.9,22.8-54.2,32.1-80.7l-19.2-6.8C844.2,472.1,830.4,508,821.5,528z"/>
<path class="st1" d="M870.2,355.1c-9.2-8.1-23.6-19.1-33.7-26.6l-12.4,16.2c8.4,6.8,24.9,19,33.5,26.4L870.2,355.1z"/>
<path class="st1" d="M870.2,410.9c-11.8-10.1-25.6-21-38.8-30.7l-12.3,16.2c13.6,9.9,27.1,20.7,38.5,30.4L870.2,410.9z"/>
<path class="st1" d="M972.2,312h-22.6v24.9h-73.6V355l33.3,0l9.1,25.9l-36.1,0v157.7h20.4V399h48v18.6h-36.7v18.1h36.7v18.6h-30.5
v56.4h67.3c7.8,0,14.2-6.3,14.2-14.2v-42.3h-30.5v-18.6h34.3v-18.1h-34.3V399h48v110.2c0,6.3-5.1,11.3-11.3,11.3h-24.1l5.3,18.1
l22.2,0c15.6,0,28.3-12.7,28.3-28.3V380.8h-36.1l9.1-25.9h33.3v-18.1h-73.6V312z M983.5,472.4V487c0,3.1-2.5,5.7-5.7,5.7h-39.6
v-20.2H983.5z M990.3,355l-7.7,25.9h-43.3l-7.7-25.9H990.3z"/>
</g>
</g>
</svg>
atms-web/src/main/webapp/app/analysis/data-import/domestic-data-import/domestic-data-import.ctrl.js
View file @ 565b1c69
...@@ -243,6 +243,7 @@ ...@@ -243,6 +243,7 @@
}).success(function(resp) { }).success(function(resp) {
var ret = resp.data; var ret = resp.data;
$scope.fileName= ''; $scope.fileName= '';
$scope.importExcelFile = null;
$('#busy-indicator-container').hide(); $('#busy-indicator-container').hide();
deferred.resolve(); deferred.resolve();
uploadAfter(); uploadAfter();
......
atms-web/src/main/webapp/app/analysis/data-import/international-data-import/international-data-import.ctrl.js
View file @ 565b1c69
...@@ -207,6 +207,7 @@ ...@@ -207,6 +207,7 @@
}).then(function (resp) { }).then(function (resp) {
var ret = resp.data; var ret = resp.data;
$scope.fileName = ''; $scope.fileName = '';
$scope.importExcelFile = null;
$('#busy-indicator-container').hide(); $('#busy-indicator-container').hide();
deferred.resolve(); deferred.resolve();
if (ret.result) { if (ret.result) {
...@@ -540,9 +541,9 @@ ...@@ -540,9 +541,9 @@
var setButtonWrapStyle = function () { var setButtonWrapStyle = function () {
if ($scope.fileName) { /* if ($scope.fileName) {
return {width: "100%"}; return {width: "100%"};
} }*/
}; };
var setGridStyle = function () { var setGridStyle = function () {
......
atms-web/src/main/webapp/app/analysis/data-import/international-data-import/international-data-import.html
View file @ 565b1c69
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
ng-click="downloadTemplate()"></button> ng-click="downloadTemplate()"></button>
<button type="button" <button type="button"
class="btn btn-vat-primary" style="" class="btn btn-vat-primary"
translate="ImportBtn" translate="ImportBtn"
ng-click="doUpload()"></button> ng-click="doUpload()"></button>
...@@ -61,7 +61,7 @@ ...@@ -61,7 +61,7 @@
</div> </div>
<div class="row" style="margin-top: 10px;"> <div class="row" style="margin-top: 10px;">
<span class="text-bold" translate="Country">:</span> <span class="text-bold" translate="Country"><span>:</span></span>
<!-- <div class="dropdown" style="margin-left:10px"> <!-- <div class="dropdown" style="margin-left:10px">
<button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu3" <button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu3"
data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" style="width: 150px;margin-left: 28px;"> data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" style="width: 150px;margin-left: 28px;">
...@@ -90,7 +90,7 @@ ...@@ -90,7 +90,7 @@
data-none-results-text ="没有匹配的国家"> data-none-results-text ="没有匹配的国家">
</select> </select>
<span class="text-bold" translate="Company">:</span> <span class="text-bold" translate="Company"><span>:</span></span>
<!--<div dx-tag-box="selectOrgOptionsComany" style="width: 287px;display: inline-block"></div>--> <!--<div dx-tag-box="selectOrgOptionsComany" style="width: 287px;display: inline-block"></div>-->
<select class="selectpicker show-tick dropup" multiple data-live-search="true" <select class="selectpicker show-tick dropup" multiple data-live-search="true"
data-width="auto" data-max-options="1" data-width="auto" data-max-options="1"
......
atms-web/src/main/webapp/app/framework/app-nav/app-nav.html
View file @ 565b1c69
<nav class="navbar-custom-top" role="navigation" style="margin-bottom: 0;border-radius:0"> <nav class="navbar-custom-top" role="navigation" style="margin-bottom: 0;border-radius:0">
<div class="nav-container" style="min-width:1435px"> <div class="nav-container" style="min-width:1435px">
<div class="nav-element-left" style="width:250px;text-align:left;font-size:17px;"> <div class="nav-element-left" style="width:250px;text-align:left;font-size:17px;">
<i class="fa fa-bullseye" style="color:red;font-size:22px;margin-right:10px"></i> <!--<i class="fa fa-bullseye" style="color:red;font-size:22px;margin-right:10px"></i>-->
<img src="app-resources/images/didi-icon.svg" style="height: 50px;margin-bottom:5px;weight:60px"/> <!---->
<span style="font-weight:bold;">DIDI TAX SYSTEM</span> <span style="font-weight:bold;">DIDI TAX SYSTEM</span>
</div> </div>
<!--<div class="nav-element-left"> <!--<div class="nav-element-left">
......
atms-web/src/main/webapp/app/taxDocumentManage/tax-document-list/tax-document-list.ctrl.js
View file @ 565b1c69
...@@ -1660,6 +1660,9 @@ taxDocumentManageModule.directive('pdfPreview', function () { ...@@ -1660,6 +1660,9 @@ taxDocumentManageModule.directive('pdfPreview', function () {
return array; return array;
} }
$scope.closePdfPop = function () { $scope.closePdfPop = function () {
//canvas高度被重设,实现画布清空
canvas.height=canvas.height;
//隐藏窗体
container.style.display = "none"; container.style.display = "none";
}; };
$scope.prevPaging = function () { $scope.prevPaging = 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