Преглед на файлове

Merge branch 'master' of huangrui/CostAccount into dev

lijiaxi преди 4 години
родител
ревизия
67260d6a3c
променени са 1 файла, в които са добавени 3 реда и са изтрити 1 реда
  1. 3 1
      src/main/java/com/imed/costaccount/service/impl/DepartmentProfitFileServiceImpl.java

+ 3 - 1
src/main/java/com/imed/costaccount/service/impl/DepartmentProfitFileServiceImpl.java

@@ -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->{