Merge pull request '修复日期' (#203) from feature/cl into develop

Reviewed-on: #203

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'");
+                            if ("1".equals(value)) {
-                            sb.append(" and ").append(tableSql).append(" <= '").append(TimeUtil.getDateByOption(value, "")).append(" 23:59:59'");
+                                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"));