1、导入分发导入文件后取消文件名；2、数据日志记录分页

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

@@ -1766,11 +1766,8 @@ public class DataImportService extends BaseService {
             if (!"".equals(value)) {
                 rlit.setRedLetterInvoiceInfoTableNum(new BigDecimal(value.toString()).toPlainString());
             }
-            rlit.setPeriod(periodDate);
-            try{
-                rlit.setFillInDate(row.getCell(1).getDateCellValue());
-            }catch (Exception e){
-            }
+            rlit.setPeriod(DateUtils.dateToPeriod(row.getCell(3).getDateCellValue()));
+            rlit.setFillInDate(row.getCell(3).getDateCellValue());
             rlit.setSalesTaxNumber(getCellStringValue(row.getCell(4)));
             rlit.setSalespersonName(getCellStringValue(row.getCell(5)));
             rlit.setTotalAmount(getCellBigDecimalValue(row.getCell(6),evaluator));
@@ -2199,7 +2196,6 @@ public class DataImportService extends BaseService {
 
         DataImportLogExample example = new DataImportLogExample();
         DataImportLogExample.Criteria criteria = example.createCriteria();
-        Page page = PageHelper.startPage(param.getPageInfo().getPageIndex(), param.getPageInfo().getPageSize());
         List<String> orgIds = organizationService.getMyOrgList().stream().map(OrgSelectDto::getId).collect(Collectors.toList());
         //财务数据抽取展示抽取记录除了admin能查看所有操作人员的操作，其余人员只能看到本身的
         String uid = authUserHelper.getCurrentUserId();
@@ -2210,6 +2206,7 @@ public class DataImportService extends BaseService {
             criteria.andOrganizationIdIn(orgIds).andCreateTimeBetween(strDate, endDate).andOperatorEqualTo(authUserHelper.getCurrentAuditor().get());
         }
         example.setOrderByClause("update_time desc");
+        Page page = PageHelper.startPage(param.getPageInfo().getPageIndex(), param.getPageInfo().getPageSize());
         PageInfo<DataImportLogDto> pageInfo = new PageInfo<>(dataImportLogMapper.selectByExample(example).stream()
                 .map(o -> beanUtil.copyProperties(o, new DataImportLogDto())).collect(Collectors.toList()));
         pageInfo.setTotal(page.getTotal());

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

@@ -767,6 +767,8 @@
                 withCredentials: true
             }).then(function(resp) {
                 var ret = resp.data;
+                $scope.fileName='';
+                $scope.importExcelFile = null;
                 $('#busy-indicator-container').hide();
                 deferred.resolve();
                 if (ret.result) {

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

@@ -741,6 +741,8 @@
                 withCredentials: true
             }).then(function(resp) {
                 var ret = resp.data;
+                $scope.fileName='';
+                $scope.importExcelFile = null;
                 $('#busy-indicator-container').hide();
                 deferred.resolve();
                 if (ret.result) {

atms-web/src/main/webapp/app/common/controls/import/import-cash-flow/import-cash-flow.ctrl.js

@@ -744,6 +744,8 @@
                 withCredentials: true
             }).then(function(resp) {
                 var ret = resp.data;
+                $scope.fileName='';
+                $scope.importExcelFile = null;
                 $('#busy-indicator-container').hide();
                 deferred.resolve();
                 if (ret.result) {

atms-web/src/main/webapp/app/common/controls/import/import-certified-invoices-list/import-certified-invoices-list.ctrl.js

@@ -186,6 +186,7 @@
             }).then(function(resp) {
                 var ret = resp.data;
                 $scope.fileName='';
+                $scope.importExcelFile = null;
                 $('#busy-indicator-container').hide();
                 deferred.resolve();
                 if (ret.result) {

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

@@ -169,6 +169,8 @@
                 withCredentials: true
             }).then(function (data) {
                     var resp = data.data;
+                    $scope.fileName='';
+                    $scope.importExcelFile = null;
                     $('#busy-indicator-container').hide();
                     deferred.resolve();
                     if (resp.data || resp.result) {

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

@@ -161,6 +161,8 @@
                 withCredentials: true
             }).then(function(data) {
                     var resp = data.data;
+                    $scope.fileName='';
+                    $scope.importExcelFile = null;
                     $('#busy-indicator-container').hide();
                     deferred.resolve();
                     if (resp.data || resp.result) {

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

@@ -160,6 +160,8 @@
                 withCredentials: true
             }).then(function(data) {
                     var resp = data.data;
+                    $scope.fileName='';
+                    $scope.importExcelFile = null;
                     $('#busy-indicator-container').hide();
                     deferred.resolve();
                     if (resp.data || resp.result) {

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

@@ -173,7 +173,8 @@
                 withCredentials: true
             }).then(function(data) {
                 var resp = data.data;
-
+                $scope.fileName='';
+                $scope.importExcelFile = null;
                 $('#busy-indicator-container').hide();
                 deferred.resolve();
                 if (resp.result) {

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

@@ -169,6 +169,8 @@
                 withCredentials: true
             }).then(function(data) {
                     var resp = data.data;
+                    $scope.fileName='';
+                    $scope.importExcelFile = null;
                     $('#busy-indicator-container').hide();
                     deferred.resolve();
                     if (resp.data || resp.result) {

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

@@ -192,9 +192,9 @@
                 __RequestVerificationToken: token,
                 withCredentials: true
             }).then(function(data) {
-                    $scope.importExcelFile = null;
-                    $scope.fileName = null;
                     var resp = data.data;
+                    $scope.fileName='';
+                    $scope.importExcelFile = null;
                     $('#busy-indicator-container').hide();
                     deferred.resolve();
                     if (resp.result) {

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

@@ -172,6 +172,8 @@
                 withCredentials: true
             }).then(function(data) {
                     $scope.fileNameShow=false;
+                    $scope.fileName='';
+                    $scope.importExcelFile = null;
                     $('#busy-indicator-container').hide();
                     var resp = data.data;
                     deferred.resolve();

atms-web/src/main/webapp/app/common/controls/import/import-coupa-purchasing-report/import-coupa-purchasing-report.ctrl.js

@@ -209,6 +209,8 @@
                 withCredentials: true
             }).then(function(resp) {
                 var ret = resp.data;
+                $scope.fileName='';
+                $scope.importExcelFile = null;
                 $('#busy-indicator-container').hide();
                 deferred.resolve();
                 if (ret.result) {

atms-web/src/main/webapp/app/common/controls/import/import-invoice-record/import-invoice-record.ctrl.js

@@ -192,7 +192,8 @@
                 withCredentials: true
             }).then(function(resp) {
                 var ret = resp.data;
-
+                $scope.fileName='';
+                $scope.importExcelFile = null;
                 $('#busy-indicator-container').hide();
                 deferred.resolve();
                 if (ret.result) {

atms-web/src/main/webapp/app/common/controls/import/import-profit-loss/import-profit-loss.ctrl.js

@@ -195,6 +195,8 @@
                 withCredentials: true
             }).then(function(resp) {
                 var ret = resp.data;
+                $scope.fileName='';
+                $scope.importExcelFile = null;
                 $('#busy-indicator-container').hide();
                 deferred.resolve();
                 if (ret.result) {

atms-web/src/main/webapp/app/common/controls/import/import-red-letter-info-table/import-red-letter-info-table.ctrl.js

@@ -194,6 +194,8 @@
                 withCredentials: true
             }).then(function(resp) {
                 var ret = resp.data;
+                $scope.fileName='';
+                $scope.importExcelFile = null;
                 $('#busy-indicator-container').hide();
                 deferred.resolve();
                 if (ret.result) {

atms-web/src/main/webapp/app/dataImport/log/import-log/import-log.ctrl.js

@@ -154,7 +154,6 @@
                     width: 518,
                     visible: true
                 },
-                height: '99%',
                 headerFilter: {
                     visible: false,
                     texts: {

atms-web/src/main/webapp/app/dataImport/log/import-log/import-log.html

@@ -20,10 +20,10 @@
             <div id="importLogGridContainer" dx-data-grid="importLogGridOptions"
                  style="margin-top: 30px;">
             </div>
-            <!--<div class="page-footer">
+            <div class="page-footer">
                 <ack-pagination page-options="pagingOptions"
                                 refresh-table="refreshConfigGrid()"></ack-pagination>
-            </div>-->
+            </div>
         </div>
     </div>
 </div>

atms-web/src/main/webapp/app/dataImport/log/import-log/import-log.less

@@ -175,6 +175,7 @@
         }
 
         .dt-init-wrapper {
+            margin: 60px 0;
             max-width: 99%;
             height: calc(100% - 200px);
             position: relative;