时间查询格式化

src/main/java/com/fdkankan/manage/util/Dateutils.java

@@ -137,4 +137,24 @@ public class Dateutils {
     }
 
 
+    public static String getStartTime(String startTime) {
+        if(StringUtils.isBlank(startTime)){
+            return null;
+        }
+        if(startTime.length() > 12){
+            return startTime;
+        }
+        return startTime +" 00:00:00";
+    }
+
+    public static String getEndTime(String endTime) {
+        if(StringUtils.isBlank(endTime)){
+            return null;
+        }
+        if(endTime.length() > 12){
+            return endTime;
+        }
+        return endTime +" 23:59:59";
+    }
+
 }

src/main/java/com/fdkankan/manage/vo/InvoicePageParamVO.java

@@ -3,9 +3,11 @@ package com.fdkankan.manage.vo;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fdkankan.common.request.RequestBase;
 import com.fdkankan.common.response.PageInfo;
+import com.fdkankan.manage.util.Dateutils;
 import com.fdkankan.mongodb.base.BaseRequestMongo;
 import java.util.Date;
 import lombok.Data;
+import org.apache.commons.lang3.StringUtils;
 
 /**
  * <p>
@@ -20,16 +22,30 @@ public class InvoicePageParamVO extends RequestBase {
 
     private String orderSn;
 
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    private Date invoiceTimeStart;
+    private String invoiceTimeStart;
 
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    private Date invoiceTimeEnd;
+    private String invoiceTimeEnd;
 
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    private Date payTimeStart;
+    private String payTimeStart;
 
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    private Date payTimeEnd;
+    private String payTimeEnd;
 
+    public String getInvoiceTimeStart() {
+        return Dateutils.getStartTime(invoiceTimeStart) ;
+    }
+
+
+    public String getInvoiceTimeEnd() {
+        return Dateutils.getEndTime(invoiceTimeEnd);
+    }
+
+
+    public String getPayTimeStart() {
+        return Dateutils.getStartTime(payTimeStart) ;
+    }
+
+
+    public String getPayTimeEnd() {
+        return Dateutils.getEndTime(payTimeEnd);
+    }
 }

src/main/java/com/fdkankan/manage/vo/request/AgentAuditListParam.java

@@ -1,6 +1,7 @@
 package com.fdkankan.manage.vo.request;
 
 import com.fdkankan.common.request.RequestBase;
+import com.fdkankan.manage.util.Dateutils;
 import lombok.Data;
 
 @Data
@@ -9,4 +10,12 @@ public class AgentAuditListParam  extends RequestBase {
     private String endTime;
     private String companyName;
     private Integer handleState = 0;        //0 待处理，1已处理
+
+    public String getStartTime() {
+        return Dateutils.getStartTime(startTime);
+    }
+
+    public String getEndTime() {
+        return Dateutils.getEndTime(endTime);
+    }
 }

src/main/java/com/fdkankan/manage/vo/request/CameraParam.java

@@ -1,6 +1,7 @@
 package com.fdkankan.manage.vo.request;
 
 import com.fdkankan.common.request.RequestBase;
+import com.fdkankan.manage.util.Dateutils;
 import lombok.Data;
 
 @Data
@@ -15,4 +16,14 @@ public class CameraParam extends RequestBase {
     private Integer type;                       //设备类型  0旧双目相机，1 四维看看 ，2 四维看看lite，9四维看见，10四维深时
     private String activatedStartTime;          //激活时间
     private String activatedEndTime;            //激活时间
+
+
+
+    public String getActivatedStartTime() {
+        return Dateutils.getStartTime(activatedStartTime);
+    }
+
+    public String getActivatedEndTime() {
+        return Dateutils.getEndTime(activatedEndTime);
+    }
 }

src/main/java/com/fdkankan/manage/vo/request/IntercomMessageParam.java

@@ -1,6 +1,7 @@
 package com.fdkankan.manage.vo.request;
 
 import com.fdkankan.common.request.RequestBase;
+import com.fdkankan.manage.util.Dateutils;
 import lombok.Data;
 
 @Data
@@ -12,4 +13,14 @@ public class IntercomMessageParam extends RequestBase {
 
     private Long id;
     private String noteContent;
+
+
+    public String getStartTime() {
+        return Dateutils.getStartTime(startTime);
+    }
+
+    public String getEndTime() {
+        return Dateutils.getEndTime(endTime);
+    }
+
 }

src/main/java/com/fdkankan/manage/vo/request/OrderParam.java

@@ -1,6 +1,7 @@
 package com.fdkankan.manage.vo.request;
 
 import com.fdkankan.common.request.RequestBase;
+import com.fdkankan.manage.util.Dateutils;
 import lombok.Data;
 
 @Data
@@ -11,4 +12,12 @@ public class OrderParam extends RequestBase {
     private String endTime;         //结束时间
     private String tradeNum;        //交易号
     private String expressNum;      //快递单号
+
+    public String getStartTime() {
+        return Dateutils.getStartTime(startTime);
+    }
+
+    public String getEndTime() {
+        return Dateutils.getEndTime(endTime);
+    }
 }