Merge branch 'dev_mysql' of http://code.tech.tax.asia.pwcinternal.com/root/atms into dev_mysql

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

@@ -100,6 +100,15 @@ public class AssetListServiceImpl extends BaseService {
         if(citAssetsListDto.getTaxAccountCompare() != 2){
             criteria.andTaxAccountCompareEqualTo(citAssetsListDto.getTaxAccountCompare());
         }
+        if(citAssetsListDto.getAssetGroupName() != null){
+            criteria.andAssetGroupNameLike(citAssetsListDto.getAssetGroupName()+"%");
+        }
+        if(citAssetsListDto.getDepreciationPeriod() != null){
+            criteria.andDepreciationPeriodEqualTo(citAssetsListDto.getDepreciationPeriod());
+        }
+        if(citAssetsListDto.getTaxGroupName() != null){
+            criteria.andTaxGroupNameLike(citAssetsListDto.getTaxGroupName()+"%");
+        }
         Page page = PageHelper.startPage(citAssetsListDto.getPageInfo().getPageIndex(),citAssetsListDto.getPageInfo().getPageSize());
         List<CitAssetsList> citAssetsLists = assetListMapper.selectByExample(assetListExample);
         CitAssetSumDataDto sumData = assetListMapper.getSumData(citAssetsListDto.getProjectId());

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

@@ -3,12 +3,12 @@
         <div>
             <table class=" table table-responsive">
                 <tr>
-                    <td><span translate="TaxAccountDifference"></span></td>
+                    <td style="vertical-align: middle"><span translate="TaxAccountDifference"></span></td>
                     <td>
                         <!--税会差异的选择-->
-                        <div class="input-group">
+                        <div class="input-group" style="width: 100%">
                             <div class="option">
-                                <div id="taxAccountDifferenceButton" dx-select-box="taxAccountDifferenceOptions"></div>
+                                <div id="taxAccountDifferenceButton" dx-select-box="taxAccountDifferenceOptions" style="width: 100%"></div>
                             </div>
                         </div>
                     </td>
@@ -16,22 +16,20 @@
                 <tr>
                     <td><span translate="AssetGroupName"></span></td>
                     <td><input class="form-control " type="text" id="assetGroupName" placeholder=""
-                               ng-model="filterData.assetGroupName"></td>
+                               ng-model="citAssetsListDto.assetGroupName"></td>
                 </tr>
                 <tr>
                     <td><span translate="DepreciationPeriod"></span></td>
                     <td>
-                        <div class="input-group">
                             <input class="form-control " type="text" id="depreciationPeriod" placeholder=""
-                                   ng-model="filterData.depreciationPeriod">
-                        </div>
+                                   ng-model="citAssetsListDto.depreciationPeriod">
                     </td>
                 </tr>
 
                 <tr>
                     <td><span translate="TaxGroupType"></span></td>
                     <td><input class="form-control " type="text" id="taxGroupType" placeholder=""
-                               ng-model="filterData.taxGroupType"></td>
+                               ng-model="citAssetsListDto.taxGroupType"></td>
                 </tr>
 
             </table>

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

@@ -57,7 +57,10 @@
                 },
                 assetType : 1,
                 projectId : projectId,
-                taxAccountCompare : 2
+                taxAccountCompare : 2,
+                assetGroupName:'',
+                depreciationPeriod:'',
+                taxGroupType:''
             };
             $scope.refreshAssetResultListGrid = function () {
                     debugger;
@@ -976,6 +979,31 @@
                 });
             };
 
+            var initParamFilter = function(){
+                $scope.citAssetsListDto.taxAccountCompare =2;
+                $scope.citAssetsListDto.assetGroupName =2;
+                $scope.citAssetsListDto.depreciationPeriod =2;
+                $scope.citAssetsListDto.taxGroupType =2;
+            };
+
+            var doDataFilter = function () {
+                debugger;
+                // initParamFilter();
+                getAssetResultList($scope.citAssetsListDto.assetType);
+
+            }
+
+            var doDataFilterReset = function () {
+                debugger;
+                // initParamFilter();
+                $scope.citAssetsListDto.taxAccountCompare =2;
+                $scope.citAssetsListDto.assetGroupName = null;
+                $scope.citAssetsListDto.depreciationPeriod = null;
+                $scope.citAssetsListDto.taxGroupType = null;
+                getAssetResultList($scope.citAssetsListDto.assetType);
+
+            };
+
             //开始
             (function initialize() {
                 //分页的设置
@@ -994,6 +1022,8 @@
                 $scope.incomeInvoiceTotalColumns = [];
                 $scope.initIncomeInvoiceTotalColumnsIndex = [];
                 $scope.changeSheet = changeSheet;
+                $scope.doDataFilter = doDataFilter;
+                $scope.doDataFilterReset = doDataFilterReset;
                 debugger;
                 function init(){
 

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

@@ -412,12 +412,12 @@
 }
 
 .popover {
-    min-width: 370px;
+     min-width: 370px;
 
-    .arrow {
-        left: 0px;
-    }
-}
+     .arrow {
+         left: 0px !important;
+     }
+ }
 
 .popover-content {
     td {

atms-web/src/main/webapp/app/common/utils/constant.js

@@ -656,7 +656,7 @@ constant.citPermission = {
             queryCode: '03.003.001.001',
             importCode: '03.003.001.002'
         }, 
-        caculateDataCode: '03.003.002', 
+        caculateDataCode: '03.003.004',
     },
     reportView: {
         reportViewCode: '03.004',