Skip to content

T
traffic-front
Commit 28fc699e authored by chase's avatar chase
Browse files
Options

fix bug

parent 7ce4524e
Show whitespace changes
Inline Side-by-side
Showing with 40 additions and 40 deletions
atms-api/src/main/java/pwc/taxtech/atms/vat/service/impl/ReportServiceImpl.java
View file @ 28fc699e
...@@ -357,21 +357,16 @@ public class ReportServiceImpl extends BaseService { ...@@ -357,21 +357,16 @@ public class ReportServiceImpl extends BaseService {
invoiceRecordMapper.clearRevenueCof(true, true, delExample); invoiceRecordMapper.clearRevenueCof(true, true, delExample);
} }
Map<String, Long> map = new HashMap<>(); // Map<String, Long> map = new HashMap<>();
for (RevenueTypeMapping mapping : mappingList) { for (RevenueTypeMapping mapping : mappingList) {
if (!map.containsKey(mapping.getContent())) {
RevenueConfigExample configExample = new RevenueConfigExample(); RevenueConfigExample configExample = new RevenueConfigExample();
configExample.createCriteria().andNameEqualTo(mapping.getRevenueTypeName()). configExample.createCriteria().andNameEqualTo(mapping.getRevenueTypeName()).
andStatusEqualTo(0).andOrgIdEqualTo(mapping.getOrgId()). andStatusEqualTo(0).andOrgIdEqualTo(mapping.getOrgId()).
andStartDateLessThanOrEqualTo(queryDate).andEndDateGreaterThanOrEqualTo(queryDate); andStartDateLessThanOrEqualTo(queryDate).andEndDateGreaterThanOrEqualTo(queryDate);
List<RevenueConfig> configs = revenueConfigMapper.selectByExample(configExample); List<RevenueConfig> configs = revenueConfigMapper.selectByExample(configExample);
if (CollectionUtils.isNotEmpty(configs)) { if(CollectionUtils.isNotEmpty(configs)){
map.put(mapping.getContent(), configs.get(0).getId());
}
}
if (map.containsKey(mapping.getContent())) {
InvoiceRecord destRecord = new InvoiceRecord(); InvoiceRecord destRecord = new InvoiceRecord();
destRecord.setRevenueCofId(map.get(mapping.getContent())); destRecord.setRevenueCofId(configs.get(0).getId());
InvoiceRecordExample recordExample = new InvoiceRecordExample(); InvoiceRecordExample recordExample = new InvoiceRecordExample();
recordExample.createCriteria().andProjectIdEqualTo(projectId) recordExample.createCriteria().andProjectIdEqualTo(projectId)
.andOrganizationIdEqualTo(mapping.getOrgId()).andBillingContentEqualTo(mapping.getContent()) .andOrganizationIdEqualTo(mapping.getOrgId()).andBillingContentEqualTo(mapping.getContent())
......
atms-web/src/main/webapp/app/taxDocumentManage/tax-document-list/tax-document-list.ctrl.js
View file @ 28fc699e
...@@ -319,7 +319,7 @@ taxDocumentManageModule.controller('taxDocumentListController', ...@@ -319,7 +319,7 @@ taxDocumentManageModule.controller('taxDocumentListController',
], ],
onCellClick: function (e) { onCellClick: function (e) {
//单元格点击— e.columnIndex=0 排除复选框列 //单元格点击— e.columnIndex=0 排除复选框列
if (e.columnIndex > 0 && e.data) { if(e.column.dataField!="" && e.data){
$("input[name='dataGridCheckBox']").each(function (index, item) { $("input[name='dataGridCheckBox']").each(function (index, item) {
if ((item.dataset) && (item.dataset.id == e.data.id)) { if ((item.dataset) && (item.dataset.id == e.data.id)) {
if (item.checked) { if (item.checked) {
......
atms-web/src/main/webapp/app/taxDocumentManage/tax-document-list/tax-document-list.html
View file @ 28fc699e
...@@ -696,24 +696,24 @@ ...@@ -696,24 +696,24 @@
</div> </div>
<div class="modal-body"> <div class="modal-body">
<div ng-if="isCreatePop" class="col-sm-6 form-group"> <!--<div ng-if="isCreatePop" class="col-sm-6 form-group">-->
<label class="col-sm-3 control-label edit-panel-left-part"> <!--<label class="col-sm-3 control-label edit-panel-left-part">-->
<span class="required-tip"> * </span> <!--<span class="required-tip"> * </span>-->
{{'Document Path'|translate}} <!--{{'Document Path'|translate}}-->
</label> <!--</label>-->
<div class="col-sm-11" style="width:61.67%"> <!--<div class="col-sm-11" style="width:61.67%">-->
<input class="form-control" title="{{editFieldModel.fileNativePath}}" <!--<input class="form-control" title="{{editFieldModel.fileNativePath}}"-->
placeholder="{{'Please Select' | translate}}" <!--placeholder="{{'Please Select' | translate}}"-->
readonly <!--readonly-->
ng-model="editFieldModel.fileNativePath" <!--ng-model="editFieldModel.fileNativePath"-->
required/> <!--required/>-->
<input id="uploadFilePlugin" type="file" style="display:none" nv-file-select <!--<input id="uploadFilePlugin" type="file" style="display:none" nv-file-select-->
uploader="uploader" filters="fileTypeFilter"> <!--uploader="uploader" filters="fileTypeFilter">-->
</div> <!--</div>-->
<div class="DTL-special-external-btn"> <!--<div class="DTL-special-external-btn">-->
<a href="javascript:void(0)" ng-click="uploadFile()"><i class="fa fa-upload"></i></a> <!--<a href="javascript:void(0)" ng-click="uploadFile()"><i class="fa fa-upload"></i></a>-->
</div> <!--</div>-->
</div> <!--</div>-->
<!--取消上传时的预览功能--> <!--取消上传时的预览功能-->
<!--<div ng-if="isCreatePop && uploader.queue.length" class="col-sm-6 form-group"> <!--<div ng-if="isCreatePop && uploader.queue.length" class="col-sm-6 form-group">
...@@ -734,6 +734,11 @@ ...@@ -734,6 +734,11 @@
ng-model="editFieldModel.fileName" ng-model="editFieldModel.fileName"
required/> required/>
</div> </div>
<div class="DTL-special-external-btn" ng-if="isCreatePop">
<input id="uploadFilePlugin" type="file" style="display:none" nv-file-select
uploader="uploader" >
<a href="javascript:void(0)" ng-click="uploadFile()"><i class="fa fa-upload"></i></a>
</div>
</div> </div>
<div class="col-sm-6 form-group"> <div class="col-sm-6 form-group">
<label class="col-sm-3 control-label edit-panel-left-part"> <label class="col-sm-3 control-label edit-panel-left-part">
...@@ -950,19 +955,19 @@ ...@@ -950,19 +955,19 @@
<div class="TDL-multi-upload-content"> <div class="TDL-multi-upload-content">
<ul> <ul>
<li ng-repeat="editFieldItem in multiUploadErrorItems" ng-show="editFieldItem.iShow"> <li ng-repeat="editFieldItem in multiUploadErrorItems" ng-show="editFieldItem.iShow">
<div class="col-sm-6 form-group"> <!--<div class="col-sm-6 form-group">-->
<label class="col-sm-3 control-label edit-panel-left-part"> <!--<label class="col-sm-3 control-label edit-panel-left-part">-->
<span class="required-tip"> * </span> <!--<span class="required-tip"> * </span>-->
{{'Document Path'|translate}} <!--{{'Document Path'|translate}}-->
</label> <!--</label>-->
<div class="col-sm-11" style="width:61.67%"> <!--<div class="col-sm-11" style="width:61.67%">-->
<input class="form-control" title="{{editFieldItem.fileNativePath}}" <!--<input class="form-control" title="{{editFieldItem.fileNativePath}}"-->
placeholder="{{'Please Select' | translate}}" <!--placeholder="{{'Please Select' | translate}}"-->
ng-class="{'upload-fail-mark':!editFieldItem.fileNativePath && editFieldItem.fileNativePath != 0}" <!--ng-class="{'upload-fail-mark':!editFieldItem.fileNativePath && editFieldItem.fileNativePath != 0}"-->
ng-model="editFieldItem.fileNativePath"/> <!--ng-model="editFieldItem.fileNativePath"/>-->
<!--<input id="{{multiUploadFilePlugin}}" type="file" style="display:none" nv-file-select uploader="uploader" filters="fileTypeFilter">--> <!--&lt;!&ndash;<input id="{{multiUploadFilePlugin}}" type="file" style="display:none" nv-file-select uploader="uploader" filters="fileTypeFilter">&ndash;&gt;-->
</div> <!--</div>-->
</div> <!--</div>-->
<div style="clear:both"></div> <div style="clear:both"></div>
<!--档案名称--> <!--档案名称-->
......
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