From d31cc2fec76a7e3aa776482c7d4b4dfa960f0c0b Mon Sep 17 00:00:00 2001
From: quyixiao <2621048238@qq.com>
Date: Tue, 3 Nov 2020 15:30:35 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=82=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lz/modules/app/controller/ResultRecordController.java  | 3 ++-
 .../java/com/lz/modules/sys/entity/app/ResultComment.java  | 7 +++++++
 .../sys/service/app/impl/ResultRecordServiceImpl.java      | 5 +++++
 src/main/resources/mapper/app/ResultCommentMapper.xml      | 2 +-
 4 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java
index ff74be58..4f51d89e 100644
--- a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java
+++ b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java
@@ -254,6 +254,7 @@ public class ResultRecordController extends AbstractController {
         list.add(resultDetailService.getWenHuaJiaZhiGuaResult2());
         list.add(resultDetailService.getLastResult(resultRecord.getLastScore()));
         List<ResultComment> comments = resultCommentService.selectByRecordId(resultRecord.getId());
+
         if (CollectionUtils.isNotEmpty(comments)) {
             ResultDetailResp header = new ResultDetailResp();
             header.setCheckRange("领导");
@@ -987,7 +988,7 @@ public class ResultRecordController extends AbstractController {
     /**
      * 删除
      */
-    // http://localhost:8080/lz_management/user/lzresultrecord/new/resultRecordDetail?resultRecordId=322&loginUserId=313
+    // http://localhost:8080/lz_management/user/lzresultrecord/new/resultRecordDetail?resultRecordId=331&loginUserId=825
     @RequestMapping("/new/resultRecordDetail")
     public R newResultRecordList(RecordDetailDto recordDetailDto) {
         if(recordDetailDto.getLoginUserId() ==null && getUser() !=null ){
diff --git a/src/main/java/com/lz/modules/sys/entity/app/ResultComment.java b/src/main/java/com/lz/modules/sys/entity/app/ResultComment.java
index d9eff989..e0e6d0d2 100644
--- a/src/main/java/com/lz/modules/sys/entity/app/ResultComment.java
+++ b/src/main/java/com/lz/modules/sys/entity/app/ResultComment.java
@@ -1,4 +1,5 @@
 package com.lz.modules.sys.entity.app;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
@@ -6,6 +7,8 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import java.util.Date;
+import java.util.List;
+
 /**
 * <p>
 * </p>*业绩评论表
@@ -50,6 +53,10 @@ public class ResultComment implements java.io.Serializable {
     //操作名称
     @ApiModelProperty(value = "操作名称", name = "optDesc")
     private String optDesc;
+
+
+    @TableField(exist=false)
+    private String avatar;
     /**
      *  
      * @return
diff --git a/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java b/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java
index 9603f5bd..74b1017f 100644
--- a/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java
+++ b/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java
@@ -1122,6 +1122,11 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
         end.setStatus(flag ? 1 : 0);
         flowRecordList.add(end);
         List<ResultComment> resultCommentList = resultCommentService.selectByRecordId(recordDetailDto.getResultRecordId());
+        for(ResultComment resultComment:resultCommentList){
+            StaffEntity staffEntity = staffService.selectStaffById(resultComment.getStaffId());
+            resultComment.setAvatar(staffEntity.getAvatar());
+        }
+
         Map<String,Integer> auth = new HashMap<>();
         auth.put("showScore",1);
         auth.put("showResult",1);
diff --git a/src/main/resources/mapper/app/ResultCommentMapper.xml b/src/main/resources/mapper/app/ResultCommentMapper.xml
index b26c1b68..9a24a613 100644
--- a/src/main/resources/mapper/app/ResultCommentMapper.xml
+++ b/src/main/resources/mapper/app/ResultCommentMapper.xml
@@ -102,7 +102,7 @@
 
 
     <select id="selectByRecordId" resultType="com.lz.modules.sys.entity.app.ResultComment">
-        select * from lz_result_comment  where record_id=#{recordId} and is_delete = 0
+        select * from lz_result_comment  where record_id=#{recordId} and is_delete = 0 order by id desc
     </select>
 
     <select id="selectLastComment" resultType="com.lz.modules.sys.entity.app.ResultComment">