From a627676d60a7f3bc1fbc4b08b6347069ce02b852 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=9C=E5=BB=BA=E8=B6=85?= <3182967682@qq.com>
Date: Wed, 4 Nov 2020 10:58:01 +0800
Subject: [PATCH] fix
---
.../java/com/lz/modules/performance/dto/TaskListDto.java | 4 +++-
.../performance/service/impl/AssessServiceImpl.java | 7 ++++++-
src/main/resources/mapper/flow/FlowRecordMapper.xml | 4 ++--
3 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/lz/modules/performance/dto/TaskListDto.java b/src/main/java/com/lz/modules/performance/dto/TaskListDto.java
index 4d68962f..e8cdae92 100644
--- a/src/main/java/com/lz/modules/performance/dto/TaskListDto.java
+++ b/src/main/java/com/lz/modules/performance/dto/TaskListDto.java
@@ -18,11 +18,13 @@ public class TaskListDto {
private Long currentApprovalStaffId;
- private String monthTime;
+ private Long startId;
private Date gmtModified;
private int flowProcess;
private int type;
+
+ private String flowName;
}
diff --git a/src/main/java/com/lz/modules/performance/service/impl/AssessServiceImpl.java b/src/main/java/com/lz/modules/performance/service/impl/AssessServiceImpl.java
index 85e7b4a5..140486a6 100644
--- a/src/main/java/com/lz/modules/performance/service/impl/AssessServiceImpl.java
+++ b/src/main/java/com/lz/modules/performance/service/impl/AssessServiceImpl.java
@@ -6,6 +6,7 @@ import com.lz.common.utils.PageUtils;
import com.lz.common.utils.StringUtil;
import com.lz.modules.app.entity.StaffEntity;
import com.lz.modules.app.service.StaffService;
+import com.lz.modules.flow.entity.FlowStart;
import com.lz.modules.flow.entity.StaffRole;
import com.lz.modules.flow.entity.StaffRoleDepartment;
import com.lz.modules.flow.service.*;
@@ -48,6 +49,8 @@ public class AssessServiceImpl implements AssessService {
private StaffRoleEvaluationGroupService staffRoleEvaluationGroupService;
@Autowired
private StaffRoleService staffRoleService;
+ @Autowired
+ private FlowStartService flowStartService;
@Override
public PageUtils userTaskList(AssessTaskReq req,Long userId) {
@@ -66,8 +69,10 @@ public class AssessServiceImpl implements AssessService {
if(taskListDto.getStaffId().equals(taskListDto.getCurrentApprovalStaffId())){
name = "您";
}
+ FlowStart start = flowStartService.selectFlowStartById(taskListDto.getStartId());
//根据状态拼接文案
- res.setTitle(name + "的" + taskListDto.getMonthTime() + "绩效考核 ");
+ String startName = start == null ? "" : start.getName();
+ res.setTitle(name + "的" + startName + "需您" + taskListDto.getFlowName());
res.setTime(DateUtils.format(taskListDto.getGmtModified(),DateUtils.DATE_TIME_PATTERN));
//跳转绩效详情页
res.setRecordId(taskListDto.getRecordId());
diff --git a/src/main/resources/mapper/flow/FlowRecordMapper.xml b/src/main/resources/mapper/flow/FlowRecordMapper.xml
index e0c2b133..3658634e 100644
--- a/src/main/resources/mapper/flow/FlowRecordMapper.xml
+++ b/src/main/resources/mapper/flow/FlowRecordMapper.xml
@@ -172,7 +172,7 @@