CIT固定资产分页以及日记账模糊查询

atms-dao/src/main/resources/pwc/taxtech/atms/dao/extends/CitJournalAdjustExtendsMapper.xml

@@ -356,13 +356,13 @@
             and org_code = #{orgCode,jdbcType=VARCHAR}
         </if>
         <if test="subjectCode != null and subjectCode != ''">
-            and subject_code = #{subjectCode,jdbcType=VARCHAR}
+            and subject_code  LIKE CONCAT('%' ,#{subjectCode},'%')
         </if>
         <if test="orgName != null and orgName != ''">
             and org_name = #{orgName,jdbcType=VARCHAR}
         </if>
         <if test="subjectName != null and subjectName != ''">
-            and subject_name = #{subjectName,jdbcType=VARCHAR}
+            and subject_name LIKE CONCAT('%' ,#{subjectName},'%')
         </if>
         <if test="periodStart!=null">
             AND account_period &gt;= #{periodStart,jdbcType=INTEGER}
@@ -385,13 +385,13 @@
             and segment1 = #{orgCode,jdbcType=VARCHAR}
         </if>
         <if test="subjectCode != null and subjectCode != ''">
-            and segment3 = #{subjectCode,jdbcType=VARCHAR}
+            and segment3 LIKE CONCAT('%' ,#{subjectCode},'%')
         </if>
         <if test="orgName != null and orgName != ''">
             and segment1_name = #{orgName,jdbcType=VARCHAR}
         </if>
         <if test="subjectName != null and subjectName != ''">
-            and segment3_name = #{subjectName,jdbcType=VARCHAR}
+            and segment3_name LIKE CONCAT('%' ,#{segment3_name},'%')
         </if>
         <if test="periodStart!=null">
             AND period &gt;= #{periodStart,jdbcType=INTEGER}

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

@@ -8,8 +8,8 @@
             <span style="width: auto" ng-click="switchTab($event,4)">{{'InvisibleAssets' | translate}}</span>
             <!--税会差异的选择-->
             <!--<div class="option" style="display: inline-block">-->
-                <!--<span>{{'TaxAccountDifference' | translate}}</span>-->
-                <!--<div id="taxAccountDifferenceButton" dx-select-box="taxAccountDifferenceOptions"></div>-->
+            <!--<span>{{'TaxAccountDifference' | translate}}</span>-->
+            <!--<div id="taxAccountDifferenceButton" dx-select-box="taxAccountDifferenceOptions"></div>-->
             <!--</div>-->
         </div>
     </div>
@@ -146,9 +146,47 @@
             </div>
         </div>
         <div class="page-footer">
-            <ack-pagination page-options="pagingOptions"
-                            refresh-table="refreshAssetResultListGrid()"></ack-pagination>
+            <div class="ack-page">
+                <div class="ack-footer">
+                    <div class="page-size">
+                        <!--共有-->
+                        <span>{{'TotalPage'| translate}}<span class="total-number">{{pagingOptions.totalItems}}</span>{{'RecordCount' | translate}}</span>
+                        <!--每页显示-->
+                        <span class="padding-span" ng-show="!hideSelector">{{'RowForPage'| translate}}</span>
+
+                        <select class="padding-span page-box" ng-model="pagingOptions.pageSizeString"
+                                ng-change="pagingService.pageSizeSelectionChanged()" ng-show="!hideSelector">
+                            <option ng-repeat="option in pagingOptions.pagingSelection" value="{{option.id}}">
+                                {{option.value}}
+                            </option>
+                        </select>
+                        <!--条记录-->
+                        <span class="padding-span" ng-show="!hideSelector">{{'RecordCount' | translate}}</span>
+                        <!--跳至-->
+                        <span class="padding-span" ng-show="!hideSelector">{{'JumpTo' | translate}} <span
+                                class="padding-span"><input class="page-box " type="number"
+                                                            ng-change="pagingService.pageIndexChanging()"
+                                                            ng-model="pagingOptions.pageIndex"/></span>&nbsp;{{'Page' | translate}}</span>
+                        <!--当前页-->
+                        <span class="padding-span" ng-show="!hideSelector">{{'CurrentPage' | translate}} <span
+                                class="normal-number">{{pagingOptions.pageIndex}}</span>/<span class="normal-number">{{pagingOptions.totalPages}}</span></span>
+                    </div>
+
+                    <ul uib-pagination total-items="pagingOptions.totalItems" items-per-page="pagingOptions.pageSize"
+                        ng-model="pagingOptions.pageIndex" num-pages="pagingOptions.totalPages"
+                        max-size="pagingOptions.maxSize" class="pagination-sm"
+                        boundary-link-numbers="true" ng-change="pagingService.pageIndexChanging()" rotate="true"
+                        boundary-links="true" first-text="{{pagingOptions.firstPage}}"
+                        previous-text="{{pagingOptions.previousPage}}" last-text="{{pagingOptions.lastPage}}"
+                        next-text="{{pagingOptions.nextPage}}"></ul>
+                </div>
+            </div>
         </div>
+
+        <!--<div class="page-footer">-->
+        <!--<ack-pagination page-options="pagingOptions"-->
+        <!--refresh-table="refreshAssetResultListGrid()"></ack-pagination>-->
+        <!--</div>-->
     </div>
 
     <!--本年与上年数据差异界面-->

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

@@ -585,5 +585,63 @@
   bottom: -10px;
 }
 
+.ack-page {
+  display: inline-block;
+
+  select {
+    border-radius: 3px;
+  }
+
+  .ack-footer {
+    display: inline-block;
+    float: right;
+    padding-right: 15px;
+
+    .page-size {
+      display: inline-block;
+      padding-right: 10px;
+      height: 100%;
+      float: left;
+      /* margin: 20px 0px; */
+      padding-top: 5px;
+      padding-left: 0;
+      margin: 20px 0;
+      border-radius: 4px;
+      clear: both;
+      color: #777777;
+      background-color: #ffffff;
+      border-color: #dddddd;
+      padding: 5px 10px;
+      font-size: 12px;
+      line-height: 1;
+
+      .total-number {
+        /*font-weight: bold;*/
+        padding: 0px 2px;
+        color: #dc6900;
+      }
+
+      .page-box {
+        width: 60px;
+        text-align: center;
+      }
+
+      .padding-span {
+        padding: 0px 2px;
+      }
+
+      .normal-number {
+        padding: 0px 2px;
+        color: #dc6900;
+      }
+    }
+
+
+    .page-uib {
+      float: right;
+      padding-right: 15px;
+    }
+  }
+}
 
 

atms-web/src/main/webapp/app/cit/report/cit-report-sheet/cit-report-sheet.js

@@ -658,7 +658,7 @@
                 // 更新数据源后，通过调用该方法计算所有当前sheet单元格，并通过比较原数据列表与spreadJS计算的新值列表，获取保存时需要修改库中Value的单元格信息列表
                 var updateCells = function () {
                     loadSheet(scope.templateId, true);
-                    return cells;
+                    // return cells;
                 };
 
                 (function initialize() {