整改清单报表

business-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ZhcxProjectManageServiceImpl.java

@@ -163,6 +163,8 @@ public class ZhcxProjectManageServiceImpl extends ServiceImpl<ZhcxProjectManageD
                 wrapper.eq("PRJID", rectifyDos.get(0).getPrjid());
                 wrapper.isNotNull("DEPTID");
                 wrapper.isNotNull("STATUS");
+                wrapper.orderByAsc("FIRSTDEPTID");
+                //wrapper.last("NULLS LAST");
                 List<ZhcxProjectRectifyMachineDo> list = projectRectifyMachineService.list(wrapper);
                 //根据施工部门分组
                 Map<String, List<ZhcxProjectRectifyMachineDo>> groupDeptList
@@ -211,6 +213,7 @@ public class ZhcxProjectManageServiceImpl extends ServiceImpl<ZhcxProjectManageD
                     rectifyDto.setData(rectifyMachineDtoList);
                     rectifyDtoList.add(rectifyDto);
                 });
+                rectifyDtoList.sort(Comparator.comparing(RectifyDto::getFirstdeptid,Comparator.nullsLast(String::compareTo)));
                 rectifyReportDto.setData(rectifyDtoList);
                 return R.ok(rectifyReportDto);
             }