Merge pull request 'fix: 修改相似度列表' (#114) from feat/updateFlow-20240415 into test

Reviewed-on: #114

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);

jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrTaskchildPictureMapper.xml

@@ -762,15 +762,15 @@
                         t1.photo_date_timestamp     photoDateTimestamp,
                         t1.similarity_score         similarityScore,
                         t1.server_thumbnail_url     serverThumbnailUrl,
-                        COALESCE(
-                                (SELECT t3.STATSHIS
+                        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
+                                     and t3.TASKINDEX =
+                                         (SELECT TASKNODE
                                           FROM ocr_taskchild_picture
                                           WHERE PICTUREID = #{pictureId})
-                                 LIMIT 1),
-                                1) AS            historyStates
+                                   LIMIT 1), 1)) AS historyStates
         FROM ocr_picture t1
                  LEFT JOIN ocr_taskchild_picture t2
                            on t1.ID = t2.PICTUREID