by2025/SmartParks
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: by2025:2cc45acc3788fbf8d71c4d325662a63227de1305
Branches Tags
by2025:master
by2025:main
..
compare: by2025:2556be5019c87f4ce72fa60fcfb52ce0c2648a88
Branches Tags
by2025:master
by2025:main

No commits in common. "2cc45acc3788fbf8d71c4d325662a63227de1305" and "2556be5019c87f4ce72fa60fcfb52ce0c2648a88" have entirely different histories.
2cc45acc37 ... 2556be5019

3 changed files with 8 additions and 29 deletions
Show Stats Expand all files Collapse all files

2
ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/AttendanceUserGroupVo.java
View File

@ -89,7 +89,5 @@ public class AttendanceUserGroupVo implements Serializable {
private RemoteUserVo remoteUserVo;
private String deptName;
}

14
ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AttendanceArrangementServiceImpl.java
View File

@ -80,14 +80,11 @@ public class AttendanceArrangementServiceImpl implements IAttendanceArrangementS
List<AttendanceUserGroupVo> userGroupList = userGroupMapper.selectVoList(Wrappers.<AttendanceUserGroup>lambdaQuery().eq(AttendanceUserGroup::getScheduleId, id));
//查询所有的用户信息
userGroupList.forEach(userGroup -> {
// SysUserVo sysUserVo = sysUserService.selectUserById(userGroup.getEmployeeId());
// userGroup.setSysUser(sysUserVo);
RemoteUserVo userInfoById = remoteUserService.getUserInfoById(userGroup.getEmployeeId());
userGroup.setRemoteUserVo(userInfoById);
//获取deptId
Long deptId = userGroup.getDeptId();
//根据deptId查询出部门名称
String deptName = remoteUserService.selectDeptNamesByIds(Arrays.asList(deptId)).get(deptId);
userGroup.setDeptName(deptName);
});
//将排班人员信息添加到排班信息中
vo.setUserGroupList(userGroupList);
@ -131,11 +128,6 @@ public class AttendanceArrangementServiceImpl implements IAttendanceArrangementS
RemoteUserVo userInfoById = remoteUserService.getUserInfoById(userGroup.getEmployeeId());
userGroup.setRemoteUserVo(userInfoById);
//获取deptId
Long deptId = userGroup.getDeptId();
//根据deptId查询出部门名称
String deptName = remoteUserService.selectDeptNamesByIds(Arrays.asList(deptId)).get(deptId);
userGroup.setDeptName(deptName);
}
);

21
ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AttendanceUserGroupServiceImpl.java
View File

@ -15,14 +15,16 @@ import org.dromara.property.domain.constant.StatusConstant;
import org.dromara.property.domain.vo.AttendanceUserGroupVo;
import org.dromara.property.mapper.*;
import org.dromara.property.service.IAttendanceUserGroupService;
import org.dromara.system.api.RemoteDeptService;
import org.dromara.system.api.RemoteUserService;
import org.dromara.system.api.domain.vo.RemoteUserVo;
import org.springframework.stereotype.Service;
import java.time.LocalDate;
import java.time.temporal.ChronoUnit;
import java.util.*;
import java.util.Collection;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.stream.Collectors;
/**
@ -51,9 +53,6 @@ public class AttendanceUserGroupServiceImpl implements IAttendanceUserGroupServi
@DubboReference
private RemoteUserService remoteUserService;
@DubboReference
private RemoteDeptService remoteDeptService;
/**
* 查询排班明细
@ -178,20 +177,10 @@ public class AttendanceUserGroupServiceImpl implements IAttendanceUserGroupServi
Long scheduleId = vo.getScheduleId();
//根据employeeId查询出用户的详细信息
// SysUserVo sysUserVo = sysUserService.selectUserById(vo.getEmployeeId());
RemoteUserVo userInfoById = remoteUserService.getUserInfoById(vo.getEmployeeId());
vo.setRemoteUserVo(userInfoById);
Long deptId = vo.getDeptId();
String deptName = remoteUserService.selectDeptNamesByIds(Arrays.asList(deptId)).get(deptId);
vo.setDeptName(deptName);
// //通过employeeId查询出用户的部门信息
// String deptInfo = remoteDeptService.selectDeptNameByIds(String.valueOf(vo.getDeptId()));
// vo.setDeptName(deptInfo);
//根据scheduleId查询出排班的详细信息
AttendanceArrangement attendanceArrangement = arrangementMapper.selectOne(Wrappers.<AttendanceArrangement>lambdaQuery().eq(AttendanceArrangement::getId, scheduleId));
// 假设每个vo只有一个scheduleId