From c993e89ceb200e9b9a8b391b51385a9145a0970c Mon Sep 17 00:00:00 2001
From: sunchenliang <2532527871@qq.com>
Date: Mon, 18 Mar 2024 19:26:28 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=BB=E5=8A=A1=E5=8C=85?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ocr/controller/OcrTaskchildPictureController.java  |  3 ++-
 .../xiaoyao/ocr/dataobject/OcrTaskchildPicture.java    |  4 ++++
 .../ocr/service/OcrTaskchildPictureService.java        |  2 +-
 .../service/impl/OcrTaskchildPictureServiceImpl.java   | 10 ++++++++--
 4 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrTaskchildPictureController.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrTaskchildPictureController.java
index c2736857..4b95acfd 100644
--- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrTaskchildPictureController.java
+++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrTaskchildPictureController.java
@@ -291,7 +291,8 @@ public class OcrTaskchildPictureController extends BaseController {
     public ResultVo getdateOcrTaskchildPicture(HttpServletResponse response, HttpServletRequest request,
                                                @PathVariable("packageid") Long packageid,
                                                @PathVariable("id") Long id) throws IOException {
-        OcrTaskchildPicture dto = this.ocrTaskchildPictureService.listPicturePackageId(id.toString(), packageid);
+        UserToken userToken = this.userTokenService.getUserToken(RequestBaseUtil.getToken(request));
+        OcrTaskchildPicture dto = this.ocrTaskchildPictureService.listPicturePackageId(id.toString(), packageid,userToken);
         if (null != dto) {
             return ResultVoUtil.success(dto);
         } else {
diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrTaskchildPicture.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrTaskchildPicture.java
index 0059f387..e610a2fb 100644
--- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrTaskchildPicture.java
+++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrTaskchildPicture.java
@@ -225,6 +225,10 @@ public class OcrTaskchildPicture implements BaseDto,java.io.Serializable {
 	@TableField(exist = false)
 	private String reporttime;
 
+	@ApiModelProperty(value ="本人审查日志")
+	@TableField(exist = false)
+	private Userapprove userapprove;
+
 	@ApiModelProperty(value ="审查日志")
 	@TableField(exist = false)
 	private List<Userapprove> userapproveList;
diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/OcrTaskchildPictureService.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/OcrTaskchildPictureService.java
index 59ce5ff6..8b00fa35 100644
--- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/OcrTaskchildPictureService.java
+++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/OcrTaskchildPictureService.java
@@ -58,7 +58,7 @@ public interface OcrTaskchildPictureService extends BaseService<OcrTaskchildPict
      * @param fromid 任务主键
      * @return
      */
-    public OcrTaskchildPicture listPicturePackageId(String fromid,Long packageid);
+    public OcrTaskchildPicture listPicturePackageId(String fromid,Long packageid,UserToken userToken);
     /**
      * 根据任务包主键，查询对应的任务信息
      * @param taskchildpictureid 当前显示的任务主键
diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrTaskchildPictureServiceImpl.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrTaskchildPictureServiceImpl.java
index 8ff1aa15..0fb3fb5a 100644
--- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrTaskchildPictureServiceImpl.java
+++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrTaskchildPictureServiceImpl.java
@@ -3,6 +3,8 @@ package cn.jyjz.xiaoyao.ocr.service.impl;
 import cn.jyjz.flowable.common.SystemConstantsOa;
 import cn.jyjz.flowable.service.IFlowTaskService;
 import cn.jyjz.xiaoyao.common.base.param.ParamterPage;
+import cn.jyjz.xiaoyao.common.base.service.UserTokenService;
+import cn.jyjz.xiaoyao.common.base.util.RequestBaseUtil;
 import cn.jyjz.xiaoyao.common.base.vo.ResultVo;
 import cn.jyjz.xiaoyao.common.base.vo.ResultVoUtil;
 import cn.jyjz.xiaoyao.common.base.vo.UserToken;
@@ -69,7 +71,7 @@ public class OcrTaskchildPictureServiceImpl extends BaseServiceImpl<OcrTaskchild
 
         StringBuffer taskType = new StringBuffer();
         for (String childpictureid : cps) {
-            OcrTaskchildPicture old = this.listPicturePackageId(childpictureid, Long.parseLong(packageid));
+            OcrTaskchildPicture old = this.listPicturePackageId(childpictureid, Long.parseLong(packageid),null);
 
             //如果是历史图片，不允许进行设置
 //			if(old.isIzHistory()){
@@ -292,13 +294,17 @@ public class OcrTaskchildPictureServiceImpl extends BaseServiceImpl<OcrTaskchild
      * @param fromid 任务主键
      * @return
      */
-    public OcrTaskchildPicture listPicturePackageId(String fromid, Long packageid) {
+    public OcrTaskchildPicture listPicturePackageId(String fromid, Long packageid, UserToken userToken) {
         OcrTaskchildPicture ocrTaskchildPicture = this.getById(fromid);
         if (ocrTaskchildPicture == null) {
             return new OcrTaskchildPicture();
         }
         List<Userapprove> list = userapproveService.list(new LambdaQueryWrapper<Userapprove>().eq(Userapprove::getFormid, fromid));
         ocrTaskchildPicture.setUserapproveList(list);
+        if(null !=userToken){
+            Optional<Userapprove> first = list.stream().filter(userapprove -> userapprove.getUserid().toString().equals(userToken.getUserid())).findFirst();
+            ocrTaskchildPicture.setUserapprove(first.orElse(new Userapprove()));
+        }
         //查询图片对象
         OcrPicture ocrPicture = this.ocrPictureService.selectDtoById(ocrTaskchildPicture.getPictureid());