CIT--fixbug

atms-api/src/main/java/pwc/taxtech/atms/common/POIUtil.java

@@ -42,6 +42,9 @@ public class POIUtil {
             }
             Row targetRow = targetSheet.createRow(r);
             for (int c = row.getFirstCellNum(); c <= row.getLastCellNum(); c++) {
+                if(c < 0 ){
+                    continue;
+                }
                 Cell cell = row.getCell(c);
                 if (null == cell) {
                     continue;

atms-api/src/main/java/pwc/taxtech/atms/controller/TemplateController.java

@@ -91,6 +91,9 @@ public class TemplateController extends BaseController {
             for (int r = sheet.getFirstRowNum(); r <= sheet.getLastRowNum(); r++) {
                 Row row = sheet.getRow(r);
                 for (int c = row.getFirstCellNum(); c <= row.getLastCellNum(); c++) {
+                    if(c < 0){
+                        continue;
+                    }
                     Cell cell = row.getCell(c);
                     if (cell != null && !cell.getCellStyle().getLocked()) {
                         cell.setCellValue(StringUtils.EMPTY);

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

@@ -154,6 +154,7 @@ public class MenuServiceImpl {
             menuIds.add("a9b1cd87-89ef-4dae-b798-b19e9bbe0828");
             menuIds.add("a9b1cd87-89ef-4dae-b798-b19e9bbe0829");
             menuIds.add("a9b1cd87-89ef-4dae-b798-b19e9bbe0830");
+//            menuIds.add("a9b1cd87-89ef-4dae-b798-b19e9bbe0831");
             menuIds.add("b8c74ee9-e5d7-467b-8565-e77efe6a499f");
         }else if(moduleId==4){
             // 这里的权限之后需要在数据库中加上对应的权限数据

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

@@ -406,6 +406,9 @@ public class TemplateGroupServiceImpl extends AbstractService {
                 for (int r = sheet.getFirstRowNum(); r <= sheet.getLastRowNum(); r++) {
                     Row row = sheet.getRow(r);
                     for (int c = row.getFirstCellNum(); c <= row.getLastCellNum(); c++) {
+                        if(c<0){
+                            continue;
+                        }
                         Cell cell = row.getCell(c);
                         if (cell == null) {
                             continue;//todo cell == null 如何处理

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

@@ -276,7 +276,7 @@
                         //     }
                         // });
                         $scope.assetsResultData = data;
-                        // $scope.TotalCount = data.length;
+                        $scope.TotalCount = data.total;
                         // $scope.TotalAccountAcquisitionValue = PWC.round($scope.TotalAccountAcquisitionValue, 2);
                         // $scope.TotalAccountYearDepreciationAmount = PWC.round($scope.TotalAccountYearDepreciationAmount, 2);
                         // $scope.TotalTaxCurrentYearDepreciationAmount = PWC.round($scope.TotalTaxCurrentYearDepreciationAmount, 2);
@@ -286,7 +286,6 @@
                         $scope.TotalTaxCurrentYearDepreciationAmount = PWC.round(data[0].totalTaxCurrentYearDepreciationAmount, 2);
                         $scope.TotalYearDifferenceAmount = PWC.round(data[0].totalYearDifferenceAmount, 2);
                     }
-                    $scope.totalItemsTemp = assetListData.data.total;
                     $scope.pagingOptions.totalItems = assetListData.data.total;
                 });
             }
@@ -979,19 +978,13 @@
 
             //开始
             (function initialize() {
-                $scope.totalItemsTemp = 0;
                 //分页的设置
                 debugger;
+                //分页的设置
                 $scope.pagingOptions = {
                     pageIndex: 1,  //当前页码
-                    pageSize: constant.page.pageSizeArrary[3],  //每页多少条数据
                     totalItems: 0,  //总数据
-                    totalPages: 0,//总页数
-                    pageSizeString: constant.page.pageSizeArrary[3].toString(),
-                    firstPage: '<<', //$translate.instant('PagingFirstPage'),
-                    previousPage: '<', //$translate.instant('PagingPreviousPage'),
-                    nextPage:'>',// $translate.instant('PagingNextPage'),
-                    lastPage: '>>' //$translate.instant('PagingLastPage'),
+                    pageSize: 100,  //每页多少条数据
                 };
                 /**************************************** function start*************************************************/
                 $scope.displayType = 2;
@@ -1002,6 +995,8 @@
                 $scope.initIncomeInvoiceTotalColumnsIndex = [];
                 $scope.changeSheet = changeSheet;
                 debugger;
+                function init(){
+
                     initColumns();
                     initDxGrid();
                     initAssetResultDxGrid();
@@ -1010,7 +1005,8 @@
                     getGroupList();
                     getGroupDetailList();
                     getUserPermission();
-                $scope.pagingOptions.totalItems = $scope.totalItemsTemp;
+                }
+                init();
                 // $scope.$watch('fileNameWrapper', function (newValue, oldValue) {
                 //     if (newValue != null && newValue !== oldValue) {
                 //         //设置上传文件名

atms-web/src/main/webapp/app/common/controls/import/import-cit-journal-adjust/import-cit-journal-adjust.ctrl.js

@@ -171,11 +171,12 @@
                 },
                 __RequestVerificationToken: token,
                 withCredentials: true
-            }).then(function(resp) {
+            }).then(function(data) {
+                var resp = data.data;
                 debugger;
                 $('#busy-indicator-container').hide();
                 deferred.resolve();
-                if (resp.result || resp.data) {
+                if (resp.result) {
                     debugger;
                     logDto.UpdateState = $translate.instant('ImportSuccess');
                     vatOperationLogService.addOperationLog(logDto);
@@ -183,7 +184,7 @@
                 } else {
                     debugger;
                     if (resp.resultMsg && resp.resultMsg.length > 0) {
-                        SweetAlert.warning($translate.instant(resp.resultMsg));
+                        SweetAlert.warning(resp.resultMsg);
                     }else{
                         SweetAlert.error($translate.instant('ImportFailed'));
                     }