From cc6a88e0c326c2e7530ccd93046460dbcf7090ed Mon Sep 17 00:00:00 2001
From: sunchenliang <2532527871@qq.com>
Date: Tue, 26 Mar 2024 16:07:28 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=BB=E5=8A=A1=E5=8C=85?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ocr/controller/OcrTaskchildPictureController.java       | 6 +++---
 .../xiaoyao/ocr/service/impl/OcrTaskPackageServiceImpl.java | 1 +
 .../src/main/resources/mapper/oa/OcrTaskPackageMapper.xml   | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrTaskchildPictureController.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrTaskchildPictureController.java
index 1e1a286e..ec45cd91 100644
--- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrTaskchildPictureController.java
+++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrTaskchildPictureController.java
@@ -409,12 +409,12 @@ public class OcrTaskchildPictureController extends BaseController {
     public ResultVo getPictureSimilarityList(
             @RequestParam(name = "pageNo") Integer pageNo,
             @RequestParam(name = "pageSize") Integer pageSize,
-            @RequestParam(name = "oderType") String oderType,
-            @RequestParam(name = "oderName") String oderName,
+            @RequestParam(name = "oderType") String orderType,
+            @RequestParam(name = "orderName") String orderName,
             @RequestParam(name = "checkDuplicateId") String checkDuplicateId,
             @RequestParam(name = "pictureId", required = false) String pictureId,
             HttpServletRequest req) {
-        Page<OcrTaskchildPicture> result = ocrTaskchildPictureService.getPackageSimilarityList(pageNo, pageSize, oderType, oderName, checkDuplicateId, pictureId);
+        Page<OcrTaskchildPicture> result = ocrTaskchildPictureService.getPackageSimilarityList(pageNo, pageSize, orderType, orderName, checkDuplicateId, pictureId);
         return ResultVoUtil.success(result);
 
     }
diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrTaskPackageServiceImpl.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrTaskPackageServiceImpl.java
index 0719dae3..576fca32 100644
--- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrTaskPackageServiceImpl.java
+++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrTaskPackageServiceImpl.java
@@ -63,6 +63,7 @@ public class OcrTaskPackageServiceImpl extends ServiceImpl<OcrTaskPackageMapper,
             List<Map<String, Object>> records = result.getRecords();
             for (Map<String, Object> record : records) {
                 record.put("id",record.get("id").toString());
+                record.put("checkDuplicateId",record.get("checkDuplicateId").toString());
                 Object search = record.getOrDefault("search", null);
                 if(search!=null){
                     Map map = JSONObject.parseObject(search.toString(), Map.class);
diff --git a/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrTaskPackageMapper.xml b/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrTaskPackageMapper.xml
index 66b08a32..729b88b4 100644
--- a/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrTaskPackageMapper.xml
+++ b/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrTaskPackageMapper.xml
@@ -3,7 +3,7 @@
 <mapper namespace="cn.jyjz.xiaoyao.ocr.dataDao.OcrTaskPackageMapper">
 
     <select id="getPackageList" resultType="java.util.Map">
-        SELECT t1.*,t2.picture_count,
+        SELECT t1.id, t1.name,t1.check_duplicate_id checkDuplicateId,t1.create_time createTime,t1.update_time updateTime,t2.picture_count pictureCount,
                t2.searching_json search
         FROM ocr_task_package t1
                  LEFT JOIN ocr_check_duplicate t2 ON t1.check_duplicate_id = t2.id