sql拼接调整

fs-service/src/main/resources/mapper/hisStore/FsStoreOrderScrmMapper.xml

@@ -456,13 +456,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         FROM
         fs_store_order_scrm  AS o
         <where>
-            o.status  &gt; 0 and
+            o.status  &gt; 0
             <choose>
                 <when test="queryType == null and queryType==1">
-                      (DATE_FORMAT(o.create_time,#{sqlDateFormat}) between #{beginTime} and #{finalTime})
+                    and     (DATE_FORMAT(o.create_time,#{sqlDateFormat}) between #{beginTime} and #{finalTime})
                 </when>
                 <when test="queryType != null and queryType==2">
-                      (DATE_FORMAT(o.delivery_send_time,#{sqlDateFormat}) between #{beginTime} and #{finalTime})
+                    and    (DATE_FORMAT(o.delivery_send_time,#{sqlDateFormat}) between #{beginTime} and #{finalTime})
                 </when>
             </choose>
             <if test="userIds != null and userIds.length>0">