feat:修改人情事件分页列表和删除接口

src/main/java/com/anyway/favor/controller/FavorController.java

@@ -1,8 +1,8 @@
 package com.anyway.favor.controller;
 
-import com.anyway.favor.model.dto.FavorDto;
 import com.anyway.favor.model.Favor;
 import com.anyway.favor.model.User;
+import com.anyway.favor.model.dto.FavorDto;
 import com.anyway.favor.service.FavorService;
 import com.anyway.util.PageQuery;
 import com.anyway.util.R;
@@ -11,6 +11,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -61,19 +62,18 @@ public class FavorController {
      * @param pageQuery
      * @return
      */
-    @ResponseBody
-    @RequestMapping("/listPage")
+    @GetMapping("/listPage")
     public R<List<Favor>> listPage(@RequestBody PageQuery<Map<String, Object>> pageQuery) {
         User currentUser = SessionUtils.currentUser();
-        Map<String, Object> mapCondition = pageQuery.getTerms();
+        Map<String, Object> mapCondition = pageQuery.getTerms(new HashMap<>());
         //查询和当前登录用户相关的人员
-        mapCondition.put("relatedId", currentUser.getId());
+        mapCondition.put("createBy", currentUser.getId());
         List<Favor> favorList = favorService.findPage(pageQuery);
         return R.page(favorList, pageQuery.getPage());
     }
 
     /**
-     * 跳转人情详情页面
+     * 人情事件详情
      *
      * @return
      */
@@ -89,7 +89,7 @@ public class FavorController {
      * @return
      */
     @PostMapping("/delete/{id}")
-    public R delete(@PathVariable Long id) {
+    public R<Boolean> delete(@PathVariable Long id) {
         boolean b = favorService.deleteById(id);
         return b ? R.ok() : R.fail("删除失败");
     }

src/main/java/com/anyway/favor/model/BaseModel.java

@@ -1,5 +1,6 @@
 package com.anyway.favor.model;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -15,12 +16,14 @@ import java.util.Date;
 @Getter
 public class BaseModel {
     /** 创建时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd hh:mm:ss", timezone = "GMT+8")
     private Date createTime;
 
     /** 创建者 */
     private Long createBy;
 
     /** 修改时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd hh:mm:ss", timezone = "GMT+8")
     private Date modifyTime;
 
     /** 修改者 */

src/main/java/com/anyway/favor/model/dto/FavorDto.java

@@ -25,7 +25,10 @@ public class FavorDto extends Favor {
 
     /** 人情明细 */
     List<FavorItemDto> favorItemList;
-
+    /**
+     * 初始化人情明细
+     * @param favorItemList
+     */
     public void initFavorItemList(List<FavorItem> favorItemList) {
         if (this.favorItemList == null) {
             this.favorItemList = new ArrayList<>();

src/main/java/com/anyway/favor/service/impl/FavorServiceImpl.java

@@ -44,9 +44,9 @@ public class FavorServiceImpl implements FavorService {
 
     @Override
     public List<Favor> findPage(PageQuery<Map<String, Object>> pageQuery) {
-        PageUtils.startPage(pageQuery);
+        PageUtils.startPage(pageQuery.getPage());
         List<Favor> favorList = favorDao.findByCondition(pageQuery.getTerms());
-        PageUtils.setPageTotal(favorList, pageQuery);
+        PageUtils.setPageTotal(favorList, pageQuery.getPage());
         return favorList;
     }
 
@@ -165,6 +165,7 @@ public class FavorServiceImpl implements FavorService {
         return favorDto;
     }
 
+    @Transactional
     @Override
     public boolean deleteById(Long id) {
         int i = favorDao.deleteById(id);

src/main/resources/mapper/FavorMapper.xml

@@ -17,7 +17,7 @@
             <include refid="allColumns" />,
             concat(p.name, '（', p.call_name, '）') as person_name
         FROM t_favor f
-        LEFT JOIN t_person p ON p.id=f.person_id
+        LEFT JOIN t_person p ON p.id=f.hold_person_id
         WHERE 1 = 1
         <if test="holdDate != null">
             AND f.hold_date = #{holdDate}
@@ -85,4 +85,4 @@
         DELETE FROM t_favor WHERE id = #{id}
     </delete>
 
-</mapper>
+</mapper>