From e7a526fdfab634e7c1098521d48617e5c471a614 Mon Sep 17 00:00:00 2001
From: nixj <nxj>
Date: Fri, 12 Jul 2024 13:24:08 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90update=E3=80=91=E6=B6=88=E8=B4=B9?=
 =?UTF-8?q?=E6=98=8E=E7=BB=86=E6=8E=A5=E5=8F=A3=E5=8F=82=E6=95=B0=E5=90=8D?=
 =?UTF-8?q?=E7=A7=B0=E4=BF=AE=E6=94=B9userCode->employeeNo?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../chint/manage/entity/query/ConsumptionDetailQuery.java   | 2 +-
 .../mapper/impl/JdbcConsumptionDetailRepositoryImpl.java    | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/chint/manage/entity/query/ConsumptionDetailQuery.java b/src/main/java/com/chint/manage/entity/query/ConsumptionDetailQuery.java
index 0f921087..60ea6c9a 100644
--- a/src/main/java/com/chint/manage/entity/query/ConsumptionDetailQuery.java
+++ b/src/main/java/com/chint/manage/entity/query/ConsumptionDetailQuery.java
@@ -19,7 +19,7 @@ public class ConsumptionDetailQuery extends BaseQuery{
      */
     private Integer productType;
     private String userName="";
-    private String userCode="";
+    private String employeeNo=""; //SF工号
     private String actualOrderNo=""; //申请单号
 //    private List<Long> orderIds=new ArrayList<>();
     private List<String> orderNos=new ArrayList<>();
diff --git a/src/main/java/com/chint/manage/mapper/impl/JdbcConsumptionDetailRepositoryImpl.java b/src/main/java/com/chint/manage/mapper/impl/JdbcConsumptionDetailRepositoryImpl.java
index 0b473bbb..4c5a198b 100644
--- a/src/main/java/com/chint/manage/mapper/impl/JdbcConsumptionDetailRepositoryImpl.java
+++ b/src/main/java/com/chint/manage/mapper/impl/JdbcConsumptionDetailRepositoryImpl.java
@@ -187,8 +187,8 @@ public class JdbcConsumptionDetailRepositoryImpl implements JdbcConsumptionDetai
             dto.setUserName(dto.getUserName() + "%");
             query += "AND tod.booking_name LIKE (:userName)";
         }
-        if (!dto.getUserCode().isEmpty()) {
-            query += "AND tod.booking_user_code = (:userCode)";
+        if (!dto.getEmployeeNo().isEmpty()) {
+            query += "AND tod.booking_user_code = (:employeeNo)";
         }
 
         if (!dto.getCompanyCodes().isEmpty()) {
@@ -199,7 +199,7 @@ public class JdbcConsumptionDetailRepositoryImpl implements JdbcConsumptionDetai
             query += "AND tod.order_no IN (:orderNos)";
         }
 
-        params.put("userCode", dto.getUserCode());
+        params.put("employeeNo", dto.getEmployeeNo());
         params.put("userName", dto.getUserName());
         params.put("orderNos", dto.getOrderNos());
         params.put("companyCodes", dto.getCompanyCodes());