ソースを参照

优化订单excel导出

赵冬冬 4 年 前
コミット
31235ff9da

+ 2 - 2
forest-admin/admin-server/src/main/java/com/hwrj/cloud/admin/dto/OmsOrderQueryParam.java

@@ -28,10 +28,10 @@ public class OmsOrderQueryParam {
     private String createTime;
 
     @ApiModelProperty(value = "开始时间")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date startTime;
 
     @ApiModelProperty(value = "结束时间")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date endTime;
 }

+ 2 - 5
forest-admin/admin-server/src/main/resources/dao/OmsOrderDao.xml

@@ -23,13 +23,10 @@
         <if test="queryParam.orderType!=null">
             AND order_type = #{queryParam.orderType}
         </if>
-        <if test="queryParam.createTime!=null and queryParam.createTime!=''">
-            AND create_time LIKE concat(#{queryParam.createTime},"%")
-        </if>
-        <if test="queryParam.startTime!=null and queryParam.startTime!=''">
+        <if test="queryParam.startTime!=null">
             AND create_time <![CDATA[>=]]> #{queryParam.startTime}
         </if>
-        <if test="queryParam.endTime!=null and queryParam.endTime!=''">
+        <if test="queryParam.endTime!=null">
             AND create_time <![CDATA[<=]]> #{queryParam.endTime}
         </if>
         <if test="queryParam.receiverKeyword!=null and queryParam.receiverKeyword!=''">