日志汇总按日期降序排列

dao/src/main/resources/mapper/ItemUserLogMapper.xml

@@ -110,6 +110,7 @@
         <if test="itemUserLogVO!=null and itemUserLogVO.itemName!=null and itemUserLogVO.itemName!='' ">
             and i.name like concat ('%',#{itemUserLogVO.itemName},'%')
         </if>
+        order by iul.log_date DESC
     </select>
 
     <select id="detail" parameterType="java.lang.Long" resultType="com.dayou.vo.ItemUserLogVO">

domain/src/main/java/com/dayou/vo/ItemLogCollectVO.java

@@ -13,7 +13,7 @@ import java.util.List;
  * created with IntelliJ IDEA.
  */
 @Data
-public class ItemLogCollectVO {
+public class ItemLogCollectVO implements Comparable<ItemLogCollectVO>{
 
     /**
      * 用户id
@@ -34,4 +34,9 @@ public class ItemLogCollectVO {
      * 日志列表
      */
     private List<ItemUserLogVO> logs;
+
+    @Override
+    public int compareTo(ItemLogCollectVO o) {
+        return o.getLogDate().compareTo(this.getLogDate());
+    }
 }

service/src/main/java/com/dayou/service/impl/ItemUserLogServiceImpl.java

@@ -66,7 +66,7 @@ public class ItemUserLogServiceImpl extends ServiceImpl<ItemUserLogMapper, ItemU
     @Override
     public List<ItemLogCollectVO> logCollect(Long departmentId, Boolean scope,Long itemId) {
         List<ItemUserLogVO> logList = new ArrayList<>();
-        List<ItemLogCollectVO> result = new LinkedList<>();
+        List<ItemLogCollectVO> result = new ArrayList<>();
         if (scope){
             Long userId = LoginContext.getUserId();
             logList = itemUserLogMapper.logListByUserId(userId,itemId);
@@ -86,6 +86,7 @@ public class ItemUserLogServiceImpl extends ServiceImpl<ItemUserLogMapper, ItemU
                 result.add(itemLogCollectVO);
             }
         }
+        Collections.sort(result);
         return result;
     }