修改api家族相册按时间分组返回

ruoyi-app/src/main/java/com/ruoyi/app/controller/FamilyAlbumController.java

@@ -13,6 +13,7 @@ import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.model.LoginUser;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.ServletUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
@@ -30,9 +31,7 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 import springfox.documentation.annotations.ApiIgnore;
 
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
 
 /**
  * 家族相簿
@@ -126,13 +125,26 @@ public class FamilyAlbumController extends AppBaseController {
             @ApiImplicitParam(name = "pageSize", value = "每页行数",paramType="query")
     })
     @GetMapping("/photo/list")
-    public TableDataInfo photoList(TbFamilyPhoto tbFamilyPhoto)
+    public AjaxResult photoList(TbFamilyPhoto tbFamilyPhoto)
     {
         ValidatorUtils.validateEntity(tbFamilyPhoto);
 
-        startPage();
+        //startPage();
         List<TbFamilyPhoto> list = iTbFamilyPhotoService.queryList(tbFamilyPhoto);
-        return getDataTable(list);
+
+        Map<String,List<TbFamilyPhoto>> retData = new HashMap<>();
+        //进行日期分组返回
+        for (TbFamilyPhoto item:list){
+            String code = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD,item.getCreateTime());
+            if (retData.containsKey(code)){
+                retData.get(code).add(item);
+            }else{
+                List<TbFamilyPhoto> val = new ArrayList<>();
+                val.add(item);
+                retData.put(code,val);
+            }
+        }
+        return AjaxResult.success(retData);
     }
 
 

ruoyi-system/src/main/java/com/ruoyi/app/family/photo/service/impl/TbFamilyPhotoServiceImpl.java

@@ -55,6 +55,8 @@ public class TbFamilyPhotoServiceImpl extends ServiceImpl<TbFamilyPhotoMapper, T
         if (StringUtils.isNotBlank(entity.getStatus())){
             lqw.eq(TbFamilyPhoto::getStatus ,entity.getStatus());
         }
+        //时间倒序
+        lqw.orderByDesc(TbFamilyPhoto::getCreateTime);
 
         List<TbFamilyPhoto> list = this.list(lqw);