1、VAT资产负债及发票记录模板下载的模板；2、固资筛选框还原...;3、添加收入类型配置代码优化

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

@@ -93,17 +93,20 @@ public class RevenueConfService extends BaseService {
             //在新增之前先验证机构和名称组合是否唯一 by zhikai.wei start
             StringBuilder sb = new StringBuilder();
             ApiResultDto apiResultDto = new ApiResultDto();
+            //循环前台选择的每一家机构
             for (String orgId : addDto.getOrgList()) {
                 RevenueConfigExample revenueConfigExample = new RevenueConfigExample();
                 revenueConfigExample.createCriteria().andNameEqualTo(addDto.getName()).andOrgIdEqualTo(orgId);
                 List<RevenueConfig> list = revenueConfigMapper.selectByExample(revenueConfigExample);
+                //判断根据机构和名称是否能查询出数据
                 if (list.size() > 0) {
                     sb.append(organizationMapper.selectByPrimaryKey(orgId).getName()).append("\n");
-                    apiResultDto.setMessage("DuplicateName");
                 }
             }
-            if(StringUtils.isNotBlank(apiResultDto.getMessage())){
+            //若有机构重复，哪怕只有一家机构重复，就返回错误信息，且不会做插入
+            if(sb.length()>0){
                 apiResultDto.setData(sb.toString());
+                apiResultDto.setMessage("DuplicateName");
                 return apiResultDto;
             }
             //在新增之前先验证机构和名称组合是否唯一 by zhikai.wei end

atms-web/src/main/webapp/app/cit/import/cit-import-asset-list/cit-import-asset-list.ctrl.js

-citModule.controller('CitImportAssetListController', ['$scope', '$log', '$translate', '$timeout', '$compile', '$uibModal', 'apiInterceptor', 'Upload',
+citModule.controller('CitImportAssetListController', ['$scope', '$log', '$translate', '$timeout', '$compile', '$uibModal', 'apiInterceptor', 'Upload',
     'assetListService', 'SweetAlert', '$q', 'uiGridConstants', '$interval', 'vatSessionService', 'citSessionService', 'vatImportService', 'loginContext',
     'browserService', 'enums', 'vatOperationLogService', 'projectService', 'vatCommonService', 'ackMessageBox',
     function ($scope, $log, $translate, $timeout, $compile, $uibModal, apiInterceptor, Upload, assetListService, SweetAlert, $q, uiGridConstants,
@@ -1266,18 +1266,6 @@
 
         };
 
-        var showSearch = function () {
-            $("[data-toggle='popover']").popover();
-        };
-
-        var showSearch1 = function () {
-            var aaaa = $("#assetListSearch").hasClass("popover");
-            var bbbb = $("#assetListSearch").hasClass("show");
-            if($("#assetListSearch").hasClass("popover")){
-
-            }
-        };
-
         //开始
         (function initialize() {
 
@@ -1288,8 +1276,6 @@
             $scope.selectedColumnMap = [];
             $scope.incomeInvoiceTotalColumns = [];
             $scope.initIncomeInvoiceTotalColumnsIndex = [];
-            $scope.showSearch = showSearch;
-            $scope.showSearch1 = showSearch1;
             $scope.changeSheet = changeSheet;
             $scope.doDataFilter = doDataFilter;
             $scope.doDataFilterReset = doDataFilterReset;
@@ -1301,7 +1287,7 @@
                 initAssetResultDxGrid();
                 // getAssetResultList(1);
                 $scope.refreshAssetResultListGrid();
-                showSearch();
+
                 getGroupList();
                 getGroupDetailList();
                 getUserPermission();

atms-web/src/main/webapp/app/cit/import/cit-import-asset-list/cit-import-asset-list.html

-<div class="cit-import-asset-list">
+<div class="cit-import-asset-list">
     <div class="nav-wrapper">
         <div class="nav-header">{{'AssetList' | translate}}</div>
         <div class="nav-tab">