From c0a939fc42aac9c713ec45e62397a9ea89d6edbf Mon Sep 17 00:00:00 2001
From: zhouwentao <1577701412@qq.com>
Date: Thu, 31 Aug 2023 20:19:45 +0800
Subject: [PATCH] updates

---
 .../modules/ocr/mapper/xml/OcrMetadataConfigMapper.xml    | 2 +-
 .../jeecg/modules/ocr/mapper/xml/OcrRuleCheckMapper.xml   | 2 +-
 .../ocr/service/impl/OcrMetadataConfigServiceImpl.java    | 8 ++++++++
 3 files changed, 10 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 d63b461..2f9d428 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
@@ -24,7 +24,7 @@
             AND oc.task_type = #{o.taskType}
         </if>
     group by oc.id
-    order by oc.update_time desc
+    order by oc.update_time,oc.create_time desc
     </select>
 
     <select id="allList" resultType="org.jeecg.modules.ocr.dto.OcrMetadataConfigDTO">
diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/mapper/xml/OcrRuleCheckMapper.xml b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/mapper/xml/OcrRuleCheckMapper.xml
index 17f2712..0ca6cad 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/mapper/xml/OcrRuleCheckMapper.xml
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/mapper/xml/OcrRuleCheckMapper.xml
@@ -14,7 +14,7 @@
         <if test="p.configRule!=null and p.configRule!=''">
             AND ocr.config_rule like concat('%',#{p.configRule},'%')
         </if>
-        order by ocr.update_time desc
+        order by ocr.update_time,ocr.create_time desc
     </select>
 
     <select id="findById" resultType="org.jeecg.modules.ocr.dto.OcrRuleCheckDTO">
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 5bfd68e..5ce250d 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
@@ -104,6 +104,14 @@ public class OcrMetadataConfigServiceImpl extends ServiceImpl<OcrMetadataConfigM
         metadataConfig.setId(null);
         metadataConfig.setConfigName(metadataConfig.getConfigName()+"("+(count+1)+")");
         this.save(metadataConfig);
+        List<OcrMetadataConfigDetail> list = ocrMetadataConfigDetailService.list(new LambdaQueryWrapper<OcrMetadataConfigDetail>().eq(OcrMetadataConfigDetail::getMetadataConfigId, id));
+        if (CollectionUtils.isNotEmpty(list)) {
+            for (OcrMetadataConfigDetail ocrMetadataConfigDetail : list) {
+                ocrMetadataConfigDetail.setId(null);
+                ocrMetadataConfigDetail.setMetadataConfigId(metadataConfig.getId());
+            }
+            ocrMetadataConfigDetailService.saveBatch(list);
+        }
         return true;
     }