From c727e3498dd084436370c471e6601a350eed3688 Mon Sep 17 00:00:00 2001 From: Joshi <3040996759@qq.com> Date: Sat, 28 Feb 2026 15:35:48 +0800 Subject: [PATCH] =?UTF-8?q?refactor(oa):=20=E9=87=8D=E5=91=BD=E5=90=8D?= =?UTF-8?q?=E8=AF=B7=E5=81=87=E8=AF=B7=E6=B1=82VO=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 将HrmLeaveReqVo重命名为HrmLeaveRequestVo - 更新MonthlyPerformanceReportVo中的属性类型引用 - 更新PerformanceReportMapper接口返回类型 - 更新MyBatis映射文件中的resultType配置 - 更新PerformanceReportServiceImpl中的导入和变量声明 - 修改buildSummary方法参数类型和循环遍历类型 --- .../{HrmLeaveReqVo.java => HrmLeaveRequestVo.java} | 2 +- .../domain/vo/performance/MonthlyPerformanceReportVo.java | 2 +- .../java/com/ruoyi/oa/mapper/PerformanceReportMapper.java | 8 ++++---- .../oa/service/impl/PerformanceReportServiceImpl.java | 8 ++++---- .../main/resources/mapper/oa/PerformanceReportMapper.xml | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) rename ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/performance/{HrmLeaveReqVo.java => HrmLeaveRequestVo.java} (95%) diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/performance/HrmLeaveReqVo.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/performance/HrmLeaveRequestVo.java similarity index 95% rename from ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/performance/HrmLeaveReqVo.java rename to ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/performance/HrmLeaveRequestVo.java index ce4a66b..3f431c1 100644 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/performance/HrmLeaveReqVo.java +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/performance/HrmLeaveRequestVo.java @@ -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; diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/performance/MonthlyPerformanceReportVo.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/performance/MonthlyPerformanceReportVo.java index 3d0dd94..c14e5a8 100644 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/performance/MonthlyPerformanceReportVo.java +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/performance/MonthlyPerformanceReportVo.java @@ -27,7 +27,7 @@ public class MonthlyPerformanceReportVo { private List attendanceDetails; /** 明细：请假（hrm_leave_req） */ - private List leaveDetails; + private List leaveDetails; /** 明细：负责人项目（sys_oa_project.functionary） */ private List responsibleProjects; diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/mapper/PerformanceReportMapper.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/mapper/PerformanceReportMapper.java index e1ee376..fb2997e 100644 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/mapper/PerformanceReportMapper.java +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/mapper/PerformanceReportMapper.java @@ -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 selectLeaveDetails(@Param("userId") Long userId, - @Param("startDate") Date startDate, - @Param("endDate") Date endDate); + List selectLeaveDetails(@Param("userId") Long userId, + @Param("startDate") Date startDate, + @Param("endDate") Date endDate); /** * 负责人项目：sys_oa_project.functionary 包含 nickName diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/PerformanceReportServiceImpl.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/PerformanceReportServiceImpl.java index 1e74772..b1e8bab 100644 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/PerformanceReportServiceImpl.java +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/PerformanceReportServiceImpl.java @@ -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 leaveDetails = performanceReportMapper.selectLeaveDetails(userId, startDate, endDate); + List leaveDetails = performanceReportMapper.selectLeaveDetails(userId, startDate, endDate); vo.setLeaveDetails(leaveDetails); // 3) 负责人项目（functionary） @@ -189,7 +189,7 @@ public class PerformanceReportServiceImpl implements IPerformanceReportService { } private MonthlyPerformanceSummaryVo buildSummary(List attendanceDetails, - List leaveDetails, + List leaveDetails, List responsibleProjects, List mySteps, List 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()); } diff --git a/ruoyi-oa/src/main/resources/mapper/oa/PerformanceReportMapper.xml b/ruoyi-oa/src/main/resources/mapper/oa/PerformanceReportMapper.xml index cd4fe6d..abfc0fb 100644 --- a/ruoyi-oa/src/main/resources/mapper/oa/PerformanceReportMapper.xml +++ b/ruoyi-oa/src/main/resources/mapper/oa/PerformanceReportMapper.xml @@ -4,7 +4,7 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - SELECT lr.biz_id AS bizId, lr.emp_id AS empId,