From 2743383f17d72353916820da613e29741f254232 Mon Sep 17 00:00:00 2001
From: sunchenliang <2532527871@qq.com>
Date: Tue, 16 Apr 2024 13:44:17 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E7=9B=B8=E4=BC=BC?=
 =?UTF-8?q?=E5=BA=A6=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ocr/api/impl/PrevailCloudApiImpl.java     |  5 +-
 .../mapper/oa/OcrTaskchildPictureMapper.xml   | 82 +++++++++----------
 2 files changed, 44 insertions(+), 43 deletions(-)

diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/api/impl/PrevailCloudApiImpl.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/api/impl/PrevailCloudApiImpl.java
index e45d0687..ceea1469 100644
--- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/api/impl/PrevailCloudApiImpl.java
+++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/api/impl/PrevailCloudApiImpl.java
@@ -129,9 +129,10 @@ public class PrevailCloudApiImpl implements PrevailCloudApi {
 
     @Override
     public void sendFlowTaskResult(String tenantId, String data) throws Exception {
-        RequestData requestData = ApiHelper.buildRequest(tenantId, apiConfig.getAccessKey(), apiConfig.getAccessCode(),data);//组装请求参数
+        ResultData<String> stringResultData = ApiHelper.buildResponse(apiConfig.getAccessCode(), data);
+//        RequestData requestData = ApiHelper.buildRequest(tenantId, apiConfig.getAccessKey(), apiConfig.getAccessCode(),data);//组装请求参数
         String url = apiConfig.getInterfaceDomain()+sendResultUrl;
-        String requestBodyJson = JSONObject.toJSONString(requestData);
+        String requestBodyJson = JSONObject.toJSONString(stringResultData);
         //入参
         System.out.println("入参数据:"+requestBodyJson);
         HttpParamers httpParamers = new HttpParamers(HttpMethod.POST);
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 7f1a622c..1547a013 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
@@ -729,48 +729,48 @@
     </select>
 
     <select id="getPictureHistoryList" resultType="cn.jyjz.xiaoyao.ocr.vo.OcrTaskChildPictureVo">
-        SELECT distinct t2.ID                    id,
-                        t2.PICTUREID             pictureId,
-                        t2.STATES                states,
-                        t2.PROCESSINSTANCEID     processInstanceId,
-                        t2.PROCESSDEFINITIONID   processDefinitionId,
-                        t2.DEPLOYMENTID          deploymentId,
-                        t2.ASSIGNEENAME          assigneeName,
-                        t2.ASSIGNEE              assignee,
-                        t2.FILEANNEX             fileAnnex,
-                        t2.GUIDANG               guiDang,
-                        t2.CREATEUSER            createUser,
-                        t2.CREATEUSERNAME        createUserName,
-                        t2.CREATEDATE            createDate,
-                        t2.USERID                userId,
-                        t2.USERNAME              userName,
-                        t2.FROMTASKID            fromTaskId,
-                        t2.FROMTASKNAME          fromTaskName,
-                        t2.FROMUSERID            fromUserId,
-                        t2.FROMPROJECTID         fromProjectId,
-                        t2.FROMPLANID            fromPlanId,
-                        t2.FROMUPTIME            fromupTime,
-                        t2.FROMSOURCEID          fromSourceId,
-                        t2.HAVEPOINTS            havePoints,
-                        t2.TASKNAME              taskName,
-                        t2.TASKID                taskId,
-                        t2.FROMUSERNAME          fromUserName,
-                        t2.FROMPROJECTNAME       fromProjectName,
-                        t2.FINISHTIME            finishTime,
+        SELECT distinct t2.ID                       id,
+                        t2.PICTUREID                pictureId,
+                        t2.STATES                   states,
+                        t2.PROCESSINSTANCEID        processInstanceId,
+                        t2.PROCESSDEFINITIONID      processDefinitionId,
+                        t2.DEPLOYMENTID             deploymentId,
+                        t2.ASSIGNEENAME             assigneeName,
+                        t2.ASSIGNEE                 assignee,
+                        t2.FILEANNEX                fileAnnex,
+                        t2.GUIDANG                  guiDang,
+                        t2.CREATEUSER               createUser,
+                        t2.CREATEUSERNAME           createUserName,
+                        t2.CREATEDATE               createDate,
+                        t2.USERID                   userId,
+                        t2.USERNAME                 userName,
+                        t2.FROMTASKID               fromTaskId,
+                        t2.FROMTASKNAME             fromTaskName,
+                        t2.FROMUSERID               fromUserId,
+                        t2.FROMPROJECTID            fromProjectId,
+                        t2.FROMPLANID               fromPlanId,
+                        t2.FROMUPTIME               fromupTime,
+                        t2.FROMSOURCEID             fromSourceId,
+                        t2.HAVEPOINTS               havePoints,
+                        t2.TASKNAME                 taskName,
+                        t2.TASKID                   taskId,
+                        t2.FROMUSERNAME             fromUserName,
+                        t2.FROMPROJECTNAME          fromProjectName,
+                        t2.FINISHTIME               finishTime,
                         t1.imgUrl,
-                        t1.submit_date_timestamp submitDateTimestamp,
-                        t1.photo_date_timestamp  photoDateTimestamp,
-                        t1.similarity_score      similarityScore,
-                        t1.server_thumbnail_url  serverThumbnailUrl,
-                        COALESCE(
-                                (SELECT t3.STATSHIS
-                                 FROM oa_userapprove_t t3
-                                 WHERE t3.FORMID = t2.ID
-                                   AND t3.TASKINDEX = (SELECT TASKNODE
-                                                       FROM ocr_taskchild_picture
-                                                       WHERE PICTUREID = #{pictureId})
-                                 LIMIT 1),
-                                1) AS            historyStates
+                        t1.submit_date_timestamp    submitDateTimestamp,
+                        t1.photo_date_timestamp     photoDateTimestamp,
+                        t1.similarity_score         similarityScore,
+                        t1.server_thumbnail_url     serverThumbnailUrl,
+                        IF(EXISTS (SELECT STATSHIS FROM oa_userapprove_t WHERE FORMID = t2.ID and STATSHIS = 3), 3,
+                           IFNULL((SELECT t3.STATSHIS
+                                   FROM oa_userapprove_t t3
+                                   WHERE t3.FORMID = t2.ID
+                                     and t3.TASKINDEX =
+                                         (SELECT TASKNODE
+                                          FROM ocr_taskchild_picture
+                                          WHERE PICTUREID = #{pictureId})
+                                   LIMIT 1), 1)) AS historyStates
         FROM ocr_picture t1
                  LEFT JOIN ocr_taskchild_picture t2
                            on t1.ID = t2.PICTUREID