Merge remote-tracking branch 'origin/main' into main

bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SysLogServiceImpl.java

@@ -181,7 +181,10 @@ public class SysLogServiceImpl implements ISysLogService {
     public R<Map<String, Object>> getLogStatistics(SysLogsVo dto) {
         Map<String,Object> map= Maps.newHashMap();
        try{
-
+           if(StringUtils.isNotEmpty(dto.getOperTime())){
+               dto.setStartTime(dto.getOperTime().split(" - ")[0].trim());
+               dto.setEndTime(dto.getOperTime().split(" - ")[1].trim());
+           }
             List<SysLogsVo> all=mapper.getAllLogs(dto);
            if(StringUtils.isNotEmpty(all)){
                int allNum= all.stream().mapToInt(SysLogsVo::getNum).sum();

bonus-modules/bonus-system/src/main/resources/mapper/system/SysLogMapper.xml

@@ -186,7 +186,7 @@
         select count(1) num
                 from sys_logs
                  where   oper_time  BETWEEN CONCAT(#{startTime}, ' 00:00:00') AND CONCAT(#{endTime},' 23:59:59')
-                GROUP BY result
+                GROUP BY log_type
     </select>
 
     <select id="getModuleName" resultType="java.lang.String">