fix bug

atms-api/src/main/java/pwc/taxtech/atms/vat/service/impl/ReportServiceImpl.java

@@ -357,29 +357,24 @@ public class ReportServiceImpl extends BaseService {
             invoiceRecordMapper.clearRevenueCof(true, true, delExample);
         }
 
-        Map<String, Long> map = new HashMap<>();
+//        Map<String, Long> map = new HashMap<>();
         for (RevenueTypeMapping mapping : mappingList) {
-            if (!map.containsKey(mapping.getContent())) {
                 RevenueConfigExample configExample = new RevenueConfigExample();
                 configExample.createCriteria().andNameEqualTo(mapping.getRevenueTypeName()).
                         andStatusEqualTo(0).andOrgIdEqualTo(mapping.getOrgId()).
                         andStartDateLessThanOrEqualTo(queryDate).andEndDateGreaterThanOrEqualTo(queryDate);
                 List<RevenueConfig> configs = revenueConfigMapper.selectByExample(configExample);
-                if (CollectionUtils.isNotEmpty(configs)) {
-                    map.put(mapping.getContent(), configs.get(0).getId());
+                if(CollectionUtils.isNotEmpty(configs)){
+                    InvoiceRecord destRecord = new InvoiceRecord();
+                    destRecord.setRevenueCofId(configs.get(0).getId());
+                    InvoiceRecordExample recordExample = new InvoiceRecordExample();
+                    recordExample.createCriteria().andProjectIdEqualTo(projectId)
+                            .andOrganizationIdEqualTo(mapping.getOrgId()).andBillingContentEqualTo(mapping.getContent())
+                            .andTaxRateEqualTo(mapping.getTaxRate())
+                            .andDepartmentEqualTo(mapping.getOuName())
+                            .andPeriodEqualTo(Integer.valueOf(queryDate.replace("-", "")));
+                    invoiceRecordMapper.updateByExampleSelective(destRecord, recordExample);
                 }
-            }
-            if (map.containsKey(mapping.getContent())) {
-                InvoiceRecord destRecord = new InvoiceRecord();
-                destRecord.setRevenueCofId(map.get(mapping.getContent()));
-                InvoiceRecordExample recordExample = new InvoiceRecordExample();
-                recordExample.createCriteria().andProjectIdEqualTo(projectId)
-                        .andOrganizationIdEqualTo(mapping.getOrgId()).andBillingContentEqualTo(mapping.getContent())
-                        .andTaxRateEqualTo(mapping.getTaxRate())
-                        .andDepartmentEqualTo(mapping.getOuName())
-                        .andPeriodEqualTo(Integer.valueOf(queryDate.replace("-", "")));
-                invoiceRecordMapper.updateByExampleSelective(destRecord, recordExample);
-            }
         }
     }
 

atms-web/src/main/webapp/app/taxDocumentManage/tax-document-list/tax-document-list.ctrl.js

@@ -319,7 +319,7 @@ taxDocumentManageModule.controller('taxDocumentListController',
                     ],
                     onCellClick: function (e) {
                         //单元格点击— e.columnIndex=0 排除复选框列
-                        if (e.columnIndex > 0 && e.data) {
+                        if(e.column.dataField!="" && e.data){
                             $("input[name='dataGridCheckBox']").each(function (index, item) {
                                 if ((item.dataset) && (item.dataset.id == e.data.id)) {
                                     if (item.checked) {

atms-web/src/main/webapp/app/taxDocumentManage/tax-document-list/tax-document-list.html

@@ -696,24 +696,24 @@
                     </div>
                     <div class="modal-body">
 
-                        <div ng-if="isCreatePop" class="col-sm-6 form-group">
-                            <label class="col-sm-3 control-label edit-panel-left-part">
-                                <span class="required-tip"> * </span>
-                                {{'Document Path'|translate}}
-                            </label>
-                            <div class="col-sm-11" style="width:61.67%">
-                                <input class="form-control" title="{{editFieldModel.fileNativePath}}"
-                                       placeholder="{{'Please Select' | translate}}"
-                                       readonly
-                                       ng-model="editFieldModel.fileNativePath"
-                                       required/>
-                                <input id="uploadFilePlugin" type="file" style="display:none" nv-file-select
-                                       uploader="uploader" filters="fileTypeFilter">
-                            </div>
-                            <div class="DTL-special-external-btn">
-                                <a href="javascript:void(0)" ng-click="uploadFile()"><i class="fa fa-upload"></i></a>
-                            </div>
-                        </div>
+                        <!--<div ng-if="isCreatePop" class="col-sm-6 form-group">-->
+                            <!--<label class="col-sm-3 control-label edit-panel-left-part">-->
+                                <!--<span class="required-tip"> * </span>-->
+                                <!--{{'Document Path'|translate}}-->
+                            <!--</label>-->
+                            <!--<div class="col-sm-11" style="width:61.67%">-->
+                                <!--<input class="form-control" title="{{editFieldModel.fileNativePath}}"-->
+                                       <!--placeholder="{{'Please Select' | translate}}"-->
+                                       <!--readonly-->
+                                       <!--ng-model="editFieldModel.fileNativePath"-->
+                                       <!--required/>-->
+                                <!--<input id="uploadFilePlugin" type="file" style="display:none" nv-file-select-->
+                                       <!--uploader="uploader" filters="fileTypeFilter">-->
+                            <!--</div>-->
+                            <!--<div class="DTL-special-external-btn">-->
+                                <!--<a href="javascript:void(0)" ng-click="uploadFile()"><i class="fa fa-upload"></i></a>-->
+                            <!--</div>-->
+                        <!--</div>-->
 
                         <!--取消上传时的预览功能-->
                         <!--<div ng-if="isCreatePop && uploader.queue.length" class="col-sm-6 form-group">
@@ -734,6 +734,11 @@
                                        ng-model="editFieldModel.fileName"
                                        required/>
                             </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 class="col-sm-6 form-group">
                             <label class="col-sm-3 control-label edit-panel-left-part">
@@ -950,19 +955,19 @@
                         <div class="TDL-multi-upload-content">
                             <ul>
                                 <li ng-repeat="editFieldItem in multiUploadErrorItems" ng-show="editFieldItem.iShow">
-                                    <div class="col-sm-6 form-group">
-                                        <label class="col-sm-3 control-label edit-panel-left-part">
-                                            <span class="required-tip"> * </span>
-                                            {{'Document Path'|translate}}
-                                        </label>
-                                        <div class="col-sm-11" style="width:61.67%">
-                                            <input class="form-control" title="{{editFieldItem.fileNativePath}}"
-                                                   placeholder="{{'Please Select' | translate}}"
-                                                   ng-class="{'upload-fail-mark':!editFieldItem.fileNativePath && editFieldItem.fileNativePath != 0}"
-                                                   ng-model="editFieldItem.fileNativePath"/>
-                                            <!--<input id="{{multiUploadFilePlugin}}" type="file" style="display:none" nv-file-select uploader="uploader" filters="fileTypeFilter">-->
-                                        </div>
-                                    </div>
+                                    <!--<div class="col-sm-6 form-group">-->
+                                        <!--<label class="col-sm-3 control-label edit-panel-left-part">-->
+                                            <!--<span class="required-tip"> * </span>-->
+                                            <!--{{'Document Path'|translate}}-->
+                                        <!--</label>-->
+                                        <!--<div class="col-sm-11" style="width:61.67%">-->
+                                            <!--<input class="form-control" title="{{editFieldItem.fileNativePath}}"-->
+                                                   <!--placeholder="{{'Please Select' | translate}}"-->
+                                                   <!--ng-class="{'upload-fail-mark':!editFieldItem.fileNativePath && editFieldItem.fileNativePath != 0}"-->
+                                                   <!--ng-model="editFieldItem.fileNativePath"/>-->
+                                            <!--&lt;!&ndash;<input id="{{multiUploadFilePlugin}}" type="file" style="display:none" nv-file-select uploader="uploader" filters="fileTypeFilter">&ndash;&gt;-->
+                                        <!--</div>-->
+                                    <!--</div>-->
 
                                     <div style="clear:both"></div>
                                     <!--档案名称-->