From 277874d91a7d693041fe9254454ec5e4ec5e2ba3 Mon Sep 17 00:00:00 2001
From: sunchenliang <2532527871@qq.com>
Date: Wed, 17 Apr 2024 23:20:32 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E5=AE=A1=E6=89=B9=E5=8E=86=E5=8F=B2=E8=AE=B0=E5=BD=95=E6=8E=92?=
 =?UTF-8?q?=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ocr/controller/OcrTaskchildPictureController.java     | 5 +++--
 .../xiaoyao/ocr/service/OcrTaskchildPictureService.java   | 2 +-
 .../ocr/service/impl/OcrTaskchildPictureServiceImpl.java  | 8 ++++----
 .../resources/mapper/oa/OcrTaskchildPictureMapper.xml     | 2 +-
 4 files changed, 9 insertions(+), 8 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 0e2c1c72..59222bac 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
@@ -298,13 +298,14 @@ public class OcrTaskchildPictureController extends BaseController {
             @ApiImplicitParam(paramType = "path", name = "id", value = "当前选中的任务主键", required = true),
             @ApiImplicitParam(paramType = "path", name = "packageid", value = "任务包主键，注意不是当前任务关联的packageid，而是当前选中的任务包主键")
     })
-    @GetMapping("/getdata/{id}/{packageid}")
+    @GetMapping("/getdata/{id}/{packageid}/{taskNode}")
     @ResponseBody
     public ResultVo getdateOcrTaskchildPicture(HttpServletResponse response, HttpServletRequest request,
                                                @PathVariable("packageid") Long packageid,
+                                               @PathVariable("taskNode") String taskNode,
                                                @PathVariable("id") Long id) throws IOException {
         UserToken userToken = this.userTokenService.getUserToken(RequestBaseUtil.getToken(request));
-        OcrTaskchildPicture dto = this.ocrTaskchildPictureService.listPicturePackageId(id.toString(), packageid, userToken);
+        OcrTaskchildPicture dto = this.ocrTaskchildPictureService.listPicturePackageId(id.toString(), packageid, userToken,taskNode);
         if (null != dto) {
             return ResultVoUtil.success(dto);
         } else {
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 adfa1b24..810b294d 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
@@ -69,7 +69,7 @@ public interface OcrTaskchildPictureService extends BaseService<OcrTaskchildPict
      * @param fromid 任务主键
      * @return
      */
-    public OcrTaskchildPicture listPicturePackageId(String fromid,Long packageid,UserToken userToken);
+    public OcrTaskchildPicture listPicturePackageId(String fromid,Long packageid,UserToken userToken,String taskNode);
     /**
      * 根据任务包主键，查询对应的任务信息
      * @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 e8c97480..b72697d1 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
@@ -109,7 +109,7 @@ public class OcrTaskchildPictureServiceImpl extends BaseServiceImpl<OcrTaskchild
 
         StringBuffer taskType = new StringBuffer();
         for (String childpictureid : cps) {
-            OcrTaskchildPicture old = this.listPicturePackageId(childpictureid, Long.parseLong(packageid), null);
+            OcrTaskchildPicture old = this.listPicturePackageId(childpictureid, Long.parseLong(packageid), null,"");
 
             //如果是历史图片，不允许进行设置
 //			if(old.isIzHistory()){
@@ -379,13 +379,13 @@ public class OcrTaskchildPictureServiceImpl extends BaseServiceImpl<OcrTaskchild
      * @param fromid 任务主键
      * @return
      */
-    public OcrTaskchildPicture listPicturePackageId(String fromid, Long packageid, UserToken userToken) {
+    public OcrTaskchildPicture listPicturePackageId(String fromid, Long packageid, UserToken userToken,String taskNode) {
         OcrTaskchildPicture ocrTaskchildPicture = this.getById(fromid);
         if (ocrTaskchildPicture == null) {
             return new OcrTaskchildPicture();
         }
         List<Userapprove> list = userapproveService.list(new LambdaQueryWrapper<Userapprove>().eq(Userapprove::getFormid, fromid));
-        Map<String, List<Userapprove>> collect = list.stream().collect(Collectors.groupingBy(Userapprove::getTaskname));
+        Map<String, List<Userapprove>> collect = list.stream().sorted(Comparator.comparing(Userapprove::getCreatedate)).collect(Collectors.groupingBy(Userapprove::getTaskname));
         List<UserapproveDto> userapproveDtos = new ArrayList<>();
         for (Map.Entry<String, List<Userapprove>> entry : collect.entrySet()) {
             UserapproveDto dto = new UserapproveDto();
@@ -395,7 +395,7 @@ public class OcrTaskchildPictureServiceImpl extends BaseServiceImpl<OcrTaskchild
         }
         ocrTaskchildPicture.setUserapproveList(userapproveDtos);
         if (null != userToken) {
-            Optional<Userapprove> first = list.stream().filter(userapprove -> userapprove.getUserid().toString().equals(userToken.getUserid())).findFirst();
+            Optional<Userapprove> first = list.stream().filter(userapprove -> userapprove.getUserid().toString().equals(userToken.getUserid()) && userapprove.getTaskindex().equals(taskNode)).findFirst();
             Userapprove userapprove = new Userapprove();
             userapprove.setStatshis(ocrTaskchildPicture.getStates()==3?2:ocrTaskchildPicture.getStates()==5?3:1);
             ocrTaskchildPicture.setUserapprove(first.orElse(userapprove));
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 d80e55ac..0f54b97f 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
@@ -765,7 +765,7 @@
                         t1.server_thumbnail_url     serverThumbnailUrl,
                         IF(EXISTS (SELECT STATSHIS
                                    FROM oa_userapprove_t
-                                   WHERE FORMID = t2.ID and STATSHIS = 3 and TASKINDEX = #{taskNode}), 3,
+                                   WHERE FORMID = t2.ID and STATSHIS = 3 and 'finale_judgment' = #{taskNode}), 3,
                            IFNULL((SELECT t3.STATSHIS
                                    FROM oa_userapprove_t t3
                                    WHERE t3.FORMID = t2.ID