查询员工年假和查询加班余额年假余额方法的修改

ruoyi-psa/src/main/java/com/ruoyi/controller/EmployeeBalanceController.java

@@ -64,9 +64,9 @@ public class EmployeeBalanceController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:balance:query')")
     @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") Long id)
+    public AjaxResult getInfo(@PathVariable("id") Long employeeId)
     {
-        return success(employeeBalanceService.selectEmployeeBalanceById(id));
+        return success(employeeBalanceService.selectEmployeeBalanceById(employeeId));
     }
 
     /**

ruoyi-psa/src/main/java/com/ruoyi/domain/EmployeeBalance.java

@@ -2,7 +2,6 @@ package com.ruoyi.domain;
 
 import java.math.BigDecimal;
 import java.util.Date;
-
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
@@ -12,42 +11,36 @@ import com.ruoyi.common.core.domain.BaseEntity;
 /**
  * 员工余额对象 employee_balance
  *
- * @author hht
- * @date 2025-03-06
+ * @author ruoyi
+ * @date 2025-04-25
  */
-public class EmployeeBalance extends BaseEntity {
+public class EmployeeBalance extends BaseEntity
+{
     private static final long serialVersionUID = 1L;
 
-    /**
-     * 唯一标识每条记录
-     */
+    /** 唯一标识每条记录 */
     private Long id;
 
-    /**
-     * 员工ID（关联到员工表）
-     */
+    /** 员工ID（关联到员工表） */
+    @Excel(name = "员工ID")
     private Long employeeId;
 
-    /**
-     * 年假余额
-     */
+    /** 年假余额 */
+    @Excel(name = "年假余额/天")
     private BigDecimal annualLeaveBalance;
 
-    /**
-     * 加班时长余额
-     */
+    /** 加班时长余额 */
+    @Excel(name = "加班时长余额/小时")
     private BigDecimal overtimeHoursBalance;
 
-    /**
-     * 创建时间
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    /** 创建时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date createdAt;
 
-    /**
-     * 更新时间
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    /** 更新时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "更新时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date updatedAt;
 
     public Long getId() {

ruoyi-psa/src/main/java/com/ruoyi/mapper/EmployeeBalanceMapper.java

@@ -10,10 +10,10 @@ public interface EmployeeBalanceMapper {
     /**
      * 查询员工余额
      *
-     * @param id 员工余额主键
+     * @param employeeId 员工id
      * @return 员工余额
      */
-    public EmployeeBalance selectEmployeeBalanceById(Long id);
+    public EmployeeBalance selectEmployeeBalanceById(Long employeeId);
 
     /**
      * 查询员工余额列表

ruoyi-psa/src/main/java/com/ruoyi/service/IEmployeeBalanceService.java

@@ -14,10 +14,10 @@ public interface IEmployeeBalanceService
     /**
      * 查询员工余额
      * 
-     * @param id 员工余额主键
+     * @param employeeId 员工id
      * @return 员工余额
      */
-    public EmployeeBalance selectEmployeeBalanceById(Long id);
+    public EmployeeBalance selectEmployeeBalanceById(Long employeeId);
 
     /**
      * 查询员工余额列表

ruoyi-psa/src/main/java/com/ruoyi/service/impl/EmployeeBalanceServiceImpl.java

@@ -22,13 +22,13 @@ public class EmployeeBalanceServiceImpl implements IEmployeeBalanceService
     /**
      * 查询员工余额
      * 
-     * @param id 员工余额主键
+     * @param employeeId 员工id
      * @return 员工余额
      */
     @Override
-    public EmployeeBalance selectEmployeeBalanceById(Long id)
+    public EmployeeBalance selectEmployeeBalanceById(Long employeeId)
     {
-        return employeeBalanceMapper.selectEmployeeBalanceById(id);
+        return employeeBalanceMapper.selectEmployeeBalanceById(employeeId);
     }
 
     /**

ruoyi-psa/src/main/resources/mapper/application/EmployeeBalanceMapper.xml

@@ -29,10 +29,10 @@
 
     <select id="selectEmployeeBalanceById" parameterType="Long" resultMap="EmployeeBalanceResult">
         <include refid="selectEmployeeBalanceVo"/>
-        where id = #{id}
+        where employee_id = #{employeeId}
     </select>
 
-    <insert id="insertEmployeeBalance" parameterType="EmployeeBalance" useGeneratedKeys="true" keyProperty="id">
+    <insert id="insertEmployeeBalance" parameterType="EmployeeBalance" useGeneratedKeys="true" keyProperty="employeeId">
         insert into employee_balance
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="employeeId != null">employee_id,</if>

ruoyi-psa/src/main/resources/mapper/application/LeaveApplicationMapper.xml

@@ -152,7 +152,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             overtime_hours_balance AS overtimeHoursBalance,
             annual_leave_balance AS annualLeaveBalance
         FROM employee_balance
-        WHERE employee_id = #{userId}
+        WHERE employee_id = #{employeeId}
     </select>
 
     <update id="updateOvertimeHoursBalance" parameterType="com.ruoyi.domain.dto.EmployeeBalanceDTO">