港大考勤改造：

考勤概况按照日期倒序

ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/components/sqlzdy/Service/SwdlServiceImpl.java

@@ -236,8 +236,17 @@ public class SwdlServiceImpl extends GenericProvider implements SwdlService {
            // int totalCount = updateDataTableDao.selectAttendance2DataCount(paramMap);
             String type = BeanUtils.isNotEmpty(paramMap.get("type"))?paramMap.get("type").toString():"";
             List<Map<String, Object>> data = calculateAttendance(list,type);
-            data = data.stream()
+/*            data = data.stream()
                     .sorted(Comparator.comparing(map2 -> (String) map2.get("user_id_")))
+                    .collect(Collectors.toList());*/
+            data = data.stream()
+                    .sorted(Comparator
+                            // 日期降序（最新的在前），null 放在最后
+                            .comparing((Map<String, Object> m) -> (String) m.get("ri_qi_"),
+                                    Comparator.nullsLast(Comparator.reverseOrder()))
+                            .thenComparing(m -> (String) m.get("user_id_"),
+                                    Comparator.nullsLast(Comparator.naturalOrder()))
+                    )
                     .collect(Collectors.toList());
             //分页
             int toIndex = Math.min(startPage + limit, data.size());

ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/components/sqlzdy/control/SwdlController.java

@@ -91,7 +91,7 @@ public class SwdlController extends GenericProvider {
         return result;
 
     }
-    @ApiOperation("考勤统计")
+    @ApiOperation("考勤概况统计")
     @PostMapping("/attendance2/queryData")
     APIResult queryAttendance2Data(@RequestBody(required = true) Map<String,Object> map) throws Exception{
         APIResult result = new APIResult<>();