From 47c35c603cec80f589aebe244e7ffe1adc7ddbf7 Mon Sep 17 00:00:00 2001 From: dy <2389062315@qq.com> Date: Tue, 15 Jul 2025 22:42:05 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=8F=AD=E6=AC=A1=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E4=B8=9A=E5=8A=A1=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AttendanceWeeksetShiftController.java | 2 +- .../dromara/property/domain/AttendanceShift.java | 11 +++++++---- .../property/domain/AttendanceWeeksetShift.java | 2 +- .../property/domain/bo/AttendanceShiftBo.java | 16 ++++++++++++---- .../domain/bo/AttendanceWeeksetShiftBo.java | 2 +- .../property/domain/vo/AttendanceShiftVo.java | 9 +++++---- .../domain/vo/AttendanceWeeksetShiftVo.java | 2 +- .../service/impl/AttendanceShiftServiceImpl.java | 6 ++++++ 8 files changed, 34 insertions(+), 16 deletions(-) diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/AttendanceWeeksetShiftController.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/AttendanceWeeksetShiftController.java index 4165462..804b552 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/AttendanceWeeksetShiftController.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/AttendanceWeeksetShiftController.java @@ -23,7 +23,7 @@ import org.dromara.property.service.IAttendanceWeeksetShiftService; import org.dromara.common.mybatis.core.page.TableDataInfo; /** - * 排班制表 + * 固定班制和星期的中间表 * 前端访问路由地址为:/Property/weeksetShift * * @author mocheng diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/AttendanceShift.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/AttendanceShift.java index 4d61ae6..d651ed9 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/AttendanceShift.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/AttendanceShift.java @@ -4,6 +4,9 @@ import org.dromara.common.tenant.core.TenantEntity; import com.baomidou.mybatisplus.annotation.*; import lombok.Data; import lombok.EqualsAndHashCode; + +import java.time.LocalDateTime; +import java.time.LocalTime; import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; @@ -37,12 +40,12 @@ public class AttendanceShift extends TenantEntity { /** * 考勤开始时间 */ - private Date startTime; + private LocalTime startTime; /** * 考勤结束时间 */ - private Date endTime; + private LocalTime endTime; /** * 状态（0：off，1：on） @@ -57,12 +60,12 @@ public class AttendanceShift extends TenantEntity { /** * 休息开始时间 */ - private Date restStartTime; + private LocalTime restStartTime; /** * 休息结束时间 */ - private Date restEndTime; + private LocalTime restEndTime; } diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/AttendanceWeeksetShift.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/AttendanceWeeksetShift.java index f820bf9..2f78400 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/AttendanceWeeksetShift.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/AttendanceWeeksetShift.java @@ -8,7 +8,7 @@ import lombok.EqualsAndHashCode; import java.io.Serial; /** - * 排班制表对象 attendance_weekset_shift + * 固定班制和星期的中间表对象 attendance_weekset_shift * * @author mocheng * @date 2025-07-15 diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/AttendanceShiftBo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/AttendanceShiftBo.java index 59997b8..e413618 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/AttendanceShiftBo.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/AttendanceShiftBo.java @@ -8,8 +8,12 @@ import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; import lombok.EqualsAndHashCode; import jakarta.validation.constraints.*; + +import java.time.LocalDateTime; +import java.time.LocalTime; import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; /** * 班次表业务对象 attendance_shift @@ -36,12 +40,14 @@ public class AttendanceShiftBo extends BaseEntity { /** * 考勤开始时间 */ - private Date startTime; + @DateTimeFormat(pattern = "HH:mm:ss") + private LocalTime startTime; /** * 考勤结束时间 */ - private Date endTime; + @DateTimeFormat(pattern = "HH:mm:ss") + private LocalTime endTime; /** * 状态（0：off，1：on） @@ -56,12 +62,14 @@ public class AttendanceShiftBo extends BaseEntity { /** * 休息开始时间 */ - private Date restStartTime; + @DateTimeFormat(pattern = "HH:mm:ss") + private LocalTime restStartTime; /** * 休息结束时间 */ - private Date restEndTime; + @DateTimeFormat(pattern = "HH:mm:ss") + private LocalTime restEndTime; } diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/AttendanceWeeksetShiftBo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/AttendanceWeeksetShiftBo.java index 244721f..64095cb 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/AttendanceWeeksetShiftBo.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/AttendanceWeeksetShiftBo.java @@ -10,7 +10,7 @@ import lombok.EqualsAndHashCode; import jakarta.validation.constraints.*; /** - * 排班制表业务对象 attendance_weekset_shift + * 固定班制和星期的中间表对象 attendance_weekset_shift * * @author mocheng * @date 2025-07-15 diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/AttendanceShiftVo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/AttendanceShiftVo.java index 987cf55..081ba2e 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/AttendanceShiftVo.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/AttendanceShiftVo.java @@ -1,5 +1,6 @@ package org.dromara.property.domain.vo; +import java.time.LocalTime; import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; import org.dromara.property.domain.AttendanceShift; @@ -46,13 +47,13 @@ public class AttendanceShiftVo implements Serializable { * 考勤开始时间 */ @ExcelProperty(value = "考勤开始时间") - private Date startTime; + private LocalTime startTime; /** * 考勤结束时间 */ @ExcelProperty(value = "考勤结束时间") - private Date endTime; + private LocalTime endTime; /** * 状态（0：off，1：on） @@ -72,13 +73,13 @@ public class AttendanceShiftVo implements Serializable { * 休息开始时间 */ @ExcelProperty(value = "休息开始时间") - private Date restStartTime; + private LocalTime restStartTime; /** * 休息结束时间 */ @ExcelProperty(value = "休息结束时间") - private Date restEndTime; + private LocalTime restEndTime; } diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/AttendanceWeeksetShiftVo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/AttendanceWeeksetShiftVo.java index b26b6da..4d21792 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/AttendanceWeeksetShiftVo.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/AttendanceWeeksetShiftVo.java @@ -15,7 +15,7 @@ import java.util.Date; /** - * 排班制表视图对象 attendance_weekset_shift + * 固定班制和星期的中间表对象 attendance_weekset_shift * * @author mocheng * @date 2025-07-15 diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AttendanceShiftServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AttendanceShiftServiceImpl.java index 21182fd..57228d8 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AttendanceShiftServiceImpl.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AttendanceShiftServiceImpl.java @@ -93,6 +93,12 @@ public class AttendanceShiftServiceImpl implements IAttendanceShiftService { @Override public Boolean insertByBo(AttendanceShiftBo bo) { AttendanceShift add = MapstructUtils.convert(bo, AttendanceShift.class); + //判断参数is_rest是否为0（不休息），如果是，则设置rest_start_time和rest_end_time为空 + if(add.getIsRest() == 0){ + add.setRestStartTime(null); + add.setRestEndTime(null); + } + //isRest为1（休息），正常设置 validEntityBeforeSave(add); boolean flag = baseMapper.insert(add) > 0; if (flag) {