From 4737149aa5825f628d23aee7617c36ca28c23a09 Mon Sep 17 00:00:00 2001
From: sunchenliang <2532527871@qq.com>
Date: Tue, 2 Apr 2024 19:11:14 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E5=8C=85=E8=AF=A6=E6=83=85=E8=BF=94=E5=9B=9EtaskId?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cn/jyjz/flowable/service/impl/FlowTaskServiceImpl.java   | 1 +
 .../main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrPicture.java | 4 ++++
 .../src/main/resources/mapper/oa/OcrPictureMapper.xml        | 5 +++--
 .../main/resources/mapper/oa/OcrTaskchildPictureMapper.xml   | 2 +-
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/flowable/service/impl/FlowTaskServiceImpl.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/flowable/service/impl/FlowTaskServiceImpl.java
index c4b7735d..be787e23 100644
--- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/flowable/service/impl/FlowTaskServiceImpl.java
+++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/flowable/service/impl/FlowTaskServiceImpl.java
@@ -564,6 +564,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
         jsonObject.put("sendTime", System.currentTimeMillis());
         jsonObject.put("fromId", model.getId().toString());
         jsonObject.put("taskName", model.getFromtaskname());
+        jsonObject.put("pictureId", model.getPictureid());
         jsonObject.put("packageId", model.getPackageid());
         msg.setBusJson(jsonObject.toJSONString());
         msg.setCreateBy(Long.valueOf(userToken.getUserid()));
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 69b54030..e266f691 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
@@ -363,6 +363,10 @@ public class OcrPicture implements BaseDto, java.io.Serializable {
     @TableField(exist = false)
     private Integer historyStates;
 
+    @ApiModelProperty(value = "节点状态")
+    @TableField(exist = false)
+    private String taskId;
+
     //保存当前登录用户的数据权限范围的搜索条件
     @TableField(exist = false)
     @JsonIgnore
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 bcee1f1e..a07d7083 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
@@ -68,6 +68,7 @@
 		<result column="photo_date_timestamp" property="photoDateTimestamp" jdbcType="VARCHAR"/>
 		<result column="suspiciousfile" property="suspiciousfile" jdbcType="INTEGER"/>
 		<result column="STATES" property="states" jdbcType="INTEGER"/>
+		<result column="TASKID" property="taskId" jdbcType="VARCHAR"/>
 		<result column="historyStates" property="historyStates" jdbcType="INTEGER"/>
 
 		<association property="pictureInfo" javaType="cn.jyjz.xiaoyao.ocr.dataobject.OcrPictureInfo">
@@ -224,7 +225,7 @@
 	</sql>
 
 	<select id="getPackagePictureInfo" resultMap="BaseResultMap">
-        SELECT t2.*,t3.*,ifnull(t5.STATSHIS, 1)  historyStates,T4.STATES
+        SELECT t2.*,t3.*,ifnull(t5.STATSHIS, 1)  historyStates,t4.STATES,t4.TASKID
         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
@@ -234,7 +235,7 @@
 		<if test="pictureId != null and pictureId != ''">
 			and t1.picture_id = #{pictureId}
 		</if>
-        ORDER BY t1.max_similarity desc,t1.similarity_group_order asc, t2.create_time DESC
+        ORDER BY t1.max_similarity desc,t1.similarity_group_order asc, t2.submit_date_timestamp DESC
         LIMIT 1
     </select>
 
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 ee1399b7..d8e77a62 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
@@ -766,7 +766,7 @@
             order by t1.max_similarity ${oderType},t1.similarity_group_order asc,t2.submit_date_timestamp ${oderType}
         </if>
         <if test="oderName == 'createdate'">
-            order by t2.create_time ${oderType}
+            order by t2.submit_date_timestamp ${oderType}
         </if>
     </select>