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

1

Browse Source
This commit is contained in:
dy 2025-07-19 09:52:37 +08:00
parent 625be80cf2
commit 49ec73df49
15 changed files with 485 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ruoyi-modules/Property/pom.xml
View File

@ -17,6 +17,13 @@
<dependencies>
<dependency>
<groupId>cn.hutool</groupId>
<artifactId>hutool-all</artifactId>
<version>5.5.8</version>
</dependency>
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-common-nacos</artifactId>

14
ruoyi-modules/Property/src/main/java/org/dromara/property/controller/AttendanceArrangementController.java
View File

@ -2,10 +2,12 @@ package org.dromara.property.controller;
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;
@ -65,10 +67,20 @@ public class AttendanceArrangementController extends BaseController {
@SaCheckPermission("Property:arrangement:query")
@GetMapping("/{id}")
public R<AttendanceArrangementVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable("id") Long id) {
@PathVariable("id") Long id) {
return R.ok(attendanceArrangementService.queryById(id));
}
/**
* 根据时间段查询排班列表
*/
@SaCheckPermission("Property:arrangement:query")
@GetMapping("/queryByTime")
public R<List<AttendanceArrangementVo>> queryByTime(@NotNull(message = "开始时间不能为空")
@DateTimeFormat(pattern = "yyyy-MM-dd") @RequestParam("startTime") DateTime startTime) {
return R.ok(attendanceArrangementService.queryByTime(startTime));
}
/**
* 新增排班
*/

106
ruoyi-modules/Property/src/main/java/org/dromara/property/controller/AttendanceUserGroupController.java Normal file
View File

@ -0,0 +1,106 @@
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 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.AttendanceUserGroupVo;
import org.dromara.property.domain.bo.AttendanceUserGroupBo;
import org.dromara.property.service.IAttendanceUserGroupService;
import org.dromara.common.mybatis.core.page.TableDataInfo;
/**
* 排班明细
* 前端访问路由地址为:/Property/userGroup
*
* @author mocheng
* @date 2025-07-18
*/
@Validated
@RequiredArgsConstructor
@RestController
@RequestMapping("/userGroup")
public class AttendanceUserGroupController extends BaseController {
private final IAttendanceUserGroupService attendanceUserGroupService;
/**
* 查询排班明细列表
*/
@SaCheckPermission("Property:userGroup:list")
@GetMapping("/list")
public TableDataInfo<AttendanceUserGroupVo> list(AttendanceUserGroupBo bo, PageQuery pageQuery) {
return attendanceUserGroupService.queryPageList(bo, pageQuery);
}
/**
* 导出排班明细列表
*/
@SaCheckPermission("Property:userGroup:export")
@Log(title = "排班明细", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(AttendanceUserGroupBo bo, HttpServletResponse response) {
List<AttendanceUserGroupVo> list = attendanceUserGroupService.queryList(bo);
ExcelUtil.exportExcel(list, "排班明细", AttendanceUserGroupVo.class, response);
}
/**
* 获取排班明细详细信息
*
* @param id 主键
*/
@SaCheckPermission("Property:userGroup:query")
@GetMapping("/{id}")
public R<AttendanceUserGroupVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable("id") Long id) {
return R.ok(attendanceUserGroupService.queryById(id));
}
/**
* 新增排班明细
*/
@SaCheckPermission("Property:userGroup:add")
@Log(title = "排班明细", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
public R<Void> add(@Validated(AddGroup.class) @RequestBody AttendanceUserGroupBo bo) {
return toAjax(attendanceUserGroupService.insertByBo(bo));
}
/**
* 修改排班明细
*/
@SaCheckPermission("Property:userGroup:edit")
@Log(title = "排班明细", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
public R<Void> edit(@Validated(EditGroup.class) @RequestBody AttendanceUserGroupBo bo) {
return toAjax(attendanceUserGroupService.updateByBo(bo));
}
/**
* 删除排班明细
*
* @param ids 主键串
*/
@SaCheckPermission("Property:userGroup:remove")
@Log(title = "排班明细", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable("ids") Long[] ids) {
return toAjax(attendanceUserGroupService.deleteWithValidByIds(List.of(ids), true));
}
}

7
ruoyi-modules/Property/src/main/java/org/dromara/property/domain/AttendanceArrangement.java
View File

@ -1,5 +1,6 @@
package org.dromara.property.domain;
import cn.hutool.core.date.DateTime;
import org.dromara.common.tenant.core.TenantEntity;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
@ -42,7 +43,7 @@ public class AttendanceArrangement extends TenantEntity {
/**
* 排班类型：1-固定班制，2-排班制
*/
private Long scheduleType;
private Integer scheduleType;
/**
* 日期类型：1-单个日期，2-长期有效，3-期间有效
@ -52,12 +53,12 @@ public class AttendanceArrangement extends TenantEntity {
/**
* 开始日期
*/
private Date startDate;
private DateTime startDate;
/**
* 结束日期(仅date_type=3时有效)
*/
private Date endDate;
private DateTime endDate;
/**
* 状态：0-未生效，1-已生效

19
ruoyi-modules/Property/src/main/java/org/dromara/property/domain/AttendanceScheduleMember.java → ruoyi-modules/Property/src/main/java/org/dromara/property/domain/AttendanceUserGroup.java
View File

@ -8,21 +8,21 @@ import lombok.EqualsAndHashCode;
import java.io.Serial;
/**
* 排班人员对象 attendance_schedule_member
* 排班明细对象 attendance_user_group
*
* @author mocheng
* @date 2025-07-15
* @date 2025-07-18
*/
@Data
@EqualsAndHashCode(callSuper = true)
@TableName("attendance_schedule_member")
public class AttendanceScheduleMember extends TenantEntity {
@TableName("attendance_user_group")
public class AttendanceUserGroup extends TenantEntity {
@Serial
private static final long serialVersionUID = 1L;
/**
* 主键ID
*
*/
@TableId(value = "id")
private Long id;
@ -33,9 +33,14 @@ public class AttendanceScheduleMember extends TenantEntity {
private Long scheduleId;
/**
* 用户ID
* 员工ID
*/
private Long userId;
private Long employeeId;
/**
* 员工姓名
*/
private String employeeName;
/**
* 部门ID

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

@ -1,5 +1,6 @@
package org.dromara.property.domain.bo;
import cn.hutool.core.date.DateTime;
import org.dromara.property.domain.AttendanceArrangement;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import org.dromara.common.core.validate.AddGroup;
@ -8,6 +9,9 @@ import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data;
import lombok.EqualsAndHashCode;
import jakarta.validation.constraints.*;
import org.dromara.property.domain.AttendanceUserGroup;
import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date;
import java.util.List;
@ -26,7 +30,7 @@ public class AttendanceArrangementBo extends BaseEntity {
/**
* 主键ID
*/
@NotNull(message = "主键ID不能为空", groups = { EditGroup.class })
@NotNull(message = "主键ID不能为空", groups = {EditGroup.class})
private Long id;
/**
@ -52,19 +56,21 @@ public class AttendanceArrangementBo extends BaseEntity {
/**
* 开始日期
*/
private Date startDate;
@DateTimeFormat(pattern = "yyyy-MM-dd")
private DateTime startDate;
/**
* 结束日期(仅date_type=3时有效)
*/
private Date endDate;
@DateTimeFormat(pattern = "yyyy-MM-dd")
private DateTime endDate;
/**
* 状态：0-未生效，1-已生效
*/
private Long status;
// private List<>
private List<AttendanceUserGroup> userGroupList;
}

23
ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/AttendanceScheduleMemberBo.java → ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/AttendanceUserGroupBo.java
View File

@ -1,6 +1,6 @@
package org.dromara.property.domain.bo;
import org.dromara.property.domain.AttendanceScheduleMember;
import org.dromara.property.domain.AttendanceUserGroup;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup;
@ -10,20 +10,20 @@ import lombok.EqualsAndHashCode;
import jakarta.validation.constraints.*;
/**
* 排班人员业务对象 attendance_schedule_member
* 排班明细业务对象 attendance_user_group
*
* @author mocheng
* @date 2025-07-15
* @date 2025-07-18
*/
@Data
@EqualsAndHashCode(callSuper = true)
@AutoMapper(target = AttendanceScheduleMember.class, reverseConvertGenerate = false)
public class AttendanceScheduleMemberBo extends BaseEntity {
@AutoMapper(target = AttendanceUserGroup.class, reverseConvertGenerate = false)
public class AttendanceUserGroupBo extends BaseEntity {
/**
* 主键ID
*
*/
@NotNull(message = "主键ID不能为空", groups = { EditGroup.class })
@NotNull(message = "不能为空", groups = { EditGroup.class })
private Long id;
/**
@ -32,9 +32,14 @@ public class AttendanceScheduleMemberBo extends BaseEntity {
private Long scheduleId;
/**
* 用户ID
* 员工ID
*/
private Long userId;
private Long employeeId;
/**
* 员工姓名
*/
private String employeeName;
/**
* 部门ID

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

@ -1,6 +1,8 @@
package org.dromara.property.domain.vo;
import java.util.Date;
import cn.hutool.core.date.DateTime;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.dromara.property.domain.AttendanceArrangement;
import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
@ -9,11 +11,12 @@ import org.dromara.common.excel.annotation.ExcelDictFormat;
import org.dromara.common.excel.convert.ExcelDictConvert;
import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data;
import org.dromara.property.domain.AttendanceUserGroup;
import java.io.Serial;
import java.io.Serializable;
import java.util.Date;
import java.util.List;
/**
@ -64,13 +67,13 @@ public class AttendanceArrangementVo implements Serializable {
* 开始日期
*/
@ExcelProperty(value = "开始日期")
private Date startDate;
private DateTime startDate;
/**
* 结束日期(仅date_type=3时有效)
*/
@ExcelProperty(value = "结束日期(仅date_type=3时有效)")
private Date endDate;
private DateTime endDate;
/**
* 状态：0-未生效，1-已生效
@ -78,5 +81,7 @@ public class AttendanceArrangementVo implements Serializable {
@ExcelProperty(value = "状态：0-未生效，1-已生效")
private Long status;
private List<AttendanceUserGroup> userGroupList;
}

26
ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/AttendanceScheduleMemberVo.java → ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/AttendanceUserGroupVo.java
View File

@ -1,6 +1,6 @@
package org.dromara.property.domain.vo;
import org.dromara.property.domain.AttendanceScheduleMember;
import org.dromara.property.domain.AttendanceUserGroup;
import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
import cn.idev.excel.annotation.ExcelProperty;
import org.dromara.common.excel.annotation.ExcelDictFormat;
@ -15,23 +15,23 @@ import java.util.Date;
/**
* 排班人员视图对象 attendance_schedule_member
* 排班明细视图对象 attendance_user_group
*
* @author mocheng
* @date 2025-07-15
* @date 2025-07-18
*/
@Data
@ExcelIgnoreUnannotated
@AutoMapper(target = AttendanceScheduleMember.class)
public class AttendanceScheduleMemberVo implements Serializable {
@AutoMapper(target = AttendanceUserGroup.class)
public class AttendanceUserGroupVo implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
/**
* 主键ID
*
*/
@ExcelProperty(value = "主键ID")
@ExcelProperty(value = "")
private Long id;
/**
@ -41,10 +41,16 @@ public class AttendanceScheduleMemberVo implements Serializable {
private Long scheduleId;
/**
* 用户ID
* 员工ID
*/
@ExcelProperty(value = "用户ID")
private Long userId;
@ExcelProperty(value = "员工ID")
private Long employeeId;
/**
* 员工姓名
*/
@ExcelProperty(value = "员工姓名")
private String employeeName;
/**
* 部门ID

15
ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/AttendanceUserGroupMapper.java Normal file
View File

@ -0,0 +1,15 @@
package org.dromara.property.mapper;
import org.dromara.property.domain.AttendanceUserGroup;
import org.dromara.property.domain.vo.AttendanceUserGroupVo;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
/**
* 排班明细Mapper接口
*
* @author mocheng
* @date 2025-07-18
*/
public interface AttendanceUserGroupMapper extends BaseMapperPlus<AttendanceUserGroup, AttendanceUserGroupVo> {
}

3
ruoyi-modules/Property/src/main/java/org/dromara/property/service/IAttendanceArrangementService.java
View File

@ -1,5 +1,6 @@
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;
@ -66,4 +67,6 @@ public interface IAttendanceArrangementService {
* @return 是否删除成功
*/
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
List<AttendanceArrangementVo> queryByTime(DateTime startTime);
}

69
ruoyi-modules/Property/src/main/java/org/dromara/property/service/IAttendanceUserGroupService.java Normal file
View File

@ -0,0 +1,69 @@
package org.dromara.property.service;
import org.dromara.property.domain.AttendanceUserGroup;
import org.dromara.property.domain.vo.AttendanceUserGroupVo;
import org.dromara.property.domain.bo.AttendanceUserGroupBo;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.mybatis.core.page.PageQuery;
import java.util.Collection;
import java.util.List;
/**
* 排班明细Service接口
*
* @author mocheng
* @date 2025-07-18
*/
public interface IAttendanceUserGroupService {
/**
* 查询排班明细
*
* @param id 主键
* @return 排班明细
*/
AttendanceUserGroupVo queryById(Long id);
/**
* 分页查询排班明细列表
*
* @param bo 查询条件
* @param pageQuery 分页参数
* @return 排班明细分页列表
*/
TableDataInfo<AttendanceUserGroupVo> queryPageList(AttendanceUserGroupBo bo, PageQuery pageQuery);
/**
* 查询符合条件的排班明细列表
*
* @param bo 查询条件
* @return 排班明细列表
*/
List<AttendanceUserGroupVo> queryList(AttendanceUserGroupBo bo);
/**
* 新增排班明细
*
* @param bo 排班明细
* @return 是否新增成功
*/
Boolean insertByBo(AttendanceUserGroupBo bo);
/**
* 修改排班明细
*
* @param bo 排班明细
* @return 是否修改成功
*/
Boolean updateByBo(AttendanceUserGroupBo bo);
/**
* 校验并批量删除排班明细信息
*
* @param ids 待删除的主键集合
* @param isValid 是否进行有效性校验
* @return 是否删除成功
*/
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
}

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

@ -1,5 +1,7 @@
package org.dromara.property.service.impl;
import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUtil;
import org.dromara.common.core.utils.MapstructUtils;
import org.dromara.common.core.utils.StringUtils;
import org.dromara.common.mybatis.core.page.TableDataInfo;
@ -9,6 +11,13 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.dromara.property.domain.AttendanceFixedSchedule;
import org.dromara.property.domain.AttendanceUserGroup;
import org.dromara.property.domain.AttendanceWeekSet;
import org.dromara.property.domain.constant.StatusConstant;
import org.dromara.property.mapper.AttendanceFixedScheduleMapper;
import org.dromara.property.mapper.AttendanceUserGroupMapper;
import org.dromara.property.mapper.AttendanceWeekSetMapper;
import org.springframework.stereotype.Service;
import org.dromara.property.domain.bo.AttendanceArrangementBo;
import org.dromara.property.domain.vo.AttendanceArrangementVo;
@ -17,9 +26,7 @@ import org.dromara.property.mapper.AttendanceArrangementMapper;
import org.dromara.property.service.IAttendanceArrangementService;
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
import java.util.Map;
import java.util.Collection;
import java.util.*;
/**
* 排班Service业务层处理
@ -34,7 +41,11 @@ public class AttendanceArrangementServiceImpl implements IAttendanceArrangementS
private final AttendanceArrangementMapper baseMapper;
private final AttendanceUserGroupMapper userGroupMapper;
private final AttendanceFixedScheduleMapper fixedScheduleMapper;
private final AttendanceWeekSetMapper weekSetMapper;
/**
* 查询排班
*
@ -43,6 +54,13 @@ public class AttendanceArrangementServiceImpl implements IAttendanceArrangementS
*/
@Override
public AttendanceArrangementVo queryById(Long id){
//根据id查询排班人员信息
List<AttendanceUserGroup> userGroupList = userGroupMapper.selectList(Wrappers.<AttendanceUserGroup>lambdaQuery().eq(AttendanceUserGroup::getScheduleId, id));
//将排班人员信息添加到排班信息中
AttendanceArrangementVo vo = baseMapper.selectVoById(id);
vo.setUserGroupList(userGroupList);
return baseMapper.selectVoById(id);
}
@ -95,16 +113,43 @@ public class AttendanceArrangementServiceImpl implements IAttendanceArrangementS
@Transactional(rollbackFor = Exception.class)
@Override
public Boolean insertByBo(AttendanceArrangementBo bo) {
//新增排班
AttendanceArrangement add = MapstructUtils.convert(bo, AttendanceArrangement.class);
validEntityBeforeSave(add);
// //判断排班类型是固定班制还是排班制
// assert add != null;
// if (Objects.equals(add.getScheduleType(), StatusConstant.FIXEDSCHEDULE)) {
// //固定班制
// //取出开始时间和结束时间，循环插入
// DateTime startDate = DateUtil.beginOfDay(bo.getStartDate());
// DateTime endDate = DateUtil.endOfDay(bo.getEndDate());
// while (startDate.isBefore(endDate)) {
// //将startDate转换为周几
// int dayOfWeek = DateUtil.dayOfWeek(bo.getStartDate());
// //取出当前固定班次的周几和dayOfWeek比较，如果相等，则设置当前班次
// AttendanceWeekSet attendanceWeekSet = weekSetMapper.selectOne(Wrappers.<AttendanceWeekSet>lambdaQuery().eq(AttendanceWeekSet::getGroupId, bo.getGroupId()).eq(AttendanceWeekSet::getDayOfWeek, dayOfWeek));
//
// if (attendanceWeekSet != null) {
// //从attendanceWeekSet中取出当前周数
// int weekNum = attendanceWeekSet.getDayOfWeek();
// //设置开始时间为周数
// }
// }
//
//
// }
boolean flag = baseMapper.insert(add) > 0;
if (flag) {
bo.setId(add.getId());
}
//取出当前新增的排班的id
Long ArrangementId = add.getId();
//向排班人员表中插入排班人员信息
//用获取到的排班id向attendanceUserGroup表中插入数据
List<AttendanceUserGroup> userGroupList = bo.getUserGroupList();
for (AttendanceUserGroup userGroup : userGroupList) {
userGroup.setScheduleId(ArrangementId);
userGroupMapper.insert(userGroup);
}
return flag;
@ -120,6 +165,16 @@ public class AttendanceArrangementServiceImpl implements IAttendanceArrangementS
public Boolean updateByBo(AttendanceArrangementBo bo) {
AttendanceArrangement update = MapstructUtils.convert(bo, AttendanceArrangement.class);
validEntityBeforeSave(update);
//取出当前排班的id
Long ArrangementId = update.getId();
//用获取到的排班id向attendanceUserGroup表中更新数据
List<AttendanceUserGroup> userGroupList = bo.getUserGroupList();
for (AttendanceUserGroup userGroup : userGroupList) {
userGroup.setScheduleId(ArrangementId);
userGroupMapper.updateById(userGroup);
}
return baseMapper.updateById(update) > 0;
}
@ -137,11 +192,22 @@ public class AttendanceArrangementServiceImpl implements IAttendanceArrangementS
* @param isValid 是否进行有效性校验
* @return 是否删除成功
*/
@Transactional(rollbackFor = Exception.class)
@Override
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
if(isValid){
//TODO 做一些业务上的校验,判断是否需要校验
}
//获取当前排班的id
List<Long> idList = new ArrayList<>(ids);
//根据获取的id删除attendanceUserGroup表中的数据
userGroupMapper.delete(Wrappers.<AttendanceUserGroup>lambdaQuery().in(AttendanceUserGroup::getScheduleId, idList));
return baseMapper.deleteByIds(ids) > 0;
}
@Override
public List<AttendanceArrangementVo> queryByTime(DateTime startTime) {
return List.of();
}
}

136
ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AttendanceUserGroupServiceImpl.java Normal file
View File

@ -0,0 +1,136 @@
package org.dromara.property.service.impl;
import org.dromara.common.core.utils.MapstructUtils;
import org.dromara.common.core.utils.StringUtils;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.mybatis.core.page.PageQuery;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.dromara.property.domain.bo.AttendanceUserGroupBo;
import org.dromara.property.domain.vo.AttendanceUserGroupVo;
import org.dromara.property.domain.AttendanceUserGroup;
import org.dromara.property.mapper.AttendanceUserGroupMapper;
import org.dromara.property.service.IAttendanceUserGroupService;
import java.util.List;
import java.util.Map;
import java.util.Collection;
/**
* 排班明细Service业务层处理
*
* @author mocheng
* @date 2025-07-18
*/
@Slf4j
@RequiredArgsConstructor
@Service
public class AttendanceUserGroupServiceImpl implements IAttendanceUserGroupService {
private final AttendanceUserGroupMapper baseMapper;
/**
* 查询排班明细
*
* @param id 主键
* @return 排班明细
*/
@Override
public AttendanceUserGroupVo queryById(Long id){
return baseMapper.selectVoById(id);
}
/**
* 分页查询排班明细列表
*
* @param bo 查询条件
* @param pageQuery 分页参数
* @return 排班明细分页列表
*/
@Override
public TableDataInfo<AttendanceUserGroupVo> queryPageList(AttendanceUserGroupBo bo, PageQuery pageQuery) {
LambdaQueryWrapper<AttendanceUserGroup> lqw = buildQueryWrapper(bo);
Page<AttendanceUserGroupVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
return TableDataInfo.build(result);
}
/**
* 查询符合条件的排班明细列表
*
* @param bo 查询条件
* @return 排班明细列表
*/
@Override
public List<AttendanceUserGroupVo> queryList(AttendanceUserGroupBo bo) {
LambdaQueryWrapper<AttendanceUserGroup> lqw = buildQueryWrapper(bo);
return baseMapper.selectVoList(lqw);
}
private LambdaQueryWrapper<AttendanceUserGroup> buildQueryWrapper(AttendanceUserGroupBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<AttendanceUserGroup> lqw = Wrappers.lambdaQuery();
lqw.orderByAsc(AttendanceUserGroup::getId);
lqw.eq(bo.getScheduleId() != null, AttendanceUserGroup::getScheduleId, bo.getScheduleId());
lqw.eq(bo.getEmployeeId() != null, AttendanceUserGroup::getEmployeeId, bo.getEmployeeId());
lqw.like(StringUtils.isNotBlank(bo.getEmployeeName()), AttendanceUserGroup::getEmployeeName, bo.getEmployeeName());
lqw.eq(bo.getDeptId() != null, AttendanceUserGroup::getDeptId, bo.getDeptId());
lqw.like(StringUtils.isNotBlank(bo.getDeptName()), AttendanceUserGroup::getDeptName, bo.getDeptName());
return lqw;
}
/**
* 新增排班明细
*
* @param bo 排班明细
* @return 是否新增成功
*/
@Override
public Boolean insertByBo(AttendanceUserGroupBo bo) {
AttendanceUserGroup add = MapstructUtils.convert(bo, AttendanceUserGroup.class);
validEntityBeforeSave(add);
boolean flag = baseMapper.insert(add) > 0;
if (flag) {
bo.setId(add.getId());
}
return flag;
}
/**
* 修改排班明细
*
* @param bo 排班明细
* @return 是否修改成功
*/
@Override
public Boolean updateByBo(AttendanceUserGroupBo bo) {
AttendanceUserGroup update = MapstructUtils.convert(bo, AttendanceUserGroup.class);
validEntityBeforeSave(update);
return baseMapper.updateById(update) > 0;
}
/**
* 保存前的数据校验
*/
private void validEntityBeforeSave(AttendanceUserGroup entity){
//TODO 做一些数据校验,如唯一约束
}
/**
* 校验并批量删除排班明细信息
*
* @param ids 待删除的主键集合
* @param isValid 是否进行有效性校验
* @return 是否删除成功
*/
@Override
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
if(isValid){
//TODO 做一些业务上的校验,判断是否需要校验
}
return baseMapper.deleteByIds(ids) > 0;
}
}

2
ruoyi-modules/Property/src/main/resources/mapper/Property/AttendanceScheduleMemberMapper.xml → ruoyi-modules/Property/src/main/resources/mapper/Property/AttendanceUserGroupMapper.xml
View File

@ -2,6 +2,6 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.dromara.property.mapper.AttendanceScheduleMemberMapper">
<mapper namespace="org.dromara.property.mapper.AttendanceUserGroupMapper">
</mapper>