From 45fc19a5b24ffe149cf179815ade357324f4a7b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=86=B7=E5=86=B7?= <2270033969@qq.com> Date: Fri, 31 May 2024 14:52:06 +0800 Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20=E8=B0=83=E6=95=B4=E6=97=A5?= =?UTF-8?q?=E7=A8=8B=E7=AE=A1=E7=90=86=E7=9B=B8=E5=85=B3=E7=9A=84=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E5=90=8D=E7=A7=B0=20=E9=80=82=E9=85=8D=20Oracle?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/0pigxx_boot.sql | 6 +++--- db/2pigxx.sql | 6 +++--- .../pigx/admin/api/entity/SysScheduleEntity.java | 10 +++++----- .../admin/service/impl/SysScheduleServiceImpl.java | 8 ++++---- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/db/0pigxx_boot.sql b/db/0pigxx_boot.sql index 7c5e01995..c4a0e5f59 100644 --- a/db/0pigxx_boot.sql +++ b/db/0pigxx_boot.sql @@ -1173,10 +1173,10 @@ CREATE TABLE `sys_schedule` ( `id` bigint(20) NOT NULL COMMENT 'id', `title` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '标题', `schedule_type` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '日程类型', - `state` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '状态', + `schedule_state` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '状态', `content` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci COMMENT '内容', - `time` time DEFAULT NULL COMMENT '时间', - `date` date DEFAULT NULL COMMENT '日期', + `schedule_time` time DEFAULT NULL COMMENT '时间', + `schedule_date` date DEFAULT NULL COMMENT '日期', `create_by` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT ' ' COMMENT '创建人', `create_time` datetime DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', `update_by` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT ' ' COMMENT '修改人', diff --git a/db/2pigxx.sql b/db/2pigxx.sql index 0c149a023..665bd4d84 100644 --- a/db/2pigxx.sql +++ b/db/2pigxx.sql @@ -1136,10 +1136,10 @@ CREATE TABLE `sys_schedule` ( `id` bigint(20) NOT NULL COMMENT 'id', `title` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '标题', `schedule_type` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '日程类型', - `state` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '状态', + `schedule_state` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '状态', `content` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci COMMENT '内容', - `time` time DEFAULT NULL COMMENT '时间', - `date` date DEFAULT NULL COMMENT '日期', + `schedule_time` time DEFAULT NULL COMMENT '时间', + `schedule_date` date DEFAULT NULL COMMENT '日期', `create_by` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT ' ' COMMENT '创建人', `create_time` datetime DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', `update_by` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT ' ' COMMENT '修改人', diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysScheduleEntity.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysScheduleEntity.java index 72a96ea8b..2c3cd38bf 100644 --- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysScheduleEntity.java +++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysScheduleEntity.java @@ -60,14 +60,13 @@ public class SysScheduleEntity extends Model { * 日程类型 */ @Schema(description = "日程类型") - @TableField("schedule_type") - private String type; + private String scheduleType; /** * 状态 */ @Schema(description = "状态") - private String state; + private String scheduleState; /** * 内容 @@ -79,13 +78,14 @@ public class SysScheduleEntity extends Model { * 时间 */ @Schema(description = "时间") - private LocalTime time; + private LocalTime scheduleTime; /** * 日期 */ @Schema(description = "日期") - private LocalDate date; + @TableField("schedule_date") + private LocalDate scheduleDate; /** * 创建人 diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysScheduleServiceImpl.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysScheduleServiceImpl.java index d07c09527..49410ef0b 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysScheduleServiceImpl.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysScheduleServiceImpl.java @@ -56,8 +56,8 @@ public class SysScheduleServiceImpl extends ServiceImpl getScheduleByScope(Page page, SysScheduleEntity sysSchedule) { LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(); wrapper.like(StrUtil.isNotBlank(sysSchedule.getTitle()), SysScheduleEntity::getTitle, sysSchedule.getTitle()); - wrapper.like(StrUtil.isNotBlank(sysSchedule.getType()), SysScheduleEntity::getType, sysSchedule.getType()); - wrapper.eq(Objects.nonNull(sysSchedule.getDate()), SysScheduleEntity::getDate, sysSchedule.getDate()); + wrapper.like(StrUtil.isNotBlank(sysSchedule.getScheduleType()), SysScheduleEntity::getScheduleType, sysSchedule.getScheduleType()); + wrapper.eq(Objects.nonNull(sysSchedule.getScheduleDate()), SysScheduleEntity::getScheduleDate, sysSchedule.getScheduleDate()); DataScope dataScope = new DataScope(); dataScope.setUsername(SecurityUtils.getUser().getUsername()); return baseMapper.selectPageByScope(page, wrapper, dataScope); @@ -74,9 +74,9 @@ public class SysScheduleServiceImpl extends ServiceImpl wrapper = Wrappers.lambdaQuery(); - wrapper.between(SysScheduleEntity::getDate, Objects.isNull(startDate) ? beginOfWeek : startDate, + wrapper.between(SysScheduleEntity::getScheduleDate, Objects.isNull(startDate) ? beginOfWeek : startDate, Objects.isNull(endDate) ? endOfWeek : endDate); - wrapper.ne(SysScheduleEntity::getState, ScheduleStateEnum.END.getCode()); + wrapper.ne(SysScheduleEntity::getScheduleState, ScheduleStateEnum.END.getCode()); DataScope dataScope = new DataScope(); dataScope.setUsername(SecurityUtils.getUser().getUsername()); return baseMapper.selectListByScope(wrapper, dataScope);