CIT数据导入CSS样式更改

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

@@ -172,6 +172,10 @@ public class CitImportExcelServiceImpl extends BaseService {
             citDataImportLogError.setRecordSize(1);
             //获取该行数据
             Row rowData = sheet.getRow(rowNum);
+            if(rowData == null){
+                citDataImportLogError.setErrorMsg("数据错误，第"+(rowNum+1)+"整行为空");
+                citDataImportLogList.add(citDataImportLogError);
+            }
             //拼接日记账调整版的实体
             CitJournalEntryAdjust citJournal = new CitJournalEntryAdjust();
             citJournal.setId(idService.nextId());
@@ -180,12 +184,27 @@ public class CitImportExcelServiceImpl extends BaseService {
             citJournal.setCreatedBy(currentUserName);
 
             SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-            citJournal.setAccountPeriod(new Integer(CitCommonUtil.getValue(rowData.getCell(2)).toString().replace("-", "")));
+            Object cellValue = CitCommonUtil.getValue(rowData.getCell(2));
+            if(cellValue == null){
+                citDataImportLogError.setErrorMsg("数据错误，第"+(rowNum+1)+"行会计期间为空");
+                citDataImportLogList.add(citDataImportLogError);
+                continue;
+            }
+
+            citJournal.setAccountPeriod(new Integer(cellValue.toString().replace("-", "")));
             citJournal.setAccountingDate(sdf.parse(CitCommonUtil.getValue(rowData.getCell(3)).toString()));
             citJournal.setVoucherNum(CitCommonUtil.getValue(rowData.getCell(7)).toString());
             citJournal.setDescription(CitCommonUtil.getValue(rowData.getCell(8)).toString());
-            citJournal.setOrgCode(CitCommonUtil.getValue(rowData.getCell(9)).toString());
-            Object cellValue = CitCommonUtil.getValue(rowData.getCell(11));
+
+            cellValue = CitCommonUtil.getValue(rowData.getCell(9));
+            if(cellValue == null){
+                citDataImportLogError.setErrorMsg("数据错误，第"+(rowNum+1)+"行主体为空");
+                citDataImportLogList.add(citDataImportLogError);
+                continue;
+            }
+            citJournal.setOrgCode(cellValue.toString());
+
+            cellValue = CitCommonUtil.getValue(rowData.getCell(11));
             if(cellValue == null){
                 citDataImportLogError.setErrorMsg("数据错误，第"+(rowNum+1)+"行科目代码为空");
                 citDataImportLogList.add(citDataImportLogError);

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

@@ -60,8 +60,8 @@
             totalItems: 0, //总数据
             totalPages: 10, //总页数
             maxSize: 5, //分页数字的限制。
-            pageSize: constant.page.pageSizeArrary[3], //每页多少条数据,100条
-            pageSizeString: constant.page.pageSizeArrary[3].toString(),
+            pageSize: constant.page.pageSizeArrary[1], //每页多少条数据,100条
+            pageSizeString: constant.page.pageSizeArrary[1].toString(),
             firstPage: $translate.instant('PagingFirstPage'),
             previousPage: $translate.instant('PagingPreviousPage'),
             nextPage: $translate.instant('PagingNextPage'),

atms-web/src/main/webapp/app/common/controls/import/import-cit-bs-prc-adjust/import-cit-bs-prc-adjust.less

@@ -4,7 +4,7 @@
     /*background-color: @color-white;*/
     padding-left: 20px;
     /*min-height: 800px;*/
-    height: 96%;
+    height: 100%;
 
     .nav-wrapper {
         /*padding-bottom: 5px;

atms-web/src/main/webapp/app/common/controls/import/import-cit-draft-account-mapping/import-cit-draft-account-mapping.ctrl.js

@@ -57,8 +57,8 @@
             totalItems: 0, //总数据
             totalPages: 10, //总页数
             maxSize: 5, //分页数字的限制。
-            pageSize: constant.page.pageSizeArrary[3], //每页多少条数据,100条
-            pageSizeString: constant.page.pageSizeArrary[3].toString(),
+            pageSize: constant.page.pageSizeArrary[1], //每页多少条数据,100条
+            pageSizeString: constant.page.pageSizeArrary[1].toString(),
             firstPage: $translate.instant('PagingFirstPage'),
             previousPage: $translate.instant('PagingPreviousPage'),
             nextPage: $translate.instant('PagingNextPage'),

atms-web/src/main/webapp/app/common/controls/import/import-cit-draft-account-mapping/import-cit-draft-account-mapping.less

@@ -4,7 +4,7 @@
     /*background-color: @color-white;*/
     padding-left: 20px;
     /*min-height: 800px;*/
-    height: 96%;
+    height: 100%;
 
     .nav-wrapper {
         /*padding-bottom: 5px;

atms-web/src/main/webapp/app/common/controls/import/import-cit-eam-assets-disposal/import-cit-eam-assets-disposal.ctrl.js

@@ -57,8 +57,8 @@
             totalItems: 0, //总数据
             totalPages: 10, //总页数
             maxSize: 5, //分页数字的限制。
-            pageSize: constant.page.pageSizeArrary[3], //每页多少条数据,100条
-            pageSizeString: constant.page.pageSizeArrary[3].toString(),
+            pageSize: constant.page.pageSizeArrary[1], //每页多少条数据,100条
+            pageSizeString: constant.page.pageSizeArrary[1].toString(),
             firstPage: $translate.instant('PagingFirstPage'),
             previousPage: $translate.instant('PagingPreviousPage'),
             nextPage: $translate.instant('PagingNextPage'),

atms-web/src/main/webapp/app/common/controls/import/import-cit-eam-assets-disposal/import-cit-eam-assets-disposal.less

@@ -4,7 +4,7 @@
     /*background-color: @color-white;*/
     padding-left: 20px;
     /*min-height: 800px;*/
-    height: 96%;
+    height: 100%;
 
     .nav-wrapper {
         /*padding-bottom: 5px;

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

@@ -62,8 +62,8 @@
             totalItems: 0, //总数据
             totalPages: 10, //总页数
             maxSize: 5, //分页数字的限制。
-            pageSize: constant.page.pageSizeArrary[3], //每页多少条数据,100条
-            pageSizeString: constant.page.pageSizeArrary[3].toString(),
+            pageSize: constant.page.pageSizeArrary[1], //每页多少条数据,100条
+            pageSizeString: constant.page.pageSizeArrary[1].toString(),
             firstPage: $translate.instant('PagingFirstPage'),
             previousPage: $translate.instant('PagingPreviousPage'),
             nextPage: $translate.instant('PagingNextPage'),

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

@@ -4,7 +4,7 @@
     /*background-color: @color-white;*/
     padding-left: 20px;
     /*min-height: 800px;*/
-    height: 96%;
+    height: 100%;
 
     .nav-wrapper {
         /*padding-bottom: 5px;

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

@@ -60,8 +60,8 @@
             totalItems: 0, //总数据
             totalPages: 10, //总页数
             maxSize: 5, //分页数字的限制。
-            pageSize: constant.page.pageSizeArrary[3], //每页多少条数据,100条
-            pageSizeString: constant.page.pageSizeArrary[3].toString(),
+            pageSize: constant.page.pageSizeArrary[1], //每页多少条数据,100条
+            pageSizeString: constant.page.pageSizeArrary[1].toString(),
             firstPage: $translate.instant('PagingFirstPage'),
             previousPage: $translate.instant('PagingPreviousPage'),
             nextPage: $translate.instant('PagingNextPage'),

atms-web/src/main/webapp/app/common/controls/import/import-cit-profit-prc-adjust/import-cit-profit-prc-adjust.less

@@ -4,7 +4,7 @@
     /*background-color: @color-white;*/
     padding-left: 20px;
     /*min-height: 800px;*/
-    height: 96%;
+    height: 100%;
 
     .nav-wrapper {
         /*padding-bottom: 5px;

atms-web/src/main/webapp/app/common/controls/import/import-cit-salary-advance/import-cit-salary-advance.ctrl.js

@@ -61,8 +61,8 @@
             totalItems: 0, //总数据
             totalPages: 10, //总页数
             maxSize: 5, //分页数字的限制。
-            pageSize: constant.page.pageSizeArrary[3], //每页多少条数据,100条
-            pageSizeString: constant.page.pageSizeArrary[3].toString(),
+            pageSize: constant.page.pageSizeArrary[1], //每页多少条数据,100条
+            pageSizeString: constant.page.pageSizeArrary[1].toString(),
             firstPage: $translate.instant('PagingFirstPage'),
             previousPage: $translate.instant('PagingPreviousPage'),
             nextPage: $translate.instant('PagingNextPage'),

atms-web/src/main/webapp/app/common/controls/import/import-cit-salary-advance/import-cit-salary-advance.less

@@ -4,7 +4,7 @@
     /*background-color: @color-white;*/
     padding-left: 20px;
     /*min-height: 800px;*/
-    height: 96%;
+    height: 100%;
 
     .nav-wrapper {
         /*padding-bottom: 5px;

atms-web/src/main/webapp/app/common/controls/import/import-cit-trial-balance/import-cit-trial-balance.ctrl.js

@@ -63,8 +63,8 @@
             totalItems: 0, //总数据
             totalPages: 10, //总页数
             maxSize: 5, //分页数字的限制。
-            pageSize: constant.page.pageSizeArrary[3], //每页多少条数据,100条
-            pageSizeString: constant.page.pageSizeArrary[3].toString(),
+            pageSize: constant.page.pageSizeArrary[1], //每页多少条数据,100条
+            pageSizeString: constant.page.pageSizeArrary[1].toString(),
             firstPage: $translate.instant('PagingFirstPage'),
             previousPage: $translate.instant('PagingPreviousPage'),
             nextPage: $translate.instant('PagingNextPage'),

atms-web/src/main/webapp/app/common/controls/import/import-cit-trial-balance/import-cit-trial-balance.less

@@ -4,7 +4,7 @@
     /*background-color: @color-white;*/
     padding-left: 20px;
     /*min-height: 800px;*/
-    height: 96%;
+    height: 100%;
 
     .nav-wrapper {
         /*padding-bottom: 5px;