From e3c4111822b701ed57b365394e1c3f135c51fcd2 Mon Sep 17 00:00:00 2001
From: DELL <haox0404@outlook.com>
Date: Thu, 11 Apr 2024 18:02:45 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E8=A7=A3=E5=86=B3=E5=9B=BE=E6=A3=80?=
 =?UTF-8?q?=E5=AE=A1=E6=89=B9=E5=88=9B=E5=BB=BA=E6=97=B6=E9=97=B4=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E8=8E=B7=E5=8F=96=E5=80=BC=E7=9A=84=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=EF=BC=8C=E4=BB=A5=E5=8F=8A=E4=BB=BB=E5=8A=A1=E5=AE=A1=E6=89=B9?=
 =?UTF-8?q?=E4=B8=BB=E5=9B=BE=E5=8A=A0=E5=85=A5=E5=8F=AF=E7=96=91=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E5=A4=B9=E5=90=8E=E5=B7=A6=E4=BE=A7=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E8=BF=98=E8=83=BD=E6=9F=A5=E8=AF=A2=E5=88=B0=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrPicture.java | 1 +
 .../java/cn/jyjz/xiaoyao/ocr/dataobject/OcrPictureInfo.java  | 4 +++-
 .../jyjz/xiaoyao/ocr/service/impl/OcrPictureServiceImpl.java | 5 ++++-
 .../main/resources/mapper/oa/OcrTaskchildPictureMapper.xml   | 3 ++-
 4 files changed, 10 insertions(+), 3 deletions(-)

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<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
diff --git a/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrTaskchildPictureMapper.xml b/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrTaskchildPictureMapper.xml
index c0eac22f..0f59d997 100644
--- a/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrTaskchildPictureMapper.xml
+++ b/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrTaskchildPictureMapper.xml
@@ -638,10 +638,11 @@
                op.releaseArea as fromCity
         from ocr_taskchild_picture tc
         LEFT JOIN OA_USERAPPROVE_T uf ON tc.ID = uf.ID
-        left join ocr_picture op on tc.PICTUREID = op.ID and op.suspiciousfile = 0
+        left join ocr_picture op on tc.PICTUREID = op.ID
         where tc.ASSIGNEE = #{searchassignee}
         and tc.TENANTID = #{searchtenantid}
         and tc.STATES = 2
+        and op.suspiciousfile = 0
         <if test="izApprovalStatus != null ">
             ${izApprovalStatus.rulesOp}
             (