From ec7bd987b231802163609274edb20d22fdf7e359 Mon Sep 17 00:00:00 2001 From: dxfeng Date: Wed, 16 Aug 2023 17:18:43 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=BA=E5=91=98=E5=BF=AB=E6=8D=B7=E6=90=9C?= =?UTF-8?q?=E7=B4=A2BUG=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/HrmResourceServiceImpl.java | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java b/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java index 0b3a62ce..66cc3284 100644 --- a/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java +++ b/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java @@ -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'"); }