From 7823fe6a0c4a0da89e2834b70e03f21727ba7d82 Mon Sep 17 00:00:00 2001 From: lzx_win <2602107437@qq.com> Date: Mon, 16 Jun 2025 15:02:52 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/jeecg/common/exception/JeecgBootExceptionHandler.java | 4 ++-- .../java/org/jeecg/modules/clockinlog/mapper/ClockinLogMapper.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/exception/JeecgBootExceptionHandler.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/exception/JeecgBootExceptionHandler.java index bd68884..51001f5 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/exception/JeecgBootExceptionHandler.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/exception/JeecgBootExceptionHandler.java @@ -103,12 +103,12 @@ public class JeecgBootExceptionHandler { } /** - * spring默认上传大小100MB 超出大小捕获异常MaxUploadSizeExceededException + * spring默认上传大小1000MB 超出大小捕获异常MaxUploadSizeExceededException */ @ExceptionHandler(MaxUploadSizeExceededException.class) public Result handleMaxUploadSizeExceededException(MaxUploadSizeExceededException e) { log.error(e.getMessage(), e); - return Result.error("文件大小超出10MB限制, 请压缩或降低文件质量! "); + return Result.error("文件大小超出1000MB限制, 请压缩或降低文件质量! "); } @ExceptionHandler(DataIntegrityViolationException.class) diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/clockinlog/mapper/ClockinLogMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/clockinlog/mapper/ClockinLogMapper.java index f7f6701..c6bb037 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/clockinlog/mapper/ClockinLogMapper.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/clockinlog/mapper/ClockinLogMapper.java @@ -41,7 +41,7 @@ public interface ClockinLogMapper extends BaseMapper { @Select("SELECT IFNULL(count(1),0) FROM clockin_log WHERE del_flag = 0 AND user_id = #{userId} AND clock_in_time like '%${date}%' AND type in (0,1)") Integer getClockInTotal(@Param("userId") String userId,@Param("date") String date); - @Select("select clock_start_time,(select clock_in_time from clockin_log where project_item_id = a.id and del_flag = 0 and user_id = '${userId}' and clock_in_time like '%${date}%') time, a.type from clock_in_project_item a where project_id = '${projectId}' AND a.del_flag = 0 AND type in (${type},2)\n") + @Select("select clock_start_time,(select MAX(clock_in_time) from clockin_log where project_item_id = a.id and del_flag = 0 and user_id = '${userId}' and clock_in_time like '%${date}%') time, a.type from clock_in_project_item a where project_id = '${projectId}' AND a.del_flag = 0 AND type in (${type},2)\n") List getClockInLogExpeort(@Param("date") String date,@Param("projectId") String projectId,@Param("userId") String userId,@Param("type") Integer type); }