修改操作日志日期筛选问题

src/main/java/com/keymobile/indicators/service/impl/LoggingEventServiceImpl.java

@@ -19,8 +19,13 @@ public class LoggingEventServiceImpl implements LoggingEventService {
     public List<LogStatistics> findClassNameAndCount(LogQuery logQuery) {
         if(logQuery!=null){
             logQuery.setStartTime(this.getDateTime(logQuery.getStartDateStr()));
-            logQuery.setEndTime(this.getDateTime(logQuery.getEndDateStr()));
+            Long endDateTime = this.getDateTime(logQuery.getEndDateStr());
+            if(endDateTime!=null){
+                endDateTime=  endDateTime+60*60*24*1000;//加一天
+            }
+            logQuery.setEndTime(endDateTime);
         }
+
         List<LogStatistics> logStatisticsList = loggingEventMapper.findClassNameAndCount(logQuery);
         Collections.sort(logStatisticsList, new Comparator<LogStatistics>() {
             @Override
@@ -97,7 +102,12 @@ public class LoggingEventServiceImpl implements LoggingEventService {
     public long findCountByLogQuery(LogQuery logQuery) {
         if(logQuery!=null){
             logQuery.setStartTime(this.getDateTime(logQuery.getStartDateStr()));
-            logQuery.setEndTime(this.getDateTime(logQuery.getEndDateStr()));
+            Long endDateTime = this.getDateTime(logQuery.getEndDateStr());
+            if(endDateTime!=null){
+                endDateTime=  endDateTime+60*60*24*1000;//加一天
+            }
+            logQuery.setEndTime(endDateTime);
+          //  logQuery.setEndTime(this.getDateTime(logQuery.getEndDateStr()));
         }
         return loggingEventMapper.findCountByLogQuery(logQuery);
     }
@@ -106,7 +116,11 @@ public class LoggingEventServiceImpl implements LoggingEventService {
     public List<LoggingEvent> findVisitMsg(LogQuery logQuery) {
         if(logQuery!=null){
             logQuery.setStartTime(this.getDateTime(logQuery.getStartDateStr()));
-            logQuery.setEndTime(this.getDateTime(logQuery.getEndDateStr()));
+            Long endDateTime = this.getDateTime(logQuery.getEndDateStr());
+            if(endDateTime!=null){
+                endDateTime=  endDateTime+60*60*24*1000;//加一天
+            }
+            logQuery.setEndTime(endDateTime);
         }
         return loggingEventMapper.findVisitMsg(logQuery);
     }

src/main/resources/mybatis/mapping/LoggingEventMapper.xml

@@ -40,13 +40,13 @@
             and timestmp >= #{startTime}
         </if>
         <if test="endTime != null and endTime != ''">
-            and timestmp &lt;= #{endTime}
+            and timestmp  &lt;  #{endTime}
         </if>
         <if test="loggerName != null and loggerName!=''">
             and arg1  like concat('%',#{loggerName},'%')
         </if>
         <if test="employeeId != null and employeeId!=''">
-            and arg0 like concat(#{employeeId},':%')
+            and arg0 like concat('%',#{employeeId},'%')
         </if>
         <if test="url != null and url!=''">
             and arg3 = #{url}