zianxin/pigx
1
0 Fork 0
mirror of http://git.pig4cloud.com/pig/pigx.git synced 2026-11-08 20:49:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

✨ 调整日程管理相关的字段名称 适配 Oracle数据库

Browse Source
This commit is contained in:
冷冷 committed 2024-05-31 14:54:08 +08:00
1 parent 3061a6ec6d
commit 45fc19a5b2
4 files changed
+15 -15
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

db/0pigxx_boot.sql
+3 -3
View File
@@ -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 '修改人',
db/2pigxx.sql
+3 -3
View File
@@ -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 '修改人',
pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysScheduleEntity.java
+5 -5
View File
@@ -60,14 +60,13 @@ public class SysScheduleEntity extends Model<SysScheduleEntity> {
* 日程类型
*/
@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<SysScheduleEntity> {
* 时间
*/
@Schema(description = "时间")
private LocalTime time;
private LocalTime scheduleTime;
/**
* 日期
*/
@Schema(description = "日期")
private LocalDate date;
@TableField("schedule_date")
private LocalDate scheduleDate;
/**
* 创建人
pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysScheduleServiceImpl.java
+4 -4
View File
@@ -56,8 +56,8 @@ public class SysScheduleServiceImpl extends ServiceImpl<SysScheduleMapper, SysSc
public IPage<SysScheduleEntity> getScheduleByScope(Page page, SysScheduleEntity sysSchedule) {
LambdaQueryWrapper<SysScheduleEntity> 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<SysScheduleMapper, SysSc
DateTime beginOfWeek = DateUtil.beginOfWeek(DateUtil.date());
DateTime endOfWeek = DateUtil.endOfWeek(DateUtil.date());
LambdaQueryWrapper<SysScheduleEntity> 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);