diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java index c88bbfe0d..52a80e951 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java @@ -672,14 +672,14 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl map : mapList) { String fieldName = (String) map.get("db_field_name");//字段 if (key.equals(fieldName)) { //字段类型(判断是输入框还是下拉,等等) 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 '/' if(value.contains("%")){ value = value.replace("%", "/%"); @@ -689,23 +689,29 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl= '" + value.split(",")[0] + "'" - + " and " + "date_format(" + key + ",'%Y-%m-%d') <= '" + value.split(",")[1] + "'"); + conditionSb.append(" and " + "date_format(sar_file_split_items." + key + ",'%Y-%m-%d') >= '" + value.split(",")[0] + "'" + + " and " + "date_format(sar_file_split_items." + key + ",'%Y-%m-%d') <= '" + value.split(",")[1] + "'"); } 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); } } }