From 91cd05ac83a76e65b80d3aef2252d082bd18527b Mon Sep 17 00:00:00 2001
From: sunchenliang <2532527871@qq.com>
Date: Sun, 31 Mar 2024 13:16:22 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BB=BB=E5=8A=A1=E5=8C=85=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E6=B7=BB=E5=8A=A0=E6=98=AF=E5=90=A6=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E6=A0=87=E8=AF=86=EF=BC=8C=E5=A2=9E=E5=8A=A0=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E5=9B=BE=E7=89=87=E8=8A=82=E7=82=B9=E7=8A=B6=E6=80=81=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ocr/dataDao/OcrPictureMybatisDao.java       |  4 ++++
 .../jyjz/xiaoyao/ocr/dataobject/OcrPicture.java |  4 ++++
 .../xiaoyao/ocr/service/OcrPictureService.java  |  8 ++++++++
 .../ocr/service/impl/OcrPictureServiceImpl.java |  8 ++++++++
 .../impl/OcrTaskchildPictureServiceImpl.java    |  4 ++--
 .../resources/mapper/oa/OcrPictureMapper.xml    | 13 +++++++++++++
 .../mapper/oa/OcrTaskPackageMapper.xml          | 17 ++++++++++++-----
 7 files changed, 51 insertions(+), 7 deletions(-)

diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataDao/OcrPictureMybatisDao.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataDao/OcrPictureMybatisDao.java
index 19b05974..a2ef7a3a 100644
--- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataDao/OcrPictureMybatisDao.java
+++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataDao/OcrPictureMybatisDao.java
@@ -5,10 +5,14 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
 * 数据持久化
 */
 @Mapper
 public interface OcrPictureMybatisDao extends BaseMapper<OcrPicture> {
     OcrPicture getPackagePictureInfo(@Param("packageId") String packageId, @Param("pictureId") String pictureId);
+
+    List<OcrPicture> getPictureNodeStatesList(@Param("pictureIds") List<String> pictureIds, @Param("userNodeType") String userNodeType);
 }
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 0218e4a3..69b54030 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
@@ -359,6 +359,10 @@ public class OcrPicture implements BaseDto, java.io.Serializable {
     @TableField(value = "photo_date_timestamp")
     private Long photoDateTimestamp;
 
+    @ApiModelProperty(value = "节点状态")
+    @TableField(exist = false)
+    private Integer historyStates;
+
     //保存当前登录用户的数据权限范围的搜索条件
     @TableField(exist = false)
     @JsonIgnore
diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/OcrPictureService.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/OcrPictureService.java
index c0713568..b349dbf6 100644
--- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/OcrPictureService.java
+++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/OcrPictureService.java
@@ -70,6 +70,14 @@ public interface OcrPictureService extends BaseService<OcrPicture>  {
 
     OcrPicture getPackagePictureInfo(String packageId, String pictureId);
 
+    /**
+     * 根据图片id查询图片节点状态
+     * @param pictureIds
+     * @param nodeType
+     * @return
+     */
+    List<OcrPicture> getPictureNodeStatesList(List<String> pictureIds,Integer nodeType);
+
 //    Long getPhotoDateTime(OcrPicture picture);
 
 }
diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrPictureServiceImpl.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrPictureServiceImpl.java
index b8afcf1e..52918cec 100644
--- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrPictureServiceImpl.java
+++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrPictureServiceImpl.java
@@ -3,6 +3,7 @@ package cn.jyjz.xiaoyao.ocr.service.impl;
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
+import cn.jyjz.flowable.common.ProcessConstant;
 import cn.jyjz.flowable.service.IFlowInstanceService;
 import cn.jyjz.xiaoyao.common.base.service.UserTokenService;
 import cn.jyjz.xiaoyao.common.base.util.RequestBaseUtil;
@@ -333,6 +334,13 @@ public class OcrPictureServiceImpl extends BaseServiceImpl<OcrPictureMybatisDao,
         return pictureMybatisDao.getPackagePictureInfo(checkDuplicateId,pictureId);
     }
 
+    @Override
+    public List<OcrPicture> getPictureNodeStatesList(List<String> pictureIds, Integer nodeType) {
+        String userNodeType = ProcessConstant.userNodeType.getOrDefault(nodeType, "一级审批");
+
+        return pictureMybatisDao.getPictureNodeStatesList(pictureIds,userNodeType);
+    }
+
 
 //    @Override
 //    public Long getPhotoDateTime(OcrPicture picture) {
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 f1f48956..a9958cb8 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
@@ -682,9 +682,9 @@ public class OcrTaskchildPictureServiceImpl extends BaseServiceImpl<OcrTaskchild
             }
             if (orderValue.equals("similarityScore")) {
                 if ("desc".equals(orderType)) {
-                    taskChildPictures.sort(Comparator.comparing(OcrTaskChildPictureVo::getSimilarityScore).thenComparing(OcrTaskChildPictureVo::getCreateDate).reversed());
+                    taskChildPictures.sort(Comparator.comparing(OcrTaskChildPictureVo::getSimilarityScore).thenComparing(OcrTaskChildPictureVo::getSubmitDateTimestamp).reversed());
                 } else {
-                    taskChildPictures.sort(Comparator.comparing(OcrTaskChildPictureVo::getSimilarityScore).thenComparing(OcrTaskChildPictureVo::getCreateDate));
+                    taskChildPictures.sort(Comparator.comparing(OcrTaskChildPictureVo::getSimilarityScore).thenComparing(OcrTaskChildPictureVo::getSubmitDateTimestamp));
                 }
             } else {
                 if ("desc".equals(orderType)) {
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 d9bf1c86..1deb6394 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
@@ -235,4 +235,17 @@
         ORDER BY t1.max_similarity desc, t2.create_time DESC
         LIMIT 1
     </select>
+
+	<select id="getPictureNodeStatesList" resultType="cn.jyjz.xiaoyao.ocr.dataobject.OcrPicture">
+		SELECT t1.*,
+		ifnull(t3.STATSHIS, 1)   historyStates
+		FROM ocr_picture t1
+		LEFT JOIN ocr_taskchild_picture t2
+		on t1.ID = t2.PICTUREID
+		LEFT JOIN oa_userapprove_t t3 on t2.ID = t3.FORMID and t3.TASKNAME = '${userNodeType}'
+		where t1.ID in
+		<foreach collection="pictureIds" open="(" close=")" item="item" separator="," index="index">
+			#{item}
+		</foreach>
+    </select>
 </mapper>
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 ffc46f88..ba5d81a8 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,15 +3,22 @@
 <mapper namespace="cn.jyjz.xiaoyao.ocr.dataDao.OcrTaskPackageMapper">
 
     <select id="getPackageList" resultType="java.util.Map">
-        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,t3.USERNAME createName
+        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,
+               t3.USERNAME           createName
         FROM ocr_task_package t1
                  LEFT JOIN ocr_check_duplicate t2 ON t1.check_duplicate_id = t2.id
-        left join s_user_t t3 on t1.create_by = t3.ID
+                 left join s_user_t t3 on t1.create_by = t3.ID
         <where>
-            t1.tenant_id = #{tenantId}
+                t1.tenant_id = #{tenantId} and t1.is_delete = 0
             <if test="packageName != null and packageName != ''">
-                and t1.name like concat('%', #{packageName}, '%') or T3.USERNAME like concat('%', #{packageName}, '%')
+                and t1.name like concat('%', #{packageName}, '%')
+                   or T3.USERNAME like concat('%', #{packageName}, '%')
             </if>
         </where>
     </select>