#

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

@@ -1917,15 +1917,11 @@ 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());
         criteria.andOrganizationIdIn(orgIds).andCreateTimeBetween(strDate, endDate);
         example.setOrderByClause("update_time desc");
-
         PageInfo<DataImportLogDto> pageInfo = new PageInfo<>(dataImportLogMapper.selectByExample(example).stream()
                 .map(o -> beanUtil.copyProperties(o, new DataImportLogDto())).collect(Collectors.toList()));
         pageInfo.setTotal(page.getTotal());
@@ -1965,11 +1961,9 @@ public class DataImportService extends BaseService {
         orgIds.add(Constant.ALL);
         criteria.andOrganizationIdIn(orgIds).andCreateTimeBetween(strDate, endDate);
         example.setOrderByClause("update_time desc");
-
         PageInfo<DataValidateLogDto> pageInfo = new PageInfo<>(dataValidateLogMapper.selectByExample(example).stream()
                 .map(o -> beanUtil.copyProperties(o, new DataValidateLogDto())).collect(Collectors.toList()));
         pageInfo.setTotal(page.getTotal());
-
         return pageInfo;
     }
 

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

@@ -2704,6 +2704,9 @@ public class ReportServiceImpl extends BaseService {
 
         Map<String, List<ProfitLossStatementPrc>> newMap = new HashMap<>();
         ///如果ebitCellData 中已经存在当前机构的数，将取 ebit中，否则取利润表中
+        if(collect1.isEmpty()){
+            newMap = collect2;
+        }else{
             for (Map.Entry<String, List<EbitCellData>> entry1 : collect1.entrySet()) {
                 for (Map.Entry<String, List<ProfitLossStatementPrc>> entry2 : collect2.entrySet()) {
                     /*System.out.println("Key = " + entry.getKey() + ", Value = " + entry.getValue());*/
@@ -2712,6 +2715,7 @@ public class ReportServiceImpl extends BaseService {
                     newMap.put(entry2.getKey(), entry2.getValue());
                 }
             }
+        }
         Map<String, List<EbitCellData>> _newMap = new HashMap<>();
         for (Map.Entry<String, List<ProfitLossStatementPrc>> entry : newMap.entrySet()) {
             _newMap.put(entry.getKey(), convertToEbitData(entry.getValue()));

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

@@ -18,7 +18,7 @@
         $scope.startRowNum = 2;
         var date = new Date();
         var year = date.getFullYear();
-        var month = date.getMonth()+1;
+        var month = date.getMonth() + 1;
         var day = date.getDate();
 
         $scope.dateFormat = $translate.instant('dateFormat4YearMonth');
@@ -51,9 +51,9 @@
                 nextPage: $translate.instant('PagingNextPage'),
                 lastPage: $translate.instant('PagingLastPage')
             },
-            type : constant.importFileType.undefined,
-            startDate: year+'/'+month+'/'+day,
-            endDate : year+'/'+month+'/'+day
+            type: constant.importFileType.undefined,
+            startDate: year + '/' + month + '/' + day,
+            endDate: year + '/' + month + '/' + day
         };
 
         var loadImportLogInfoDatagrid = function () {
@@ -155,7 +155,7 @@
                 if (data && data.list) {
                     $scope.ImportLogGridSource = data.list;
                     $scope.pagingOptions.totalItems = data.pageInfo.totalCount;
-                }else {
+                } else {
                     SweetAlert.error($translate.instant('SystemError'));
                 }
             });
@@ -191,16 +191,16 @@
 
         var setButtonWrapStyle = function () {
             if ($scope.fileName) {
-                return { width: "100%" };
+                return {width: "100%"};
             }
         };
 
         var setGridStyle = function () {
             if ($scope.showTotalSecondRow) {
-                return { 'margin-top': '60px' }
+                return {'margin-top': '60px'}
             }
             else {
-                return { 'margin-top': '55px' }
+                return {'margin-top': '55px'}
             }
         };
 
@@ -218,11 +218,10 @@
                 clearBtn: true, //清除按钮
                 todayBtn: false, //今日按钮
                 format: 'yyyy/mm/dd' //日期格式，详见 http://bootstrap-datepicker.readthedocs.org/en/release/options.html#format
-            }).on('changeDate',function(ev){
-                if(ev.date != undefined)
-                {
-                    _ele2.datepicker('setStartDate',ev.date);
-                    _ele1.datepicker('setFormat','yyyy/mm/dd');
+            }).on('changeDate', function (ev) {
+                if (ev.date != undefined) {
+                    _ele2.datepicker('setStartDate', ev.date);
+                    _ele1.datepicker('setFormat', 'yyyy/mm/dd');
                 }
             });
             _ele1.datepicker("setDate", new Date().formatDateTime('yyyy/mm/dd'));
@@ -235,11 +234,11 @@
                 clearBtn: true, //清除按钮
                 todayBtn: false, //今日按钮
                 format: 'yyyy/mm/dd' //日期格式，详见 http://bootstrap-datepicker.readthedocs.org/en/release/options.html#format
-            }).on('changeDate',function(ev){
-                if(ev.date != undefined)
-                {
-                    _ele1.datepicker('setEndDate',ev.date);
-                    _ele1.datepicker('setFormat','yyyy/mm/dd');
+            }).on('changeDate', function (ev) {
+                if (ev.date != undefined) {
+                    _ele1.datepicker('setEndDate', ev.date);
+                    _ele1.datepicker('setFormat', 'yyyy/mm/dd');
+                    $('.datepicker').css('display', 'none');
                 }
 
             });

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

@@ -243,6 +243,7 @@
                 if (ev.date != undefined) {
                     ele2.datepicker('setEndDate', ev.date);
                     ele2.datepicker('setFormat', 'yyyy/mm/dd');
+                    $('.datepicker').css('display', 'none');
                 }
             });
             ;