From d678700078d7ddf312fab07d82538ea47e7a2d2d Mon Sep 17 00:00:00 2001
From: zhouwentao <1577701412@qq.com>
Date: Fri, 4 Aug 2023 13:07:05 +0800
Subject: [PATCH] updates

---
 .../modules/ocr/controller/OcrIdentifyController.java      | 7 +++----
 .../java/org/jeecg/modules/ocr/entity/OcrIdentify.java     | 5 +++++
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/controller/OcrIdentifyController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/controller/OcrIdentifyController.java
index 66ea2cf..f329e2e 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/controller/OcrIdentifyController.java
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/controller/OcrIdentifyController.java
@@ -251,10 +251,7 @@ public class OcrIdentifyController extends JeecgController<OcrIdentify, IOcrIden
     @ApiOperation(value = "ocr识别-通过id查询", notes = "ocr识别-通过id查询")
     @GetMapping(value = "/queryById")
     public Result<OcrIdentify> queryById(@RequestParam(name = "id", required = true) String id) {
-        Map<String, String[]> parameterMap=new HashMap<>();
-        parameterMap.put("id",new String[]{id});
-        QueryWrapper<OcrIdentify> queryWrapper = QueryGenerator.initQueryWrapper(new OcrIdentify(),parameterMap);
-        OcrIdentify ocrIdentify = ocrIdentifyService.getOne(queryWrapper);
+        OcrIdentify ocrIdentify = ocrIdentifyService.getById(id);
         if (ocrIdentify == null) {
             return Result.error("未找到对应数据");
         }
@@ -279,7 +276,9 @@ public class OcrIdentifyController extends JeecgController<OcrIdentify, IOcrIden
         }
         OcrRuleCheckVo ocrRuleCheckVo = ocrRuleCheckMap.get(ocrIdentify.getRuleCheck());
         if (ocrRuleCheckVo!=null && StringUtils.isNotBlank(ocrRuleCheckVo.getMetadataConfigId())) {
+            ocrIdentify.setRuleCheck_dictText(ocrRuleCheckVo.getConfigName());
             ocrIdentify.setMetadataConfigId(ocrRuleCheckVo.getMetadataConfigId());
+            ocrIdentify.setMetadataConfigId_dictText(ocrRuleCheckVo.getMetadataConfigName());
             OcrMetadataConfigVo ocrMetadataConfigVo = metadataConfigMap.get(ocrRuleCheckVo.getMetadataConfigId());
             if (ocrMetadataConfigVo!=null) {
                 ocrIdentify.setTaskType(ocrMetadataConfigVo.getTaskType());
diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/entity/OcrIdentify.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/entity/OcrIdentify.java
index 42231a8..7ff8bc1 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/entity/OcrIdentify.java
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/entity/OcrIdentify.java
@@ -119,6 +119,11 @@ public class OcrIdentify implements Serializable {
 
     //======================非数据库映射
     /**任务类型_字段中文*/
+    @TableField(exist = false)
+    private String metadataConfigId_dictText;
+
+    @TableField(exist = false)
+    private String ruleCheck_dictText;
     @ApiModelProperty(value = "任务类型名称")
     @Excel(name = "任务类型", width = 15)
     @TableField(exist = false)