diff --git a/src/main/java/com/lz/modules/app/entity/StaffSimpleInfo.java b/src/main/java/com/lz/modules/app/entity/StaffSimpleInfo.java index cb6203f2..86eb9f05 100644 --- a/src/main/java/com/lz/modules/app/entity/StaffSimpleInfo.java +++ b/src/main/java/com/lz/modules/app/entity/StaffSimpleInfo.java @@ -52,4 +52,8 @@ public class StaffSimpleInfo implements Serializable { private Long recordId; + + + + } diff --git a/src/main/java/com/lz/modules/job/business/DingtalkBusiness.java b/src/main/java/com/lz/modules/job/business/DingtalkBusiness.java index 73be5359..a7d96f1d 100644 --- a/src/main/java/com/lz/modules/job/business/DingtalkBusiness.java +++ b/src/main/java/com/lz/modules/job/business/DingtalkBusiness.java @@ -193,9 +193,17 @@ public class DingtalkBusiness { return sendWorkMSGByEntity(appid, fromStaffEntity, toStaffEntity, workMsgTypeEnum, "https://www.baidu.com"); } - public String sendWorkMSGWithAsyn(StaffSimpleInfo fromStaff, List toStaffids, int type) { - if(toStaffids.get(0).getEmployeeId() == null || toStaffids.get(0).getEmployeeId().length() == 0){ + + public String sendWorkMSGWithAsyn(Long resultRecordId , int type) { + + return null; + } + + + public String sendWorkMSGWithAsyn(StaffSimpleInfo fromStaff, List toStaffids, int type) { + + if (toStaffids.get(0).getEmployeeId() == null || toStaffids.get(0).getEmployeeId().length() == 0) { //查询第三方id List ids = toStaffids.stream().map(new Function() { @Override @@ -204,8 +212,8 @@ public class DingtalkBusiness { } }).collect(Collectors.toList()); List staffSimpleInfos = staffService.selectStaffSimpleInfos(ids); - Map map = toStaffids.stream().collect(Collectors.toMap(StaffSimpleInfo::getId, e->e)); - for (StaffSimpleInfo staff:staffSimpleInfos + Map map = toStaffids.stream().collect(Collectors.toMap(StaffSimpleInfo::getId, e -> e)); + for (StaffSimpleInfo staff : staffSimpleInfos ) { StaffSimpleInfo staff1 = map.get(staff.getId()); staff1.setEmployeeId(staff1.getEmployeeId()); 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 47263635..d8b372d2 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 @@ -793,14 +793,14 @@ public class ResultRecordServiceImpl extends ServiceImpl staffRoles= staffRoleService.selectAllStaffRoleByDepartmentLevel(Arrays.asList(new String[]{RoleEnums.MASTER_PM.getName(),RoleEnums.CHILD_PM.getName()})); for(StaffRole staffRole:staffRoles){ approvalStaff = staffService.selectStaffById(staffRole.getStaffId()); if(staffRole.getDepartmentId() ==0){ //如果是管理所有部门 - insertFlowRecord(flowRecord,approvalStaff,flows,flowApprovalRole,resultRecord,i); + insertFlowRecord(flowRecord,approvalStaff,flows,flowApprovalRole,resultRecord,i,1); }else{ DepartmentsStaffRelateEntity relateEntity = departmentsStaffRelateService.selectLastDepartmentByStaffId(resultRecord.getStaffId()); Map map = departmentsService.selectUserAllDepartmentIds(relateEntity.getDepartmentId()); @@ -814,33 +814,28 @@ public class ResultRecordServiceImpl extends ServiceImpl flows,FlowApprovalRole flowApprovalRole ,ResultRecord resultRecord,int i ){ - flowRecord.setApprovalStaffName(staffEntity.getName()); - flowRecord.setApprovalStaffId(staffEntity.getId()); + public void insertFlowRecord(FlowRecord flowRecord,StaffEntity approvalStaff,List flows,FlowApprovalRole flowApprovalRole ,ResultRecord resultRecord,int i,Integer stepType ){ + flowRecord.setApprovalStaffName(approvalStaff.getName()); + flowRecord.setApprovalStaffId(approvalStaff.getId()); flowRecord.setFlowName(getFlow(flows, flowApprovalRole.getFlowId()).getOptDesc()); flowRecord.setRecordStaffId(resultRecord.getStaffId()); flowRecord.setFlowId(flowApprovalRole.getFlowId()); FlowChart flowChart = flowService.selectFlowChartByChartId(flowApprovalRole.getFlowId()); flowRecord.setProcessId(flowChart.getProcessId()); flowRecord.setFlowProcess(flowChart.getFlowProcess()); - String staffRole = StaffRoles.getStaffRole(staffEntity.getId(), StringUtil.strToLongs(flowApprovalRole.getRoleId())); + String staffRole = StaffRoles.getStaffRole(approvalStaff.getId(), StringUtil.strToLongs(flowApprovalRole.getRoleId())); if (i == 0) { flowRecord.setStatus(FlowRecordStatusEnums.CURRENT_FLOW_STATUS.getStatus()); resultRecord.setFlowStaffIdRole(staffRole); @@ -850,7 +845,7 @@ public class ResultRecordServiceImpl extends ServiceImpl