From 5b9a213668ad7f375e41a152070827d4612cdea7 Mon Sep 17 00:00:00 2001 From: ljt <18301674552@163.com> Date: Mon, 18 Mar 2024 15:56:29 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=BC=E5=90=88=E6=90=9C=E7=B4=A2=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E5=B7=B2=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../OcrSearchHistoryController.java | 5 +- .../ocr/dataDao/OcrSearchHistoryMapper.java | 6 +- .../ocr/service/IOcrSearchHistoryService.java | 2 +- .../impl/OcrSearchHistoryServiceImpl.java | 16 ++++- .../mapper/oa/OcrSearchHistoryMapper.xml | 62 +++++++++++++++---- 5 files changed, 72 insertions(+), 19 deletions(-) diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrSearchHistoryController.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrSearchHistoryController.java index fc38b35c..38d147d7 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrSearchHistoryController.java +++ b/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 selectsearch = ocrSearchHistoryService.selectsearch(search, userToken.getUsername()); + List>> selectsearch = ocrSearchHistoryService.selectsearch(search, userToken.getLoginname()); OcrSearchHistory ocrsearchhistory =new OcrSearchHistory(); ocrsearchhistory.setHistoryname(search); diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataDao/OcrSearchHistoryMapper.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataDao/OcrSearchHistoryMapper.java index 83c966bc..3846a8a6 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataDao/OcrSearchHistoryMapper.java +++ b/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 { - List selectsearch(@Param("search")String search,@Param("assignee") String assignee); + List> selectsearch1(@Param("search")String search,@Param("assignee") String assignee); + + List> selectsearch2(@Param("search")String search,@Param("assignee") String assignee); + + List> selectsearch3(@Param("search")String search,@Param("assignee") String assignee); diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/IOcrSearchHistoryService.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/IOcrSearchHistoryService.java index dc77b900..1a82f893 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/IOcrSearchHistoryService.java +++ b/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 { - List selectsearch(String search,String assignee); + List>> selectsearch(String search,String assignee); Map toolscount(String userid); } diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrSearchHistoryServiceImpl.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrSearchHistoryServiceImpl.java index dcc8206f..24f94f81 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrSearchHistoryServiceImpl.java +++ b/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 selectsearch(String search, String assignee) { - return ocrsearchhistorymapper.selectsearch(search,assignee); + public List>> selectsearch(String search, String assignee) { + List> strings1 = ocrsearchhistorymapper.selectsearch1(search, assignee); + List> strings2 = ocrsearchhistorymapper.selectsearch2(search, assignee); + List> strings3 = ocrsearchhistorymapper.selectsearch3(search, assignee); + + + List>> list = new ArrayList<>(); + + list.add(strings1); + list.add(strings2); + list.add(strings3); + + return list; } @Override diff --git a/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrSearchHistoryMapper.xml b/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrSearchHistoryMapper.xml index aebb9dd2..04d3cede 100644 --- a/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrSearchHistoryMapper.xml +++ b/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrSearchHistoryMapper.xml @@ -15,27 +15,63 @@ id, historyname, userid, createdate - SELECT - - CONCAT_WS("-",r.FROMTASKNAME,t.planName) as name + r.ID,CONCAT_WS( "-", img.taskName, img.planName ) AS aiName 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' - and - r.ASSIGNEE=#{assignee} - AND - r.FROMTASKID like "%"#{search}"%" - OR r.FROMTASKNAME like "%"#{search}"%" - OR t.field1 like "%"#{search}"%" - ORDER BY r.CREATEDATE DESC +-- r.STATES = '1' AND + r.ASSIGNEE = #{assignee} + 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 + + +