修改导出

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/WarehouseBaseInfo.java

@@ -209,15 +209,15 @@ public class WarehouseBaseInfo extends BaseModel<WarehouseBaseInfo> {
     /**
      * 开始时间
      */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @TableField(exist = false)
     private Date startDate;
     /**
      * 结束时间
      */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @TableField(exist = false)
     private Date endDate;
     /**

winsea-haixin-plugin-yiliangyiyun/src/main/resources/mapper/WarehouseBaseInfoMapper.xml

@@ -95,11 +95,11 @@
             AND a.warehouse_name= #{warehouseName}
         </if>
         <if test="startDate != null">
-            AND (DATE_FORMAT(a.create_date,"%Y%m%d") &gt;=
+            AND (DATE_FORMAT(a.settlement_date,"%Y%m%d%H%m%s") &gt;=
             DATE_FORMAT(#{startDate},"%Y%m%d"))
         </if>
         <if test="endDate != null">
-            AND (DATE_FORMAT(a.create_date,"%Y%m%d") &lt;=
+            AND (DATE_FORMAT(a.settlement_date,"%Y%m%d%H%m%s") &lt;=
             DATE_FORMAT(#{endDate},"%Y%m%d"))
         </if>
         UNION ALL