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

---
 .../ocr/mapper/xml/OcrMetadataConfigMapper.xml       |  2 +-
 .../service/impl/OcrMetadataConfigServiceImpl.java   | 12 ++++++++++++
 .../jeecg/modules/ocr/vo/OcrMetadataConfigVo.java    |  1 -
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/mapper/xml/OcrMetadataConfigMapper.xml b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/mapper/xml/OcrMetadataConfigMapper.xml
index e463219..9188e9e 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/mapper/xml/OcrMetadataConfigMapper.xml
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/mapper/xml/OcrMetadataConfigMapper.xml
@@ -29,7 +29,7 @@
 
     <select id="allList" resultType="org.jeecg.modules.ocr.vo.OcrMetadataConfigVo">
         SELECT oc.*,
-               tasktype.type_name as taskType_dictText
+           tasktype.type_name as taskType_dictText
         FROM ocr_metadata_config oc
         LEFT JOIN ocr_task_type tasktype ON tasktype.id = oc.task_type
         WHERE 1=1
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 8e35201..8ffb38c 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
@@ -163,12 +163,24 @@ public class OcrMetadataConfigServiceImpl extends ServiceImpl<OcrMetadataConfigM
         }else{
             allList=baseMapper.allList(null);
         }
+        List<String> taskTypeIdList = allList.stream().map(a -> a.getTaskType()).collect(Collectors.toList());
+        List<OcrTaskType> ocrTaskTypeList=new ArrayList<>();
+        if (taskTypeIdList.size()>0) {
+            ocrTaskTypeList = ocrTaskTypeService.listByIds(taskTypeIdList);
+
+        }
+
         List<OcrMetadataConfigDetail> metadataConfigDetails = ocrMetadataConfigDetailService.list();
         List<OcrMetadataConfigDetail> arrayTestList=new ArrayList<>();
         String fieldName=null,getField=null;
         for (OcrMetadataConfigVo ocrMetadataConfig : allList) {
             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));
+            }
+
             if (metadataConfigDetails!=null&&metadataConfigDetails.size()>0) {
                 arrayTestList = metadataConfigDetails.stream().filter(m -> m.getMetadataConfigId().equals(ocrMetadataConfig.getId())).collect(Collectors.toList());
                 fieldName = arrayTestList.stream().map(o -> o.getFieldName()).collect(Collectors.joining(","));
diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/vo/OcrMetadataConfigVo.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/vo/OcrMetadataConfigVo.java
index eb04a59..8abce88 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/vo/OcrMetadataConfigVo.java
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/vo/OcrMetadataConfigVo.java
@@ -19,7 +19,6 @@ import java.util.List;
 public class OcrMetadataConfigVo extends OcrMetadataConfig {
     /**任务类型_字段中文*/
     @ApiModelProperty(value = "任务类型名称")
-    @TableField(exist = false)
     @Excel(name = "任务类型", width = 15)
     private String taskType_dictText;