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

fix:高级检索的修改先注释掉，SearchQuery类修改的代码不完整，会影响服务运行

Browse Source
pull/48/head
DELL 1 year ago
parent e94dcb014c
commit 4e9d6d3345
1 changed files with 134 additions and 134 deletions
Show Stats Download Patch File Download Diff File

268
jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/flowable/service/impl/FlowTaskServiceImpl.java
Unescape View File

@ -1316,14 +1316,14 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
query.put("searchassignee", user.getLoginname()); query.put("searchassignee", user.getLoginname());
query.putAll(searchQuery); query.putAll(searchQuery);
if (!StringUtils.isBlank(userSearchId)) { // if (!StringUtils.isBlank(userSearchId)) {
OcrUsersearch ocrUsersearch = ocrUsersearchService.selectByUserSearchId(userSearchId); // OcrUsersearch ocrUsersearch = ocrUsersearchService.selectByUserSearchId(userSearchId);
SearchQuery additionalQuery = new SearchQuery(); // SearchQuery additionalQuery = new SearchQuery();
for (OcrUsersearchchild usersearchchild : ocrUsersearch.getOcrUsersearchchildList()) { // for (OcrUsersearchchild usersearchchild : ocrUsersearch.getOcrUsersearchchildList()) {
this.formattingSearchChild1(additionalQuery, usersearchchild); // this.formattingSearchChild1(additionalQuery, usersearchchild);
} // }
query.putAll(additionalQuery.getQuery()); // query.putAll(additionalQuery.getQuery());
} // }
Long count = ocrTaskchildPictureService.listmytaskCount(query); Long count = ocrTaskchildPictureService.listmytaskCount(query);
@ -1951,132 +1951,132 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
return queryWrapper; return queryWrapper;
} }
private SearchQuery formattingSearchChild1(SearchQuery searchQuery, OcrUsersearchchild usersearchchild) { // private SearchQuery formattingSearchChild1(SearchQuery searchQuery, OcrUsersearchchild usersearchchild) {
switch (usersearchchild.getSearchRelationType()) { // switch (usersearchchild.getSearchRelationType()) {
case "where": // case "where":
// 添加 "where" 查询条件 // // 添加 "where" 查询条件
this.formattingSearchType1(searchQuery, usersearchchild); // this.formattingSearchType1(searchQuery, usersearchchild);
break; // break;
case "and": // case "and":
// 添加 "and" 查询条件 // // 添加 "and" 查询条件
searchQuery.addRulesOp(usersearchchild.getSearchfield(),"and"); // searchQuery.addRulesOp(usersearchchild.getSearchfield(),"and");
SearchQuery andQuery = this.formattingSearchType1(searchQuery, usersearchchild); // SearchQuery andQuery = this.formattingSearchType1(searchQuery, usersearchchild);
searchQuery.setSearchQuery(andQuery); // searchQuery.setSearchQuery(andQuery);
break; // break;
case "or": // case "or":
// 添加 "or" 查询条件 // // 添加 "or" 查询条件
searchQuery.addRulesOp(usersearchchild.getSearchfield(),"or"); // searchQuery.addRulesOp(usersearchchild.getSearchfield(),"or");
SearchQuery orQuery = this.formattingSearchType1(searchQuery, usersearchchild); // SearchQuery orQuery = this.formattingSearchType1(searchQuery, usersearchchild);
searchQuery.setSearchQuery(orQuery); // searchQuery.setSearchQuery(orQuery);
break; // break;
default: // default:
break; // break;
} // }
return searchQuery; // return searchQuery;
} // }
//
private SearchQuery formattingSearchType1(SearchQuery searchQuery, OcrUsersearchchild usersearchchild) { // private SearchQuery formattingSearchType1(SearchQuery searchQuery, OcrUsersearchchild usersearchchild) {
//查询类型 相等true 不相等fase // //查询类型 相等true 不相等fase
boolean queryType = "eq".equals(usersearchchild.getSearchtype()); // boolean queryType = "eq".equals(usersearchchild.getSearchtype());
//
// 1.获取检查数据，确定数据类型 // // 1.获取检查数据，确定数据类型
String valueType = SearchParaFormatting.clickSearchValue(usersearchchild.getSearchvalue()); // String valueType = SearchParaFormatting.clickSearchValue(usersearchchild.getSearchvalue());
List<String> arrayData = null; //集合型数据 // List<String> arrayData = null; //集合型数据
List<Integer> sectionInts = null; //纯数字区间型数据 // List<Integer> sectionInts = null; //纯数字区间型数据
String[] sections = null; //字符串区间型数据 // String[] sections = null; //字符串区间型数据
DateTime beginTime = null; //日期时间区间型数据 // DateTime beginTime = null; //日期时间区间型数据
DateTime endTime = null; //日期时间区间型数据 // DateTime endTime = null; //日期时间区间型数据
//
// 2.根据数据类型，解构数据 // // 2.根据数据类型，解构数据
switch (valueType) { // switch (valueType) {
case "array": // case "array":
//处理多文件 // //处理多文件
String[] datas = usersearchchild.getSearchvalue().split(","); // String[] datas = usersearchchild.getSearchvalue().split(",");
arrayData = Arrays.asList(datas); // arrayData = Arrays.asList(datas);
break; // break;
case "section": // case "section":
//格式化数据,仅在做区间的时候去除空格，其他地方不进行空格去除. // //格式化数据,仅在做区间的时候去除空格，其他地方不进行空格去除.
sections = usersearchchild.getSearchvalue().trim().replaceAll("\\s+", "").split("-"); // sections = usersearchchild.getSearchvalue().trim().replaceAll("\\s+", "").split("-");
//校验是否纯数字,纯数字的话，要转成int,否则比对时会有问题 // //校验是否纯数字,纯数字的话，要转成int,否则比对时会有问题
sectionInts = new ArrayList<>(); // sectionInts = new ArrayList<>();
for (String data : sections) { // for (String data : sections) {
if (data.matches("\\d+")) { // if (data.matches("\\d+")) {
sectionInts.add(Integer.parseInt(data)); // sectionInts.add(Integer.parseInt(data));
} // }
} // }
break; // break;
case "time": // case "time":
//格式化时间数据 // //格式化时间数据
String[] times = usersearchchild.getSearchvalue().trim().replaceAll("\\s+", "").split("-"); // String[] times = usersearchchild.getSearchvalue().trim().replaceAll("\\s+", "").split("-");
beginTime = DateUtil.parse(times[0], "yyyy/MM/dd"); // beginTime = DateUtil.parse(times[0], "yyyy/MM/dd");
endTime = DateUtil.parse(times[1], "yyyy/MM/dd"); // endTime = DateUtil.parse(times[1], "yyyy/MM/dd");
break; // break;
default: // default:
} // }
//
// 3.根据查询类型 组装查询条件 相等 // // 3.根据查询类型 组装查询条件 相等
switch (valueType) { // switch (valueType) {
case "array": // case "array":
//集合数据 // //集合数据
//相等 // //相等
if (queryType) { // if (queryType) {
searchQuery.addIn(usersearchchild.getSearchfield(), arrayData); // searchQuery.addIn(usersearchchild.getSearchfield(), arrayData);
break; // break;
} // }
//不相等 // //不相等
searchQuery.addNotIn(usersearchchild.getSearchfield(), arrayData); // searchQuery.addNotIn(usersearchchild.getSearchfield(), arrayData);
break; // break;
//
case "section": // case "section":
//数字区间查询 // //数字区间查询
if (sectionInts != null && sectionInts.size() == 2) { // if (sectionInts != null && sectionInts.size() == 2) {
if (queryType) { // if (queryType) {
//相等 // //相等
searchQuery.addGreaterEqual(usersearchchild.getSearchfield(), sectionInts.get(0)); // searchQuery.addGreaterEqual(usersearchchild.getSearchfield(), sectionInts.get(0));
searchQuery.addLessEqual(usersearchchild.getSearchfield(), sectionInts.get(1)); // searchQuery.addLessEqual(usersearchchild.getSearchfield(), sectionInts.get(1));
break; // break;
} // }
//不相等 // //不相等
searchQuery.addLess(usersearchchild.getSearchfield(), sectionInts.get(0)); // searchQuery.addLess(usersearchchild.getSearchfield(), sectionInts.get(0));
searchQuery.addGreater(usersearchchild.getSearchfield(), sectionInts.get(1)); // searchQuery.addGreater(usersearchchild.getSearchfield(), sectionInts.get(1));
break; // break;
} // }
//
//字符串区间查询 // //字符串区间查询
if (queryType) { // if (queryType) {
//相等 // //相等
searchQuery.addGreaterEqual(usersearchchild.getSearchfield(), sections[0]); // searchQuery.addGreaterEqual(usersearchchild.getSearchfield(), sections[0]);
searchQuery.addLessEqual(usersearchchild.getSearchfield(), sections[1]); // searchQuery.addLessEqual(usersearchchild.getSearchfield(), sections[1]);
break; // break;
} // }
//不相等 // //不相等
searchQuery.addLess(usersearchchild.getSearchfield(), sections[0]); // searchQuery.addLess(usersearchchild.getSearchfield(), sections[0]);
searchQuery.addGreater(usersearchchild.getSearchfield(), sections[1]); // searchQuery.addGreater(usersearchchild.getSearchfield(), sections[1]);
break; // break;
//
//
case "time": // case "time":
//时间区间数据 // //时间区间数据
//相等 // //相等
if (queryType) { // if (queryType) {
searchQuery.addGreaterEqual(usersearchchild.getSearchfield(), beginTime); // searchQuery.addGreaterEqual(usersearchchild.getSearchfield(), beginTime);
searchQuery.addLessEqual(usersearchchild.getSearchfield(), endTime); // searchQuery.addLessEqual(usersearchchild.getSearchfield(), endTime);
break; // break;
} // }
//不相等 // //不相等
searchQuery.addLess(usersearchchild.getSearchfield(), beginTime); // searchQuery.addLess(usersearchchild.getSearchfield(), beginTime);
searchQuery.addGreater(usersearchchild.getSearchfield(), endTime); // searchQuery.addGreater(usersearchchild.getSearchfield(), endTime);
break; // break;
//
default: // default:
if (queryType) { // if (queryType) {
searchQuery.addEqual(usersearchchild.getSearchfield(), usersearchchild.getSearchvalue()); // searchQuery.addEqual(usersearchchild.getSearchfield(), usersearchchild.getSearchvalue());
break; // break;
} // }
searchQuery.addNotEqual(usersearchchild.getSearchfield(), usersearchchild.getSearchvalue()); // searchQuery.addNotEqual(usersearchchild.getSearchfield(), usersearchchild.getSearchvalue());
} // }
return searchQuery; // return searchQuery;
} // }
} }

Write Preview
Loading…
Cancel
Save