文档库--ocr识别调取已入库文件分页搜索条件添加状态
This commit is contained in:
+27
-1
@@ -59,6 +59,14 @@ public class DocumentSearchServiceImpl implements IDocumentSearchService {
|
|||||||
@Override
|
@Override
|
||||||
public List<Map<String, Object>> queryCondition(String flag, String cut, String searchFlag) {
|
public List<Map<String, Object>> queryCondition(String flag, String cut, String searchFlag) {
|
||||||
List<Map<String, Object>> mapList = iBussDocumentLibraryEOService.queryCondition(flag, cut, searchFlag);
|
List<Map<String, Object>> mapList = iBussDocumentLibraryEOService.queryCondition(flag, cut, searchFlag);
|
||||||
|
//搜索条件手动添加正文
|
||||||
|
if("1".equals(searchFlag)){
|
||||||
|
Map<String,Object> map = new HashMap<>();
|
||||||
|
map.put("db_field_txt","正文");
|
||||||
|
map.put("field_show_type","1");
|
||||||
|
map.put("db_field_name","file_text");
|
||||||
|
mapList.add(map);
|
||||||
|
}
|
||||||
//type = 0时,查询下拉,树形,日期等字段 type = 1时,查询输入框字段
|
//type = 0时,查询下拉,树形,日期等字段 type = 1时,查询输入框字段
|
||||||
return mapList;
|
return mapList;
|
||||||
}
|
}
|
||||||
@@ -693,8 +701,26 @@ public class DocumentSearchServiceImpl implements IDocumentSearchService {
|
|||||||
}
|
}
|
||||||
int pageNo = Integer.parseInt(map.get("pageNo").toString());
|
int pageNo = Integer.parseInt(map.get("pageNo").toString());
|
||||||
int pageSize = Integer.parseInt(map.get("pageSize").toString());
|
int pageSize = Integer.parseInt(map.get("pageSize").toString());
|
||||||
|
//判断第一次传参和第二次传参 inputFieldList
|
||||||
|
String selectValue = "";
|
||||||
|
String selectValueTwo = "";
|
||||||
|
for (Map.Entry<String, Object> entry : mapOne.entrySet()) {
|
||||||
|
String key = entry.getKey();
|
||||||
|
String value = (String)entry.getValue();
|
||||||
|
if(inputFieldList.contains(key) && StringUtils.isNotBlank(value)){
|
||||||
|
selectValue = value;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
for (Map.Entry<String, Object> entry : mapTwo.entrySet()) {
|
||||||
|
String key = entry.getKey();
|
||||||
|
String value = (String)entry.getValue();
|
||||||
|
if(inputFieldList.contains(key) && StringUtils.isNotBlank(value)){
|
||||||
|
selectValueTwo = value;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
IPage iPage = getiPage(null, null, must, pageNo, pageSize);
|
|
||||||
|
IPage iPage = getiPage(selectValue, selectValueTwo, must, pageNo, pageSize);
|
||||||
return iPage;
|
return iPage;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user