|
@@ -74,6 +74,7 @@ public class CommonServiceImpl implements ICommonService {
|
|
|
List<String> test = Arrays.asList(whereTerm);
|
|
|
// 拼接条件
|
|
|
conditions.forEach((key, val) -> {
|
|
|
+ // 把前端回传的查询参数值名称驼峰转下划线命名,进行筛选是否存在匹配项
|
|
|
String sqlWhere = test.stream().filter(item -> item.contains(toUnderScoreCase(key))).findAny().get();
|
|
|
if (sqlWhere.indexOf("#{timeframe}") != -1) { // 时间范围查询拼接
|
|
|
endSQL.append(" AND " + sqlWhere.replace("#{timeframe}", "'" + val.toString().split(",")[0] + "'" + " and " + "'" + val.toString().split(",")[1] + "'"));
|