From 17a467d3f67dc4c7ff1048d204f6dbc2112ab367 Mon Sep 17 00:00:00 2001
From: sunchenliang <2532527871@qq.com>
Date: Mon, 1 Apr 2024 19:54:35 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E7=9B=B8=E4=BC=BC=E5=BA=A6=E5=88=97?=
=?UTF-8?q?=E8=A1=A8=E6=B7=BB=E5=8A=A0=E5=9B=BE=E7=89=87=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../mapper/oa/OcrTaskchildPictureMapper.xml | 81 ++++++++++++++++---
1 file changed, 68 insertions(+), 13 deletions(-)
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 c1e01598..8f662cb9 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
@@ -39,6 +39,51 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -139,6 +184,7 @@
+
and OCPICTUREID ${ocpictureid.dataOp} ${ocpictureid.likestar}#{ocpictureid.value}${ocpictureid.likeend}
@@ -260,6 +306,7 @@
+
and tcp.OCPICTUREID ${ocpictureid.dataOp} ${ocpictureid.likestar}#{ocpictureid.value}${ocpictureid.likeend}
@@ -450,7 +497,7 @@
where tc.STATES = 5
) as tcp
left join ocr_picture pic
- on tcp.PICTUREID = pic.ID and pic.suspiciousfile =0
+ on tcp.PICTUREID = pic.ID and pic.suspiciousfile = 0
@@ -472,15 +519,16 @@
from ocr_taskchild_picture tc,
OA_USERFINAL_T uf,
ocr_picture p
- where tc.ID = uf.FORMID and p.ID = tc.PICTUREID and p.suspiciousfile =0
+ where tc.ID = uf.FORMID
+ and p.ID = tc.PICTUREID
+ and p.suspiciousfile = 0
and uf.USERID ${thisLoginUserid.dataOp} ${thisLoginUserid.likestar}#{thisLoginUserid.value}${thisLoginUserid.likeend}
UNION
select
tc.*
- from ocr_taskchild_picture tc,
- ocr_picture p
+ from ocr_taskchild_picture tc, ocr_picture p
where tc.STATES = 5 and p.suspiciousfile =0
) as tcp
@@ -498,7 +546,7 @@
uf.TASKNO
from ocr_taskchild_picture tc
LEFT JOIN OA_USERAPPROVE_T uf ON tc.ID = uf.ID
- left join ocr_picture op on tc.PICTUREID = op.ID and op.suspiciousfile =0
+ left join ocr_picture op on tc.PICTUREID = op.ID and op.suspiciousfile = 0
where tc.ASSIGNEE = #{searchassignee}
and tc.TENANTID = #{searchtenantid}
and tc.STATES = 2
@@ -511,8 +559,10 @@
uf.TASKNO
from ocr_taskchild_picture tc,
OA_USERAPPROVE_T uf,
- ocr_picture op
- where tc.ID = uf.FORMID and tc.PICTUREID = op.ID and op.suspiciousfile =0
+ ocr_picture op
+ where tc.ID = uf.FORMID
+ and tc.PICTUREID = op.ID
+ and op.suspiciousfile = 0
and tc.TENANTID = #{searchtenantid}
and uf.USERID = #{thisLoginUserid}
@@ -591,12 +641,13 @@
ifnull(t3.STATSHIS, 1) historyStates,
t1.submit_date_timestamp submitDateTimestamp,
t1.photo_date_timestamp photoDateTimestamp,
- t1.similarity_score similarityScore
+ t1.similarity_score similarityScore
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 = '${taskname}'
- where t1.suspiciousfile = 0 and t1.ID in
+ where t1.suspiciousfile = 0
+ and t1.ID in
#{item}
@@ -660,10 +711,11 @@
LEFT JOIN ocr_picture_info t2 on t1.ID = t2.picture_id
LEFT JOIN ocr_taskchild_picture t3 on t1.ID = t3.PICTUREID
LEFT JOIN oa_userapprove_t t4 on t4.FORMID = t3.ID
- where t1.ID = #{pictureId} and t1.suspiciousfile = 0
+ where t1.ID = #{pictureId}
+ and t1.suspiciousfile = 0
-