拆分条款-查询条件修改
This commit is contained in:
+13
-7
@@ -672,14 +672,14 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
|
|||||||
conditionSb.append(" and sar_file_split_items." + key + " in('" + menuIds + "')");
|
conditionSb.append(" and sar_file_split_items." + key + " in('" + menuIds + "')");
|
||||||
}
|
}
|
||||||
} else if (!"pageNo".equals(key) && !"pageSize".equals(key)) {
|
} else if (!"pageNo".equals(key) && !"pageSize".equals(key)) {
|
||||||
String value = (String) entry.getValue();
|
if (ObjectUtil.isNotEmpty(entry.getValue())) {
|
||||||
if (StringUtils.isNotBlank(value)) {
|
|
||||||
for (Map<String, Object> map : mapList) {
|
for (Map<String, Object> map : mapList) {
|
||||||
String fieldName = (String) map.get("db_field_name");//字段
|
String fieldName = (String) map.get("db_field_name");//字段
|
||||||
if (key.equals(fieldName)) {
|
if (key.equals(fieldName)) {
|
||||||
//字段类型(判断是输入框还是下拉,等等)
|
//字段类型(判断是输入框还是下拉,等等)
|
||||||
String fieldType = (String) map.get("field_show_type");//字段类型
|
String fieldType = (String) map.get("field_show_type");//字段类型
|
||||||
if (FieldTypeEnum.TEXT_STRING.getValue().equals(fieldType)) {
|
if (FieldTypeEnum.TEXT_STRING.getValue().equals(fieldType) || FieldTypeEnum.TEXT_LINK.getValue().equals(fieldType)) {
|
||||||
|
String value = (String) entry.getValue();
|
||||||
//输入框 LIKE CONCAT("%", '/%', "%") ESCAPE '/'
|
//输入框 LIKE CONCAT("%", '/%', "%") ESCAPE '/'
|
||||||
if(value.contains("%")){
|
if(value.contains("%")){
|
||||||
value = value.replace("%", "/%");
|
value = value.replace("%", "/%");
|
||||||
@@ -689,23 +689,29 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
|
|||||||
} else if (FieldTypeEnum.PULL_SINGLE.getValue().equals(fieldType)
|
} else if (FieldTypeEnum.PULL_SINGLE.getValue().equals(fieldType)
|
||||||
|| FieldTypeEnum.PULL_MORE.getValue().equals(fieldType)
|
|| FieldTypeEnum.PULL_MORE.getValue().equals(fieldType)
|
||||||
|| FieldTypeEnum.TREE.getValue().equals(fieldType)) {
|
|| FieldTypeEnum.TREE.getValue().equals(fieldType)) {
|
||||||
|
String value = (String) entry.getValue();
|
||||||
StringBuilder valueSb = new StringBuilder();
|
StringBuilder valueSb = new StringBuilder();
|
||||||
StringBuilder condition = new StringBuilder();
|
StringBuilder condition = new StringBuilder();
|
||||||
for (String valueTemp : value.split(",")) {
|
for (String valueTemp : value.split(",")) {
|
||||||
valueSb.append("'" + valueTemp + "',");
|
valueSb.append("'" + valueTemp + "',");
|
||||||
condition.append(" or sar_file_split_items." + key + " like concat(concat('%','" + valueTemp + "'),'%'))");
|
condition.append(" or sar_file_split_items." + key + " like concat(concat('%','" + valueTemp + "'),'%')");
|
||||||
}
|
}
|
||||||
|
condition.append(")");
|
||||||
String substring = valueSb.substring(0, valueSb.length() - 1);
|
String substring = valueSb.substring(0, valueSb.length() - 1);
|
||||||
//下拉单选或下拉多选
|
//下拉单选或下拉多选
|
||||||
conditionSb.append(" and (sar_file_split_items." + key + " in(" + substring + ")" + condition.toString());
|
conditionSb.append(" and (sar_file_split_items." + key + " in(" + substring + ")" + condition.toString());
|
||||||
} else if (FieldTypeEnum.DATE_SINGLE.getValue().equals(fieldType)) {
|
} else if (FieldTypeEnum.DATE_SINGLE.getValue().equals(fieldType)) {
|
||||||
|
String value = (String) entry.getValue();
|
||||||
//日期(区分单日期还时间范围)
|
//日期(区分单日期还时间范围)
|
||||||
if (value.contains(",")) {
|
if (value.contains(",")) {
|
||||||
conditionSb.append(" and " + "date_format(" + key + ",'%Y-%m-%d') >= '" + value.split(",")[0] + "'"
|
conditionSb.append(" and " + "date_format(sar_file_split_items." + key + ",'%Y-%m-%d') >= '" + value.split(",")[0] + "'"
|
||||||
+ " and " + "date_format(" + key + ",'%Y-%m-%d') <= '" + value.split(",")[1] + "'");
|
+ " and " + "date_format(sar_file_split_items." + key + ",'%Y-%m-%d') <= '" + value.split(",")[1] + "'");
|
||||||
} else {
|
} else {
|
||||||
conditionSb.append(" and " + "date_format(" + key + ",'%Y-%m-%d') = '" + value + "'");
|
conditionSb.append(" and " + "date_format(sar_file_split_items." + key + ",'%Y-%m-%d') = '" + value + "'");
|
||||||
}
|
}
|
||||||
|
} else if (FieldTypeEnum.TEXT_NUMBER.getValue().equals(fieldType)) {
|
||||||
|
Double value = Double.valueOf(entry.getValue().toString());
|
||||||
|
conditionSb.append(" and sar_file_split_items." + key + " =" + value);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user