From c16e7d3526774803259755dfd7f6ad5eb700279e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com>
Date: Fri, 24 Oct 2025 15:25:12 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=94=E9=99=A2=E4=BA=8C=E5=BC=80=EF=BC=8C?=
 =?UTF-8?q?=E5=85=A5=E8=81=8C=E5=92=8C=E8=BD=AC=E6=AD=A3=E6=97=A5=E6=9C=9F?=
 =?UTF-8?q?=E7=AD=9B=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../param/SalaryAcctEmployeeQueryParam.java          |  4 ++--
 .../mapper/salaryacct/SalaryAcctEmployeeMapper.xml   | 12 ++++++------
 .../service/impl/SalaryAcctEmployeeServiceImpl.java  |  4 ++--
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/com/engine/salary/entity/salaryacct/param/SalaryAcctEmployeeQueryParam.java b/src/com/engine/salary/entity/salaryacct/param/SalaryAcctEmployeeQueryParam.java
index f58a1bccd..840305644 100644
--- a/src/com/engine/salary/entity/salaryacct/param/SalaryAcctEmployeeQueryParam.java
+++ b/src/com/engine/salary/entity/salaryacct/param/SalaryAcctEmployeeQueryParam.java
@@ -58,10 +58,10 @@ public class SalaryAcctEmployeeQueryParam extends BaseQueryParam {
     private LocalDateRange dismissDate;
 
     //入职日期
-    private List<String> hireDate;
+    private List<Date> hireDate;
 
     //转正日期
-    private List<String> zzrq;
+    private List<Date> zzrq;
 
     //薪资核算人员列表主键id")
     private List<Long> ids;
diff --git a/src/com/engine/salary/mapper/salaryacct/SalaryAcctEmployeeMapper.xml b/src/com/engine/salary/mapper/salaryacct/SalaryAcctEmployeeMapper.xml
index a215ba9e2..e8b86f68b 100644
--- a/src/com/engine/salary/mapper/salaryacct/SalaryAcctEmployeeMapper.xml
+++ b/src/com/engine/salary/mapper/salaryacct/SalaryAcctEmployeeMapper.xml
@@ -495,8 +495,8 @@
         LEFT JOIN hrmsubcompany c ON c.id = e.subcompanyid1
         WHERE delete_type = 0
         AND salary_acct_record_id = #{param.salaryAcctRecordId}
-        <if test="param.hiredate != null and param.hiredate.size() == 2">
-            AND (e.companystartdate BETWEEN #{param.hiredate[0]} AND #{param.hiredate[1]})
+        <if test="param.hireDate != null and param.hireDate.size() == 2">
+            AND (e.companystartdate BETWEEN #{param.hireDate[0]} AND #{param.hireDate[1]})
         </if>
         <if test="param.zzrq != null and param.zzrq.size() == 2">
             AND (t.zzrq BETWEEN #{param.zzrq[0]} AND #{param.zzrq[1]})
@@ -516,8 +516,8 @@
         LEFT JOIN hrmsubcompany c ON c.id = e.subcompanyid1
         WHERE delete_type = 0
         AND salary_acct_record_id = #{param.salaryAcctRecordId}
-        <if test="param.hiredate != null and param.hiredate.size() == 2">
-            AND (e.companystartdate BETWEEN #{param.hiredate[0]} AND #{param.hiredate[1]})
+        <if test="param.hireDate != null and param.hireDate.size() == 2">
+            AND (e.companystartdate BETWEEN #{param.hireDate[0]} AND #{param.hireDate[1]})
         </if>
         <if test="param.zzrq != null and param.zzrq.size() == 2">
             AND (t.zzrq BETWEEN #{param.zzrq[0]} AND #{param.zzrq[1]})
@@ -537,8 +537,8 @@
         LEFT JOIN hrmsubcompany c ON c.id = e.subcompanyid1
         WHERE delete_type = 0
         AND salary_acct_record_id = #{param.salaryAcctRecordId}
-        <if test="param.hiredate != null and param.hiredate.size() == 2">
-            AND (e.companystartdate BETWEEN #{param.hiredate[0]} AND #{param.hiredate[1]})
+        <if test="param.hireDate != null and param.hireDate.size() == 2">
+            AND (e.companystartdate BETWEEN #{param.hireDate[0]} AND #{param.hireDate[1]})
         </if>
         <if test="param.zzrq != null and param.zzrq.size() == 2">
             AND (t.zzrq BETWEEN #{param.zzrq[0]} AND #{param.zzrq[1]})
diff --git a/src/com/engine/salary/service/impl/SalaryAcctEmployeeServiceImpl.java b/src/com/engine/salary/service/impl/SalaryAcctEmployeeServiceImpl.java
index 13e031bd6..180075c8c 100644
--- a/src/com/engine/salary/service/impl/SalaryAcctEmployeeServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SalaryAcctEmployeeServiceImpl.java
@@ -486,7 +486,7 @@ public class SalaryAcctEmployeeServiceImpl extends Service implements SalaryAcct
         Map<Long, String> zzrqMap = new HashMap<>();
         partition.forEach(part -> {
             String empIds = StringUtils.join(part, ",");
-            rs.execute("select id,"+field+" from cus_fielddata where scopeid=3 and id in ("+ empIds +")");
+            rs.execute("select id," + field + " from cus_fielddata where scopeid=3 and id in (" + empIds + ")");
             while (rs.next()) {
                 zzrqMap.put(Long.valueOf(rs.getInt("id")), rs.getString(field));
             }
@@ -723,7 +723,7 @@ public class SalaryAcctEmployeeServiceImpl extends Service implements SalaryAcct
 
         if (CollectionUtils.isNotEmpty(param.getSalarySob())) {
             lambdaQueryChainWrapper.setSalarySobIds(param.getSalarySob());
-        } else  {
+        } else {
             // 分权
             SalarySobQueryParam salarySobQueryParam = new SalarySobQueryParam();
             salarySobQueryParam.setFilterType(AuthFilterTypeEnum.QUERY_DATA);