From 71eec4287b6187198ed325c7e4893e09e146b39a Mon Sep 17 00:00:00 2001
From: sunchenliang <2532527871@qq.com>
Date: Tue, 26 Mar 2024 23:14:54 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B7=A5=E5=8D=95=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E5=8F=8A=E7=9B=B8=E5=85=B3=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/OcrTaskchildPictureController.java  |  2 +-
 .../cn/jyjz/xiaoyao/ocr/dataobject/OcrPicture.java |  3 +++
 .../ocr/service/OcrTaskchildPictureService.java    |  2 +-
 .../service/impl/OcrTaskPackageServiceImpl.java    |  1 +
 .../impl/OcrTaskchildPictureServiceImpl.java       | 10 +++++++---
 .../main/resources/mapper/oa/OcrPictureMapper.xml  | 14 +++++++++++++-
 .../mapper/oa/OcrTaskchildPictureMapper.xml        |  2 +-
 7 files changed, 27 insertions(+), 7 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 a0ddcaeb..0858aa56 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
@@ -396,7 +396,7 @@ public class OcrTaskchildPictureController extends BaseController {
         String orderType = request.getParameter("orderType");
         //排序字段
         String orderValue = request.getParameter("orderName");
-        List<OcrTaskchildPicture> similarityList = ocrTaskchildPictureService.getSimilarityList(Integer.valueOf(pageNo), Integer.valueOf(pageSize), pictureId, orderType, orderValue);
+        Page<OcrTaskchildPicture> similarityList = ocrTaskchildPictureService.getSimilarityList(Integer.valueOf(pageNo), Integer.valueOf(pageSize), pictureId, orderType, orderValue);
         return ResultVoUtil.success(similarityList);
     }
 
diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrPicture.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrPicture.java
index d040aeb9..4c34a272 100644
--- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrPicture.java
+++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrPicture.java
@@ -360,6 +360,9 @@ public class OcrPicture implements BaseDto, java.io.Serializable {
     @JsonIgnore
     private SearchQuery searchQueryrolesShowleave;
 
+    @TableField(exist = false)
+    private OcrPictureInfo pictureInfo;
+
     @TableField(exist = false)
     @JsonIgnore
     private final Map<String, String> query = Stream.of(
diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/OcrTaskchildPictureService.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/OcrTaskchildPictureService.java
index fe561b64..5df03fbc 100644
--- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/OcrTaskchildPictureService.java
+++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/OcrTaskchildPictureService.java
@@ -142,7 +142,7 @@ public interface OcrTaskchildPictureService extends BaseService<OcrTaskchildPict
 
     PictureDetailVo getPictureDetail(String pictureId, UserToken userToken);
 
-    List<OcrTaskchildPicture> getSimilarityList(Integer pageNo, Integer pageSize, String pictureId, String orderType, String orderValue);
+    Page<OcrTaskchildPicture> getSimilarityList(Integer pageNo, Integer pageSize, String pictureId, String orderType, String orderValue);
 
     Page<OcrTaskchildPicture> getPackageSimilarityList(Integer pageNo, Integer pageSize, String oderType, String oderName, String checkDuplicateId, String pictureId);
 
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 576fca32..501f86bf 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
@@ -68,6 +68,7 @@ public class OcrTaskPackageServiceImpl extends ServiceImpl<OcrTaskPackageMapper,
                 if(search!=null){
                     Map map = JSONObject.parseObject(search.toString(), Map.class);
                     record.putAll(map);
+                    record.put("createTime",map.getOrDefault("submit_date_timestamp","").toString());
                 }
             }
         }
diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrTaskchildPictureServiceImpl.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrTaskchildPictureServiceImpl.java
index 68581b15..8fe066b5 100644
--- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrTaskchildPictureServiceImpl.java
+++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrTaskchildPictureServiceImpl.java
@@ -643,8 +643,9 @@ public class OcrTaskchildPictureServiceImpl extends BaseServiceImpl<OcrTaskchild
     }
 
     @Override
-    public List<OcrTaskchildPicture> getSimilarityList(Integer pageNo, Integer pageSize, String pictureId, String orderType, String orderValue) {
+    public Page<OcrTaskchildPicture> getSimilarityList(Integer pageNo, Integer pageSize, String pictureId, String orderType, String orderValue) {
         OcrPictureDuplicateHis duplicateHis = pictureDuplicateHisService.getOne(new LambdaQueryWrapper<OcrPictureDuplicateHis>().eq(OcrPictureDuplicateHis::getPictureId, pictureId));
+        Page<OcrTaskchildPicture> objectPage = new Page<>();
         if (ObjectUtils.isNotEmpty(duplicateHis) && org.apache.commons.lang3.StringUtils.isNotBlank(duplicateHis.getCheckDuplicateResultHisJson())) {
             OcrTaskchildPicture one = this.getOne(new LambdaQueryWrapper<OcrTaskchildPicture>().eq(OcrTaskchildPicture::getPictureid, pictureId));
             JSONObject jsonObject = JSONObject.parseObject(duplicateHis.getCheckDuplicateResultHisJson());
@@ -666,9 +667,12 @@ public class OcrTaskchildPictureServiceImpl extends BaseServiceImpl<OcrTaskchild
                     taskChildPictures.sort(Comparator.comparing(OcrTaskchildPicture::getCreatedate));
                 }
             }
-            return taskChildPictures.stream().skip((pageNo - 1) * pageSize).limit(pageSize).collect(Collectors.toList());
+            List<OcrTaskchildPicture> collect = taskChildPictures.stream().skip((pageNo - 1) * pageSize).limit(pageSize).collect(Collectors.toList());
+            objectPage.setRecords(collect);
+            objectPage.setTotal(taskChildPictures.size());
+            return objectPage;
         }
-        return new ArrayList<>();
+        return objectPage;
     }
 
     @Override
diff --git a/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrPictureMapper.xml b/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrPictureMapper.xml
index 9d5ea242..ca120a9c 100644
--- a/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrPictureMapper.xml
+++ b/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrPictureMapper.xml
@@ -65,6 +65,17 @@
 		<result column="field17" property="field17" jdbcType="VARCHAR"/>
 		<result column="field18" property="field18" jdbcType="VARCHAR"/>
 		<result column="suspiciousfile" property="suspiciousfile" jdbcType="INTEGER"/>
+		<association property="pictureInfo" javaType="cn.jyjz.xiaoyao.ocr.dataobject.OcrPictureInfo">
+			<result column="pictureid" property="pictureId"/>
+			<result column="img_size" property="imgSize"/>
+			<result column="img_format" property="imgFormat"/>
+			<result column="img_measure" property="imgMeasure"/>
+			<result column="upload_time" property="uploadTime"/>
+			<result column="create_time" property="createTime"/>
+			<result column="img_space" property="imgSpace"/>
+			<result column="tag_time" property="tagTime"/>
+			<result column="source" property="source"/>
+		</association>
 	</resultMap>
 	<sql id="Base_Column_List">
 		ID AS id,
@@ -207,9 +218,10 @@
 	</sql>
 
 	<select id="getPackagePictureInfo" resultMap="BaseResultMap">
-        SELECT t2.*
+        SELECT t2.*,t3.*
         FROM ocr_check_duplicate_result t1
                  LEFT JOIN ocr_picture t2 ON t1.picture_id = t2.ID
+		left join ocr_picture_info t3 on t2.ID=t3.picture_id
         where t1.check_duplicate_id = #{packageId}
 		<if test="pictureId != null and pictureId != ''">
 			and t1.picture_id = #{pictureId}
diff --git a/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrTaskchildPictureMapper.xml b/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrTaskchildPictureMapper.xml
index fb7e658b..b2a4034e 100644
--- a/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrTaskchildPictureMapper.xml
+++ b/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrTaskchildPictureMapper.xml
@@ -644,7 +644,7 @@
             order by t1.max_similarity ${oderType}
         </if>
         <if test="oderName == 'createdate'">
-            order by t2.createdate ${oderType}
+            order by t2.create_time ${oderType}
         </if>
     </select>
 </mapper>