From 9c009bdf66ba13964fca013ccc1672797c6cb57b Mon Sep 17 00:00:00 2001
From: zhouwentao <1577701412@qq.com>
Date: Mon, 17 Jul 2023 23:13:19 +0800
Subject: [PATCH] updates

---
 .../controller/OcrMetadataConfigController.java   |  4 ++--
 .../ocr/service/IOcrMetadataConfigService.java    |  2 ++
 .../impl/OcrMetadataConfigServiceImpl.java        | 15 +++++++++++++++
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/controller/OcrMetadataConfigController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/controller/OcrMetadataConfigController.java
index 78d12d0..cc42775 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/controller/OcrMetadataConfigController.java
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/controller/OcrMetadataConfigController.java
@@ -175,8 +175,8 @@ public class OcrMetadataConfigController extends JeecgController<OcrMetadataConf
 	//@AutoLog(value = "元数据配置-通过id查询")
 	@ApiOperation(value="元数据配置-通过id查询", notes="元数据配置-通过id查询")
 	@GetMapping(value = "/queryById")
-	public Result<OcrMetadataConfig> queryById(@RequestParam(name="id",required=true) String id) {
-		OcrMetadataConfig ocrMetadataConfig = ocrMetadataConfigService.getById(id);
+	public Result<OcrMetadataConfigVo> queryById(@RequestParam(name="id",required=true) String id) {
+		OcrMetadataConfigVo ocrMetadataConfig = ocrMetadataConfigService.findById(id);
 		if(ocrMetadataConfig==null) {
 			return Result.error("未找到对应数据");
 		}
diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/service/IOcrMetadataConfigService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/service/IOcrMetadataConfigService.java
index 20e2f91..94793df 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/service/IOcrMetadataConfigService.java
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/service/IOcrMetadataConfigService.java
@@ -48,4 +48,6 @@ public interface IOcrMetadataConfigService extends IService<OcrMetadataConfig> {
     IPage<OcrMetadataConfigVo> pageVo(Page<OcrMetadataConfig> page, OcrMetadataConfig ocrMetadataConfig);
 
     List<OcrMetadataConfigVo> allList();
+
+    OcrMetadataConfigVo findById(String id);
 }
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 0acc5ad..0c6900c 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
@@ -12,6 +12,7 @@ import org.jeecg.modules.ocr.model.OcrMetadataConfigSaveModel;
 import org.jeecg.modules.ocr.service.IOcrMetadataConfigDetailService;
 import org.jeecg.modules.ocr.service.IOcrMetadataConfigService;
 import org.jeecg.modules.ocr.vo.OcrMetadataConfigVo;
+import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
@@ -149,4 +150,18 @@ public class OcrMetadataConfigServiceImpl extends ServiceImpl<OcrMetadataConfigM
         }
         return allList;
     }
+
+    @Override
+    public OcrMetadataConfigVo findById(String id) {
+        OcrMetadataConfigVo copyEntityVo=new OcrMetadataConfigVo();
+        OcrMetadataConfig ocrMetadataConfig = this.getById(id);
+        BeanUtils.copyProperties(ocrMetadataConfig,copyEntityVo);
+        List<OcrMetadataConfigDetail> list = ocrMetadataConfigDetailService.list(new LambdaQueryWrapper<OcrMetadataConfigDetail>().eq(OcrMetadataConfigDetail::getMetadataConfigId, id));
+        String fieldName = list.stream().map(o -> o.getFieldName()).collect(Collectors.joining(","));
+        String getField = list.stream().map(o -> o.getGetField()).collect(Collectors.joining(","));
+        copyEntityVo.setResultName(fieldName);
+        copyEntityVo.setGetField(getField);
+        copyEntityVo.setOcrMetadataConfigDetailList(list);
+        return copyEntityVo;
+    }
 }