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-13 11:48:39 +08:00
commit eaa4fa541c
8 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/lz/modules/flow/dao/EvaluationGroupMapper.java
View File

@ -43,7 +43,7 @@ public interface EvaluationGroupMapper extends BaseMapper<EvaluationGroup> {
EvaluationGroup selectEvaluationGroupByName(@Param("name") String name);
void deleteByCopyIds(@Param("ids") List<Long> ids);
void deleteByCopyIds(@Param("ids") List<Long> ids,@Param("startId")Long startId);
List<Long> selectIdsByCopyIds(@Param("copyIds")String copyIds,@Param("startId")Long startId);

2
src/main/java/com/lz/modules/flow/service/EvaluationGroupService.java
View File

@ -52,7 +52,7 @@ public interface EvaluationGroupService extends IService<EvaluationGroup> {
//获取考核组里面所有参与的人员信息，去除重复，去除离职
List<StaffSimpleInfo> selectAllStaffSimpleInfoByGroupId(EvaluationGroup evaluationGroup);
void deleteByCopyIds(List<Long> ids);
void deleteByCopyIds(List<Long> ids,Long startId);
R checkStaff(CheckStaffReq checkStaffReq);

4
src/main/java/com/lz/modules/flow/service/impl/EvaluationGroupServiceImpl.java
View File

@ -311,8 +311,8 @@ public class EvaluationGroupServiceImpl extends ServiceImpl<EvaluationGroupMappe
@Override
public void deleteByCopyIds(List<Long> ids) {
evaluationGroupMapper.deleteByCopyIds(ids);
public void deleteByCopyIds(List<Long> ids,Long startId) {
evaluationGroupMapper.deleteByCopyIds(ids,startId);
}

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

@ -14,9 +14,9 @@ public class TaskListDto {
private Long recordId;
private Long staffId;
private Long recordStaffId;
private Long currentApprovalStaffId;
private Long approvalStaffId;
private Long startId;

3
src/main/java/com/lz/modules/performance/service/impl/AssessManagerServiceImpl.java
View File

@ -174,7 +174,7 @@ public class AssessManagerServiceImpl implements AssessManagerService {
List<String> ids = Arrays.asList(split);
List<Long> collect = ids.stream().map(s -> Long.valueOf(s)).collect(toList());
//删除副本组
evaluationGroupService.deleteByCopyIds(collect);
evaluationGroupService.deleteByCopyIds(collect,flowStart.getId());
}
resultRecordMapper.batchDeleteByStartId(flowStart.getId());
return ;
@ -260,6 +260,7 @@ public class AssessManagerServiceImpl implements AssessManagerService {
StartGroups startGroups = new StartGroups();
startGroups.setStartId(req.getStartId());
startGroups.setGroups(groupS);
log.info("添加人员初始化请求：" + JSON.toJSONString(startGroups));
R r = flowStartService.startStaffs(startGroups);
log.info("添加人员初始化返回：" + JSON.toJSONString(r));
return r;

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

@ -68,10 +68,10 @@ public class AssessServiceImpl implements AssessService {
List<TaskListDto> dtos = pageUtils.getList();
dtos.stream().forEach(taskListDto -> {
TaskListRes res = new TaskListRes();
StaffEntity staffEntity = staffService.selectStaffById(taskListDto.getStaffId());
StaffEntity staffEntity = staffService.selectStaffById(taskListDto.getRecordStaffId());
res.setAvatar(Optional.ofNullable(staffEntity.getAvatar()).orElse(StringUtil.EMPTY));
String name = staffEntity.getName();
if(taskListDto.getStaffId().equals(taskListDto.getCurrentApprovalStaffId())){
if(taskListDto.getRecordStaffId().equals(taskListDto.getApprovalStaffId())){
name = "您";
}
FlowStart start = flowStartService.selectFlowStartById(taskListDto.getStartId());

1
src/main/resources/mapper/flow/EvaluationGroupMapper.xml
View File

@ -141,6 +141,7 @@
<update id="deleteByCopyIds">
update lz_evaluation_group set is_delete = 1 where is_delete=0
and start_id = #{startId}
and copy_id in (
<foreach collection="ids" item="id" separator=",">
#{id}

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

@ -186,7 +186,7 @@
</select>
<select id="selectTodoTasksByApprovalStaffId" resultType="com.lz.modules.performance.dto.TaskListDto">
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
SELECT DISTINCT(record_id),f.flow_process,f.flow_name,f.approval_staff_id,f.record_staff_id,start_id,r.gmt_modified,f.type from lz_flow_record f
LEFT JOIN lz_result_record r
ON f.record_id = r.id
where f.is_delete=0 and r.is_delete=0