|
|
|
@ -1143,7 +1143,18 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic
|
|
|
|
|
switch (conditionItem.getConditionType()) {
|
|
|
|
|
case INPUT:// 单行文本框
|
|
|
|
|
case TEXTAREA:// 多行文本框
|
|
|
|
|
sb.append(" and ").append(tableSql).append(dbType.like(value));
|
|
|
|
|
if (isQuickSearch) {
|
|
|
|
|
if ("-1".equals(value)) {
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
QuickSearchDetail quickSearchDetailById = getQuickSearchMapper().getQuickSearchDetailById(value);
|
|
|
|
|
Integer maxNum = quickSearchDetailById.getMaxNum();
|
|
|
|
|
Integer minNum = quickSearchDetailById.getMinNum();
|
|
|
|
|
sb.append(" and ").append(dbType.ifNull(tableSql, "0")).append(" >= ").append(minNum);
|
|
|
|
|
sb.append(" and ").append(dbType.ifNull(tableSql, "0")).append(" < ").append(maxNum);
|
|
|
|
|
} else {
|
|
|
|
|
sb.append(" and ").append(tableSql).append(dbType.like(value));
|
|
|
|
|
}
|
|
|
|
|
// 模糊搜索
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
@ -1154,7 +1165,7 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic
|
|
|
|
|
|
|
|
|
|
case INPUTNUMBER:// 数字
|
|
|
|
|
if (isQuickSearch) {
|
|
|
|
|
if ("-1".equals(value)){
|
|
|
|
|
if ("-1".equals(value)) {
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
QuickSearchDetail quickSearchDetailById = getQuickSearchMapper().getQuickSearchDetailById(value);
|
|
|
|
@ -1188,7 +1199,7 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic
|
|
|
|
|
if (!"6".equals(value)) {
|
|
|
|
|
if ("1".equals(value)) {
|
|
|
|
|
sb.append(" and ").append(tableSql).append(" = '").append(OrganizationDateUtil.getFormatLocalDate(LocalDate.now())).append("'");
|
|
|
|
|
}else {
|
|
|
|
|
} else {
|
|
|
|
|
sb.append(" and ").append(tableSql).append(" >= '").append(TimeUtil.getDateByOption(value, "0")).append(" 00:00:00'");
|
|
|
|
|
sb.append(" and ").append(tableSql).append(" <= '").append(TimeUtil.getDateByOption(value, "")).append(" 23:59:59'");
|
|
|
|
|
}
|
|
|
|
|