From 585282ca5183a84214423595b4c6cff6c6c15be4 Mon Sep 17 00:00:00 2001
From: anthonyywj2 <353682448@qq.com>
Date: Sat, 11 Jun 2022 12:20:51 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E6=9C=9F=E6=9B=B4=E6=96=B0=EF=BC=8C?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=AC=AC=E4=B8=89=E6=96=B9=E4=BA=A7=E5=93=81?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=EF=BC=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/basic/UdiContrastController.java |  4 ++++
 .../mybatis/mapper/basic/ProductInfoDao.xml     | 17 +++++++++--------
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiContrastController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiContrastController.java
index a8bd4ce..f49eb78 100644
--- a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiContrastController.java
+++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiContrastController.java
@@ -323,6 +323,10 @@ public class UdiContrastController {
         udiInfoEntity.setUuid(udiRelevanceEntity.getUuid());
         udiInfoEntity.setProductType(ConstantStatus.PRODUCT_TYPE_THIRD);
         udiInfoEntity.setDiType(1);
+        udiInfoEntity.setScbssfbhph("是");
+        udiInfoEntity.setScbssfbhscrq("是");
+        udiInfoEntity.setScbssfbhsxrq("是");
+        udiInfoEntity.setScbssfbhxlh("否");
         udiInfoEntity = UdiInfoUtil.initUdiInfoEntity(udiInfoEntity);
         udiInfoService.insertUdiInfo(udiInfoEntity);
     }
diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/ProductInfoDao.xml b/api-admin/src/main/resources/mybatis/mapper/basic/ProductInfoDao.xml
index f6579ff..f6a000b 100644
--- a/api-admin/src/main/resources/mybatis/mapper/basic/ProductInfoDao.xml
+++ b/api-admin/src/main/resources/mybatis/mapper/basic/ProductInfoDao.xml
@@ -29,7 +29,7 @@
                 AND tyshxydm = #{tyshxydm}
             </if>
             <if test="updateTime!=null and updateTime!=''">
-                <![CDATA[   and DATE_FORMAT(updateTime, '%Y-%m-%d %H:%i:%S')>=  DATE_FORMAT(#{updateTime}, '%Y-%m-%d %H:%i:%S')   ]]>
+                <![CDATA[   and updateTime>=  DATE_FORMAT(#{updateTime}, '%Y-%m-%d %H:%i:%S')   ]]>
             </if>
 
 
@@ -64,7 +64,7 @@
                 AND tyshxydm = #{tyshxydm}
             </if>
             <if test="updateTime!=null and updateTime!=''">
-                <![CDATA[   and DATE_FORMAT(updateTime, '%Y-%m-%d %H:%i:%S')>=  DATE_FORMAT(#{updateTime}, '%Y-%m-%d %H:%i:%S')   ]]>
+                <![CDATA[   and updateTime>=  DATE_FORMAT(#{updateTime}, '%Y-%m-%d %H:%i:%S')   ]]>
             </if>
         </where>
         GROUP BY uuid
@@ -88,7 +88,7 @@
                 AND uuid = #{uuid}
             </if>
             <if test="updateTime!=null and updateTime!=''">
-                <![CDATA[   and DATE_FORMAT(updateTime, '%Y-%m-%d %H:%i:%S')>=  DATE_FORMAT(#{updateTime}, '%Y-%m-%d %H:%i:%S')   ]]>
+                <![CDATA[   and updateTime>=  DATE_FORMAT(#{updateTime}, '%Y-%m-%d %H:%i:%S')   ]]>
             </if>
         </where>
         GROUP BY cpmctymc
@@ -113,7 +113,7 @@
                 AND uuid = #{uuid}
             </if>
             <if test="updateTime!=null and updateTime!=''">
-                <![CDATA[   and DATE_FORMAT(updateTime, '%Y-%m-%d %H:%i:%S')>=  DATE_FORMAT(#{updateTime}, '%Y-%m-%d %H:%i:%S')   ]]>
+                <![CDATA[   and updateTime>=  DATE_FORMAT(#{updateTime}, '%Y-%m-%d %H:%i:%S')   ]]>
             </if>
         </where>
         GROUP BY nameCode
@@ -249,7 +249,7 @@
                 AND deviceRecordKey = #{deviceRecordKey}
             </if>
             <if test="updateTime!=null and updateTime!=''">
-                <![CDATA[   and DATE_FORMAT(updateTime, '%Y-%m-%d %H:%i:%S')>=  DATE_FORMAT(#{updateTime}, '%Y-%m-%d %H:%i:%S')   ]]>
+                <![CDATA[   and updateTime>=  DATE_FORMAT(#{updateTime}, '%Y-%m-%d %H:%i:%S')   ]]>
             </if>
             <if test="isNewest != null and isNewest!=''">
                 AND isNewest = #{isNewest}
@@ -266,9 +266,10 @@
         select *
         from productinfo
         where
- <![CDATA[   DATE_FORMAT(updateTime, '%Y-%m-%d %H:%i:%S') >= DATE_FORMAT(#{startDate}, '%Y-%m-%d %H:%i:%S')   ]]>
+ <![CDATA[   updateTime >= DATE_FORMAT(#{startDate}, '%Y-%m-%d %H:%i:%S')   ]]>
         and
-  <![CDATA[   DATE_FORMAT(updateTime, '%Y-%m-%d %H:%i:%S') <= DATE_FORMAT(#{endDate}, '%Y-%m-%d %H:%i:%S')
+  <![CDATA[   updateTime, '%Y-%m-%d %H:%i:%S' <= DATE_FORMAT(#{endDate}
+            , '%Y-%m-%d %H:%i:%S')
         ]]>
     </select>
     <!--<select id="filterUdi" parameterType="com.glxp.sync.admin.req.ProductInfoFilterRequest"-->
@@ -342,7 +343,7 @@
                 AND deviceRecordKey = #{deviceRecordKey}
             </if>
             <if test="updateTime!=null and updateTime!=''">
-                <![CDATA[   and DATE_FORMAT(updateTime, '%Y-%m-%d %H:%i:%S')>=  DATE_FORMAT(#{updateTime}, '%Y-%m-%d %H:%i:%S')   ]]>
+                <![CDATA[   and updateTime>=  DATE_FORMAT(#{updateTime}, '%Y-%m-%d %H:%i:%S')   ]]>
             </if>
         </where>
         limit #{page},#{limit}