From c9202520f77d0a7085b10fc652af4ef8a6d3a6bf Mon Sep 17 00:00:00 2001
From: sunchenliang <2532527871@qq.com>
Date: Wed, 20 Mar 2024 14:24:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8E=86=E5=8F=B2=E5=AE=A1?=
 =?UTF-8?q?=E6=9F=A5=E6=95=B0=E6=8D=AE=E7=BB=93=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ocr/dataobject/OcrTaskchildPicture.java    |  3 ++-
 .../jyjz/xiaoyao/ocr/dto/UserapproveDto.java   | 18 ++++++++++++++++++
 .../impl/OcrTaskchildPictureServiceImpl.java   | 15 ++++++++++++---
 3 files changed, 32 insertions(+), 4 deletions(-)
 create mode 100644 jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dto/UserapproveDto.java

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 e9d3aa9b..1900a328 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
@@ -9,6 +9,7 @@ import cn.jyjz.xiaoyao.common.base.util.requestFormat.SearchQuery;
 
 import cn.jyjz.xiaoyao.oa.from.dataobject.Category;
 import cn.jyjz.xiaoyao.oa.from.dataobject.Userapprove;
+import cn.jyjz.xiaoyao.ocr.dto.UserapproveDto;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -242,7 +243,7 @@ public class OcrTaskchildPicture implements BaseDto, java.io.Serializable {
 
     @ApiModelProperty(value = "审查日志")
     @TableField(exist = false)
-    private List<Userapprove> userapproveList;
+    private List<UserapproveDto> userapproveList;
 
     //保存当前登录用户的数据权限范围的搜索条件
     @TableField(exist = false)
diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dto/UserapproveDto.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dto/UserapproveDto.java
new file mode 100644
index 00000000..e7acbcd6
--- /dev/null
+++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dto/UserapproveDto.java
@@ -0,0 +1,18 @@
+package cn.jyjz.xiaoyao.ocr.dto;
+
+import cn.jyjz.xiaoyao.oa.from.dataobject.Userapprove;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * ClassName： UserapproveDto$.java
+ * Description:
+ * Author： scl.
+ * Date： 2024/3/20 14:07
+ */
+@Data
+public class UserapproveDto {
+    private String nodeName;
+    private List<Userapprove> userapproveList;
+}
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 0fb3fb5a..36450b54 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
@@ -15,6 +15,7 @@ import cn.jyjz.xiaoyao.ocr.dataDao.OcrTaskchildPictureMybatisDao;
 import cn.jyjz.xiaoyao.ocr.dataobject.OcrPicture;
 import cn.jyjz.xiaoyao.ocr.dataobject.OcrTaskchildPicture;
 import cn.jyjz.xiaoyao.ocr.dataobject.OcrTaskchildPictureAppro;
+import cn.jyjz.xiaoyao.ocr.dto.UserapproveDto;
 import cn.jyjz.xiaoyao.ocr.service.OcrPictureService;
 import cn.jyjz.xiaoyao.ocr.service.OcrTaskchildPictureService;
 import com.alibaba.fastjson.JSON;
@@ -71,7 +72,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()){
@@ -300,8 +301,16 @@ public class OcrTaskchildPictureServiceImpl extends BaseServiceImpl<OcrTaskchild
             return new OcrTaskchildPicture();
         }
         List<Userapprove> list = userapproveService.list(new LambdaQueryWrapper<Userapprove>().eq(Userapprove::getFormid, fromid));
-        ocrTaskchildPicture.setUserapproveList(list);
-        if(null !=userToken){
+        Map<String, List<Userapprove>> collect = list.stream().collect(Collectors.groupingBy(Userapprove::getTaskname));
+        List<UserapproveDto> userapproveDtos = new ArrayList<>();
+        for (Map.Entry<String, List<Userapprove>> entry : collect.entrySet()) {
+            UserapproveDto dto = new UserapproveDto();
+            dto.setNodeName(entry.getKey());
+            dto.setUserapproveList(entry.getValue());
+            userapproveDtos.add(dto);
+        }
+        ocrTaskchildPicture.setUserapproveList(userapproveDtos);
+        if (null != userToken) {
             Optional<Userapprove> first = list.stream().filter(userapprove -> userapprove.getUserid().toString().equals(userToken.getUserid())).findFirst();
             ocrTaskchildPicture.setUserapprove(first.orElse(new Userapprove()));
         }