From 432ac36346184037be9720a3d3dbddc0073b3745 Mon Sep 17 00:00:00 2001
From: shuliYao <1397940314@qq.com>
Date: Tue, 2 Apr 2024 23:17:20 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=A7=A3=E5=86=B3=E7=BB=88=E5=AE=A1?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/FlowTaskServiceImpl.java         |  2 +-
 .../mapper/oa/OcrTaskchildPictureMapper.xml       | 15 ++++++++++++---
 2 files changed, 13 insertions(+), 4 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 be787e2..6912acd 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
@@ -980,7 +980,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
         if (StringUtils.isNotBlank(pageUtils.getSortname())) {
             paramterPage.setSortname(pageUtils.getSortname());
         } else {
-            paramterPage.setSortname("CREATEDATE");
+            paramterPage.setSortname("submit_date_timestamp");
         }
 
         if (StringUtils.isNotBlank(pageUtils.getSortorder())) {
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 db685b0..22bb273 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
@@ -535,12 +535,21 @@
         </if>
         UNION
         select
-            tc.*
-        from ocr_taskchild_picture tc, ocr_picture p
-        where tc.STATES = 5 and p.suspiciousfile =0
+        tc.*
+        from ocr_taskchild_picture tc
+        where tc.STATES = 5
         ) as tcp
+        left join ocr_picture pic
+        on tcp.PICTUREID = pic.ID
         <include refid="Base_Where_union">
         </include>
+        and pic.suspiciousfile = 0
+        <if test="fromuptimeStart != null">
+            and tcp.fromuptime &gt;= ${fromuptimeStart}
+        </if>
+        <if test="fromuptimeEnd != null">
+            and tcp.fromuptime &lt;= ${fromuptimeEnd}
+        </if>
     </select>
 
     <select id="listmytask" resultType="cn.jyjz.xiaoyao.ocr.dataobject.OcrTaskchildPictureAppro"