From 0cf94d5c4c51b3afab0b4082cf7870fbf9f5fbfa Mon Sep 17 00:00:00 2001
From: sunchenliang <2532527871@qq.com>
Date: Mon, 15 Apr 2024 14:51:36 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=8C=85=E4=B8=BB=E5=9B=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cn/jyjz/xiaoyao/ocr/dataobject/OcrTaskchildPicture.java | 4 ++--
 .../ocr/service/impl/TaskchildPictureServiceImpl.java       | 2 +-
 .../main/resources/mapper/oa/OcrTaskchildPictureMapper.xml  | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrTaskchildPicture.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrTaskchildPicture.java
index 08427aa8..26de0f3b 100644
--- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrTaskchildPicture.java
+++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrTaskchildPicture.java
@@ -196,8 +196,8 @@ public class OcrTaskchildPicture implements BaseDto, java.io.Serializable {
     private String taskname;
 
     @Schema(description = "当前节点名称")
-    @TableField(value = "TASKINDEX")
-    private String taskindex;
+    @TableField(value = "TASKNODE")
+    private String taskNode;
 
     @Schema(description = "当前节点id")
     @TableField(value = "TASKID")
diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/TaskchildPictureServiceImpl.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/TaskchildPictureServiceImpl.java
index bad279f4..6489b38d 100644
--- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/TaskchildPictureServiceImpl.java
+++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/TaskchildPictureServiceImpl.java
@@ -252,7 +252,7 @@ public class TaskchildPictureServiceImpl extends BaseServiceImpl<OcrTaskchildPic
                 //iFlowFormMessageService.sendMsg(user.getLoginname(),model.getUsername() + SystemMessage.SYS_OA_TYPE_LEAVE + SystemMessage.SYS_OA_TO_DO,taskId,processInstanceId,fromid, CacheQyweixinConstants.OA_DISTIONARY_TYPE_MSG_SHENPI,model.getCategoryid().toString());
             }
             model.setAssigneename(stringBuffer.toString());
-            model.setTaskindex(task.getDescription());
+            model.setTaskNode(task.getDescription());
             return this.ocrTaskchildPictureService.updateById(model);
         }
         return false;
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 4cda92de..13b5cfa4 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
@@ -946,7 +946,7 @@
 
     <select id="listFinalTask" resultType="cn.jyjz.xiaoyao.ocr.dataobject.OcrTaskchildPicture"
             parameterType="java.util.Map">
-        select tcp.*, pic.field11 reporttime, pic.similarity_score similarityscore
+        select tcp.*, pic.field11 reporttime, pic.similarity_score similarityscore,pic.server_thumbnail_url serverThumbnailUrl
         from ocr_taskchild_picture tcp
                  left join ocr_picture pic
                            on tcp.PICTUREID = pic.ID
@@ -963,10 +963,10 @@
         </if>
 
         <if test="fromuptimeStart != null">
-            and tcp.fromuptime &gt;= ${fromuptimeStart}
+            and tcp.fromuptime &gt;= ${fromuptimeStart.value}
         </if>
         <if test="fromuptimeEnd != null">
-            and tcp.fromuptime &lt;= ${fromuptimeEnd}
+            and tcp.fromuptime &lt;= ${fromuptimeEnd.value}
         </if>
         <if test="page != null">
             <if test="page.sortname != null">