时间转换

src/main/java/com/caimei/modules/order/entity/CmReturnedPurchase.java

@@ -46,9 +46,9 @@ public class CmReturnedPurchase implements Serializable {
     private String returnTime;        // 申请退款时间
     private String confirmReturnTime;        // 确认退款时间(审核退款时间)
 
-    @DateTimeFormat
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date beginReturnTime;
-    @DateTimeFormat
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date endReturnTime;
 
     private Date beginConfirmReturnTime;

src/main/resources/mapper/CmReturnedPurchaseMapper.xml

@@ -104,16 +104,16 @@
             <if test="confirmReturnTime != null and confirmReturnTime != ''">
                 AND a.confirmReturnTime = #{confirmReturnTime}
             </if>
-            <if test="beginReturnTime != null and beginReturnTime != ''">
+            <if test="beginReturnTime != null">
                 AND STR_TO_DATE(returnTime,'%Y-%m-%d %H:%i') <![CDATA[  >  ]]> STR_TO_DATE(#{beginReturnTime},'%Y-%m-%d %H:%i')
             </if>
-            <if test="endReturnTime != null and endReturnTime != ''">
+            <if test="endReturnTime != null">
                 AND STR_TO_DATE(returnTime,'%Y-%m-%d %H:%i') <![CDATA[  <  ]]> STR_TO_DATE(#{endReturnTime},'%Y-%m-%d %H:%i')
             </if>
-            <if test="beginConfirmReturnTime != null and beginConfirmReturnTime != ''">
+            <if test="beginConfirmReturnTime != null">
                 AND STR_TO_DATE(confirmReturnTime,'%Y-%m-%d %H:%i') <![CDATA[  >  ]]> STR_TO_DATE(#{beginConfirmReturnTime},'%Y-%m-%d %H:%i')
             </if>
-            <if test="endConfirmReturnTime != null and endConfirmReturnTime != ''">
+            <if test="endConfirmReturnTime != null">
                 AND STR_TO_DATE(confirmReturnTime,'%Y-%m-%d %H:%i') <![CDATA[  <  ]]> STR_TO_DATE(#{endConfirmReturnTime},'%Y-%m-%d %H:%i')
             </if>
             <if test="userName != null and userName != ''">