Merge pull request 'fix:修改ai审批工具接口，调整查询表和返回数据' (#23) from fix/aiApprovalTool into test

Reviewed-on: #23

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrSearchHistoryServiceImpl.java

@@ -87,7 +87,7 @@ public class OcrSearchHistoryServiceImpl extends ServiceImpl<OcrSearchHistoryMap
         List<OcrPicture> saveList = new ArrayList<>();
         int i=0;
         for (String childpictureid : cps) {
-            if (childpictureid.equals("100.00")){
+            if (childpictureid.equals("100")){
                 i++;
             }
         }
@@ -97,7 +97,7 @@ public class OcrSearchHistoryServiceImpl extends ServiceImpl<OcrSearchHistoryMap
         map.put("tenantusername",selectaiuser);
         map.put("packagename",selectaisp.get("packagename"));
         map.put("tasks","基线任务");
-        map.put("similarcount",selectaisp.get("similarcount"));
+//        map.put("similarcount",selectaisp.get("similarcount"));
         map.put("createtime",selectaisp.get("createtime"));
         map.put("similarComplete",i);
 

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

@@ -66,14 +66,27 @@
             (SELECT COUNT(*) FROM ocr_taskchild_picture WHERE TENANTID = ""#{tenantid}"" AND STATES = '3') as approved
     </select>
 
+<!--    <select id="selectaisp" resultType="map">-->
+<!--        SELECT-->
+<!--            rw.ID as id,rw.OCPICTUREID as ocpictureid,t.packagename,rw.PICTURERESULT as pictureresult,count(length(rw.PICTURERESULT)-length(replace(rw.PICTURERESULT,',',''))+1) as similarcount,t.create_time as createtime-->
+<!--        FROM-->
+<!--            ocr_taskchild_picture rw-->
+<!--            LEFT JOIN ocr_packagetask t ON rw.PACKAGEID = t.ID-->
+
+<!--        WHERE t.ID = #{id}-->
+<!--    </select>-->
+
     <select id="selectaisp" resultType="map">
         SELECT
-            rw.ID as id,rw.OCPICTUREID as ocpictureid,t.packagename,rw.PICTURERESULT as pictureresult,count(length(rw.PICTURERESULT)-length(replace(rw.PICTURERESULT,',',''))+1) as similarcount,t.create_time as createtime
+            tp.id as id,
+            tp.name as packagename,
+            GROUP_CONCAT(IFNULL(cdr.max_similarity, 0)) as pictureresult,
+            tp.create_time as createtime
         FROM
-            ocr_taskchild_picture rw
-            LEFT JOIN ocr_packagetask t ON rw.PACKAGEID = t.ID
-
-        WHERE t.ID = #{id}
+            ocr_task_package tp
+            LEFT JOIN ocr_check_duplicate_result cdr ON tp.check_duplicate_id = cdr.check_duplicate_id
+        WHERE
+            tp.ID = #{id}
     </select>
 
     <select id="selectaiuser" resultType="String">