merge

2018-03-19 21:51:05 +08:00
parent 0077cb9a13
commit 8dae8694c2
2 changed files with 5 additions and 6 deletions
@@ -8,10 +8,9 @@ package com.xwbing.demo;
 */
 public class Ademo {
    public static void main(String[] args) {
-        String a="aaaaa";
-        String b="bbbbb";
-        String aa = aa(a);
-        System.out.println(aa);
+      double a=10;
+      a=a+a*0.2;
+        System.out.println(a);

    }
    public static String aa(String aa){
@@ -61,12 +61,12 @@ public class SysUserLoginInOutService {
        List<SysUserLoginInOut> list = loginInOutRepository.getByInoutType(inout);
        if (CollectionUtils.isNotEmpty(list)) {
            if (MapUtils.isNotEmpty(userMap)) {
-                list.forEach(inOut -> {
+                list=list.stream().sorted((o1, o2) -> o2.getCreateTime().compareTo(o1.getCreateTime())).peek(inOut -> {
                    inOut.setUserIdName(userMap.get(inOut.getUserId()).getName());//用户姓名
                    inOut.setRecordTime(DateUtil2.dateToStr(inOut.getCreateTime(), DateUtil2.YYYY_MM_DD_HH_MM_SS));//记录时间
                    CommonEnum.LoginInOutEnum inOutEnum = Arrays.stream(CommonEnum.LoginInOutEnum.values()).filter(obj -> obj.getValue() == inout).findFirst().get();//登录登出
                    inOut.setInoutTypeName(inOutEnum.getName());
-                });
+                }).collect(Collectors.toList());
            }
        }
        return list;