|
@@ -1,5 +1,6 @@
|
|
|
package com.fdkankan.manage.vo.response;
|
|
|
|
|
|
+import com.fasterxml.jackson.annotation.JsonFormat;
|
|
|
import com.fdkankan.manage.constant.CameraOutTypeEnum;
|
|
|
import com.fdkankan.manage.util.Dateutils;
|
|
|
import lombok.Data;
|
|
@@ -25,15 +26,15 @@ public class CameraDetailVo {
|
|
|
private Integer agentId;
|
|
|
private String agentName;
|
|
|
|
|
|
- private String buyDate;
|
|
|
+ @JsonFormat(pattern="yyyy-MM-dd")
|
|
|
+ private Date buyDate;
|
|
|
private String warrantyDate;
|
|
|
|
|
|
public String getWarrantyDate() {
|
|
|
- if(StringUtils.isBlank(buyDate)){
|
|
|
+ if(buyDate ==null){
|
|
|
return null;
|
|
|
}
|
|
|
- Date outTime = Dateutils.getDate(buyDate);
|
|
|
- Date date = Dateutils.dateAddOneYear(outTime, 1);
|
|
|
+ Date date = Dateutils.dateAddOneYear(buyDate, 1);
|
|
|
date = Dateutils.dateAddOne(date, 7);
|
|
|
return Dateutils.getDayDate(date) +" 23:59:59";
|
|
|
}
|