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

Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0

Browse Source
This commit is contained in:
wulin 2020-11-04 11:33:34 +08:00
commit dbad69aadc
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/lz/modules/performance/dto/TaskListDto.java
View File

@ -18,11 +18,13 @@ public class TaskListDto {
private Long currentApprovalStaffId; private Long currentApprovalStaffId;
private String monthTime; private Long startId;
private Date gmtModified; private Date gmtModified;
private int flowProcess; private int flowProcess;
private int type; private int type;
private String flowName;
} }

7
src/main/java/com/lz/modules/performance/service/impl/AssessServiceImpl.java
View File

@ -6,6 +6,7 @@ import com.lz.common.utils.PageUtils;
import com.lz.common.utils.StringUtil; import com.lz.common.utils.StringUtil;
import com.lz.modules.app.entity.StaffEntity; import com.lz.modules.app.entity.StaffEntity;
import com.lz.modules.app.service.StaffService; 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.StaffRole;
import com.lz.modules.flow.entity.StaffRoleDepartment; import com.lz.modules.flow.entity.StaffRoleDepartment;
import com.lz.modules.flow.service.*; import com.lz.modules.flow.service.*;
@ -48,6 +49,8 @@ public class AssessServiceImpl implements AssessService {
private StaffRoleEvaluationGroupService staffRoleEvaluationGroupService; private StaffRoleEvaluationGroupService staffRoleEvaluationGroupService;
@Autowired @Autowired
private StaffRoleService staffRoleService; private StaffRoleService staffRoleService;
@Autowired
private FlowStartService flowStartService;
@Override @Override
public PageUtils userTaskList(AssessTaskReq req,Long userId) { public PageUtils userTaskList(AssessTaskReq req,Long userId) {
@ -66,8 +69,10 @@ public class AssessServiceImpl implements AssessService {
if(taskListDto.getStaffId().equals(taskListDto.getCurrentApprovalStaffId())){ if(taskListDto.getStaffId().equals(taskListDto.getCurrentApprovalStaffId())){
name = "您"; 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.setTime(DateUtils.format(taskListDto.getGmtModified(),DateUtils.DATE_TIME_PATTERN));
//跳转绩效详情页 //跳转绩效详情页
res.setRecordId(taskListDto.getRecordId()); res.setRecordId(taskListDto.getRecordId());

4
src/main/resources/mapper/flow/FlowRecordMapper.xml
View File

@ -172,7 +172,7 @@
<select id="selectFinishTasksByApprovalStaffId" resultType="com.lz.modules.performance.dto.TaskListDto"> <select id="selectFinishTasksByApprovalStaffId" resultType="com.lz.modules.performance.dto.TaskListDto">
SELECT DISTINCT(record_id),f.flow_process,current_approval_staff_id,staff_id,month_time,r.gmt_modified,f.type from lz_flow_record f SELECT DISTINCT(record_id),f.flow_process,f.flow_name,current_approval_staff_id,staff_id,start_id,r.gmt_modified,f.type from lz_flow_record f
LEFT JOIN lz_result_record r LEFT JOIN lz_result_record r
ON f.record_id = r.id ON f.record_id = r.id
where f.is_delete=0 and r.is_delete=0 where f.is_delete=0 and r.is_delete=0
@ -182,7 +182,7 @@
</select> </select>
<select id="selectTodoTasksByApprovalStaffId" resultType="com.lz.modules.performance.dto.TaskListDto"> <select id="selectTodoTasksByApprovalStaffId" resultType="com.lz.modules.performance.dto.TaskListDto">
SELECT DISTINCT(record_id),f.flow_process,current_approval_staff_id,staff_id,month_time,r.gmt_modified,f.type from lz_flow_record f SELECT DISTINCT(record_id),f.flow_process,f.flow_name,current_approval_staff_id,staff_id,start_id,r.gmt_modified,f.type from lz_flow_record f
LEFT JOIN lz_result_record r LEFT JOIN lz_result_record r
ON f.record_id = r.id ON f.record_id = r.id
where f.is_delete=0 and r.is_delete=0 where f.is_delete=0 and r.is_delete=0