refactor(oa): 重命名请假请求VO类
- 将HrmLeaveReqVo重命名为HrmLeaveRequestVo - 更新MonthlyPerformanceReportVo中的属性类型引用 - 更新PerformanceReportMapper接口返回类型 - 更新MyBatis映射文件中的resultType配置 - 更新PerformanceReportServiceImpl中的导入和变量声明 - 修改buildSummary方法参数类型和循环遍历类型
This commit is contained in:
@@ -9,7 +9,7 @@ import java.util.Date;
|
||||
* 请假明细(来自 hrm_leave_req,关联 hrm_employee.user_id 映射到系统用户)
|
||||
*/
|
||||
@Data
|
||||
public class HrmLeaveReqVo {
|
||||
public class HrmLeaveRequestVo {
|
||||
|
||||
private Long bizId;
|
||||
private Long empId;
|
||||
@@ -27,7 +27,7 @@ public class MonthlyPerformanceReportVo {
|
||||
private List<SysOaAttendanceVo> attendanceDetails;
|
||||
|
||||
/** 明细:请假(hrm_leave_req) */
|
||||
private List<HrmLeaveReqVo> leaveDetails;
|
||||
private List<HrmLeaveRequestVo> leaveDetails;
|
||||
|
||||
/** 明细:负责人项目(sys_oa_project.functionary) */
|
||||
private List<SysOaProjectVo> responsibleProjects;
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package com.ruoyi.oa.mapper;
|
||||
|
||||
import com.ruoyi.oa.domain.vo.SysOaProjectVo;
|
||||
import com.ruoyi.oa.domain.vo.performance.HrmLeaveReqVo;
|
||||
import com.ruoyi.oa.domain.vo.performance.HrmLeaveRequestVo;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
|
||||
import java.util.Date;
|
||||
@@ -16,9 +16,9 @@ public interface PerformanceReportMapper {
|
||||
* 请假明细:通过 hrm_employee.user_id 映射到系统用户
|
||||
* 时间口径:与区间有交集(start_time <= endDate 且 end_time >= startDate)
|
||||
*/
|
||||
List<HrmLeaveReqVo> selectLeaveDetails(@Param("userId") Long userId,
|
||||
@Param("startDate") Date startDate,
|
||||
@Param("endDate") Date endDate);
|
||||
List<HrmLeaveRequestVo> selectLeaveDetails(@Param("userId") Long userId,
|
||||
@Param("startDate") Date startDate,
|
||||
@Param("endDate") Date endDate);
|
||||
|
||||
/**
|
||||
* 负责人项目:sys_oa_project.functionary 包含 nickName
|
||||
|
||||
@@ -11,7 +11,7 @@ import com.ruoyi.oa.domain.vo.OaProjectScheduleStepVo;
|
||||
import com.ruoyi.oa.domain.vo.SysOaAttendanceVo;
|
||||
import com.ruoyi.oa.domain.vo.SysOaProjectVo;
|
||||
import com.ruoyi.oa.domain.vo.SysOaTaskVo;
|
||||
import com.ruoyi.oa.domain.vo.performance.HrmLeaveReqVo;
|
||||
import com.ruoyi.oa.domain.vo.performance.HrmLeaveRequestVo;
|
||||
import com.ruoyi.oa.domain.vo.performance.MonthlyPerformanceReportVo;
|
||||
import com.ruoyi.oa.domain.vo.performance.MonthlyPerformanceSummaryVo;
|
||||
import com.ruoyi.oa.mapper.*;
|
||||
@@ -52,7 +52,7 @@ public class PerformanceReportServiceImpl implements IPerformanceReportService {
|
||||
vo.setAttendanceDetails(attendanceDetails);
|
||||
|
||||
// 2) 请假明细(hrm_leave_req)
|
||||
List<HrmLeaveReqVo> leaveDetails = performanceReportMapper.selectLeaveDetails(userId, startDate, endDate);
|
||||
List<HrmLeaveRequestVo> leaveDetails = performanceReportMapper.selectLeaveDetails(userId, startDate, endDate);
|
||||
vo.setLeaveDetails(leaveDetails);
|
||||
|
||||
// 3) 负责人项目(functionary)
|
||||
@@ -189,7 +189,7 @@ public class PerformanceReportServiceImpl implements IPerformanceReportService {
|
||||
}
|
||||
|
||||
private MonthlyPerformanceSummaryVo buildSummary(List<SysOaAttendanceVo> attendanceDetails,
|
||||
List<HrmLeaveReqVo> leaveDetails,
|
||||
List<HrmLeaveRequestVo> leaveDetails,
|
||||
List<SysOaProjectVo> responsibleProjects,
|
||||
List<OaProjectScheduleStepVo> mySteps,
|
||||
List<OaProjectReportVo> projectReports,
|
||||
@@ -217,7 +217,7 @@ public class PerformanceReportServiceImpl implements IPerformanceReportService {
|
||||
s.setLeaveRequestCount(leaveDetails == null ? 0L : (long) leaveDetails.size());
|
||||
BigDecimal leaveHours = BigDecimal.ZERO;
|
||||
if (leaveDetails != null) {
|
||||
for (HrmLeaveReqVo lr : leaveDetails) {
|
||||
for (HrmLeaveRequestVo lr : leaveDetails) {
|
||||
if (lr.getHours() != null) {
|
||||
leaveHours = leaveHours.add(lr.getHours());
|
||||
}
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="com.ruoyi.oa.mapper.PerformanceReportMapper">
|
||||
|
||||
<select id="selectLeaveDetails" resultType="com.ruoyi.oa.domain.vo.performance.HrmLeaveReqVo">
|
||||
<select id="selectLeaveDetails" resultType="com.ruoyi.oa.domain.vo.performance.HrmLeaveRequestVo">
|
||||
SELECT
|
||||
lr.biz_id AS bizId,
|
||||
lr.emp_id AS empId,
|
||||
|
||||
Reference in New Issue
Block a user