Browse Source

修改大事件和家族园地模块

liuhj 4 years ago
parent
commit
b929aafb17

+ 3 - 0
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TbFamilyGardenController.java

@@ -2,6 +2,7 @@ package com.ruoyi.web.controller.api;
 
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 
 
+import java.util.Date;
 import java.util.List;
 import java.util.List;
 import java.util.Arrays;
 import java.util.Arrays;
 
 
@@ -88,6 +89,8 @@ public class TbFamilyGardenController extends BaseController {
     @Log(title = "家族园地" , businessType = BusinessType.INSERT)
     @Log(title = "家族园地" , businessType = BusinessType.INSERT)
     @PostMapping
     @PostMapping
     public AjaxResult add(@RequestBody TbFamilyGarden tbFamilyGarden) {
     public AjaxResult add(@RequestBody TbFamilyGarden tbFamilyGarden) {
+        Date date = new Date();
+        tbFamilyGarden.setCreateTime(date);
         return toAjax(iTbFamilyGardenService.save(tbFamilyGarden) ? 1 : 0);
         return toAjax(iTbFamilyGardenService.save(tbFamilyGarden) ? 1 : 0);
     }
     }
 
 

+ 1 - 0
ruoyi-system/src/main/java/com/ruoyi/app/domain/TbFamilyGarden.java

@@ -67,6 +67,7 @@ public class TbFamilyGarden implements Serializable {
 
 
     /** 创建时间 */
     /** 创建时间 */
     @ApiModelProperty(value="创建时间")
     @ApiModelProperty(value="创建时间")
+    @JsonFormat(locale="zh", timezone="GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     private Date createTime;
     private Date createTime;
 
 
     /** 更新者 */
     /** 更新者 */

+ 1 - 1
ruoyi-system/src/main/java/com/ruoyi/app/service/impl/TbFamilyEventsServiceImpl.java

@@ -27,7 +27,7 @@ public class TbFamilyEventsServiceImpl extends ServiceImpl<TbFamilyEventsMapper,
 
 
     @Override
     @Override
     public List<TbFamilyEvents> queryList(TbFamilyEvents  entity) {
     public List<TbFamilyEvents> queryList(TbFamilyEvents  entity) {
-        LambdaQueryWrapper<TbFamilyEvents> lqw = new LambdaQueryWrapper<TbFamilyEvents>();
+        LambdaQueryWrapper<TbFamilyEvents> lqw = new LambdaQueryWrapper<TbFamilyEvents>().orderByDesc(TbFamilyEvents::getCreateTime);
         if (entity.getFamilyId() != null){
         if (entity.getFamilyId() != null){
             lqw.eq(TbFamilyEvents::getFamilyId ,entity.getFamilyId());
             lqw.eq(TbFamilyEvents::getFamilyId ,entity.getFamilyId());
         }
         }

+ 2 - 1
ruoyi-system/src/main/java/com/ruoyi/app/service/impl/TbFamilyGardenServiceImpl.java

@@ -2,6 +2,7 @@ package com.ruoyi.app.service.impl;
 
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.ruoyi.app.domain.TbFamily;
 import com.ruoyi.app.domain.TbFamily;
+import com.ruoyi.app.domain.TbFamilyEvents;
 import com.ruoyi.app.service.ITbFamilyService;
 import com.ruoyi.app.service.ITbFamilyService;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -27,7 +28,7 @@ public class TbFamilyGardenServiceImpl extends ServiceImpl<TbFamilyGardenMapper,
 
 
     @Override
     @Override
     public List<TbFamilyGarden> queryList(TbFamilyGarden  entity) {
     public List<TbFamilyGarden> queryList(TbFamilyGarden  entity) {
-        LambdaQueryWrapper<TbFamilyGarden> lqw = new LambdaQueryWrapper<TbFamilyGarden>();
+        LambdaQueryWrapper<TbFamilyGarden> lqw = new LambdaQueryWrapper<TbFamilyGarden>().orderByDesc(TbFamilyGarden::getCreateTime);
         if (entity.getFamilyId() != null){
         if (entity.getFamilyId() != null){
             lqw.eq(TbFamilyGarden::getFamilyId ,entity.getFamilyId());
             lqw.eq(TbFamilyGarden::getFamilyId ,entity.getFamilyId());
         }
         }