|
@@ -55,7 +55,9 @@ public class DepartmentProfitFileServiceImpl extends ServiceImpl<DepartmentProfi
|
|
|
Page<FileRecord> pages = fileRecordService.page(profitFilePage, new QueryWrapper<FileRecord>()
|
|
|
.lambda()
|
|
|
.eq(FileRecord::getHospId, hospId).eq(FileRecord::getFileSource, NumberConstant.ZERO)
|
|
|
- .eq(StrUtil.isNotBlank(date), FileRecord::getDateYear, dateYear).eq(StrUtil.isNotBlank(date), FileRecord::getDateMonth, month));
|
|
|
+ .eq(StrUtil.isNotBlank(date), FileRecord::getDateYear, dateYear)
|
|
|
+ .eq(StrUtil.isNotBlank(date), FileRecord::getDateMonth, month)
|
|
|
+ .orderByDesc(FileRecord::getCreateTime));
|
|
|
List<FileRecord> records = pages.getRecords();
|
|
|
List<FileRecordDepartmentVO> departmentProfitFileVOList = BeanUtil.convertList(records, FileRecordDepartmentVO.class);
|
|
|
departmentProfitFileVOList.forEach(i->{
|