From dc8c270fab1f9bf7a28737d3aa4b6bd13ea10b3f Mon Sep 17 00:00:00 2001
From: nixj <nxj>
Date: Thu, 20 Jun 2024 13:16:01 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90update=E3=80=91=E8=B6=85=E6=A0=87?=
 =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E5=8E=BB=E9=99=A4SF=E5=B7=A5=E5=8F=B7?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/chint/manage/entity/query/StandardQuery.java | 1 -
 .../chint/manage/mapper/JdbcOrderExceedStandardRepository.java | 2 +-
 .../java/com/chint/manage/service/impl/ManageServiceImpl.java  | 3 +--
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/chint/manage/entity/query/StandardQuery.java b/src/main/java/com/chint/manage/entity/query/StandardQuery.java
index c0c64a8e..bac68d28 100644
--- a/src/main/java/com/chint/manage/entity/query/StandardQuery.java
+++ b/src/main/java/com/chint/manage/entity/query/StandardQuery.java
@@ -9,5 +9,4 @@ public class StandardQuery extends BaseQuery {
     private String companyName=""; // 出差公司
     private String orderNo=""; //订单号
     private String actualOrderNo=""; //申请单号
-    private String employeeNo=""; //SF工号
 }
diff --git a/src/main/java/com/chint/manage/mapper/JdbcOrderExceedStandardRepository.java b/src/main/java/com/chint/manage/mapper/JdbcOrderExceedStandardRepository.java
index 3a6a270e..b7cdff16 100644
--- a/src/main/java/com/chint/manage/mapper/JdbcOrderExceedStandardRepository.java
+++ b/src/main/java/com/chint/manage/mapper/JdbcOrderExceedStandardRepository.java
@@ -18,5 +18,5 @@ public interface JdbcOrderExceedStandardRepository extends CrudRepository<OrderE
     @Query("UPDATE order_exceed_standard SET approval_status = :status WHERE order_no = :orderNo")
     void updateApprovalStatusById(@Param("status") String status, @Param("orderNo") String orderNo);
 
-    Page<OrderExceedStandard> findAllByApplicantContainsAndCompanyNameContainsAndActualOrderNoContainsAndOrderNoContainsAndEmployeeNoContainsAndOrderNoIn(String applicant, String company, String actualOrderNo, String orderNo,String employeeNo, List<String> orderNos, Pageable pageable);
+    Page<OrderExceedStandard> findAllByApplicantContainsAndCompanyNameContainsAndActualOrderNoContainsAndOrderNoContainsAndOrderNoIn(String applicant, String company, String actualOrderNo, String orderNo, List<String> orderNos, Pageable pageable);
 }
diff --git a/src/main/java/com/chint/manage/service/impl/ManageServiceImpl.java b/src/main/java/com/chint/manage/service/impl/ManageServiceImpl.java
index 93d79dce..a8571bf4 100644
--- a/src/main/java/com/chint/manage/service/impl/ManageServiceImpl.java
+++ b/src/main/java/com/chint/manage/service/impl/ManageServiceImpl.java
@@ -105,11 +105,10 @@ public class ManageServiceImpl implements ManageService {
 
         PageRequest pageRequest = PageRequest
                 .of(dto.getPageNum() - 1, dto.getPageSize(), Sort.by("id").descending());
-        Page<OrderExceedStandard> page=jdbcOrderExceedStandardRepository.findAllByApplicantContainsAndCompanyNameContainsAndActualOrderNoContainsAndOrderNoContainsAndEmployeeNoContainsAndOrderNoIn(dto.getApplicant(),
+        Page<OrderExceedStandard> page=jdbcOrderExceedStandardRepository.findAllByApplicantContainsAndCompanyNameContainsAndActualOrderNoContainsAndOrderNoContainsAndOrderNoIn(dto.getApplicant(),
                 dto.getCompanyName(),
                 dto.getActualOrderNo(),
                 dto.getOrderNo(),
-                dto.getEmployeeNo(),
                 orderNos,
                 pageRequest);