wulin/wl_management
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

提交悠

Browse Source
This commit is contained in:
quyixiao 2020-11-03 15:30:35 +08:00
parent 491f31797d
commit d31cc2fec7
4 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/lz/modules/app/controller/ResultRecordController.java
View File

@ -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 ){

7
src/main/java/com/lz/modules/sys/entity/app/ResultComment.java
View File

@ -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

5
src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java
View File

@ -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);

2
src/main/resources/mapper/app/ResultCommentMapper.xml
View File

@ -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">