Commit ee379411 authored by 曹盼盼's avatar 曹盼盼

修改96333中日期报错问题

parent 143d7e3e
...@@ -6,6 +6,7 @@ import io.swagger.annotations.ApiModel; ...@@ -6,6 +6,7 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
...@@ -36,6 +37,7 @@ public class AlertCalledDto extends BaseDto { ...@@ -36,6 +37,7 @@ public class AlertCalledDto extends BaseDto {
private String alertSourceCode; private String alertSourceCode;
@ApiModelProperty(value = "接警时间") @ApiModelProperty(value = "接警时间")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date callTime; private Date callTime;
@ApiModelProperty(value = "报警人电话") @ApiModelProperty(value = "报警人电话")
...@@ -102,9 +104,11 @@ public class AlertCalledDto extends BaseDto { ...@@ -102,9 +104,11 @@ public class AlertCalledDto extends BaseDto {
private String address; private String address;
@ApiModelProperty(value = "接警时间开始---用于列表过滤") @ApiModelProperty(value = "接警时间开始---用于列表过滤")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date callTimeStart ; private Date callTimeStart ;
@ApiModelProperty(value = "接警时间结束---用于列表过滤") @ApiModelProperty(value = "接警时间结束---用于列表过滤")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date callTimeEnd ; private Date callTimeEnd ;
@ApiModelProperty(value = "是否处警") @ApiModelProperty(value = "是否处警")
......
...@@ -5,6 +5,7 @@ import com.alibaba.excel.annotation.ExcelProperty; ...@@ -5,6 +5,7 @@ import com.alibaba.excel.annotation.ExcelProperty;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date; import java.util.Date;
...@@ -40,10 +41,12 @@ public class AlertCalledRecordDto { ...@@ -40,10 +41,12 @@ public class AlertCalledRecordDto {
@ExcelIgnore @ExcelIgnore
@ApiModelProperty(value = "接警开始时间") @ApiModelProperty(value = "接警开始时间")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date callTimeStart; private Date callTimeStart;
@ExcelIgnore @ExcelIgnore
@ApiModelProperty(value = "接警结束时间") @ApiModelProperty(value = "接警结束时间")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date callTimeEnd; private Date callTimeEnd;
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment