综合搜索接口已修改

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrSearchHistoryController.java

@@ -15,6 +15,7 @@ import javax.servlet.http.HttpServletRequest;
 import cn.jyjz.xiaoyao.ocr.service.IOcrSearchHistoryService;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * ocr控制器
@@ -42,10 +43,10 @@ public class OcrSearchHistoryController  {
      */
     @RequestMapping(value = "/searchList", method = RequestMethod.GET)
     public ResultVo searchList(HttpServletRequest request,
-                               @RequestParam(value = "search", required = false) String search) {
+                               @RequestParam(value = "search", required = true) String search) {
         UserToken userToken = this.userTokenService.getUserToken(RequestBaseUtil.getToken(request));
         //执行查询方法
-        List<String> selectsearch = ocrSearchHistoryService.selectsearch(search, userToken.getUsername());
+        List<List<Map<String, String>>> selectsearch = ocrSearchHistoryService.selectsearch(search, userToken.getLoginname());
 
         OcrSearchHistory ocrsearchhistory =new OcrSearchHistory();
         ocrsearchhistory.setHistoryname(search);

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataDao/OcrSearchHistoryMapper.java

@@ -20,7 +20,11 @@ import java.util.Map;
  */
 @Mapper
 public interface OcrSearchHistoryMapper extends BaseMapper<OcrSearchHistory> {
-        List<String> selectsearch(@Param("search")String search,@Param("assignee") String assignee);
+        List<Map<String,String>> selectsearch1(@Param("search")String search,@Param("assignee") String assignee);
+
+        List<Map<String,String>> selectsearch2(@Param("search")String search,@Param("assignee") String assignee);
+
+        List<Map<String,String>> selectsearch3(@Param("search")String search,@Param("assignee") String assignee);
 
 
 

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

@@ -17,7 +17,7 @@ import java.util.Map;
  * @since 2024-03-15
  */
 public interface IOcrSearchHistoryService extends IService<OcrSearchHistory> {
-    List<String> selectsearch(String search,String assignee);
+    List<List<Map<String,String>>> selectsearch(String search,String assignee);
 
     Map<Object,Object> toolscount(String userid);
 }

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

@@ -7,6 +7,7 @@ import org.springframework.stereotype.Service;
 import cn.jyjz.xiaoyao.ocr.dataDao.OcrSearchHistoryMapper;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
@@ -26,8 +27,19 @@ public class OcrSearchHistoryServiceImpl extends ServiceImpl<OcrSearchHistoryMap
     OcrSearchHistoryMapper ocrsearchhistorymapper;
 
     @Override
-    public List<String> selectsearch(String search, String assignee) {
+    public List<List<Map<String,String>>> selectsearch(String search, String assignee) {
-        return ocrsearchhistorymapper.selectsearch(search,assignee);
+        List<Map<String,String>> strings1 = ocrsearchhistorymapper.selectsearch1(search, assignee);
+        List<Map<String,String>> strings2 = ocrsearchhistorymapper.selectsearch2(search, assignee);
+        List<Map<String,String>> strings3 = ocrsearchhistorymapper.selectsearch3(search, assignee);
+
+
+        List<List<Map<String,String>>> list = new ArrayList<>();
+
+        list.add(strings1);
+        list.add(strings2);
+        list.add(strings3);
+
+        return list;
     }
 
     @Override

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

@@ -15,27 +15,63 @@
         id, historyname, userid, createdate
     </sql>
 
-    <select id="selectsearch" resultType="map">
+    <select id="selectsearch1" resultType="map">
-
         SELECT
-
+            r.ID,CONCAT_WS( "-", img.taskName, img.planName ) AS aiName
-            CONCAT_WS("-",r.FROMTASKNAME,t.planName) as name
         FROM
             ocr_taskchild_picture r
-                LEFT JOIN ocr_picture t ON r.PICTUREID = t.ID
+                LEFT JOIN ocr_packagetask t ON r.PACKAGEID = t.ID
+                LEFT JOIN ocr_picture img ON FIND_IN_SET(img.ID,r.OCPICTUREID)
+
         WHERE
-            r.STATES='1'
+--             r.STATES = '1' AND
-                and
+           r.ASSIGNEE = #{assignee}
-            r.ASSIGNEE=#{assignee}
+          AND (r.PACKAGEID LIKE "%"#{search}"%"
-                AND
+            OR img.taskName LIKE "%"#{search}"%"
-            r.FROMTASKID like "%"#{search}"%"
+            OR img.field1 LIKE "%"#{search}"%"
-           OR r.FROMTASKNAME like "%"#{search}"%"
+            OR img.field3 LIKE "%"#{search}"%")
-           OR t.field1 like "%"#{search}"%"
+        ORDER BY
-        ORDER BY r.CREATEDATE DESC
+            r.CREATEDATE DESC
             LIMIT 3
 
+    </select>
+    <select id="selectsearch2" resultType="map">
+        SELECT
+            r.ID,CONCAT_WS( "-", img.taskName, img.planName ) AS preliminaryName
+        FROM
+            ocr_taskchild_picture r
+                LEFT JOIN ocr_packagetask t ON r.PACKAGEID = t.ID
+                LEFT JOIN ocr_picture img ON FIND_IN_SET(img.ID,r.OCPICTUREID)
 
+        WHERE
+            r.ASSIGNEE = #{assignee}
+          AND r.taskName IN ( '一级审批', '二级审批' )
+          AND (r.PACKAGEID LIKE "%"#{search}"%"
+            OR img.taskName LIKE "%"#{search}"%"
+            OR img.field1 LIKE "%"#{search}"%"
+            OR img.field3 LIKE "%"#{search}"%")
+        ORDER BY
+            r.CREATEDATE DESC
+            LIMIT 3
+    </select>
+    <select id="selectsearch3" resultType="map">
+        SELECT
+            r.ID,CONCAT_WS( "-", img.taskName, img.planName ) AS finalName
+        FROM
+            ocr_taskchild_picture r
+                LEFT JOIN ocr_packagetask t ON r.PACKAGEID = t.ID
+                LEFT JOIN ocr_picture img ON FIND_IN_SET(img.ID,r.OCPICTUREID)
 
+        WHERE
+            r.ASSIGNEE = #{assignee}
+          AND r.taskName  = '三级审批'
+          AND (r.PACKAGEID LIKE "%"#{search}"%"
+            OR img.taskName LIKE "%"#{search}"%"
+            OR img.field1 LIKE "%"#{search}"%"
+            OR img.field3 LIKE "%"#{search}"%")
+        ORDER BY
+            r.CREATEDATE DESC
+            LIMIT 3
 
     </select>