Commit 20b307aa authored by gary's avatar gary

1、fix international tax import

parent b0960375
......@@ -506,7 +506,7 @@ public class AnalysisServiceImpl extends BaseService {
lists.add(model);
}
AnalysisInternationalTaxDataExample example = new AnalysisInternationalTaxDataExample();
example.createCriteria().andPeriodEqualTo(selectedPer);
example.createCriteria().andPeriodEqualTo(selectedPer).andCountryEqualTo(country).andCompanyNameEqualTo(companyName);
analysisInternationalTaxDataMapper.deleteByExample(example);
lists.forEach(l->{
analysisInternationalTaxDataMapper.insertSelective(l);
......@@ -554,7 +554,7 @@ public class AnalysisServiceImpl extends BaseService {
lists.add(model);
}
AnalysisInternationalBusinessDataExample example = new AnalysisInternationalBusinessDataExample();
example.createCriteria().andPeriodEqualTo(selectedPer);
example.createCriteria().andPeriodEqualTo(selectedPer).andCountryEqualTo(country).andCompanyNameEqualTo(companyName);
analysisInternationalBusinessDataMapper.deleteByExample(example);
lists.forEach(l->{
analysisInternationalBusinessDataMapper.insertSelective(l);
......
......@@ -30,11 +30,8 @@
$scope.showTotalSecondRow = false;
$scope.importExcelFileUrlList = {
taxData : apiInterceptor.webApiHostUrl + '/Analysis/InternationalExcelFile',
returnTax : apiInterceptor.webApiHostUrl + '/Analysis/InternationalExcelFile',
gmvSubsidy : apiInterceptor.webApiHostUrl + '/Analysis/InternationalExcelFile',
employeeNum : apiInterceptor.webApiHostUrl + '/Analysis/InternationalExcelFile',
driverNum : apiInterceptor.webApiHostUrl + '/Analysis/InternationalExcelFile'
internationalBU : apiInterceptor.webApiHostUrl + '/Analysis/InternationalExcelFile',
internationalTax : apiInterceptor.webApiHostUrl + '/Analysis/InternationalExcelFile'
};
$scope.maxTitleLength = constant.maxButtonTitleLength;
......@@ -254,10 +251,10 @@
var url = "";
switch ($scope.importType) {
case 100:
url = $scope.importExcelFileUrlList.taxData;
url = $scope.importExcelFileUrlList.internationalBU;
break;
case 101:
url = $scope.importExcelFileUrlList.returnTax;
url = $scope.importExcelFileUrlList.internationalTax;
break;
default:
break;
......
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