From 4159493572244f288365af68549cc10ae8ffec5e Mon Sep 17 00:00:00 2001
From: yjz <3131811435@qq.com>
Date: Wed, 14 Aug 2024 16:21:49 +0800
Subject: [PATCH] =?UTF-8?q?feat(ocr):=20=E8=8B=B1=E6=96=87=E7=BF=BB?=
 =?UTF-8?q?=E8=AF=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/laws/ocr/entity/OcrRecordEO.java  | 56 +++++++++++++------
 .../service/impl/OcrRecordEOServiceImpl.java  | 14 ++++-
 2 files changed, 51 insertions(+), 19 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/laws/ocr/entity/OcrRecordEO.java b/laws-modules/src/main/java/com/jero/modules/laws/ocr/entity/OcrRecordEO.java
index 7874cead..8e32a18a 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/ocr/entity/OcrRecordEO.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/ocr/entity/OcrRecordEO.java
@@ -33,32 +33,54 @@ public class OcrRecordEO extends BaseEntity implements Serializable{
     //转换结果
     private String resultContent;
 
-    public String getResultContentDictText() {
-        return resultContentDictText;
-    }
-
-    public void setResultContentDictText(String resultContentDictText) {
-        this.resultContentDictText = resultContentDictText;
-    }
-
     //转换结果 翻译
-    private String resultContentDictText;
+    private String resultContent_dictText;
+    //转换结果 翻译英文
+    private String resultContent_dictTextEn;
     //新增字段
     private String fileType;
+
+    public String getFileType_dictTextEn() {
+        return fileType_dictTextEn;
+    }
+
+    public void setFileType_dictTextEn(String fileType_dictTextEn) {
+        this.fileType_dictTextEn = fileType_dictTextEn;
+    }
+
+    public String getFileType_dictText() {
+        return fileType_dictText;
+    }
+
+    public void setFileType_dictText(String fileType_dictText) {
+        this.fileType_dictText = fileType_dictText;
+    }
+
+    public String getResultContent_dictTextEn() {
+        return resultContent_dictTextEn;
+    }
+
+    public void setResultContent_dictTextEn(String resultContent_dictTextEn) {
+        this.resultContent_dictTextEn = resultContent_dictTextEn;
+    }
+
+    public String getResultContent_dictText() {
+        return resultContent_dictText;
+    }
+
+    public void setResultContent_dictText(String resultContent_dictText) {
+        this.resultContent_dictText = resultContent_dictText;
+    }
+
     //文件类型 翻译
-    private String fileTypeDictText;
+    private String fileType_dictText;
+    //文件类型 翻译英文
+    private String fileType_dictTextEn;
     private String standNumber;
     private String standName;
     private String creationUser;
     private String attId;
     private String wordAttId;
-    public String getFileTypeDictText() {
-        return fileTypeDictText;
-    }
-
-    public void setFileTypeDictText(String fileTypeDictText) {
-        this.fileTypeDictText = fileTypeDictText;
-    }
 
     public String getJsonAttId() {
         return jsonAttId;
diff --git a/laws-modules/src/main/java/com/jero/modules/laws/ocr/service/impl/OcrRecordEOServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/ocr/service/impl/OcrRecordEOServiceImpl.java
index ee34f437..8d58b8e2 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/ocr/service/impl/OcrRecordEOServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/ocr/service/impl/OcrRecordEOServiceImpl.java
@@ -33,12 +33,22 @@ public class OcrRecordEOServiceImpl implements OcrRecordEOService {
             String transitionStatus =
                     sysDictService.queryDictTextByKey("transition_status", ocrRecordEO.getResultContent());
             if (StringUtils.isNotBlank(transitionStatus)){
-                ocrRecordEO.setResultContentDictText(transitionStatus);
+                ocrRecordEO.setResultContent_dictText(transitionStatus);
+            }
+            String transitionStatusEn =
+                    sysDictService.queryDictTextByKeyEn("transition_status", ocrRecordEO.getResultContent());
+            if (StringUtils.isNotBlank(transitionStatusEn)){
+                ocrRecordEO.setResultContent_dictTextEn(transitionStatusEn);
             }
             String processManuscript =
                     sysDictService.queryDictTextByKey("process_manuscript", ocrRecordEO.getFileType());
             if (StringUtils.isNotBlank(processManuscript)){
-                ocrRecordEO.setFileTypeDictText(processManuscript);
+                ocrRecordEO.setFileType_dictText(processManuscript);
+            }
+            String processManuscriptEn =
+                    sysDictService.queryDictTextByKeyEn("process_manuscript", ocrRecordEO.getFileType());
+            if (StringUtils.isNotBlank(processManuscriptEn)){
+                ocrRecordEO.setFileType_dictTextEn(processManuscriptEn);
             }
         }
         return ocrRecordEOS;