diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrPicture.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrPicture.java index 0cb6d759..f1aef307 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrPicture.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrPicture.java @@ -361,6 +361,7 @@ public class OcrPicture implements BaseDto, java.io.Serializable { @ApiModelProperty(value = "拍照时间") @TableField(value = "photo_date_timestamp") + @JsonSerialize(using = DateSerializer.class) private Long photoDateTimestamp; @ApiModelProperty(value = "节点状态") diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrPictureInfo.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrPictureInfo.java index 47bf3322..74b45b57 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrPictureInfo.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrPictureInfo.java @@ -1,6 +1,7 @@ package cn.jyjz.xiaoyao.ocr.dataobject; import cn.jyjz.xiaoyao.common.base.jsonDomain.DateNotimeSerializer; +import cn.jyjz.xiaoyao.common.base.jsonDomain.DateSerializer; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; @@ -64,7 +65,8 @@ public class OcrPictureInfo { * 创建时间 */ @TableField(value = "create_time") - @JsonSerialize(using = DateNotimeSerializer.class) +// @JsonSerialize(using = DateNotimeSerializer.class) + @JsonSerialize(using = DateSerializer.class) private Long createTime; /** diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrPictureServiceImpl.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrPictureServiceImpl.java index 8cab36a2..d7c69e25 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrPictureServiceImpl.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrPictureServiceImpl.java @@ -320,7 +320,10 @@ public class OcrPictureServiceImpl extends BaseServiceImpl ${izApprovalStatus.rulesOp} (