Commit 71a118bd authored by weizhikai's avatar weizhikai

1、导入分发各个模板优化;2、CIT试算平衡表导入时页面的展示及提示

parent ab7696c2
...@@ -804,8 +804,13 @@ public class CitImportExcelServiceImpl extends BaseService { ...@@ -804,8 +804,13 @@ public class CitImportExcelServiceImpl extends BaseService {
citBSPrcAdjustMapper.deleteByExample(example); citBSPrcAdjustMapper.deleteByExample(example);
updateImportLog(EnumCitImportType.BalanceSheetPrcAdjust.getCode()); updateImportLog(EnumCitImportType.BalanceSheetPrcAdjust.getCode());
} }
saveResult.setResultMsg("导入成功");
int insertBatchNum = citBSPrcAdjustMapper.insertBatch(citBSPrcAdjustList); int insertBatchNum = 0;
if(citBSPrcAdjustList != null && citBSPrcAdjustList.size()>0){
insertBatchNum = citBSPrcAdjustMapper.insertBatch(citBSPrcAdjustList);
}else{
saveResult.setResultMsg("导入失败");
}
CitDataImportLog citDataImportLog = generalCitDataImportLog(companyCode, orgId, taxPayerId, CitDataImportLog citDataImportLog = generalCitDataImportLog(companyCode, orgId, taxPayerId,
EnumCitImportType.BalanceSheetPrcAdjust.getCode(), period, EnumCitImportType.BalanceSheetPrcAdjust.getCode(), period,
companyName, "资产负债表(单家PRC)", true); companyName, "资产负债表(单家PRC)", true);
...@@ -815,7 +820,6 @@ public class CitImportExcelServiceImpl extends BaseService { ...@@ -815,7 +820,6 @@ public class CitImportExcelServiceImpl extends BaseService {
addDataImportLog(citDataImportLogList); addDataImportLog(citDataImportLogList);
saveResult.setResult(true); saveResult.setResult(true);
saveResult.setData(insertBatchNum); saveResult.setData(insertBatchNum);
saveResult.setResultMsg("导入成功");
return saveResult; return saveResult;
} }
......
...@@ -171,7 +171,6 @@ ...@@ -171,7 +171,6 @@
__RequestVerificationToken: token, __RequestVerificationToken: token,
withCredentials: true withCredentials: true
}).then(function(data) { }).then(function(data) {
$scope.fileNameShow=false;
$scope.fileName=''; $scope.fileName='';
$scope.importExcelFile = null; $scope.importExcelFile = null;
$('#busy-indicator-container').hide(); $('#busy-indicator-container').hide();
......
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
<i class="fa fa-calendar imp-subheader red-color" style="width:20px;"></i> <i class="fa fa-calendar imp-subheader red-color" style="width:20px;"></i>
</div> </div>
</div> </div>
<div ng-show="fileNameShow" style="display:inline-block"> <div ng-show="fileName" style="display:inline-block">
<span title="{{fileName}}">{{'FileName' | translate}}{{fileName | limitString:20}}</span> <span title="{{fileName}}">{{'FileName' | translate}}{{fileName | limitString:20}}</span>
</div> </div>
<div class="form-group"> <div class="form-group">
......
...@@ -166,6 +166,8 @@ ...@@ -166,6 +166,8 @@
withCredentials: true withCredentials: true
}).then(function(resp) { }).then(function(resp) {
var ret = resp.data; var ret = resp.data;
$scope.fileName='';
$scope.importExcelFile = null;
$('#busy-indicator-container').hide(); $('#busy-indicator-container').hide();
deferred.resolve(); deferred.resolve();
if (ret.result) { if (ret.result) {
......
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