From 183384e84a634b4ae5cad2766b7eae1c4730a06d Mon Sep 17 00:00:00 2001
From: zhouwentao <1577701412@qq.com>
Date: Wed, 9 Aug 2023 01:14:04 +0800
Subject: [PATCH] updates

---
 .../jeecg/modules/ocr/controller/OcrIdentifyController.java   | 4 ++++
 .../main/java/org/jeecg/modules/ocr/entity/OcrIdentify.java   | 3 +++
 .../modules/ocr/service/impl/OcrIdentifyServiceImpl.java      | 3 ++-
 3 files changed, 9 insertions(+), 1 deletion(-)

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 1e204db..4ae7cc8 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
@@ -114,7 +114,11 @@ public class OcrIdentifyController extends JeecgController<OcrIdentify, IOcrIden
         Map<String, String> taskNameMap = ocrTaskTypeService.listNameToMap(null);
         IPage<OcrIdentify> pageList = ocrIdentifyService.page(page, queryWrapper);
         if (pageList != null && pageList.getRecords() != null) {
+            List<String> identifyIdList = pageList.getRecords().stream().map(p -> p.getId()).collect(Collectors.toList());
+            List<OcrIdentifyDetail> identifyDetailList = ocrIdentifyDetailService.list(new LambdaQueryWrapper<OcrIdentifyDetail>().in(OcrIdentifyDetail::getIdentifyId));
             for (OcrIdentify record : pageList.getRecords()) {
+                long count = identifyDetailList.stream().filter(i -> i.getIdentifyId().equals(record.getId())).count();
+                record.setImgNum(count);
                 if (StringUtils.isNotBlank(record.getTaskResultInfo())) {
                     List<OcrResult2> ocrResult2s = JSONObject.parseArray(record.getTaskResultInfo()).toJavaList(OcrResult2.class);
                     int tagNum = ocrResult2s.size();
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 ec7ad3d..f3d3e1c 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
@@ -151,5 +151,8 @@ public class OcrIdentify implements Serializable {
     private Integer tagSuccessNum=0;
     @TableField(exist = false)
     private String successRate="0";
+
+    @TableField(exist = false)
+    private Long imgNum;//图片数量
     //================================================================
 }
diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/service/impl/OcrIdentifyServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/service/impl/OcrIdentifyServiceImpl.java
index a7ee51e..e95dd41 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/service/impl/OcrIdentifyServiceImpl.java
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/service/impl/OcrIdentifyServiceImpl.java
@@ -291,7 +291,6 @@ public class OcrIdentifyServiceImpl extends ServiceImpl<OcrIdentifyMapper, OcrId
 
                     updateWrapper.set(OcrIdentify::getErrorMsg, errorMsg);
                     updateWrapper.set(OcrIdentify::getTaskResult, 0);
-
                     fieldMapFor: for (String s : fieldMap.keySet()) {
                         if (successFields.contains(s)) {
                             updateWrapper.set(OcrIdentify::getTaskResult, 1);
@@ -301,6 +300,8 @@ public class OcrIdentifyServiceImpl extends ServiceImpl<OcrIdentifyMapper, OcrId
 
                 }
                 String taskResultInfo = JSONArray.toJSONString(ocrResults);
+                updateWrapper.set(OcrIdentify::getStatus,"1");
+                updateWrapper.set(OcrIdentify::getEndTime,new Date());
                 updateWrapper.set(OcrIdentify::getTaskResultInfo,taskResultInfo);
             }
         }