Commit c12993fb authored by Memorydoc's avatar Memorydoc

#

parent 7e95ac6a
...@@ -1917,15 +1917,11 @@ public class DataImportService extends BaseService { ...@@ -1917,15 +1917,11 @@ public class DataImportService extends BaseService {
}*/ }*/
DataImportLogExample example = new DataImportLogExample(); DataImportLogExample example = new DataImportLogExample();
DataImportLogExample.Criteria criteria = example.createCriteria(); DataImportLogExample.Criteria criteria = example.createCriteria();
Page page = PageHelper.startPage(param.getPageInfo().getPageIndex(), param.getPageInfo().getPageSize()); Page page = PageHelper.startPage(param.getPageInfo().getPageIndex(), param.getPageInfo().getPageSize());
List<String> orgIds = organizationService.getMyOrgList().stream().map(OrgSelectDto::getId).collect(Collectors.toList()); List<String> orgIds = organizationService.getMyOrgList().stream().map(OrgSelectDto::getId).collect(Collectors.toList());
criteria.andOrganizationIdIn(orgIds).andCreateTimeBetween(strDate, endDate); criteria.andOrganizationIdIn(orgIds).andCreateTimeBetween(strDate, endDate);
example.setOrderByClause("update_time desc"); example.setOrderByClause("update_time desc");
PageInfo<DataImportLogDto> pageInfo = new PageInfo<>(dataImportLogMapper.selectByExample(example).stream() PageInfo<DataImportLogDto> pageInfo = new PageInfo<>(dataImportLogMapper.selectByExample(example).stream()
.map(o -> beanUtil.copyProperties(o, new DataImportLogDto())).collect(Collectors.toList())); .map(o -> beanUtil.copyProperties(o, new DataImportLogDto())).collect(Collectors.toList()));
pageInfo.setTotal(page.getTotal()); pageInfo.setTotal(page.getTotal());
...@@ -1965,11 +1961,9 @@ public class DataImportService extends BaseService { ...@@ -1965,11 +1961,9 @@ public class DataImportService extends BaseService {
orgIds.add(Constant.ALL); orgIds.add(Constant.ALL);
criteria.andOrganizationIdIn(orgIds).andCreateTimeBetween(strDate, endDate); criteria.andOrganizationIdIn(orgIds).andCreateTimeBetween(strDate, endDate);
example.setOrderByClause("update_time desc"); example.setOrderByClause("update_time desc");
PageInfo<DataValidateLogDto> pageInfo = new PageInfo<>(dataValidateLogMapper.selectByExample(example).stream() PageInfo<DataValidateLogDto> pageInfo = new PageInfo<>(dataValidateLogMapper.selectByExample(example).stream()
.map(o -> beanUtil.copyProperties(o, new DataValidateLogDto())).collect(Collectors.toList())); .map(o -> beanUtil.copyProperties(o, new DataValidateLogDto())).collect(Collectors.toList()));
pageInfo.setTotal(page.getTotal()); pageInfo.setTotal(page.getTotal());
return pageInfo; return pageInfo;
} }
......
...@@ -2704,12 +2704,16 @@ public class ReportServiceImpl extends BaseService { ...@@ -2704,12 +2704,16 @@ public class ReportServiceImpl extends BaseService {
Map<String, List<ProfitLossStatementPrc>> newMap = new HashMap<>(); Map<String, List<ProfitLossStatementPrc>> newMap = new HashMap<>();
///如果ebitCellData 中已经存在当前机构的数,将取 ebit中,否则取利润表中 ///如果ebitCellData 中已经存在当前机构的数,将取 ebit中,否则取利润表中
for (Map.Entry<String, List<EbitCellData>> entry1 : collect1.entrySet()) { if(collect1.isEmpty()){
for (Map.Entry<String, List<ProfitLossStatementPrc>> entry2 : collect2.entrySet()) { newMap = collect2;
/*System.out.println("Key = " + entry.getKey() + ", Value = " + entry.getValue());*/ }else{
if (entry2.getKey() == entry1.getKey()) for (Map.Entry<String, List<EbitCellData>> entry1 : collect1.entrySet()) {
continue; for (Map.Entry<String, List<ProfitLossStatementPrc>> entry2 : collect2.entrySet()) {
newMap.put(entry2.getKey(), entry2.getValue()); /*System.out.println("Key = " + entry.getKey() + ", Value = " + entry.getValue());*/
if (entry2.getKey() == entry1.getKey())
continue;
newMap.put(entry2.getKey(), entry2.getValue());
}
} }
} }
Map<String, List<EbitCellData>> _newMap = new HashMap<>(); Map<String, List<EbitCellData>> _newMap = new HashMap<>();
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
$scope.startRowNum = 2; $scope.startRowNum = 2;
var date = new Date(); var date = new Date();
var year = date.getFullYear(); var year = date.getFullYear();
var month = date.getMonth()+1; var month = date.getMonth() + 1;
var day = date.getDate(); var day = date.getDate();
$scope.dateFormat = $translate.instant('dateFormat4YearMonth'); $scope.dateFormat = $translate.instant('dateFormat4YearMonth');
...@@ -51,9 +51,9 @@ ...@@ -51,9 +51,9 @@
nextPage: $translate.instant('PagingNextPage'), nextPage: $translate.instant('PagingNextPage'),
lastPage: $translate.instant('PagingLastPage') lastPage: $translate.instant('PagingLastPage')
}, },
type : constant.importFileType.undefined, type: constant.importFileType.undefined,
startDate: year+'/'+month+'/'+day, startDate: year + '/' + month + '/' + day,
endDate : year+'/'+month+'/'+day endDate: year + '/' + month + '/' + day
}; };
var loadImportLogInfoDatagrid = function () { var loadImportLogInfoDatagrid = function () {
...@@ -155,7 +155,7 @@ ...@@ -155,7 +155,7 @@
if (data && data.list) { if (data && data.list) {
$scope.ImportLogGridSource = data.list; $scope.ImportLogGridSource = data.list;
$scope.pagingOptions.totalItems = data.pageInfo.totalCount; $scope.pagingOptions.totalItems = data.pageInfo.totalCount;
}else { } else {
SweetAlert.error($translate.instant('SystemError')); SweetAlert.error($translate.instant('SystemError'));
} }
}); });
...@@ -191,16 +191,16 @@ ...@@ -191,16 +191,16 @@
var setButtonWrapStyle = function () { var setButtonWrapStyle = function () {
if ($scope.fileName) { if ($scope.fileName) {
return { width: "100%" }; return {width: "100%"};
} }
}; };
var setGridStyle = function () { var setGridStyle = function () {
if ($scope.showTotalSecondRow) { if ($scope.showTotalSecondRow) {
return { 'margin-top': '60px' } return {'margin-top': '60px'}
} }
else { else {
return { 'margin-top': '55px' } return {'margin-top': '55px'}
} }
}; };
...@@ -218,11 +218,10 @@ ...@@ -218,11 +218,10 @@
clearBtn: true, //清除按钮 clearBtn: true, //清除按钮
todayBtn: false, //今日按钮 todayBtn: false, //今日按钮
format: 'yyyy/mm/dd' //日期格式,详见 http://bootstrap-datepicker.readthedocs.org/en/release/options.html#format format: 'yyyy/mm/dd' //日期格式,详见 http://bootstrap-datepicker.readthedocs.org/en/release/options.html#format
}).on('changeDate',function(ev){ }).on('changeDate', function (ev) {
if(ev.date != undefined) if (ev.date != undefined) {
{ _ele2.datepicker('setStartDate', ev.date);
_ele2.datepicker('setStartDate',ev.date); _ele1.datepicker('setFormat', 'yyyy/mm/dd');
_ele1.datepicker('setFormat','yyyy/mm/dd');
} }
}); });
_ele1.datepicker("setDate", new Date().formatDateTime('yyyy/mm/dd')); _ele1.datepicker("setDate", new Date().formatDateTime('yyyy/mm/dd'));
...@@ -235,12 +234,12 @@ ...@@ -235,12 +234,12 @@
clearBtn: true, //清除按钮 clearBtn: true, //清除按钮
todayBtn: false, //今日按钮 todayBtn: false, //今日按钮
format: 'yyyy/mm/dd' //日期格式,详见 http://bootstrap-datepicker.readthedocs.org/en/release/options.html#format format: 'yyyy/mm/dd' //日期格式,详见 http://bootstrap-datepicker.readthedocs.org/en/release/options.html#format
}).on('changeDate',function(ev){ }).on('changeDate', function (ev) {
if(ev.date != undefined) if (ev.date != undefined) {
{ _ele1.datepicker('setEndDate', ev.date);
_ele1.datepicker('setEndDate',ev.date); _ele1.datepicker('setFormat', 'yyyy/mm/dd');
_ele1.datepicker('setFormat','yyyy/mm/dd'); $('.datepicker').css('display', 'none');
} }
}); });
_ele2.datepicker("setDate", new Date().formatDateTime('yyyy/mm/dd')); _ele2.datepicker("setDate", new Date().formatDateTime('yyyy/mm/dd'));
......
...@@ -243,6 +243,7 @@ ...@@ -243,6 +243,7 @@
if (ev.date != undefined) { if (ev.date != undefined) {
ele2.datepicker('setEndDate', ev.date); ele2.datepicker('setEndDate', ev.date);
ele2.datepicker('setFormat', 'yyyy/mm/dd'); ele2.datepicker('setFormat', 'yyyy/mm/dd');
$('.datepicker').css('display', 'none');
} }
}); });
; ;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment