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

反查

Browse Source
This commit is contained in:
dy 2025-08-21 11:30:38 +08:00
parent 5c9672dc18
commit eba9e78695
5 changed files with 50 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ruoyi-modules/Property/src/main/java/org/dromara/property/domain/AttendanceUserGroup.java
View File

@ -39,20 +39,20 @@ public class AttendanceUserGroup extends TenantEntity {
*/
private Long employeeId;
/**
* 员工姓名
*/
private String employeeName;
// /**
// * 员工姓名
// */
// private String employeeName;
/**
* 部门ID
*/
private Long deptId;
/**
* 部门名称
*/
private String deptName;
// /**
// * 部门名称
// */
// private String deptName;
/**
* 开始日期

16
ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/attendanceBo/AttendanceUserGroupBo.java
View File

@ -37,20 +37,20 @@ public class AttendanceUserGroupBo extends BaseEntity {
*/
private Long employeeId;
/**
* 员工姓名
*/
private String employeeName;
// /**
// * 员工姓名
// */
// private String employeeName;
/**
* 部门ID
*/
private Long deptId;
/**
* 部门名称
*/
private String deptName;
// /**
// * 部门名称
// */
// private String deptName;
/**
* 开始日期

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

@ -5,6 +5,7 @@ import cn.idev.excel.annotation.ExcelProperty;
import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data;
import org.dromara.property.domain.*;
import org.dromara.system.api.domain.vo.RemoteDeptVo;
import org.dromara.system.api.domain.vo.RemoteUserVo;
import org.springframework.format.annotation.DateTimeFormat;
@ -46,11 +47,11 @@ public class AttendanceUserGroupVo implements Serializable {
@ExcelProperty(value = "员工ID")
private Long employeeId;
/**
* 员工姓名
*/
@ExcelProperty(value = "员工姓名")
private String employeeName;
// /**
// * 员工姓名
// */
// @ExcelProperty(value = "员工姓名")
// private String employeeName;
/**
* 部门ID
@ -58,11 +59,11 @@ public class AttendanceUserGroupVo implements Serializable {
@ExcelProperty(value = "部门ID")
private Long deptId;
/**
* 部门名称
*/
@ExcelProperty(value = "部门名称")
private String deptName;
// /**
// * 部门名称
// */
// @ExcelProperty(value = "部门名称")
// private String deptName;
/**
* 开始日期
@ -94,4 +95,8 @@ public class AttendanceUserGroupVo implements Serializable {
private List<AttendanceArea> attendanceAreaList;
private RemoteDeptVo remoteDeptVo;
private String DeptName;
}

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

@ -17,7 +17,9 @@ import org.dromara.property.domain.vo.attendanceVo.AttendanceArrangementVo;
import org.dromara.property.domain.vo.attendanceVo.AttendanceUserGroupVo;
import org.dromara.property.mapper.attendanceMapper.*;
import org.dromara.property.service.attendanceService.IAttendanceArrangementService;
import org.dromara.system.api.RemoteDeptService;
import org.dromara.system.api.RemoteUserService;
import org.dromara.system.api.domain.vo.RemoteDeptVo;
import org.dromara.system.api.domain.vo.RemoteUserVo;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@ -60,6 +62,9 @@ public class AttendanceArrangementServiceImpl implements IAttendanceArrangementS
@DubboReference
private RemoteUserService remoteUserService;
@DubboReference
private RemoteDeptService remoteDeptService;
/**
* 根据id查询排班详情
*
@ -88,8 +93,10 @@ public class AttendanceArrangementServiceImpl implements IAttendanceArrangementS
//获取deptId
Long deptId = userGroup.getDeptId();
//根据deptId查询出部门名称
String deptName = remoteUserService.selectDeptNamesByIds(Arrays.asList(deptId)).get(deptId);
userGroup.setDeptName(deptName);
RemoteDeptVo remoteDeptVo = remoteDeptService.selectDeptVoById(deptId);
// String deptName = remoteUserService.selectDeptNamesByIds(Arrays.asList(deptId)).get(deptId);
// userGroup.setRemoteDeptVo(remoteDeptVo);
userGroup.setDeptName(remoteDeptVo.getDeptName());
});
//将排班人员信息添加到排班信息中
vo.setUserGroupList(userGroupList);
@ -154,8 +161,10 @@ public class AttendanceArrangementServiceImpl implements IAttendanceArrangementS
//获取deptId
Long deptId = userGroup.getDeptId();
//根据deptId查询出部门名称
String deptName = remoteUserService.selectDeptNamesByIds(Arrays.asList(deptId)).get(deptId);
userGroup.setDeptName(deptName);
// String deptName = remoteUserService.selectDeptNamesByIds(Arrays.asList(deptId)).get(deptId);
RemoteDeptVo remoteDeptVo = remoteDeptService.selectDeptVoById(deptId);
// userGroup.setRemoteDeptVo(remoteDeptVo);
remoteDeptVo.setDeptName(remoteDeptVo.getDeptName());
}
);
@ -286,7 +295,6 @@ public class AttendanceArrangementServiceImpl implements IAttendanceArrangementS
// int count = Math.toIntExact(scheduleCycleMapper.selectCount(Wrappers.<AttendanceScheduleCycle>lambdaQuery().eq(AttendanceScheduleCycle::getGroupId, groupId)));
//
//
// //todo: 匹配天数
//
//
// //取出attendanceScheduleCycle表中的天数

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

@ -175,8 +175,9 @@ public class AttendanceUserGroupServiceImpl implements IAttendanceUserGroupServi
RemoteUserVo remoteUserVo = remoteUserService.getUserInfoById(attendanceUserGroupVo.getEmployeeId());
attendanceUserGroupVo.setRemoteUserVo(remoteUserVo);
// todo 当表冗余了部门信息，以下反查操作可以去掉
RemoteDeptVo dept = remoteDeptService.selectDeptVoById(attendanceUserGroupVo.getDeptId());
attendanceUserGroupVo.setDeptName(dept.getDeptName());
String deptName = remoteDeptService.selectDeptVoById(attendanceUserGroupVo.getDeptId()).getDeptName();
// attendanceUserGroupVo.setRemoteDeptVo(dept);
attendanceUserGroupVo.setDeptName(deptName);
});
}
return attendanceUserGroupVos;
@ -208,8 +209,9 @@ public class AttendanceUserGroupServiceImpl implements IAttendanceUserGroupServi
Long deptId = vo.getDeptId();
String deptName = remoteUserService.selectDeptNamesByIds(Arrays.asList(deptId)).get(deptId);
vo.setDeptName(deptName);
RemoteDeptVo remoteDeptVo = remoteDeptService.selectDeptVoById(deptId);
// vo.setRemoteDeptVo(remoteDeptVo);
vo.setDeptName(remoteDeptVo.getDeptName());
//根据scheduleId查询出排班的详细信息
AttendanceArrangement attendanceArrangement = arrangementMapper.selectOne(Wrappers.<AttendanceArrangement>lambdaQuery().eq(AttendanceArrangement::getId, scheduleId));