From 963749ebe7792e717df96bf256261ba9dd0db8a5 Mon Sep 17 00:00:00 2001
From: zhouwentao <1577701412@qq.com>
Date: Mon, 24 Jul 2023 16:59:45 +0800
Subject: [PATCH] updates

---
 .../impl/OcrMetadataConfigServiceImpl.java      | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/service/impl/OcrMetadataConfigServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/service/impl/OcrMetadataConfigServiceImpl.java
index f298880..23a9e19 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/service/impl/OcrMetadataConfigServiceImpl.java
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/service/impl/OcrMetadataConfigServiceImpl.java
@@ -141,8 +141,21 @@ public class OcrMetadataConfigServiceImpl extends ServiceImpl<OcrMetadataConfigM
         IPage<OcrMetadataConfigVo> pageList=baseMapper.pageVo(page,params);
         List<OcrMetadataConfigDetail> metadataConfigDetails = ocrMetadataConfigDetailService.list();
         List<OcrMetadataConfigDetail> arrayTestList=new ArrayList<>();
+
+
+        List<String> taskTypeIdList = pageList.getRecords().stream().map(a -> a.getTaskType()).collect(Collectors.toList());
+        List<OcrTaskType> ocrTaskTypeList=new ArrayList<>();
+        if (taskTypeIdList.size()>0) {
+            ocrTaskTypeList = ocrTaskTypeService.listByIds(taskTypeIdList);
+        }
+
         String fieldName=null,getField=null;
         for (OcrMetadataConfigVo record : pageList.getRecords()) {
+            if (StringUtils.isNotBlank(record.getTaskType())) {
+                String taskTypeName = ocrTaskTypeList.stream().filter(o -> o.getId().equals(record.getTaskType())).map(o -> o.getTypeName()).collect(Collectors.joining(""));
+                record.setTaskType_dictText(taskTypeName);
+            }
+
             if (metadataConfigDetails!=null && metadataConfigDetails.size()>0) {
                 arrayTestList = metadataConfigDetails.stream().filter(m -> m.getMetadataConfigId().equals(record.getId())).collect(Collectors.toList());
                 fieldName = arrayTestList.stream().map(o -> o.getFieldName()).collect(Collectors.joining(","));
@@ -177,8 +190,8 @@ public class OcrMetadataConfigServiceImpl extends ServiceImpl<OcrMetadataConfigM
             ocrMetadataConfig.setId(ocrMetadataConfig.getId());
             ocrMetadataConfig.setConfigName(ocrMetadataConfig.getConfigName());
             if (StringUtils.isNotBlank(ocrMetadataConfig.getTaskType())) {
-                List<String> collect = ocrTaskTypeList.stream().filter(o -> o.getId().equals(ocrMetadataConfig.getTaskType())).map(o -> o.getTypeName()).collect(Collectors.toList());
-                ocrMetadataConfig.setTaskType_dictText(collect.get(0));
+                String taskTypeName = ocrTaskTypeList.stream().filter(o -> o.getId().equals(ocrMetadataConfig.getTaskType())).map(o -> o.getTypeName()).collect(Collectors.joining(""));
+                ocrMetadataConfig.setTaskType_dictText(taskTypeName);
             }
 
             if (metadataConfigDetails!=null&&metadataConfigDetails.size()>0) {