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 ee53e9fc..4f599876 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 @@ -46,7 +46,7 @@ public class OcrSearchHistoryController { @RequestParam(value = "search", required = true) String search) { UserToken userToken = this.userTokenService.getUserToken(RequestBaseUtil.getToken(request)); //执行查询方法 - List>>> selectsearch = ocrSearchHistoryService.selectsearch(search, userToken.getLoginname()); + Map>> 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/service/IOcrSearchHistoryService.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/IOcrSearchHistoryService.java index efc17fb0..8307cfe3 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 @@ -16,7 +16,7 @@ import java.util.Map; * @since 2024-03-15 */ public interface IOcrSearchHistoryService extends IService { - List>>> selectsearch(String search,String assignee); + Map>> 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 f0c01629..89000659 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 @@ -25,21 +25,21 @@ public class OcrSearchHistoryServiceImpl extends ServiceImpl>>> selectsearch(String search, String assignee) { + public Map>> selectsearch(String search, String assignee) { List> strings1 = ocrsearchhistorymapper.selectsearch1(search); List> strings2 = ocrsearchhistorymapper.selectsearch2(search); List> strings3 = ocrsearchhistorymapper.selectsearch3(search); - List>>> list = new ArrayList<>(); +// List>>> list = new ArrayList<>(); Map>> map=new HashMap<>(); map.put("ai",strings1); map.put("preliminary",strings2); map.put("final",strings3); - list.add(map); +// list.add(map); - return list; + return map; } @Override