guoxiangbin
/
ocr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

综合搜索接口修改返回参数集合

Browse Source
pull/1/head
ljt 1 year ago
parent f133c8e9a8
commit 956aa0552f
5 changed files with 21 additions and 25 deletions
Show Stats Download Patch File Download Diff File

2
jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrSearchHistoryController.java
Unescape View File

@ -46,7 +46,7 @@ public class OcrSearchHistoryController {
@RequestParam(value = "search", required = true) String search) { @RequestParam(value = "search", required = true) String search) {
UserToken userToken = this.userTokenService.getUserToken(RequestBaseUtil.getToken(request)); UserToken userToken = this.userTokenService.getUserToken(RequestBaseUtil.getToken(request));
//执行查询方法 //执行查询方法
List<List<Map<String, String>>> selectsearch = ocrSearchHistoryService.selectsearch(search, userToken.getLoginname()); List<Map<Object,List<Map<String,String>>>> selectsearch = ocrSearchHistoryService.selectsearch(search, userToken.getLoginname());
OcrSearchHistory ocrsearchhistory =new OcrSearchHistory(); OcrSearchHistory ocrsearchhistory =new OcrSearchHistory();
ocrsearchhistory.setHistoryname(search); ocrsearchhistory.setHistoryname(search);

7
jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataDao/OcrSearchHistoryMapper.java
Unescape View File

@ -3,7 +3,6 @@ package cn.jyjz.xiaoyao.ocr.dataDao;
import cn.jyjz.xiaoyao.ocr.dataobject.OcrSearchHistory; import cn.jyjz.xiaoyao.ocr.dataobject.OcrSearchHistory;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import liquibase.pro.packaged.S;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
@ -20,11 +19,11 @@ import java.util.Map;
*/ */
@Mapper @Mapper
public interface OcrSearchHistoryMapper extends BaseMapper<OcrSearchHistory> { public interface OcrSearchHistoryMapper extends BaseMapper<OcrSearchHistory> {
List<Map<String,String>> selectsearch1(@Param("search")String search,@Param("assignee") String assignee); List<Map<String,String>> selectsearch1(@Param("search")String search);
List<Map<String,String>> selectsearch2(@Param("search")String search,@Param("assignee") String assignee); List<Map<String,String>> selectsearch2(@Param("search")String search);
List<Map<String,String>> selectsearch3(@Param("search")String search,@Param("assignee") String assignee); List<Map<String,String>> selectsearch3(@Param("search")String search);

3
jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/IOcrSearchHistoryService.java
Unescape View File

@ -3,7 +3,6 @@ package cn.jyjz.xiaoyao.ocr.service;
import cn.jyjz.xiaoyao.ocr.dataobject.OcrSearchHistory; import cn.jyjz.xiaoyao.ocr.dataobject.OcrSearchHistory;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import org.apache.ibatis.annotations.Param;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@ -17,7 +16,7 @@ import java.util.Map;
* @since 2024-03-15 * @since 2024-03-15
*/ */
public interface IOcrSearchHistoryService extends IService<OcrSearchHistory> { public interface IOcrSearchHistoryService extends IService<OcrSearchHistory> {
List<List<Map<String,String>>> selectsearch(String search,String assignee); List<Map<Object,List<Map<String,String>>>> selectsearch(String search,String assignee);
Map<Object,Object> toolscount(String userid); Map<Object,Object> toolscount(String userid);

18
jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrSearchHistoryServiceImpl.java
Unescape View File

@ -25,17 +25,19 @@ public class OcrSearchHistoryServiceImpl extends ServiceImpl<OcrSearchHistoryMap
OcrSearchHistoryMapper ocrsearchhistorymapper; OcrSearchHistoryMapper ocrsearchhistorymapper;
@Override @Override
public List<List<Map<String,String>>> selectsearch(String search, String assignee) { public List<Map<Object,List<Map<String,String>>>> selectsearch(String search, String assignee) {
List<Map<String,String>> strings1 = ocrsearchhistorymapper.selectsearch1(search, assignee); List<Map<String,String>> strings1 = ocrsearchhistorymapper.selectsearch1(search);
List<Map<String,String>> strings2 = ocrsearchhistorymapper.selectsearch2(search, assignee); List<Map<String,String>> strings2 = ocrsearchhistorymapper.selectsearch2(search);
List<Map<String,String>> strings3 = ocrsearchhistorymapper.selectsearch3(search, assignee); List<Map<String,String>> strings3 = ocrsearchhistorymapper.selectsearch3(search);
List<List<Map<String,String>>> list = new ArrayList<>(); List<Map<Object,List<Map<String,String>>>> list = new ArrayList<>();
Map<Object,List<Map<String,String>>> map=new HashMap<>();
map.put("ai",strings1);
map.put("preliminary",strings2);
map.put("final",strings3);
list.add(map);
list.add(strings1);
list.add(strings2);
list.add(strings3);
return list; return list;
} }

16
jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrSearchHistoryMapper.xml
Unescape View File

@ -17,16 +17,14 @@
<select id="selectsearch1" resultType="map"> <select id="selectsearch1" resultType="map">
SELECT SELECT
r.ID,CONCAT_WS( "-", img.taskName, img.planName ) AS aiName r.ID as id,CONCAT_WS( "-", img.taskName, img.planName ) AS name
FROM FROM
ocr_taskchild_picture r ocr_taskchild_picture r
LEFT JOIN ocr_packagetask t ON r.PACKAGEID = 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) LEFT JOIN ocr_picture img ON FIND_IN_SET(img.ID,r.OCPICTUREID)
WHERE WHERE
-- r.STATES = '1' AND (r.PACKAGEID LIKE "%"#{search}"%"
r.ASSIGNEE = #{assignee}
AND (r.PACKAGEID LIKE "%"#{search}"%"
OR img.taskName LIKE "%"#{search}"%" OR img.taskName LIKE "%"#{search}"%"
OR img.field1 LIKE "%"#{search}"%" OR img.field1 LIKE "%"#{search}"%"
OR img.field3 LIKE "%"#{search}"%") OR img.field3 LIKE "%"#{search}"%")
@ -37,15 +35,14 @@
</select> </select>
<select id="selectsearch2" resultType="map"> <select id="selectsearch2" resultType="map">
SELECT SELECT
r.ID,CONCAT_WS( "-", img.taskName, img.planName ) AS preliminaryName r.ID as id,CONCAT_WS( "-", img.taskName, img.planName ) AS name
FROM FROM
ocr_taskchild_picture r ocr_taskchild_picture r
LEFT JOIN ocr_packagetask t ON r.PACKAGEID = 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) LEFT JOIN ocr_picture img ON FIND_IN_SET(img.ID,r.OCPICTUREID)
WHERE WHERE
r.ASSIGNEE = #{assignee} r.taskName IN ( '一级审批', '二级审批' )
AND r.taskName IN ( '一级审批', '二级审批' )
AND (r.PACKAGEID LIKE "%"#{search}"%" AND (r.PACKAGEID LIKE "%"#{search}"%"
OR img.taskName LIKE "%"#{search}"%" OR img.taskName LIKE "%"#{search}"%"
OR img.field1 LIKE "%"#{search}"%" OR img.field1 LIKE "%"#{search}"%"
@ -56,15 +53,14 @@
</select> </select>
<select id="selectsearch3" resultType="map"> <select id="selectsearch3" resultType="map">
SELECT SELECT
r.ID,CONCAT_WS( "-", img.taskName, img.planName ) AS finalName r.ID as id,CONCAT_WS( "-", img.taskName, img.planName ) AS name
FROM FROM
ocr_taskchild_picture r ocr_taskchild_picture r
LEFT JOIN ocr_packagetask t ON r.PACKAGEID = 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) LEFT JOIN ocr_picture img ON FIND_IN_SET(img.ID,r.OCPICTUREID)
WHERE WHERE
r.ASSIGNEE = #{assignee} r.taskName = '最终审批'
AND r.taskName = '三级审批'
AND (r.PACKAGEID LIKE "%"#{search}"%" AND (r.PACKAGEID LIKE "%"#{search}"%"
OR img.taskName LIKE "%"#{search}"%" OR img.taskName LIKE "%"#{search}"%"
OR img.field1 LIKE "%"#{search}"%" OR img.field1 LIKE "%"#{search}"%"

Write Preview
Loading…
Cancel
Save