From 7096a4af4b78e228cd7015c6df53e5875d9b0547 Mon Sep 17 00:00:00 2001
From: chenhc <2369838784@qq.com>
Date: Mon, 25 Nov 2024 17:38:34 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../glxp/mipsdl/client/scpwxyy/ScpwxyyClient.java   | 13 +++++++------
 .../com/glxp/mipsdl/entity/scpwxyy/A010head.java    |  2 ++
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/glxp/mipsdl/client/scpwxyy/ScpwxyyClient.java b/src/main/java/com/glxp/mipsdl/client/scpwxyy/ScpwxyyClient.java
index 2347143..926fab1 100644
--- a/src/main/java/com/glxp/mipsdl/client/scpwxyy/ScpwxyyClient.java
+++ b/src/main/java/com/glxp/mipsdl/client/scpwxyy/ScpwxyyClient.java
@@ -1401,8 +1401,8 @@ public class ScpwxyyClient extends CommonHttpClient {
 
             String startTime = udiwmsBasicSkPrescribeRequest.getStartTime();
             String endTime = udiwmsBasicSkPrescribeRequest.getEndTime();
-            wrapper.ge(StrUtil.isNotEmpty(startTime), A010head::getPrescribedate, startTime);
-            wrapper.le(StrUtil.isNotEmpty(endTime), A010head::getPrescribedate, endTime);
+            wrapper.ge(StrUtil.isNotEmpty(startTime), A010head::getPrescribedate, DateUtil.parseDate(startTime));
+            wrapper.le(StrUtil.isNotEmpty(endTime), A010head::getPrescribedate, DateUtil.parseDate(endTime));
 
             String code = udiwmsBasicSkPrescribeRequest.getCode();
             String fromCorpName = udiwmsBasicSkPrescribeRequest.getFromCorpName();
@@ -1428,8 +1428,8 @@ public class ScpwxyyClient extends CommonHttpClient {
 
             String startTime = udiwmsBasicSkPrescribeRequest.getStartTime();
             String endTime = udiwmsBasicSkPrescribeRequest.getEndTime();
-            wrapper.ge(StrUtil.isNotEmpty(startTime), A011head::getPrescribedate, startTime);
-            wrapper.le(StrUtil.isNotEmpty(endTime), A011head::getPrescribedate, endTime);
+            wrapper.ge(StrUtil.isNotEmpty(startTime), A011head::getPrescribedate, DateUtil.parseDate(startTime));
+            wrapper.le(StrUtil.isNotEmpty(endTime), A011head::getPrescribedate, DateUtil.parseDate(endTime));
 
 
             String code = udiwmsBasicSkPrescribeRequest.getCode();
@@ -1542,8 +1542,9 @@ public class ScpwxyyClient extends CommonHttpClient {
 
             String startTime = udiwmsThrOrderRequest.getStartTime();
             String endTime = udiwmsThrOrderRequest.getEndTime();
-            wrapper.ge(StrUtil.isNotEmpty(startTime), VYpzsIoInfo::getKEEP_BOOK_TIME, startTime);
-            wrapper.le(StrUtil.isNotEmpty(endTime), VYpzsIoInfo::getKEEP_BOOK_TIME, endTime);
+            wrapper.ge(StrUtil.isNotEmpty(startTime), VYpzsIoInfo::getKEEP_BOOK_TIME, DateUtil.parseDate(startTime));
+            wrapper.le(StrUtil.isNotEmpty(endTime), VYpzsIoInfo::getKEEP_BOOK_TIME, DateUtil.parseDate(endTime));
+
             wrapper.and(StrUtil.isNotEmpty(udiwmsThrOrderRequest.getCorpName()), t -> t.like(VYpzsIoInfo::getCONSIGNEE_NAME, udiwmsThrOrderRequest.getCorpName()).or().eq(VYpzsIoInfo::getCONSIGNOR_NAME, udiwmsThrOrderRequest.getCorpName()));
 
             wrapper.eq(StrUtil.isNotBlank(udiwmsThrOrderRequest.getBillNo()), VYpzsIoInfo::getPHYSIC_CODE, udiwmsThrOrderRequest.getBillNo());
diff --git a/src/main/java/com/glxp/mipsdl/entity/scpwxyy/A010head.java b/src/main/java/com/glxp/mipsdl/entity/scpwxyy/A010head.java
index 70007fa..2960fc2 100644
--- a/src/main/java/com/glxp/mipsdl/entity/scpwxyy/A010head.java
+++ b/src/main/java/com/glxp/mipsdl/entity/scpwxyy/A010head.java
@@ -2,6 +2,8 @@ package com.glxp.mipsdl.entity.scpwxyy;
 
 import java.math.BigDecimal;
 import java.util.Date;
+
+import cn.hutool.core.date.DateTime;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;