Merge pull request 'fix:解决图检审批创建时间字段获取值的问题，以及任务审批主图加入可疑文件夹后左侧列表还能查询到的问题' (#87) from fix/Picture_check_approval_creation_time into test

Reviewed-on: #87

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 = "节点状态")

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;
 
     /**

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<OcrPictureMybatisDao,
     public OcrPicture getPackagePictureInfo(String checkDuplicateId, String pictureId, UserToken userToken) {
         String userNodeType = ProcessConstant.userNodeType.getOrDefault(userToken.getNodeType(), "一级审批");
 
-        return pictureMybatisDao.getPackagePictureInfo(checkDuplicateId,pictureId,userNodeType);
+        OcrPicture ocrPicture = pictureMybatisDao.getPackagePictureInfo(checkDuplicateId,pictureId,userNodeType);
+
+        ocrPicture.getPictureInfo().setCreateTime(ocrPicture.getPhotoDateTimestamp());
+        return ocrPicture;
     }
 
     @Override