From 39a5398c9939c8388dbf6647a31b160c2855b859 Mon Sep 17 00:00:00 2001 From: quyixiao <2621048238@qq.com> Date: Tue, 27 Oct 2020 12:05:23 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ResultRecordController.java | 14 +++++ .../com/lz/modules/app/dto/RecordListDto.java | 8 +++ .../app/impl/ResultRecordServiceImpl.java | 63 ++++++++----------- 3 files changed, 48 insertions(+), 37 deletions(-) create mode 100644 src/main/java/com/lz/modules/app/dto/RecordListDto.java 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 1bda4bab..59a914c1 100644 --- a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java +++ b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java @@ -4,6 +4,7 @@ import com.lz.common.emun.WorkMsgTypeEnum; import com.lz.common.utils.*; import com.lz.modules.app.dto.ApprovalDto; import com.lz.modules.app.dto.DepartmentsDto; +import com.lz.modules.app.dto.RecordListDto; import com.lz.modules.app.dto.StaffDepartmentDto; import com.lz.modules.app.entity.DepartmentsStaffRelateEntity; import com.lz.modules.app.entity.StaffEntity; @@ -662,4 +663,17 @@ public class ResultRecordController extends AbstractController { } + + /** + * 删除 + */ + // http://localhost:8080/lz_management/user/lzresultrecord/new/resultRecordList + @RequestMapping("/new/resultRecordList") + public R newResultRecordList(RecordListDto recordListDto) { + + + return null; + } + + } diff --git a/src/main/java/com/lz/modules/app/dto/RecordListDto.java b/src/main/java/com/lz/modules/app/dto/RecordListDto.java new file mode 100644 index 00000000..d7e5c896 --- /dev/null +++ b/src/main/java/com/lz/modules/app/dto/RecordListDto.java @@ -0,0 +1,8 @@ +package com.lz.modules.app.dto; + +import lombok.Data; + +@Data +public class RecordListDto { + private Long loginUserId; +} 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 5eb85d14..132cac25 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 @@ -68,6 +68,8 @@ public class ResultRecordServiceImpl extends ServiceImpl flowApprovalRoles =flowApprovalRoleService.selectFlowApprovalRoleList(flowIds); - int i = 0 ; - DepartmentsStaffRelateEntity relateEntity = departmentsStaffRelateService.selectLastDepartmentByStaffId(resultRecord.getStaffId()); - Map map = departmentsService.selectUserAllDepartmentInFo(relateEntity.getDepartmentId()); + int i = 0; List flowRecords = new ArrayList<>(); - for(FlowApprovalRole flowApprovalRole:flowApprovalRoles){ + for (FlowApprovalRole flowApprovalRole : flowApprovalRoles) { FlowRecord flowRecord = new FlowRecord(); flowRecord.setRecordId(resultRecord.getId()); StaffEntity staffEntity = new StaffEntity(); - if(FlowApprovalRoleTypeEnums.ME.getType().equals(flowApprovalRole.getType())){ - staffEntity = staffService.selectStaffById(resultRecord.getStaffId()); - }else if(FlowApprovalRoleTypeEnums.STAFF.getType().equals(flowApprovalRole.getType())){ + if (FlowApprovalRoleTypeEnums.ME.getType().equals(flowApprovalRole.getType())) { + staffEntity = staffService.selectStaffById(resultRecord.getStaffId()); + } else if (FlowApprovalRoleTypeEnums.STAFF.getType().equals(flowApprovalRole.getType())) { staffEntity = staffService.selectStaffById(flowApprovalRole.getApprovalId()); - }else if(FlowApprovalRoleTypeEnums.ONE_SUPPER.getType().equals(flowApprovalRole.getType())){ - staffEntity = getDepartmentStaff(map,1); - }else if(FlowApprovalRoleTypeEnums.TWO_SUPPER.getType().equals(flowApprovalRole.getType())){ - staffEntity = getDepartmentStaff(map,2); - }else if(FlowApprovalRoleTypeEnums.THREE_SUPPER.getType().equals(flowApprovalRole.getType())){ - staffEntity = getDepartmentStaff(map,3); - }else if(FlowApprovalRoleTypeEnums.FOUR_SUPPER.getType().equals(flowApprovalRole.getType())){ - staffEntity = getDepartmentStaff(map,4); - }else if(FlowApprovalRoleTypeEnums.FOUR_SUPPER.getType().equals(flowApprovalRole.getType())){ - staffEntity = getDepartmentStaff(map,5); + } else if (FlowApprovalRoleTypeEnums.ONE_SUPPER.getType().equals(flowApprovalRole.getType())) { + staffEntity = getDepartmentStaff(resultRecord.getStaffId(), 1); + } else if (FlowApprovalRoleTypeEnums.TWO_SUPPER.getType().equals(flowApprovalRole.getType())) { + staffEntity = getDepartmentStaff(resultRecord.getStaffId(), 2); + } else if (FlowApprovalRoleTypeEnums.THREE_SUPPER.getType().equals(flowApprovalRole.getType())) { + staffEntity = getDepartmentStaff(resultRecord.getStaffId(), 3); + } else if (FlowApprovalRoleTypeEnums.FOUR_SUPPER.getType().equals(flowApprovalRole.getType())) { + staffEntity = getDepartmentStaff(resultRecord.getStaffId(), 4); + } else if (FlowApprovalRoleTypeEnums.FOUR_SUPPER.getType().equals(flowApprovalRole.getType())) { + staffEntity = getDepartmentStaff(resultRecord.getStaffId(), 5); } flowRecord.setApprovalStaffName(staffEntity.getName()); flowRecord.setApprovalStaffId(staffEntity.getId()); - flowRecord.setFlowName(getFlow(flows,flowApprovalRole.getFlowId()).getOptDesc()); + flowRecord.setFlowName(getFlow(flows, flowApprovalRole.getFlowId()).getOptDesc()); flowRecord.setRecordStaffId(resultRecord.getStaffId()); flowRecord.setFlowId(flowApprovalRole.getFlowId()); String staffRole = StaffRoles.getStaffRole(staffEntity.getId(), StringUtil.strToLongs(flowApprovalRole.getRoleId())); - if(i == 0 ){ + if (i == 0) { flowRecord.setStatus(FlowRecordStatusEnums.CURRENT_FLOW_STATUS.getStatus()); resultRecord.setFlowStaffIdRole(staffRole); FlowChart flowChart = flowService.selectFlowChartByChartId(flowRecord.getFlowId()); resultRecord.setFlowProcess(flowChart.getFlowProcess()); - }else{ + } else { flowRecord.setStatus(FlowRecordStatusEnums.UN_TO_STATUS.getStatus()); } flowRecord.setFlowStaffIdRole(staffRole); flowRecord.setFlowIndex(flowApprovalRole.getStepIndex()); flowRecord.setType(flowApprovalRole.getStepType()); //步骤类型0：依次，1：或签（同时通知，一人通过或拒绝即可），2会签（同时通知，所有人同意才可） - i ++; + i++; flowRecords.add(flowRecord); } flowRecordService.insertFlowRecords(flowRecords); @@ -849,7 +849,6 @@ public class ResultRecordServiceImpl extends ServiceImpl map, int level) { - for (int i = 1; i < 6; i++) { - String deparment = map.get("dd" + i ); - if (StringUtil.isNotBlank(deparment)) { - DepartmentsStaffRelateEntity departmentsStaffRelateEntity = departmentsStaffRelateService.selectDepartmentByDepartmentId(deparment); - if (departmentsStaffRelateEntity != null) { - StaffEntity staffEntity = staffService.selectStaffById(departmentsStaffRelateEntity.getStaffId()); - if (level == i) { - return staffEntity; - } - } - } + public StaffEntity getDepartmentStaff(Long staffId, int level) { + DepartManagers departManagers = staffService.findLeader( staffId, level); + List staffEntities = departManagers.getManagers(); + if(CollectionUtils.isNotEmpty(staffEntities)){ + return staffEntities.get(0); } return new StaffEntity();