From 8c2a9937f9461d3201cc83ad9223c5fd792e39bc Mon Sep 17 00:00:00 2001 From: Chengliang <1546584672@qq.com> Date: Wed, 16 Aug 2023 15:59:25 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=97=A5=E6=9C=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/HrmResourceServiceImpl.java | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java b/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java index 1aba4a21..ba3bd722 100644 --- a/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java +++ b/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java @@ -65,6 +65,7 @@ import weaver.hrm.definedfield.HrmFieldManager; import java.math.BigDecimal; import java.math.RoundingMode; +import java.time.LocalDate; import java.util.*; import java.util.concurrent.atomic.AtomicInteger; import java.util.stream.Collectors; @@ -1160,7 +1161,7 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic 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); + sb.append(" and ").append(dbType.ifNull(tableSql, "0")).append(" < ").append(maxNum); } else { sb.append(" and ").append(dbType.ifNull(tableSql, "0")).append(" = '").append(value).append("' "); } @@ -1185,8 +1186,13 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic if (isQuickSearch) { if (StringUtils.isNotBlank(value) && !"-1".equals(value) && !"0,,".equals(value) && !"0".equals(value)) { if (!"6".equals(value)) { - 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'"); + if ("1".equals(value)) { + sb.append(" and ").append(tableSql).append(" = '").append(OrganizationDateUtil.getFormatLocalDate(LocalDate.now())).append(" '"); + }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'"); + } + } else { String startDate = Util.null2String(params.get(key + "_start")); String endDate = Util.null2String(params.get(key + "_end"));