From 17b7bc054c925d2fdf52a8bee23af7a01c96c157 Mon Sep 17 00:00:00 2001
From: chenhc <2369838784@qq.com>
Date: Thu, 21 Nov 2024 15:45:20 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=8D=97=E9=9D=96=E5=88=9D=E5=A7=8B?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../glxp/mipsdl/client/njxyy/NjxyyClient.java   |  3 ++-
 .../java/com/glxp/mipsdl/entity/njxyy/A005.java |  3 +++
 .../mybatis/mapper/other/njxyy/A005Mapper.xml   | 17 +++++++++--------
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/glxp/mipsdl/client/njxyy/NjxyyClient.java b/src/main/java/com/glxp/mipsdl/client/njxyy/NjxyyClient.java
index 080b0f9..7591f7e 100644
--- a/src/main/java/com/glxp/mipsdl/client/njxyy/NjxyyClient.java
+++ b/src/main/java/com/glxp/mipsdl/client/njxyy/NjxyyClient.java
@@ -759,7 +759,8 @@ public class NjxyyClient extends CommonHttpClient {
     public BaseResponse getInvResult(UdiwmsInvProductsRequest udiwmsInvProductsRequest) {
         udiwmsInvProductsRequest.setDatabaseProductName(getDataSourceType());
         if (udiwmsInvProductsRequest != null && udiwmsInvProductsRequest.getStartDate() != null && udiwmsInvProductsRequest.getEndDate() != null){
-
+            udiwmsInvProductsRequest.setStartDate(DateUtil.formatDate(DateUtil.parseDate(udiwmsInvProductsRequest.getStartDate()), "yyyyMMdd"));
+            udiwmsInvProductsRequest.setEndDate(DateUtil.formatDate(DateUtil.parseDate(udiwmsInvProductsRequest.getEndDate()), "yyyyMMdd"));
         }else {
             return ResultVOUtils.error(500,"缺少开始结束日期必要参数");
         }
diff --git a/src/main/java/com/glxp/mipsdl/entity/njxyy/A005.java b/src/main/java/com/glxp/mipsdl/entity/njxyy/A005.java
index f76d672..eaa49f2 100644
--- a/src/main/java/com/glxp/mipsdl/entity/njxyy/A005.java
+++ b/src/main/java/com/glxp/mipsdl/entity/njxyy/A005.java
@@ -79,4 +79,7 @@ public class A005 {
     @TableField(value = "REMARK")
     private String remark;
 
+    @TableField(value = "REMARK1")
+    private String remark1;
+
 }
\ No newline at end of file
diff --git a/src/main/resources/mybatis/mapper/other/njxyy/A005Mapper.xml b/src/main/resources/mybatis/mapper/other/njxyy/A005Mapper.xml
index 658fc46..f46201f 100644
--- a/src/main/resources/mybatis/mapper/other/njxyy/A005Mapper.xml
+++ b/src/main/resources/mybatis/mapper/other/njxyy/A005Mapper.xml
@@ -25,41 +25,42 @@
     <result column="CORPID" jdbcType="VARCHAR" property="corpid" />
     <result column="CORPNAME" jdbcType="VARCHAR" property="corpname" />
     <result column="REMARK" jdbcType="TIMESTAMP" property="remark" />
+    <result column="REMARK1" jdbcType="VARCHAR" property="remark" />
 
   </resultMap>
   <sql id="Base_Column_List">
     <!--@mbg.generated-->
     CPMCTYMC, THRCODE, AMECODE, GGXH, BATCHNO, MEASNAME, PRICE, PRODUCTIONDATE, EXPIREDATE, 
     YLQXZCRBARMC, ZCZBHHZBAPZBH, MANUFACTURER, MANUFACTORYCODE, AMOUNT, RECOUNT, INOUTTYPE, 
-    INVCODE, INVNAME, CORPID, CORPNAME, REMARK
+    INVCODE, INVNAME, CORPID, CORPNAME, REMARK, REMARK1
   </sql>
 
     <select id="filterList" resultType="com.glxp.mipsdl.entity.njxyy.A005">
         SELECT     CPMCTYMC, THRCODE, AMECODE, GGXH, BATCHNO, MEASNAME, PRICE, PRODUCTIONDATE, EXPIREDATE,
     YLQXZCRBARMC, ZCZBHHZBAPZBH, MANUFACTURER, MANUFACTORYCODE, AMOUNT, RECOUNT, INOUTTYPE,
-    INVCODE, INVNAME, CORPID, CORPNAME, REMARK
+    INVCODE, INVNAME, CORPID, CORPNAME, REMARK, REMARK1
         FROM a005
         <where>
 
             <if test="startDate != null   and databaseProductName == 'Oracle'">
                 <![CDATA[
-                and TRUNC(REMARK) >= TO_DATE(#{startDate} , 'YYYY-MM-DD')
+                and REMARK1 >= #{startDate}
                 ]]>
             </if>
             <if test="endDate != null   and databaseProductName == 'Oracle'">
                 <![CDATA[
-                and TRUNC(REMARK) <= TO_DATE(#{endDate} , 'YYYY-MM-DD')
+                and REMARK1 <= #{endDate}
                 ]]>
             </if>
 
-            <if test="startDate != null   and databaseProductName == 'MySql'">
+            <if test="startDate != null   and databaseProductName == 'MySQL'">
                 <![CDATA[
-                and REMARK >= (#{startDate}
+                and REMARK1 >= #{startDate}
                 ]]>
             </if>
-            <if test="endDate != null   and databaseProductName == 'MySql'">
+            <if test="endDate != null   and databaseProductName == 'MySQL'">
                 <![CDATA[
-                and REMARK <= #{endDate}
+                and REMARK1 <= #{endDate}
                 ]]>
             </if>