by2025/SmartParks
9
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

修改班次管理业务逻辑

Browse Source
This commit is contained in:
dy 2025-07-15 22:42:05 +08:00
parent 94b0156479
commit 47c35c603c
8 changed files with 34 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-modules/Property/src/main/java/org/dromara/property/controller/AttendanceWeeksetShiftController.java
View File

@ -23,7 +23,7 @@ import org.dromara.property.service.IAttendanceWeeksetShiftService;
import org.dromara.common.mybatis.core.page.TableDataInfo;
/**
* 排班制表
* 固定班制和星期的中间表
* 前端访问路由地址为:/Property/weeksetShift
*
* @author mocheng

11
ruoyi-modules/Property/src/main/java/org/dromara/property/domain/AttendanceShift.java
View File

@ -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;
}

2
ruoyi-modules/Property/src/main/java/org/dromara/property/domain/AttendanceWeeksetShift.java
View File

@ -8,7 +8,7 @@ import lombok.EqualsAndHashCode;
import java.io.Serial;
/**
* 排班制表对象 attendance_weekset_shift
* 固定班制和星期的中间表对象 attendance_weekset_shift
*
* @author mocheng
* @date 2025-07-15

16
ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/AttendanceShiftBo.java
View File

@ -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;
}

2
ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/AttendanceWeeksetShiftBo.java
View File

@ -10,7 +10,7 @@ import lombok.EqualsAndHashCode;
import jakarta.validation.constraints.*;
/**
* 排班制表业务对象 attendance_weekset_shift
* 固定班制和星期的中间表对象 attendance_weekset_shift
*
* @author mocheng
* @date 2025-07-15

9
ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/AttendanceShiftVo.java
View File

@ -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;
}

2
ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/AttendanceWeeksetShiftVo.java
View File

@ -15,7 +15,7 @@ import java.util.Date;
/**
* 排班制表视图对象 attendance_weekset_shift
* 固定班制和星期的中间表对象 attendance_weekset_shift
*
* @author mocheng
* @date 2025-07-15

6
ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AttendanceShiftServiceImpl.java
View File

@ -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) {