From 6965b78db0456dd0975019f551c0efe3548621c1 Mon Sep 17 00:00:00 2001 From: dy <2389062315@qq.com> Date: Wed, 30 Jul 2025 16:17:52 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=92=E7=8F=AD=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AttendanceArrangementController.java | 55 ++-- .../AttendanceArrangementGroupController.java | 22 ++ .../AttendanceFixedScheduleController.java | 31 +-- .../domain/AttendanceArrangement.java | 11 +- .../domain/AttendanceArrangementGroup.java | 35 +++ .../domain/bo/AttendanceArrangementBo.java | 12 +- .../bo/AttendanceArrangementGroupBo.java | 54 ++++ .../vo/AttendanceArrangementGroupVo.java | 46 ++++ .../domain/vo/AttendanceArrangementVo.java | 6 +- .../AttendanceArrangementGroupMapper.java | 16 ++ .../IAttendanceArrangementGroupService.java | 12 + .../IAttendanceArrangementService.java | 9 +- ...AttendanceArrangementGroupServiceImpl.java | 40 +++ .../AttendanceArrangementServiceImpl.java | 249 ++++++++++-------- .../AttendanceArrangementGroupMapper.xml | 7 + 15 files changed, 431 insertions(+), 174 deletions(-) create mode 100644 ruoyi-modules/Property/src/main/java/org/dromara/property/controller/AttendanceArrangementGroupController.java create mode 100644 ruoyi-modules/Property/src/main/java/org/dromara/property/domain/AttendanceArrangementGroup.java create mode 100644 ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/AttendanceArrangementGroupBo.java create mode 100644 ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/AttendanceArrangementGroupVo.java create mode 100644 ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/AttendanceArrangementGroupMapper.java create mode 100644 ruoyi-modules/Property/src/main/java/org/dromara/property/service/IAttendanceArrangementGroupService.java create mode 100644 ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AttendanceArrangementGroupServiceImpl.java create mode 100644 ruoyi-modules/Property/src/main/resources/mapper/Property/AttendanceArrangementGroupMapper.xml diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/AttendanceArrangementController.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/AttendanceArrangementController.java index 1c4e647d..dd5d0c02 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/AttendanceArrangementController.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/AttendanceArrangementController.java @@ -1,29 +1,25 @@ package org.dromara.property.controller; -import java.time.LocalDate; -import java.util.List; - -import cn.hutool.core.date.DateTime; -import lombok.RequiredArgsConstructor; -import jakarta.servlet.http.HttpServletResponse; -import jakarta.validation.constraints.*; import cn.dev33.satoken.annotation.SaCheckPermission; -import org.springframework.format.annotation.DateTimeFormat; -import org.springframework.web.bind.annotation.*; -import org.springframework.validation.annotation.Validated; -import org.dromara.common.idempotent.annotation.RepeatSubmit; -import org.dromara.common.log.annotation.Log; -import org.dromara.common.web.core.BaseController; -import org.dromara.common.mybatis.core.page.PageQuery; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; +import lombok.RequiredArgsConstructor; import org.dromara.common.core.domain.R; import org.dromara.common.core.validate.AddGroup; import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; import org.dromara.common.log.enums.BusinessType; -import org.dromara.common.excel.utils.ExcelUtil; -import org.dromara.property.domain.vo.AttendanceArrangementVo; -import org.dromara.property.domain.bo.AttendanceArrangementBo; -import org.dromara.property.service.IAttendanceArrangementService; +import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.web.core.BaseController; +import org.dromara.property.domain.bo.AttendanceArrangementBo; +import org.dromara.property.domain.vo.AttendanceArrangementVo; +import org.dromara.property.service.IAttendanceArrangementService; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.List; /** * 排班 @@ -50,16 +46,25 @@ public class AttendanceArrangementController extends BaseController { } /** - * 导出排班列表 + * 查询排班列表 */ - @SaCheckPermission("Property:arrangement:export") - @Log(title = "排班", businessType = BusinessType.EXPORT) - @PostMapping("/export") - public void export(AttendanceArrangementBo bo, HttpServletResponse response) { - List list = attendanceArrangementService.queryList(bo); - ExcelUtil.exportExcel(list, "排班", AttendanceArrangementVo.class, response); + @SaCheckPermission("Property:arrangement:explore") + @GetMapping("/explore") + public List list(AttendanceArrangementBo bo) { + return attendanceArrangementService.queryList(bo); } +// /** +// * 导出排班列表 +// */ +// @SaCheckPermission("Property:arrangement:export") +// @Log(title = "排班", businessType = BusinessType.EXPORT) +// @PostMapping("/export") +// public void export(AttendanceArrangementBo bo, HttpServletResponse response) { +// List list = attendanceArrangementService.queryList(bo); +// ExcelUtil.exportExcel(list, "排班", AttendanceArrangementVo.class, response); +// } + /** * 获取排班详细信息 * diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/AttendanceArrangementGroupController.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/AttendanceArrangementGroupController.java new file mode 100644 index 00000000..7b6d553b --- /dev/null +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/AttendanceArrangementGroupController.java @@ -0,0 +1,22 @@ +package org.dromara.property.controller; + +import lombok.RequiredArgsConstructor; +import org.dromara.common.web.core.BaseController; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * 排班考勤组的中间表控制层 + * 前端访问路由地址为:/Property/arrangementGroup + * + * @author mocheng + * @date 2025-07-15 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/arrangementGroup") +public class AttendanceArrangementGroupController extends BaseController { + +} diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/AttendanceFixedScheduleController.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/AttendanceFixedScheduleController.java index 1a00104a..6df6a500 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/AttendanceFixedScheduleController.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/AttendanceFixedScheduleController.java @@ -1,26 +1,27 @@ package org.dromara.property.controller; -import java.util.List; - -import lombok.RequiredArgsConstructor; -import jakarta.servlet.http.HttpServletResponse; -import jakarta.validation.constraints.*; import cn.dev33.satoken.annotation.SaCheckPermission; -import org.springframework.web.bind.annotation.*; -import org.springframework.validation.annotation.Validated; -import org.dromara.common.idempotent.annotation.RepeatSubmit; -import org.dromara.common.log.annotation.Log; -import org.dromara.common.web.core.BaseController; -import org.dromara.common.mybatis.core.page.PageQuery; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; +import lombok.RequiredArgsConstructor; import org.dromara.common.core.domain.R; import org.dromara.common.core.validate.AddGroup; import org.dromara.common.core.validate.EditGroup; -import org.dromara.common.log.enums.BusinessType; import org.dromara.common.excel.utils.ExcelUtil; -import org.dromara.property.domain.vo.AttendanceFixedScheduleVo; -import org.dromara.property.domain.bo.AttendanceFixedScheduleBo; -import org.dromara.property.service.IAttendanceFixedScheduleService; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.web.core.BaseController; +import org.dromara.property.domain.bo.AttendanceFixedScheduleBo; +import org.dromara.property.domain.vo.AttendanceFixedScheduleVo; +import org.dromara.property.service.IAttendanceFixedScheduleService; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.List; /** * 固定班制表 diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/AttendanceArrangement.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/AttendanceArrangement.java index fb83467d..77c7a7d7 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/AttendanceArrangement.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/AttendanceArrangement.java @@ -1,16 +1,13 @@ package org.dromara.property.domain; -import cn.hutool.core.date.DateTime; -import org.dromara.common.tenant.core.TenantEntity; -import com.baomidou.mybatisplus.annotation.*; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; - -import java.time.LocalDate; -import java.util.Date; -import com.fasterxml.jackson.annotation.JsonFormat; +import org.dromara.common.tenant.core.TenantEntity; import java.io.Serial; +import java.util.Date; /** * 排班对象 attendance_arrangement diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/AttendanceArrangementGroup.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/AttendanceArrangementGroup.java new file mode 100644 index 00000000..7439ef85 --- /dev/null +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/AttendanceArrangementGroup.java @@ -0,0 +1,35 @@ +package org.dromara.property.domain; + +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.dromara.common.tenant.core.TenantEntity; + +import java.io.Serial; +import java.util.Date; + +/** + * 考勤排班组中间表对象 attendance_arrangement_group + * + * @author ruoyi + * @date 2025-07-30 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("attendance_arrangement_group") +public class AttendanceArrangementGroup extends TenantEntity +{ + + @Serial + private static final long serialVersionUID = 1L; + /** 主键ID */ + private Long id; + + /** 排班id */ + private Long arrangementId; + + /** 考勤组ID */ + private Long groupId; + + +} diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/AttendanceArrangementBo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/AttendanceArrangementBo.java index f935281a..6cd85bde 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/AttendanceArrangementBo.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/AttendanceArrangementBo.java @@ -1,6 +1,7 @@ package org.dromara.property.domain.bo; import cn.hutool.core.date.DateTime; +import com.fasterxml.jackson.annotation.JsonFormat; import org.dromara.property.domain.AttendanceArrangement; import org.dromara.common.mybatis.core.domain.BaseEntity; import org.dromara.common.core.validate.AddGroup; @@ -14,6 +15,7 @@ import org.dromara.property.domain.AttendanceUserGroup; import org.springframework.format.annotation.DateTimeFormat; import java.time.LocalDate; +import java.time.YearMonth; import java.util.Date; import java.util.List; @@ -67,16 +69,16 @@ public class AttendanceArrangementBo extends BaseEntity { @DateTimeFormat(pattern = "yyyy-MM-dd") private Date endDate; - /** - * 前端传日历的开始时间和结束时间 - */ - private Date calendarStartDate; - private Date calendarEndTimeDate; /** * 前端传某天的当前日期 */ private Date currentDate; + /** + * 日期月份 + */ + @JsonFormat(pattern = "yyyy-MM") + private YearMonth month; /** diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/AttendanceArrangementGroupBo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/AttendanceArrangementGroupBo.java new file mode 100644 index 00000000..af5efea2 --- /dev/null +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/AttendanceArrangementGroupBo.java @@ -0,0 +1,54 @@ +package org.dromara.property.domain.bo; + +import cn.hutool.core.date.DateTime; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.dromara.property.domain.AttendanceArrangementGroup; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import lombok.EqualsAndHashCode; +import jakarta.validation.constraints.*; +import org.dromara.property.domain.AttendanceScheduleCycle; +import org.dromara.property.domain.AttendanceUserGroup; +import org.dromara.property.domain.AttendanceWeekSet; +import org.dromara.property.domain.AttendanceShift; +import org.springframework.format.annotation.DateTimeFormat; + +import java.time.LocalDate; +import java.time.YearMonth; +import java.util.Date; +import java.util.List; + +/** + * 考勤排班组业务对象 attendance_arrangement_group + * + * @author mocheng + * @date 2025-07-30 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = AttendanceArrangementGroup.class, reverseConvertGenerate = false) +public class AttendanceArrangementGroupBo extends BaseEntity { + + /** + * 主键ID + */ + @NotNull(message = "主键ID不能为空", groups = {EditGroup.class}) + private Long id; + + /** + * 排班名称 + */ + @NotBlank(message = "排班id不能为空", groups = {AddGroup.class, EditGroup.class}) + private Long arrangementId; + + /** + * 考勤组ID + */ + @NotNull(message = "考勤组ID不能为空", groups = {AddGroup.class, EditGroup.class}) + private Long groupId; + + +} diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/AttendanceArrangementGroupVo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/AttendanceArrangementGroupVo.java new file mode 100644 index 00000000..116b52bf --- /dev/null +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/AttendanceArrangementGroupVo.java @@ -0,0 +1,46 @@ +package org.dromara.property.domain.vo; + +import cn.idev.excel.annotation.ExcelIgnoreUnannotated; +import cn.idev.excel.annotation.ExcelProperty; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import org.dromara.property.domain.*; + +import java.io.Serial; +import java.io.Serializable; +import java.time.LocalDate; +import java.util.List; + +/** + * 考勤排班组视图对象 attendance_arrangement_group + * + * @author mocheng + * @date 2025-07-30 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = AttendanceArrangementGroup.class) +public class AttendanceArrangementGroupVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键ID + */ + @ExcelProperty(value = "主键ID") + private Long id; + + /** + * 排班名称 + */ + @ExcelProperty(value = "排班id") + private Long arrangementId; + + /** + * 考勤组ID + */ + @ExcelProperty(value = "考勤组ID") + private Long groupId; + +} diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/AttendanceArrangementVo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/AttendanceArrangementVo.java index 9f9fc293..c6ca7b0a 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/AttendanceArrangementVo.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/AttendanceArrangementVo.java @@ -8,7 +8,7 @@ import org.dromara.property.domain.*; import java.io.Serial; import java.io.Serializable; -import java.util.Date; +import java.time.LocalDate; import java.util.List; @@ -60,13 +60,13 @@ public class AttendanceArrangementVo implements Serializable { * 开始日期 */ @ExcelProperty(value = "开始日期") - private Date startDate; + private LocalDate startDate; /** * 结束日期(仅date_type=3时有效) */ @ExcelProperty(value = "结束日期(仅date_type=3时有效)") - private Date endDate; + private LocalDate endDate; /** * 状态：0-未生效，1-已生效 diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/AttendanceArrangementGroupMapper.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/AttendanceArrangementGroupMapper.java new file mode 100644 index 00000000..a4fa14f6 --- /dev/null +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/AttendanceArrangementGroupMapper.java @@ -0,0 +1,16 @@ +package org.dromara.property.mapper; + +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; +import org.dromara.property.domain.AttendanceArrangementGroup; +import org.dromara.property.domain.vo.AttendanceArrangementGroupVo; + +/** + * 排班Mapper接口 + * + * @author mocheng + * @date 2025-07-15 + */ +public interface AttendanceArrangementGroupMapper extends BaseMapperPlus { + + +} diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/IAttendanceArrangementGroupService.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/IAttendanceArrangementGroupService.java new file mode 100644 index 00000000..0e5d6d91 --- /dev/null +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/IAttendanceArrangementGroupService.java @@ -0,0 +1,12 @@ +package org.dromara.property.service; + +/** + * 排班Service接口 + * + * @author mocheng + * @date 2025-07-15 + */ +public interface IAttendanceArrangementGroupService { + + +} diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/IAttendanceArrangementService.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/IAttendanceArrangementService.java index 5b659c76..e889d044 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/IAttendanceArrangementService.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/IAttendanceArrangementService.java @@ -1,13 +1,10 @@ package org.dromara.property.service; -import cn.hutool.core.date.DateTime; -import org.dromara.property.domain.AttendanceArrangement; -import org.dromara.property.domain.vo.AttendanceArrangementVo; -import org.dromara.property.domain.bo.AttendanceArrangementBo; -import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.property.domain.bo.AttendanceArrangementBo; +import org.dromara.property.domain.vo.AttendanceArrangementVo; -import java.time.LocalDate; import java.util.Collection; import java.util.List; diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AttendanceArrangementGroupServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AttendanceArrangementGroupServiceImpl.java new file mode 100644 index 00000000..a4a6be14 --- /dev/null +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AttendanceArrangementGroupServiceImpl.java @@ -0,0 +1,40 @@ +package org.dromara.property.service.impl; + +import cn.hutool.core.date.DateUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.property.domain.*; +import org.dromara.property.domain.bo.AttendanceArrangementBo; +import org.dromara.property.domain.constant.StatusConstant; +import org.dromara.property.domain.vo.AttendanceArrangementVo; +import org.dromara.property.mapper.*; +import org.dromara.property.service.IAttendanceArrangementGroupService; +import org.dromara.property.service.IAttendanceArrangementService; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.time.LocalDate; +import java.time.ZoneId; +import java.util.*; +import java.util.stream.Collectors; + +/** + * 排班Service业务层处理 + * + * @author mocheng + * @date 2025-07-15 + */ +@Slf4j +@RequiredArgsConstructor +@Service +public class AttendanceArrangementGroupServiceImpl implements IAttendanceArrangementGroupService { + + +} diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AttendanceArrangementServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AttendanceArrangementServiceImpl.java index 2271d73c..cca1a7d9 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AttendanceArrangementServiceImpl.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AttendanceArrangementServiceImpl.java @@ -41,11 +41,7 @@ public class AttendanceArrangementServiceImpl implements IAttendanceArrangementS private final AttendanceGroupMapper attendanceGroupMapper; - private final AttendanceWeekSetMapper weekSetMapper; - - private final AttendanceShiftMapper attendanceShiftMapper; - - private final AttendanceScheduleCycleMapper scheduleCycleMapper; + private final AttendanceArrangementGroupMapper arrangementGroupMapper; /** * 查询排班 @@ -80,68 +76,9 @@ public class AttendanceArrangementServiceImpl implements IAttendanceArrangementS Page attendanceArrangementVoPage = result.setRecords(result.getRecords().stream().peek(vo -> { - //1.如：在2号到10号有固定班制和排班制，根据当前日期查询出所有的考勤组id - //查询指定日期在哪些排班中 - List arrangementList = baseMapper.selectList(Wrappers.lambdaQuery().ge(AttendanceArrangement::getStartDate, bo.getCurrentDate()).le(AttendanceArrangement::getEndDate, bo.getCurrentDate())); - //根据排班查询出考勤组id - List groupIds = arrangementList.stream().map(AttendanceArrangement::getGroupId).distinct().toList(); - - // 2.循环将所有的考勤组id设置到考勤组中 - //循环groupIds，循环和AttendanceGroup中的id做对比，如果有相同的，则取出attendanceGroup中的所有数据 - groupIds.forEach( - groupId -> { - //从数据库查询出当前考勤组的所有数据 - AttendanceGroup group = attendanceGroupMapper.selectOne(Wrappers.lambdaQuery().eq(AttendanceGroup::getId, groupId)); - - // 3.查询出当前考勤组的所有数据，从考勤组判断当前id是固定班制还是排班制 - if (group.getAttendanceType().equals(StatusConstant.FIXEDSCHEDULE)) { - // 3.1固定班制：将当前的日期转为周几，然后与数据库中的班次周数作对比，取出当前日期的班次信息 - //将传来的日期参数转为周几 - int week = DateUtil.dayOfWeek(bo.getCurrentDate()); - //取出当前日期的周数，与数据库中的班次周数作对比，取出当前日期的班次信息 - AttendanceWeekSet weekSet = weekSetMapper.selectOne(Wrappers.lambdaQuery().eq(AttendanceWeekSet::getGroupId, groupId).eq(AttendanceWeekSet::getDayOfWeek, week)); - //将weekSet存到结果中 - AttendanceArrangementVo arrangementVo = new AttendanceArrangementVo(); - arrangementVo.setWeekSet(weekSet); - //根据weekSet取出id，根据id查询出attendanceWeekSetShift表中的shiftId - Long shiftId = weekSet.getId(); - //根据shiftId查询attendanceShift表中对应的id的数据 - AttendanceShift shift = attendanceShiftMapper.selectById(shiftId); - //将shift存到结果中 - arrangementVo.setShift(shift); - - } else if (group.getAttendanceType().equals(StatusConstant.SHIFTSCHEDULE)) { - // 3.2排班制：判断第一天是从几号开始，循环判断，判断当前是循环中的第几天，取出当前天数的班次信息。 - //取出排班中的开始时间和结束时间 - Date startDate = bo.getStartDate(); - Date endDate = bo.getEndDate(); - Date currentDate = bo.getCurrentDate(); - //取出attendanceScheduleCycle表中的天数 - Integer cycleDays = scheduleCycleMapper.selectOne(Wrappers.lambdaQuery().eq(AttendanceScheduleCycle::getGroupId, groupId)).getDayNumber(); - //在startDate和endDate之间循环，判端当前日期是cycleDays中的第几天 - int cycleDay = 0; - while (startDate.before(currentDate) || endDate.after(currentDate)) { - cycleDay++; - startDate = DateUtil.offsetDay(startDate, 1); - //判断当前日期是clcleDays中的第几天 - if (cycleDay > cycleDays) { - cycleDay = 1; - } - } - //根据cycleDay查询出当前日期的班次信息 - AttendanceScheduleCycle cycle = scheduleCycleMapper.selectOne(Wrappers.lambdaQuery().eq(AttendanceScheduleCycle::getGroupId, groupId).eq(AttendanceScheduleCycle::getDayNumber, cycleDay)); - //将cycle存到结果中 - AttendanceArrangementVo arrangementVo = new AttendanceArrangementVo(); - arrangementVo.setCycle(cycle); - - } - } - ); }).collect(Collectors.toList())); - - // //1.根据当前日期查询出排班信息 // AttendanceArrangementVo arrangementvo = baseMapper.selectVoByTime(bo.getCurrentDate()); // //2.查询人员组的信息 @@ -166,7 +103,7 @@ public class AttendanceArrangementServiceImpl implements IAttendanceArrangementS } /** - * 查询符合条件的排班列表 + * 查询某个月的日历排班信息的排班列表 * * @param bo 查询条件 * @return 排班列表 @@ -174,60 +111,141 @@ public class AttendanceArrangementServiceImpl implements IAttendanceArrangementS @Override public List queryList(AttendanceArrangementBo bo) { - Date startDate = bo.getStartDate(); - Date endDate = bo.getEndDate(); - Date calendarStartDate = bo.getCalendarStartDate(); - Date calendarEndTimeDate = bo.getCalendarEndTimeDate(); + LocalDate month = bo.getMonth().atEndOfMonth(); + // 1. 拿到日历的开始时间和结束时间 + LocalDate calendarStartDate = month.withDayOfMonth(1); + LocalDate calendarEndDate = month.withDayOfMonth(calendarStartDate.lengthOfMonth()); + + // 2. 根据日历的开始时间和结束时间查询出每一天的排班信息 + // 2.1 循环日历的开始时间和结束时间，判断 calendarStartDate 在哪些排班中 + List result = new ArrayList<>(); + + for (LocalDate date = calendarStartDate; date.isBefore(calendarEndDate); date = date.plusDays(1)) { + // 查询指定日期在哪些排班中 + List arrangementList = baseMapper.selectList( + Wrappers.lambdaQuery() + .ge(AttendanceArrangement::getStartDate, date.atStartOfDay(ZoneId.systemDefault()).toInstant()) + .le(AttendanceArrangement::getEndDate, date.atStartOfDay(ZoneId.systemDefault()).plusDays(1).toInstant().minusSeconds(1)) + ); + + // 根据排班查询出考勤组id + List groupIds = arrangementList.stream() + .map(AttendanceArrangement::getGroupId) + .distinct() + .toList(); + + // 如果当前日期没有排班，则跳过当前日期 + if (groupIds.isEmpty()) { + continue; + } + + // 循环 groupIds，循环和 AttendanceGroup 中的 id 做对比，如果有相同的，则取出 attendanceGroup 中的所有数据 + for (Long groupId : groupIds) { + AttendanceGroup attendanceGroup = attendanceGroupMapper.selectById(groupId); + if (attendanceGroup != null) { + // 创建 AttendanceArrangementVo 对象并设置属性 + AttendanceArrangementVo vo = new AttendanceArrangementVo(); + vo.setStartDate(LocalDate.from(date.atStartOfDay(ZoneId.systemDefault()))); + vo.setEndDate(LocalDate.from(date.atStartOfDay(ZoneId.systemDefault()).plusDays(1).toInstant().minusSeconds(1))); + // 设置其他属性... + result.add(vo); + } + } + + // 如果 collected 不为空，则返回 result + if (!result.isEmpty()) { + return result; + } + } + + // 循环结束后如果 result 仍为空，则返回空列表 + return Collections.emptyList(); - - - - //1.根据日历的开始时间和日历的结束时间查询所有的排班信息 - List arrangementList = baseMapper.selectList(Wrappers.lambdaQuery().ge(AttendanceArrangement::getStartDate, bo.getCalendarStartDate()).le(AttendanceArrangement::getEndDate, bo.getCalendarEndTimeDate())); - //2.查询人员组的信息 - //根据开始时间查询排班的id - List scheduleIdList = arrangementList.stream().map(AttendanceArrangement::getId).collect(Collectors.toList()); - //根据排班的id查询出排班的人员详细信息 - List userGroupList = userGroupMapper.selectList(Wrappers.lambdaQuery().in(AttendanceUserGroup::getScheduleId, scheduleIdList)); - //3.将排班人员信息添加到排班信息中 - - return arrangementList.stream().map(arrangement -> { - AttendanceArrangementVo vo = MapstructUtils.convert(arrangement, AttendanceArrangementVo.class); - assert vo != null; - vo.setUserGroupList(userGroupList.stream().filter(userGroup -> userGroup.getScheduleId().equals(arrangement.getId())).collect(Collectors.toList())); - return vo; - }).collect(Collectors.toList()); - - -// //判断参数是固定排班制还是排班制 -// if (Objects.equals(bo.getScheduleType(), StatusConstant.FIXEDSCHEDULE)) { -// //固定班制 -// //获取所有的排班信息 -// List arrangementList = baseMapper.selectList(Wrappers.lambdaQuery().eq(AttendanceArrangement::getScheduleType, StatusConstant.FIXEDSCHEDULE)); -// //判断排班信息是否在日历的开始时间和结束时间之间 -// List filterList = arrangementList.stream().filter(arrangement -> { -// LocalDate startDate = arrangement.getStartDate(); -// LocalDate endDate = arrangement.getEndDate(); -// return startDate.isAfter(calendarStartDate) && endDate.isBefore(calendarEndTimeDate); -// }).toList(); +// //1.如：在2号到10号有固定班制和排班制，根据当前日期查询出所有的考勤组id +// //查询指定日期在哪些排班中 +// List arrangementList = baseMapper.selectList(Wrappers.lambdaQuery().ge(AttendanceArrangement::getStartDate, bo.getCurrentDate()).le(AttendanceArrangement::getEndDate, bo.getCurrentDate())); +// //根据排班查询出考勤组id +// List groupIds = arrangementList.stream().map(AttendanceArrangement::getGroupId).distinct().toList(); // -// //在日历的开始日期和结束日期之间，则获取所有固定班次的考勤组id -// List groupIds = filterList.stream().map(AttendanceArrangement::getGroupId).distinct().collect(Collectors.toList()); -// //根据考勤组id查询所有的固定班制 -// List weekSetList = weekSetMapper.selectList(Wrappers.lambdaQuery().in(AttendanceWeekSet::getGroupId, groupIds)); +// // 2.循环将所有的考勤组id设置到考勤组中 +// //循环groupIds，循环和AttendanceGroup中的id做对比，如果有相同的，则取出attendanceGroup中的所有数据 +// groupIds.forEach( +// groupId -> { +// //从数据库查询出当前考勤组的所有数据 +// AttendanceGroup group = attendanceGroupMapper.selectOne(Wrappers.lambdaQuery().eq(AttendanceGroup::getId, groupId)); // -// //根据固定班制的groupId查询出week_set_shift表中的数据 -// List shiftList = weekSetList.stream().flatMap(weekSet -> weekSet.getWeeksetShiftList().stream()).toList(); +// // 3.查询出当前考勤组的所有数据，从考勤组判断当前id是固定班制还是排班制 +// if (group.getAttendanceType().equals(StatusConstant.FIXEDSCHEDULE)) { +// // 3.1固定班制：将当前的日期转为周几，然后与数据库中的班次周数作对比，取出当前日期的班次信息 +// //将传来的日期参数转为周几 +// int week = DateUtil.dayOfWeek(bo.getCurrentDate()); +// //取出当前日期的周数，与数据库中的班次周数作对比，取出当前日期的班次信息 +// AttendanceWeekSet weekSet = weekSetMapper.selectOne(Wrappers.lambdaQuery().eq(AttendanceWeekSet::getGroupId, groupId).eq(AttendanceWeekSet::getDayOfWeek, week)); +// //将weekSet存到结果中 +// AttendanceArrangementVo arrangementVo = new AttendanceArrangementVo(); +// arrangementVo.setWeekSet(weekSet); +// //根据weekSet取出id，根据id查询出attendanceWeekSetShift表中的shiftId +// Long shiftId = weekSet.getId(); +// //根据shiftId查询attendanceShift表中对应的id的数据 +// AttendanceShift shift = attendanceShiftMapper.selectById(shiftId); +// //将shift存到结果中 +// arrangementVo.setShift(shift); // -// } else if (Objects.equals(bo.getScheduleType(), StatusConstant.SHIFTSCHEDULE)) { -// //排班制 -// //获取所有的排班信息 -// List arrangementList = baseMapper.selectList(Wrappers.lambdaQuery().eq(AttendanceArrangement::getScheduleType, StatusConstant.SHIFTSCHEDULE)); -// } +// } else if (group.getAttendanceType().equals(StatusConstant.SHIFTSCHEDULE)) { +// // 3.2排班制：判断第一天是从几号开始，循环判断，判断当前是循环中的第几天，取出当前天数的班次信息。 +// //取出排班中的开始时间和结束时间 +// Date startDate = bo.getStartDate(); +// Date endDate = bo.getEndDate(); +// Date currentDate = bo.getCurrentDate(); +// //取出attendanceScheduleCycle表中的天数 +// Integer cycleDays = scheduleCycleMapper.selectOne(Wrappers.lambdaQuery().eq(AttendanceScheduleCycle::getGroupId, groupId)).getDayNumber(); +// //在startDate和endDate之间循环，判端当前日期是cycleDays中的第几天 +// int cycleDay = 0; +// while (startDate.before(currentDate) || endDate.after(currentDate)) { +// cycleDay++; +// startDate = DateUtil.offsetDay(startDate, 1); +// //判断当前日期是clcleDays中的第几天 +// if (cycleDay > cycleDays) { +// cycleDay = 1; +// } +// } +// //根据cycleDay查询出当前日期的班次信息 +// AttendanceScheduleCycle cycle = scheduleCycleMapper.selectOne(Wrappers.lambdaQuery().eq(AttendanceScheduleCycle::getGroupId, groupId).eq(AttendanceScheduleCycle::getDayNumber, cycleDay)); +// //将cycle存到结果中 +// AttendanceArrangementVo arrangementVo = new AttendanceArrangementVo(); +// arrangementVo.setCycle(cycle); +// +// } +// } +// ); + +// // 计算交集的开始时间（取较晚的开始时间）和结束时间（取较早的结束时间） +// Date overlapStart = calendarStartDate.after(startDate) +// ? calendarStartDate : startDate; +// Date overlapEnd = calendarEndTimeDate.before(endDate) +// ? calendarEndTimeDate : endDate; + + //根据交集的时间范围查询排班信息 + + +// //1.根据日历的开始时间和日历的结束时间查询所有的排班信息 +//// List arrangementList = baseMapper.selectList(Wrappers.lambdaQuery().ge(AttendanceArrangement::getStartDate, bo.getCalendarStartDate()).le(AttendanceArrangement::getEndDate, bo.getCalendarEndTimeDate())); +// //2.查询人员组的信息 +// //根据开始时间查询排班的id +// List scheduleIdList = arrangementList.stream().map(AttendanceArrangement::getId).collect(Collectors.toList()); +// //根据排班的id查询出排班的人员详细信息 +// List userGroupList = userGroupMapper.selectList(Wrappers.lambdaQuery().in(AttendanceUserGroup::getScheduleId, scheduleIdList)); +// //3.将排班人员信息添加到排班信息中 +// +// return arrangementList.stream().map(arrangement -> { +// AttendanceArrangementVo vo = MapstructUtils.convert(arrangement, AttendanceArrangementVo.class); +// assert vo != null; +// vo.setUserGroupList(userGroupList.stream().filter(userGroup -> userGroup.getScheduleId().equals(arrangement.getId())).collect(Collectors.toList())); +// return vo; +// }).collect(Collectors.toList()); -// return voList; } @@ -264,6 +282,11 @@ public class AttendanceArrangementServiceImpl implements IAttendanceArrangementS judgeDate(bo, add); + AttendanceArrangementGroup attendanceArrangementGroup = new AttendanceArrangementGroup(); + //向排班和考勤组中间表中插入数据 + attendanceArrangementGroup.setGroupId(add.getGroupId()); + attendanceArrangementGroup.setArrangementId(bo.getId()); + arrangementGroupMapper.insert(attendanceArrangementGroup); //取出当前新增的排班的id Long ArrangementId = add.getId(); @@ -290,7 +313,7 @@ public class AttendanceArrangementServiceImpl implements IAttendanceArrangementS LocalDate longTimeEndDate = LocalDate.of(2099, 12, 31); add.setEndDate(Date.from(longTimeEndDate.atStartOfDay(ZoneId.systemDefault()).toInstant())); } - if (bo.getDateType().equals(StatusConstant.SHORTTIME)){ + if (bo.getDateType().equals(StatusConstant.SHORTTIME)) { add.setEndDate(bo.getEndDate()); } } diff --git a/ruoyi-modules/Property/src/main/resources/mapper/Property/AttendanceArrangementGroupMapper.xml b/ruoyi-modules/Property/src/main/resources/mapper/Property/AttendanceArrangementGroupMapper.xml new file mode 100644 index 00000000..afa306e3 --- /dev/null +++ b/ruoyi-modules/Property/src/main/resources/mapper/Property/AttendanceArrangementGroupMapper.xml @@ -0,0 +1,7 @@ + + + + +