From 620bb4712a31791231c4381581f0f60088f079fe Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期三, 27 五月 2026 14:03:45 +0800
Subject: [PATCH] Merge branch 'refs/heads/dev_New_pro' into dev_宁夏_英泽防锈

---
 src/main/java/com/ruoyi/staff/mapper/StaffOnJobMapper.java |   16 +++++++++++++---
 1 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/ruoyi/staff/mapper/StaffOnJobMapper.java b/src/main/java/com/ruoyi/staff/mapper/StaffOnJobMapper.java
index 5bd15e4..7cad87f 100644
--- a/src/main/java/com/ruoyi/staff/mapper/StaffOnJobMapper.java
+++ b/src/main/java/com/ruoyi/staff/mapper/StaffOnJobMapper.java
@@ -14,12 +14,13 @@
 @Mapper
 public interface StaffOnJobMapper extends BaseMapper<StaffOnJob> {
 
-    IPage<StaffOnJobDto> staffOnJobListPage(Page page, @Param("staffOnJob") StaffOnJob staffOnJob);
+    IPage<StaffOnJobDto> staffOnJobListPage(Page page, @Param("staffOnJob") StaffOnJobDto staffOnJob);
 
     List<StaffOnJobDto> staffOnJobList(@Param("staffOnJob") StaffOnJob staffOnJob);
 
     /**
      * 缁熻鎸囧畾鏃ユ湡鐨勫湪鑱屽憳宸ユ暟
+     *
      * @param date 鏃ユ湡
      * @return 鍦ㄨ亴鍛樺伐鏁�
      */
@@ -27,9 +28,18 @@
 
     /**
      * 缁熻鎸囧畾鏈堜唤鐨勬柊鍏ヨ亴鍛樺伐鏁�
+     *
      * @param monthStart 鏈堜唤寮�濮嬫棩鏈�
-     * @param monthEnd 鏈堜唤缁撴潫鏃ユ湡
+     * @param monthEnd   鏈堜唤缁撴潫鏃ユ湡
      * @return 鏂板叆鑱屽憳宸ユ暟
      */
     Integer countNewHireByMonth(@Param("monthStart") LocalDate monthStart, @Param("monthEnd") LocalDate monthEnd);
-}
\ No newline at end of file
+
+    /**
+     * 鏍规嵁鍛樺伐濮撳悕鏌ヨ鍛樺伐淇℃伅
+     *
+     * @param staffName 鍛樺伐濮撳悕
+     * @return 鍛樺伐鏁版嵁
+     */
+    StaffOnJob selectStaffByNickName(String staffName);
+}

--
Gitblit v1.9.3