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

分包
All checks were successful
Build and Push to Target Registry / 构建并推送镜像到目标仓库 (push) Successful in 6m17s
Details

Browse Source
This commit is contained in:
dy
2025-08-20 23:51:53 +08:00
parent 5fb396575d
commit 5c9672dc18
118 changed files with 287 additions and 412 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ruoyi-modules/Property/src/main/java/org/dromara/property/controller/AttendanceAreaController.java → ruoyi-modules/Property/src/main/java/org/dromara/property/controller/attendance/AttendanceAreaController.java
View File

@@ -1,4 +1,4 @@
package org.dromara.property.controller;
package org.dromara.property.controller.attendance;
import java.util.List;
@@ -17,9 +17,9 @@ 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.AttendanceAreaVo;
import org.dromara.property.domain.bo.AttendanceAreaBo;
import org.dromara.property.service.IAttendanceAreaService;
import org.dromara.property.domain.vo.attendanceVo.AttendanceAreaVo;
import org.dromara.property.domain.bo.attendanceBo.AttendanceAreaBo;
import org.dromara.property.service.attendanceService.IAttendanceAreaService;
import org.dromara.common.mybatis.core.page.TableDataInfo;
/**

8
ruoyi-modules/Property/src/main/java/org/dromara/property/controller/AttendanceAreaDeviceController.java → ruoyi-modules/Property/src/main/java/org/dromara/property/controller/attendance/AttendanceAreaDeviceController.java
View File

@@ -1,4 +1,4 @@
package org.dromara.property.controller;
package org.dromara.property.controller.attendance;
import java.util.List;
@@ -17,9 +17,9 @@ 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.AttendanceAreaDeviceVo;
import org.dromara.property.domain.bo.AttendanceAreaDeviceBo;
import org.dromara.property.service.IAttendanceAreaDeviceService;
import org.dromara.property.domain.vo.attendanceVo.AttendanceAreaDeviceVo;
import org.dromara.property.domain.bo.attendanceBo.AttendanceAreaDeviceBo;
import org.dromara.property.service.attendanceService.IAttendanceAreaDeviceService;
import org.dromara.common.mybatis.core.page.TableDataInfo;
/**

8
ruoyi-modules/Property/src/main/java/org/dromara/property/controller/AttendanceArrangementAreaController.java → ruoyi-modules/Property/src/main/java/org/dromara/property/controller/attendance/AttendanceArrangementAreaController.java
View File

@@ -1,4 +1,4 @@
package org.dromara.property.controller;
package org.dromara.property.controller.attendance;
import java.util.List;
@@ -17,9 +17,9 @@ 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.AttendanceArrangementAreaVo;
import org.dromara.property.domain.bo.AttendanceArrangementAreaBo;
import org.dromara.property.service.IAttendanceArrangementAreaService;
import org.dromara.property.domain.vo.attendanceVo.AttendanceArrangementAreaVo;
import org.dromara.property.domain.bo.attendanceBo.AttendanceArrangementAreaBo;
import org.dromara.property.service.attendanceService.IAttendanceArrangementAreaService;
import org.dromara.common.mybatis.core.page.TableDataInfo;
/**

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

@@ -1,4 +1,4 @@
package org.dromara.property.controller;
package org.dromara.property.controller.attendance;
import cn.dev33.satoken.annotation.SaCheckPermission;
import jakarta.validation.constraints.NotEmpty;
@@ -13,9 +13,9 @@ 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.AttendanceArrangementBo;
import org.dromara.property.domain.vo.AttendanceArrangementVo;
import org.dromara.property.service.IAttendanceArrangementService;
import org.dromara.property.domain.bo.attendanceBo.AttendanceArrangementBo;
import org.dromara.property.domain.vo.attendanceVo.AttendanceArrangementVo;
import org.dromara.property.service.attendanceService.IAttendanceArrangementService;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;

8
ruoyi-modules/Property/src/main/java/org/dromara/property/controller/AttendanceClockDateController.java → ruoyi-modules/Property/src/main/java/org/dromara/property/controller/attendance/AttendanceClockDateController.java
View File

@@ -1,4 +1,4 @@
package org.dromara.property.controller;
package org.dromara.property.controller.attendance;
import java.util.List;
@@ -17,9 +17,9 @@ 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.AttendanceClockDateVo;
import org.dromara.property.domain.bo.AttendanceClockDateBo;
import org.dromara.property.service.IAttendanceClockDateService;
import org.dromara.property.domain.vo.attendanceVo.AttendanceClockDateVo;
import org.dromara.property.domain.bo.attendanceBo.AttendanceClockDateBo;
import org.dromara.property.service.attendanceService.IAttendanceClockDateService;
import org.dromara.common.mybatis.core.page.TableDataInfo;
/**

8
ruoyi-modules/Property/src/main/java/org/dromara/property/controller/AttendanceFixedScheduleController.java → ruoyi-modules/Property/src/main/java/org/dromara/property/controller/attendance/AttendanceFixedScheduleController.java
View File

@@ -1,4 +1,4 @@
package org.dromara.property.controller;
package org.dromara.property.controller.attendance;
import cn.dev33.satoken.annotation.SaCheckPermission;
import jakarta.servlet.http.HttpServletResponse;
@@ -15,9 +15,9 @@ 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.dromara.property.domain.bo.attendanceBo.AttendanceFixedScheduleBo;
import org.dromara.property.domain.vo.attendanceVo.AttendanceFixedScheduleVo;
import org.dromara.property.service.attendanceService.IAttendanceFixedScheduleService;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;

8
ruoyi-modules/Property/src/main/java/org/dromara/property/controller/AttendanceGroupController.java → ruoyi-modules/Property/src/main/java/org/dromara/property/controller/attendance/AttendanceGroupController.java
View File

@@ -1,4 +1,4 @@
package org.dromara.property.controller;
package org.dromara.property.controller.attendance;
import java.util.List;
@@ -17,9 +17,9 @@ 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.AttendanceGroupVo;
import org.dromara.property.domain.bo.AttendanceGroupBo;
import org.dromara.property.service.IAttendanceGroupService;
import org.dromara.property.domain.vo.attendanceVo.AttendanceGroupVo;
import org.dromara.property.domain.bo.attendanceBo.AttendanceGroupBo;
import org.dromara.property.service.attendanceService.IAttendanceGroupService;
import org.dromara.common.mybatis.core.page.TableDataInfo;
/**

8
ruoyi-modules/Property/src/main/java/org/dromara/property/controller/AttendanceScheduleCycleController.java → ruoyi-modules/Property/src/main/java/org/dromara/property/controller/attendance/AttendanceScheduleCycleController.java
View File

@@ -1,4 +1,4 @@
package org.dromara.property.controller;
package org.dromara.property.controller.attendance;
import java.util.List;
@@ -17,9 +17,9 @@ 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.AttendanceScheduleCycleVo;
import org.dromara.property.domain.bo.AttendanceScheduleCycleBo;
import org.dromara.property.service.IAttendanceScheduleCycleService;
import org.dromara.property.domain.vo.attendanceVo.AttendanceScheduleCycleVo;
import org.dromara.property.domain.bo.attendanceBo.AttendanceScheduleCycleBo;
import org.dromara.property.service.attendanceService.IAttendanceScheduleCycleService;
import org.dromara.common.mybatis.core.page.TableDataInfo;
/**

8
ruoyi-modules/Property/src/main/java/org/dromara/property/controller/AttendanceShiftController.java → ruoyi-modules/Property/src/main/java/org/dromara/property/controller/attendance/AttendanceShiftController.java
View File

@@ -1,4 +1,4 @@
package org.dromara.property.controller;
package org.dromara.property.controller.attendance;
import java.util.List;
@@ -17,9 +17,9 @@ 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.AttendanceShiftVo;
import org.dromara.property.domain.bo.AttendanceShiftBo;
import org.dromara.property.service.IAttendanceShiftService;
import org.dromara.property.domain.vo.attendanceVo.AttendanceShiftVo;
import org.dromara.property.domain.bo.attendanceBo.AttendanceShiftBo;
import org.dromara.property.service.attendanceService.IAttendanceShiftService;
import org.dromara.common.mybatis.core.page.TableDataInfo;
/**

8
ruoyi-modules/Property/src/main/java/org/dromara/property/controller/AttendanceShiftScheduleController.java → ruoyi-modules/Property/src/main/java/org/dromara/property/controller/attendance/AttendanceShiftScheduleController.java
View File

@@ -1,4 +1,4 @@
package org.dromara.property.controller;
package org.dromara.property.controller.attendance;
import java.util.List;
@@ -17,9 +17,9 @@ 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.AttendanceShiftScheduleVo;
import org.dromara.property.domain.bo.AttendanceShiftScheduleBo;
import org.dromara.property.service.IAttendanceShiftScheduleService;
import org.dromara.property.domain.vo.attendanceVo.AttendanceShiftScheduleVo;
import org.dromara.property.domain.bo.attendanceBo.AttendanceShiftScheduleBo;
import org.dromara.property.service.attendanceService.IAttendanceShiftScheduleService;
import org.dromara.common.mybatis.core.page.TableDataInfo;
/**

8
ruoyi-modules/Property/src/main/java/org/dromara/property/controller/AttendanceUserGroupController.java → ruoyi-modules/Property/src/main/java/org/dromara/property/controller/attendance/AttendanceUserGroupController.java
View File

@@ -1,4 +1,4 @@
package org.dromara.property.controller;
package org.dromara.property.controller.attendance;
import cn.dev33.satoken.annotation.SaCheckPermission;
import jakarta.servlet.http.HttpServletResponse;
@@ -15,9 +15,9 @@ 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.AttendanceUserGroupBo;
import org.dromara.property.domain.vo.AttendanceUserGroupVo;
import org.dromara.property.service.IAttendanceUserGroupService;
import org.dromara.property.domain.bo.attendanceBo.AttendanceUserGroupBo;
import org.dromara.property.domain.vo.attendanceVo.AttendanceUserGroupVo;
import org.dromara.property.service.attendanceService.IAttendanceUserGroupService;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;

8
ruoyi-modules/Property/src/main/java/org/dromara/property/controller/AttendanceWeekSetController.java → ruoyi-modules/Property/src/main/java/org/dromara/property/controller/attendance/AttendanceWeekSetController.java
View File

@@ -1,4 +1,4 @@
package org.dromara.property.controller;
package org.dromara.property.controller.attendance;
import java.util.List;
@@ -17,9 +17,9 @@ 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.AttendanceWeekSetVo;
import org.dromara.property.domain.bo.AttendanceWeekSetBo;
import org.dromara.property.service.IAttendanceWeekSetService;
import org.dromara.property.domain.vo.attendanceVo.AttendanceWeekSetVo;
import org.dromara.property.domain.bo.attendanceBo.AttendanceWeekSetBo;
import org.dromara.property.service.attendanceService.IAttendanceWeekSetService;
import org.dromara.common.mybatis.core.page.TableDataInfo;
/**

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

@@ -1,4 +1,4 @@
package org.dromara.property.controller;
package org.dromara.property.controller.attendance;
import java.util.List;
@@ -17,9 +17,9 @@ 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.AttendanceWeeksetShiftVo;
import org.dromara.property.domain.bo.AttendanceWeeksetShiftBo;
import org.dromara.property.service.IAttendanceWeeksetShiftService;
import org.dromara.property.domain.vo.attendanceVo.AttendanceWeeksetShiftVo;
import org.dromara.property.domain.bo.attendanceBo.AttendanceWeeksetShiftBo;
import org.dromara.property.service.attendanceService.IAttendanceWeeksetShiftService;
import org.dromara.common.mybatis.core.page.TableDataInfo;
/**

8
ruoyi-modules/Property/src/main/java/org/dromara/property/controller/CleanController.java → ruoyi-modules/Property/src/main/java/org/dromara/property/controller/cleanOrder/CleanController.java
View File

@@ -1,4 +1,4 @@
package org.dromara.property.controller;
package org.dromara.property.controller.cleanOrder;
import java.util.List;
@@ -17,9 +17,9 @@ 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.CleanVo;
import org.dromara.property.domain.bo.CleanBo;
import org.dromara.property.service.ICleanService;
import org.dromara.property.domain.vo.cleanOrderVo.CleanVo;
import org.dromara.property.domain.bo.cleanOrderBo.CleanBo;
import org.dromara.property.service.cleanOrderService.ICleanService;
import org.dromara.common.mybatis.core.page.TableDataInfo;
/**

9
ruoyi-modules/Property/src/main/java/org/dromara/property/controller/CleanOrderController.java → ruoyi-modules/Property/src/main/java/org/dromara/property/controller/cleanOrder/CleanOrderController.java
View File

@@ -1,8 +1,7 @@
package org.dromara.property.controller;
package org.dromara.property.controller.cleanOrder;
import java.util.List;
import cn.dev33.satoken.annotation.SaIgnore;
import lombok.RequiredArgsConstructor;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.constraints.*;
@@ -18,9 +17,9 @@ 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.CleanOrderVo;
import org.dromara.property.domain.bo.CleanOrderBo;
import org.dromara.property.service.ICleanOrderService;
import org.dromara.property.domain.vo.cleanOrderVo.CleanOrderVo;
import org.dromara.property.domain.bo.cleanOrderBo.CleanOrderBo;
import org.dromara.property.service.cleanOrderService.ICleanOrderService;
import org.dromara.common.mybatis.core.page.TableDataInfo;
/**

8
ruoyi-modules/Property/src/main/java/org/dromara/property/controller/CleanserverOrderController.java → ruoyi-modules/Property/src/main/java/org/dromara/property/controller/cleanOrder/CleanserverOrderController.java
View File

@@ -1,4 +1,4 @@
package org.dromara.property.controller;
package org.dromara.property.controller.cleanOrder;
import java.util.List;
@@ -17,9 +17,9 @@ 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.CleanserverOrderVo;
import org.dromara.property.domain.bo.CleanserverOrderBo;
import org.dromara.property.service.ICleanserverOrderService;
import org.dromara.property.domain.vo.cleanOrderVo.CleanserverOrderVo;
import org.dromara.property.domain.bo.cleanOrderBo.CleanserverOrderBo;
import org.dromara.property.service.cleanOrderService.ICleanserverOrderService;
import org.dromara.common.mybatis.core.page.TableDataInfo;
/**

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

@@ -8,8 +8,6 @@ import org.dromara.common.tenant.core.TenantEntity;
import java.io.Serial;
import java.time.LocalDate;
import java.util.Date;
import java.util.List;
/**
* 排班对象 attendance_arrangement

1
ruoyi-modules/Property/src/main/java/org/dromara/property/domain/AttendanceClockDate.java
View File

@@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.io.Serial;

1
ruoyi-modules/Property/src/main/java/org/dromara/property/domain/AttendanceGroup.java
View File

@@ -6,7 +6,6 @@ import lombok.Data;
import lombok.EqualsAndHashCode;
import java.io.Serial;
import java.util.List;
/**
* 考勤组基本信息对象 attendance_group

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

@@ -1,15 +1,11 @@
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;
import lombok.EqualsAndHashCode;
import java.time.LocalDateTime;
import java.time.LocalTime;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.io.Serial;

3
ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/AttendanceAreaBo.java → ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/attendanceBo/AttendanceAreaBo.java
View File

@@ -1,8 +1,7 @@
package org.dromara.property.domain.bo;
package org.dromara.property.domain.bo.attendanceBo;
import org.dromara.property.domain.AttendanceArea;
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;

3
ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/AttendanceAreaDeviceBo.java → ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/attendanceBo/AttendanceAreaDeviceBo.java
View File

@@ -1,8 +1,7 @@
package org.dromara.property.domain.bo;
package org.dromara.property.domain.bo.attendanceBo;
import org.dromara.property.domain.AttendanceAreaDevice;
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;

3
ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/AttendanceArrangementAreaBo.java → ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/attendanceBo/AttendanceArrangementAreaBo.java
View File

@@ -1,8 +1,7 @@
package org.dromara.property.domain.bo;
package org.dromara.property.domain.bo.attendanceBo;
import org.dromara.property.domain.AttendanceArrangementArea;
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;

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

@@ -1,4 +1,4 @@
package org.dromara.property.domain.bo;
package org.dromara.property.domain.bo.attendanceBo;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.github.linpeilie.annotations.AutoMapper;
@@ -14,7 +14,6 @@ import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDate;
import java.time.YearMonth;
import java.util.Date;
import java.util.List;

4
ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/AttendanceClockDateBo.java → ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/attendanceBo/AttendanceClockDateBo.java
View File

@@ -1,15 +1,13 @@
package org.dromara.property.domain.bo;
package org.dromara.property.domain.bo.attendanceBo;
import org.dromara.property.domain.AttendanceClockDate;
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 java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
/**
* 必须/无需打卡业务对象 attendance_clock_date

3
ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/AttendanceFixedScheduleBo.java → ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/attendanceBo/AttendanceFixedScheduleBo.java
View File

@@ -1,8 +1,7 @@
package org.dromara.property.domain.bo;
package org.dromara.property.domain.bo.attendanceBo;
import org.dromara.property.domain.AttendanceFixedSchedule;
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;

4
ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/AttendanceGroupBo.java → ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/attendanceBo/AttendanceGroupBo.java
View File

@@ -1,9 +1,8 @@
package org.dromara.property.domain.bo;
package org.dromara.property.domain.bo.attendanceBo;
import org.dromara.property.domain.AttendanceClockDate;
import org.dromara.property.domain.AttendanceGroup;
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;
@@ -12,7 +11,6 @@ import jakarta.validation.constraints.*;
import org.dromara.property.domain.AttendanceScheduleCycle;
import org.dromara.property.domain.AttendanceWeekSet;
import java.util.Date;
import java.util.List;
/**

3
ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/AttendanceScheduleCycleBo.java → ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/attendanceBo/AttendanceScheduleCycleBo.java
View File

@@ -1,8 +1,7 @@
package org.dromara.property.domain.bo;
package org.dromara.property.domain.bo.attendanceBo;
import org.dromara.property.domain.AttendanceScheduleCycle;
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;

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

@@ -1,19 +1,15 @@
package org.dromara.property.domain.bo;
package org.dromara.property.domain.bo.attendanceBo;
import cn.hutool.core.date.DateTime;
import org.dromara.property.domain.AttendanceShift;
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 java.time.LocalDateTime;
import java.time.LocalTime;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;
/**

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

@@ -1,4 +1,4 @@
package org.dromara.property.domain.bo;
package org.dromara.property.domain.bo.attendanceBo;
import org.dromara.property.domain.AttendanceShiftSchedule;
import org.dromara.common.mybatis.core.domain.BaseEntity;

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

@@ -1,14 +1,12 @@
package org.dromara.property.domain.bo;
package org.dromara.property.domain.bo.attendanceBo;
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;
import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data;
import lombok.EqualsAndHashCode;
import jakarta.validation.constraints.*;
import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDate;

3
ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/AttendanceWeekSetBo.java → ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/attendanceBo/AttendanceWeekSetBo.java
View File

@@ -1,8 +1,7 @@
package org.dromara.property.domain.bo;
package org.dromara.property.domain.bo.attendanceBo;
import org.dromara.property.domain.AttendanceWeekSet;
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;

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

@@ -1,8 +1,7 @@
package org.dromara.property.domain.bo;
package org.dromara.property.domain.bo.attendanceBo;
import org.dromara.property.domain.AttendanceWeeksetShift;
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;

4
ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/CleanBo.java → ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/cleanOrderBo/CleanBo.java
View File

@@ -1,6 +1,5 @@
package org.dromara.property.domain.bo;
package org.dromara.property.domain.bo.cleanOrderBo;
import org.dromara.common.core.validate.enumd.EnumPattern;
import org.dromara.property.domain.Clean;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import org.dromara.common.core.validate.AddGroup;
@@ -9,7 +8,6 @@ import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data;
import lombok.EqualsAndHashCode;
import jakarta.validation.constraints.*;
import org.dromara.property.domain.CleanRelation;
import java.util.List;

5
ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/CleanOrderBo.java → ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/cleanOrderBo/CleanOrderBo.java
View File

@@ -1,4 +1,4 @@
package org.dromara.property.domain.bo;
package org.dromara.property.domain.bo.cleanOrderBo;
import org.dromara.property.domain.Clean;
import org.dromara.property.domain.CleanOrder;
@@ -10,9 +10,6 @@ import lombok.Data;
import lombok.EqualsAndHashCode;
import jakarta.validation.constraints.*;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import com.fasterxml.jackson.annotation.JsonFormat;

3
ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/CleanRelationBo.java → ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/cleanOrderBo/CleanRelationBo.java
View File

@@ -1,7 +1,6 @@
package org.dromara.property.domain.bo;
package org.dromara.property.domain.bo.cleanOrderBo;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data;
import lombok.EqualsAndHashCode;

3
ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/CleanserverOrderBo.java → ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/cleanOrderBo/CleanserverOrderBo.java
View File

@@ -1,8 +1,7 @@
package org.dromara.property.domain.bo;
package org.dromara.property.domain.bo.cleanOrderBo;
import org.dromara.property.domain.CleanserverOrder;
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;

6
ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/AttendanceAreaDeviceVo.java → ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/attendanceVo/AttendanceAreaDeviceVo.java
View File

@@ -1,18 +1,14 @@
package org.dromara.property.domain.vo;
package org.dromara.property.domain.vo.attendanceVo;
import org.dromara.property.domain.AttendanceAreaDevice;
import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
import cn.idev.excel.annotation.ExcelProperty;
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.sis.api.domain.RemoteSisDeviceManage;
import java.io.Serial;
import java.io.Serializable;
import java.util.Date;
/**

6
ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/AttendanceAreaVo.java → ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/attendanceVo/AttendanceAreaVo.java
View File

@@ -1,17 +1,13 @@
package org.dromara.property.domain.vo;
package org.dromara.property.domain.vo.attendanceVo;
import org.dromara.property.domain.AttendanceArea;
import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
import cn.idev.excel.annotation.ExcelProperty;
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.AttendanceAreaDevice;
import java.io.Serial;
import java.io.Serializable;
import java.util.Date;
import java.util.List;

6
ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/AttendanceArrangementAreaVo.java → ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/attendanceVo/AttendanceArrangementAreaVo.java
View File

@@ -1,17 +1,13 @@
package org.dromara.property.domain.vo;
package org.dromara.property.domain.vo.attendanceVo;
import org.dromara.property.domain.AttendanceArrangementArea;
import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
import cn.idev.excel.annotation.ExcelProperty;
import org.dromara.common.excel.annotation.ExcelDictFormat;
import org.dromara.common.excel.convert.ExcelDictConvert;
import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data;
import java.io.Serial;
import java.io.Serializable;
import java.util.Date;
/**

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

@@ -1,4 +1,4 @@
package org.dromara.property.domain.vo;
package org.dromara.property.domain.vo.attendanceVo;
import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
import cn.idev.excel.annotation.ExcelProperty;
@@ -9,7 +9,6 @@ import org.dromara.property.domain.*;
import java.io.Serial;
import java.io.Serializable;
import java.time.LocalDate;
import java.util.Date;
import java.util.List;

6
ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/AttendanceClockDateVo.java → ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/attendanceVo/AttendanceClockDateVo.java
View File

@@ -1,7 +1,7 @@
package org.dromara.property.domain.vo;
package org.dromara.property.domain.vo.attendanceVo;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.dromara.property.domain.AttendanceClockDate;
import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
import cn.idev.excel.annotation.ExcelProperty;
@@ -12,8 +12,6 @@ import lombok.Data;
import java.io.Serial;
import java.io.Serializable;
import java.util.Date;
/**

6
ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/AttendanceFixedScheduleVo.java → ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/attendanceVo/AttendanceFixedScheduleVo.java
View File

@@ -1,17 +1,13 @@
package org.dromara.property.domain.vo;
package org.dromara.property.domain.vo.attendanceVo;
import org.dromara.property.domain.AttendanceFixedSchedule;
import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
import cn.idev.excel.annotation.ExcelProperty;
import org.dromara.common.excel.annotation.ExcelDictFormat;
import org.dromara.common.excel.convert.ExcelDictConvert;
import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data;
import java.io.Serial;
import java.io.Serializable;
import java.util.Date;
/**

7
ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/AttendanceGroupVo.java → ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/attendanceVo/AttendanceGroupVo.java
View File

@@ -1,16 +1,13 @@
package org.dromara.property.domain.vo;
package org.dromara.property.domain.vo.attendanceVo;
import org.dromara.property.domain.*;
import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
import cn.idev.excel.annotation.ExcelProperty;
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.*;
import java.io.Serial;
import java.io.Serializable;
import java.util.Date;
import java.util.List;

6
ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/AttendanceScheduleCycleVo.java → ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/attendanceVo/AttendanceScheduleCycleVo.java
View File

@@ -1,17 +1,13 @@
package org.dromara.property.domain.vo;
package org.dromara.property.domain.vo.attendanceVo;
import org.dromara.property.domain.AttendanceScheduleCycle;
import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
import cn.idev.excel.annotation.ExcelProperty;
import org.dromara.common.excel.annotation.ExcelDictFormat;
import org.dromara.common.excel.convert.ExcelDictConvert;
import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data;
import java.io.Serial;
import java.io.Serializable;
import java.util.Date;
/**

6
ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/AttendanceShiftScheduleVo.java → ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/attendanceVo/AttendanceShiftScheduleVo.java
View File

@@ -1,17 +1,13 @@
package org.dromara.property.domain.vo;
package org.dromara.property.domain.vo.attendanceVo;
import org.dromara.property.domain.AttendanceShiftSchedule;
import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
import cn.idev.excel.annotation.ExcelProperty;
import org.dromara.common.excel.annotation.ExcelDictFormat;
import org.dromara.common.excel.convert.ExcelDictConvert;
import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data;
import java.io.Serial;
import java.io.Serializable;
import java.util.Date;
/**

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

@@ -1,10 +1,7 @@
package org.dromara.property.domain.vo;
package org.dromara.property.domain.vo.attendanceVo;
import java.time.LocalTime;
import java.util.Date;
import cn.hutool.core.date.DateTime;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.dromara.property.domain.AttendanceShift;
import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
import cn.idev.excel.annotation.ExcelProperty;
@@ -15,8 +12,6 @@ import lombok.Data;
import java.io.Serial;
import java.io.Serializable;
import java.util.Date;
/**

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

@@ -1,4 +1,4 @@
package org.dromara.property.domain.vo;
package org.dromara.property.domain.vo.attendanceVo;
import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
import cn.idev.excel.annotation.ExcelProperty;

4
ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/AttendanceWeekSetVo.java → ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/attendanceVo/AttendanceWeekSetVo.java
View File

@@ -1,4 +1,4 @@
package org.dromara.property.domain.vo;
package org.dromara.property.domain.vo.attendanceVo;
import org.dromara.property.domain.AttendanceWeekSet;
import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
@@ -10,8 +10,6 @@ import lombok.Data;
import java.io.Serial;
import java.io.Serializable;
import java.util.Date;
/**

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

@@ -1,17 +1,13 @@
package org.dromara.property.domain.vo;
package org.dromara.property.domain.vo.attendanceVo;
import org.dromara.property.domain.AttendanceWeeksetShift;
import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
import cn.idev.excel.annotation.ExcelProperty;
import org.dromara.common.excel.annotation.ExcelDictFormat;
import org.dromara.common.excel.convert.ExcelDictConvert;
import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data;
import java.io.Serial;
import java.io.Serializable;
import java.util.Date;
/**

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

@@ -1,22 +1,15 @@
package org.dromara.property.domain.vo;
package org.dromara.property.domain.vo.cleanOrderVo;
import java.time.LocalDateTime;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import kotlin.text.UStringsKt;
import org.dromara.property.domain.Clean;
import org.dromara.property.domain.CleanOrder;
import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
import cn.idev.excel.annotation.ExcelProperty;
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.CleanRelation;
import java.io.Serial;
import java.io.Serializable;
import java.util.Date;
import java.util.List;

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

@@ -1,4 +1,4 @@
package org.dromara.property.domain.vo;
package org.dromara.property.domain.vo.cleanOrderVo;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;

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

@@ -1,21 +1,14 @@
package org.dromara.property.domain.vo;
package org.dromara.property.domain.vo.cleanOrderVo;
import jakarta.validation.constraints.NotBlank;
import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup;
import org.dromara.property.domain.Clean;
import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
import cn.idev.excel.annotation.ExcelProperty;
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.CleanRelation;
import java.io.Serial;
import java.io.Serializable;
import java.util.Date;
import java.util.List;
/**

6
ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/CleanserverOrderVo.java → ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/cleanOrderVo/CleanserverOrderVo.java
View File

@@ -1,17 +1,13 @@
package org.dromara.property.domain.vo;
package org.dromara.property.domain.vo.cleanOrderVo;
import org.dromara.property.domain.CleanserverOrder;
import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
import cn.idev.excel.annotation.ExcelProperty;
import org.dromara.common.excel.annotation.ExcelDictFormat;
import org.dromara.common.excel.convert.ExcelDictConvert;
import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data;
import java.io.Serial;
import java.io.Serializable;
import java.util.Date;
/**

5
ruoyi-modules/Property/src/main/java/org/dromara/property/dubbo/RemoteAttendanceServiceImpl.java
View File

@@ -4,11 +4,10 @@ import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil;
import lombok.RequiredArgsConstructor;
import org.apache.dubbo.config.annotation.DubboService;
import org.dromara.common.core.utils.MapstructUtils;
import org.dromara.property.api.RemoteAttendanceService;
import org.dromara.property.api.domain.vo.RemoteAttendanceUserGroupVo;
import org.dromara.property.domain.vo.AttendanceUserGroupVo;
import org.dromara.property.service.IAttendanceUserGroupService;
import org.dromara.property.domain.vo.attendanceVo.AttendanceUserGroupVo;
import org.dromara.property.service.attendanceService.IAttendanceUserGroupService;
import java.util.Date;
import java.util.List;

4
ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/AttendanceAreaDeviceMapper.java → ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/attendanceMapper/AttendanceAreaDeviceMapper.java
View File

@@ -1,7 +1,7 @@
package org.dromara.property.mapper;
package org.dromara.property.mapper.attendanceMapper;
import org.dromara.property.domain.AttendanceAreaDevice;
import org.dromara.property.domain.vo.AttendanceAreaDeviceVo;
import org.dromara.property.domain.vo.attendanceVo.AttendanceAreaDeviceVo;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
/**

4
ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/AttendanceAreaMapper.java → ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/attendanceMapper/AttendanceAreaMapper.java
View File

@@ -1,7 +1,7 @@
package org.dromara.property.mapper;
package org.dromara.property.mapper.attendanceMapper;
import org.dromara.property.domain.AttendanceArea;
import org.dromara.property.domain.vo.AttendanceAreaVo;
import org.dromara.property.domain.vo.attendanceVo.AttendanceAreaVo;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
/**

4
ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/AttendanceArrangementAreaMapper.java → ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/attendanceMapper/AttendanceArrangementAreaMapper.java
View File

@@ -1,7 +1,7 @@
package org.dromara.property.mapper;
package org.dromara.property.mapper.attendanceMapper;
import org.dromara.property.domain.AttendanceArrangementArea;
import org.dromara.property.domain.vo.AttendanceArrangementAreaVo;
import org.dromara.property.domain.vo.attendanceVo.AttendanceArrangementAreaVo;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
/**

4
ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/AttendanceArrangementMapper.java → ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/attendanceMapper/AttendanceArrangementMapper.java
View File

@@ -1,8 +1,8 @@
package org.dromara.property.mapper;
package org.dromara.property.mapper.attendanceMapper;
import org.apache.ibatis.annotations.Select;
import org.dromara.property.domain.AttendanceArrangement;
import org.dromara.property.domain.vo.AttendanceArrangementVo;
import org.dromara.property.domain.vo.attendanceVo.AttendanceArrangementVo;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
import java.time.LocalDate;

4
ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/AttendanceClockDateMapper.java → ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/attendanceMapper/AttendanceClockDateMapper.java
View File

@@ -1,7 +1,7 @@
package org.dromara.property.mapper;
package org.dromara.property.mapper.attendanceMapper;
import org.dromara.property.domain.AttendanceClockDate;
import org.dromara.property.domain.vo.AttendanceClockDateVo;
import org.dromara.property.domain.vo.attendanceVo.AttendanceClockDateVo;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
/**

4
ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/AttendanceFixedScheduleMapper.java → ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/attendanceMapper/AttendanceFixedScheduleMapper.java
View File

@@ -1,7 +1,7 @@
package org.dromara.property.mapper;
package org.dromara.property.mapper.attendanceMapper;
import org.dromara.property.domain.AttendanceFixedSchedule;
import org.dromara.property.domain.vo.AttendanceFixedScheduleVo;
import org.dromara.property.domain.vo.attendanceVo.AttendanceFixedScheduleVo;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
/**

4
ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/AttendanceGroupMapper.java → ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/attendanceMapper/AttendanceGroupMapper.java
View File

@@ -1,7 +1,7 @@
package org.dromara.property.mapper;
package org.dromara.property.mapper.attendanceMapper;
import org.dromara.property.domain.AttendanceGroup;
import org.dromara.property.domain.vo.AttendanceGroupVo;
import org.dromara.property.domain.vo.attendanceVo.AttendanceGroupVo;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
/**

4
ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/AttendanceScheduleCycleMapper.java → ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/attendanceMapper/AttendanceScheduleCycleMapper.java
View File

@@ -1,7 +1,7 @@
package org.dromara.property.mapper;
package org.dromara.property.mapper.attendanceMapper;
import org.dromara.property.domain.AttendanceScheduleCycle;
import org.dromara.property.domain.vo.AttendanceScheduleCycleVo;
import org.dromara.property.domain.vo.attendanceVo.AttendanceScheduleCycleVo;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
/**

4
ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/AttendanceShiftMapper.java → ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/attendanceMapper/AttendanceShiftMapper.java
View File

@@ -1,7 +1,7 @@
package org.dromara.property.mapper;
package org.dromara.property.mapper.attendanceMapper;
import org.dromara.property.domain.AttendanceShift;
import org.dromara.property.domain.vo.AttendanceShiftVo;
import org.dromara.property.domain.vo.attendanceVo.AttendanceShiftVo;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
/**

4
ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/AttendanceShiftScheduleMapper.java → ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/attendanceMapper/AttendanceShiftScheduleMapper.java
View File

@@ -1,7 +1,7 @@
package org.dromara.property.mapper;
package org.dromara.property.mapper.attendanceMapper;
import org.dromara.property.domain.AttendanceShiftSchedule;
import org.dromara.property.domain.vo.AttendanceShiftScheduleVo;
import org.dromara.property.domain.vo.attendanceVo.AttendanceShiftScheduleVo;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
/**

4
ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/AttendanceUserGroupMapper.java → ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/attendanceMapper/AttendanceUserGroupMapper.java
View File

@@ -1,7 +1,7 @@
package org.dromara.property.mapper;
package org.dromara.property.mapper.attendanceMapper;
import org.dromara.property.domain.AttendanceUserGroup;
import org.dromara.property.domain.vo.AttendanceUserGroupVo;
import org.dromara.property.domain.vo.attendanceVo.AttendanceUserGroupVo;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
/**

4
ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/AttendanceWeekSetMapper.java → ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/attendanceMapper/AttendanceWeekSetMapper.java
View File

@@ -1,7 +1,7 @@
package org.dromara.property.mapper;
package org.dromara.property.mapper.attendanceMapper;
import org.dromara.property.domain.AttendanceWeekSet;
import org.dromara.property.domain.vo.AttendanceWeekSetVo;
import org.dromara.property.domain.vo.attendanceVo.AttendanceWeekSetVo;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
/**

4
ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/AttendanceWeeksetShiftMapper.java → ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/attendanceMapper/AttendanceWeeksetShiftMapper.java
View File

@@ -1,7 +1,7 @@
package org.dromara.property.mapper;
package org.dromara.property.mapper.attendanceMapper;
import org.dromara.property.domain.AttendanceWeeksetShift;
import org.dromara.property.domain.vo.AttendanceWeeksetShiftVo;
import org.dromara.property.domain.vo.attendanceVo.AttendanceWeeksetShiftVo;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
/**

7
ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/CleanMapper.java → ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/cleanOrderMapper/CleanMapper.java
View File

@@ -1,13 +1,10 @@
package org.dromara.property.mapper;
package org.dromara.property.mapper.cleanOrderMapper;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Select;
import org.dromara.property.domain.Clean;
import org.dromara.property.domain.vo.CleanVo;
import org.dromara.property.domain.vo.cleanOrderVo.CleanVo;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
import java.util.List;
/**
* 保洁管理Mapper接口
*

4
ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/CleanOrderMapper.java → ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/cleanOrderMapper/CleanOrderMapper.java
View File

@@ -1,10 +1,10 @@
package org.dromara.property.mapper;
package org.dromara.property.mapper.cleanOrderMapper;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.ibatis.annotations.Mapper;
import org.dromara.property.domain.CleanOrder;
import org.dromara.property.domain.vo.CleanOrderVo;
import org.dromara.property.domain.vo.cleanOrderVo.CleanOrderVo;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
/**

4
ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/CleanRelationMapper.java → ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/cleanOrderMapper/CleanRelationMapper.java
View File

@@ -1,10 +1,10 @@
package org.dromara.property.mapper;
package org.dromara.property.mapper.cleanOrderMapper;
import org.apache.ibatis.annotations.Insert;
import org.apache.ibatis.annotations.Mapper;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
import org.dromara.property.domain.CleanRelation;
import org.dromara.property.domain.vo.CleanRelationVo;
import org.dromara.property.domain.vo.cleanOrderVo.CleanRelationVo;
/**
* 保洁-保洁关系表Mapper接口

4
ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/CleanserverOrderMapper.java → ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/cleanOrderMapper/CleanserverOrderMapper.java
View File

@@ -1,8 +1,8 @@
package org.dromara.property.mapper;
package org.dromara.property.mapper.cleanOrderMapper;
import org.apache.ibatis.annotations.Mapper;
import org.dromara.property.domain.CleanserverOrder;
import org.dromara.property.domain.vo.CleanserverOrderVo;
import org.dromara.property.domain.vo.cleanOrderVo.CleanserverOrderVo;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
/**

7
ruoyi-modules/Property/src/main/java/org/dromara/property/service/IAttendanceAreaDeviceService.java → ruoyi-modules/Property/src/main/java/org/dromara/property/service/attendanceService/IAttendanceAreaDeviceService.java
View File

@@ -1,8 +1,7 @@
package org.dromara.property.service;
package org.dromara.property.service.attendanceService;
import org.dromara.property.domain.AttendanceAreaDevice;
import org.dromara.property.domain.vo.AttendanceAreaDeviceVo;
import org.dromara.property.domain.bo.AttendanceAreaDeviceBo;
import org.dromara.property.domain.vo.attendanceVo.AttendanceAreaDeviceVo;
import org.dromara.property.domain.bo.attendanceBo.AttendanceAreaDeviceBo;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.mybatis.core.page.PageQuery;

7
ruoyi-modules/Property/src/main/java/org/dromara/property/service/IAttendanceAreaService.java → ruoyi-modules/Property/src/main/java/org/dromara/property/service/attendanceService/IAttendanceAreaService.java
View File

@@ -1,8 +1,7 @@
package org.dromara.property.service;
package org.dromara.property.service.attendanceService;
import org.dromara.property.domain.AttendanceArea;
import org.dromara.property.domain.vo.AttendanceAreaVo;
import org.dromara.property.domain.bo.AttendanceAreaBo;
import org.dromara.property.domain.vo.attendanceVo.AttendanceAreaVo;
import org.dromara.property.domain.bo.attendanceBo.AttendanceAreaBo;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.mybatis.core.page.PageQuery;

7
ruoyi-modules/Property/src/main/java/org/dromara/property/service/IAttendanceArrangementAreaService.java → ruoyi-modules/Property/src/main/java/org/dromara/property/service/attendanceService/IAttendanceArrangementAreaService.java
View File

@@ -1,8 +1,7 @@
package org.dromara.property.service;
package org.dromara.property.service.attendanceService;
import org.dromara.property.domain.AttendanceArrangementArea;
import org.dromara.property.domain.vo.AttendanceArrangementAreaVo;
import org.dromara.property.domain.bo.AttendanceArrangementAreaBo;
import org.dromara.property.domain.vo.attendanceVo.AttendanceArrangementAreaVo;
import org.dromara.property.domain.bo.attendanceBo.AttendanceArrangementAreaBo;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.mybatis.core.page.PageQuery;

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

@@ -1,12 +1,11 @@
package org.dromara.property.service;
package org.dromara.property.service.attendanceService;
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 org.dromara.property.domain.bo.attendanceBo.AttendanceArrangementBo;
import org.dromara.property.domain.vo.attendanceVo.AttendanceArrangementVo;
import java.util.Collection;
import java.util.List;
/**
* 排班Service接口

7
ruoyi-modules/Property/src/main/java/org/dromara/property/service/IAttendanceClockDateService.java → ruoyi-modules/Property/src/main/java/org/dromara/property/service/attendanceService/IAttendanceClockDateService.java
View File

@@ -1,8 +1,7 @@
package org.dromara.property.service;
package org.dromara.property.service.attendanceService;
import org.dromara.property.domain.AttendanceClockDate;
import org.dromara.property.domain.vo.AttendanceClockDateVo;
import org.dromara.property.domain.bo.AttendanceClockDateBo;
import org.dromara.property.domain.vo.attendanceVo.AttendanceClockDateVo;
import org.dromara.property.domain.bo.attendanceBo.AttendanceClockDateBo;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.mybatis.core.page.PageQuery;

7
ruoyi-modules/Property/src/main/java/org/dromara/property/service/IAttendanceFixedScheduleService.java → ruoyi-modules/Property/src/main/java/org/dromara/property/service/attendanceService/IAttendanceFixedScheduleService.java
View File

@@ -1,8 +1,7 @@
package org.dromara.property.service;
package org.dromara.property.service.attendanceService;
import org.dromara.property.domain.AttendanceFixedSchedule;
import org.dromara.property.domain.vo.AttendanceFixedScheduleVo;
import org.dromara.property.domain.bo.AttendanceFixedScheduleBo;
import org.dromara.property.domain.vo.attendanceVo.AttendanceFixedScheduleVo;
import org.dromara.property.domain.bo.attendanceBo.AttendanceFixedScheduleBo;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.mybatis.core.page.PageQuery;

7
ruoyi-modules/Property/src/main/java/org/dromara/property/service/IAttendanceGroupService.java → ruoyi-modules/Property/src/main/java/org/dromara/property/service/attendanceService/IAttendanceGroupService.java
View File

@@ -1,8 +1,7 @@
package org.dromara.property.service;
package org.dromara.property.service.attendanceService;
import org.dromara.property.domain.AttendanceGroup;
import org.dromara.property.domain.vo.AttendanceGroupVo;
import org.dromara.property.domain.bo.AttendanceGroupBo;
import org.dromara.property.domain.vo.attendanceVo.AttendanceGroupVo;
import org.dromara.property.domain.bo.attendanceBo.AttendanceGroupBo;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.mybatis.core.page.PageQuery;

7
ruoyi-modules/Property/src/main/java/org/dromara/property/service/IAttendanceScheduleCycleService.java → ruoyi-modules/Property/src/main/java/org/dromara/property/service/attendanceService/IAttendanceScheduleCycleService.java
View File

@@ -1,8 +1,7 @@
package org.dromara.property.service;
package org.dromara.property.service.attendanceService;
import org.dromara.property.domain.AttendanceScheduleCycle;
import org.dromara.property.domain.vo.AttendanceScheduleCycleVo;
import org.dromara.property.domain.bo.AttendanceScheduleCycleBo;
import org.dromara.property.domain.vo.attendanceVo.AttendanceScheduleCycleVo;
import org.dromara.property.domain.bo.attendanceBo.AttendanceScheduleCycleBo;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.mybatis.core.page.PageQuery;

7
ruoyi-modules/Property/src/main/java/org/dromara/property/service/IAttendanceShiftScheduleService.java → ruoyi-modules/Property/src/main/java/org/dromara/property/service/attendanceService/IAttendanceShiftScheduleService.java
View File

@@ -1,8 +1,7 @@
package org.dromara.property.service;
package org.dromara.property.service.attendanceService;
import org.dromara.property.domain.AttendanceShiftSchedule;
import org.dromara.property.domain.vo.AttendanceShiftScheduleVo;
import org.dromara.property.domain.bo.AttendanceShiftScheduleBo;
import org.dromara.property.domain.vo.attendanceVo.AttendanceShiftScheduleVo;
import org.dromara.property.domain.bo.attendanceBo.AttendanceShiftScheduleBo;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.mybatis.core.page.PageQuery;

7
ruoyi-modules/Property/src/main/java/org/dromara/property/service/IAttendanceShiftService.java → ruoyi-modules/Property/src/main/java/org/dromara/property/service/attendanceService/IAttendanceShiftService.java
View File

@@ -1,8 +1,7 @@
package org.dromara.property.service;
package org.dromara.property.service.attendanceService;
import org.dromara.property.domain.AttendanceShift;
import org.dromara.property.domain.vo.AttendanceShiftVo;
import org.dromara.property.domain.bo.AttendanceShiftBo;
import org.dromara.property.domain.vo.attendanceVo.AttendanceShiftVo;
import org.dromara.property.domain.bo.attendanceBo.AttendanceShiftBo;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.mybatis.core.page.PageQuery;

7
ruoyi-modules/Property/src/main/java/org/dromara/property/service/IAttendanceUserGroupService.java → ruoyi-modules/Property/src/main/java/org/dromara/property/service/attendanceService/IAttendanceUserGroupService.java
View File

@@ -1,10 +1,9 @@
package org.dromara.property.service;
package org.dromara.property.service.attendanceService;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.property.domain.AttendanceUserGroup;
import org.dromara.property.domain.bo.AttendanceUserGroupBo;
import org.dromara.property.domain.vo.AttendanceUserGroupVo;
import org.dromara.property.domain.bo.attendanceBo.AttendanceUserGroupBo;
import org.dromara.property.domain.vo.attendanceVo.AttendanceUserGroupVo;
import java.util.Collection;
import java.util.Date;

7
ruoyi-modules/Property/src/main/java/org/dromara/property/service/IAttendanceWeekSetService.java → ruoyi-modules/Property/src/main/java/org/dromara/property/service/attendanceService/IAttendanceWeekSetService.java
View File

@@ -1,8 +1,7 @@
package org.dromara.property.service;
package org.dromara.property.service.attendanceService;
import org.dromara.property.domain.AttendanceWeekSet;
import org.dromara.property.domain.vo.AttendanceWeekSetVo;
import org.dromara.property.domain.bo.AttendanceWeekSetBo;
import org.dromara.property.domain.vo.attendanceVo.AttendanceWeekSetVo;
import org.dromara.property.domain.bo.attendanceBo.AttendanceWeekSetBo;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.mybatis.core.page.PageQuery;

7
ruoyi-modules/Property/src/main/java/org/dromara/property/service/IAttendanceWeeksetShiftService.java → ruoyi-modules/Property/src/main/java/org/dromara/property/service/attendanceService/IAttendanceWeeksetShiftService.java
View File

@@ -1,8 +1,7 @@
package org.dromara.property.service;
package org.dromara.property.service.attendanceService;
import org.dromara.property.domain.AttendanceWeeksetShift;
import org.dromara.property.domain.vo.AttendanceWeeksetShiftVo;
import org.dromara.property.domain.bo.AttendanceWeeksetShiftBo;
import org.dromara.property.domain.vo.attendanceVo.AttendanceWeeksetShiftVo;
import org.dromara.property.domain.bo.attendanceBo.AttendanceWeeksetShiftBo;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.mybatis.core.page.PageQuery;

7
ruoyi-modules/Property/src/main/java/org/dromara/property/service/ICleanOrderService.java → ruoyi-modules/Property/src/main/java/org/dromara/property/service/cleanOrderService/ICleanOrderService.java
View File

@@ -1,8 +1,7 @@
package org.dromara.property.service;
package org.dromara.property.service.cleanOrderService;
import org.dromara.property.domain.CleanOrder;
import org.dromara.property.domain.vo.CleanOrderVo;
import org.dromara.property.domain.bo.CleanOrderBo;
import org.dromara.property.domain.vo.cleanOrderVo.CleanOrderVo;
import org.dromara.property.domain.bo.cleanOrderBo.CleanOrderBo;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.mybatis.core.page.PageQuery;

7
ruoyi-modules/Property/src/main/java/org/dromara/property/service/ICleanService.java → ruoyi-modules/Property/src/main/java/org/dromara/property/service/cleanOrderService/ICleanService.java
View File

@@ -1,8 +1,7 @@
package org.dromara.property.service;
package org.dromara.property.service.cleanOrderService;
import org.dromara.property.domain.Clean;
import org.dromara.property.domain.vo.CleanVo;
import org.dromara.property.domain.bo.CleanBo;
import org.dromara.property.domain.vo.cleanOrderVo.CleanVo;
import org.dromara.property.domain.bo.cleanOrderBo.CleanBo;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.mybatis.core.page.PageQuery;

7
ruoyi-modules/Property/src/main/java/org/dromara/property/service/ICleanserverOrderService.java → ruoyi-modules/Property/src/main/java/org/dromara/property/service/cleanOrderService/ICleanserverOrderService.java
View File

@@ -1,8 +1,7 @@
package org.dromara.property.service;
package org.dromara.property.service.cleanOrderService;
import org.dromara.property.domain.CleanserverOrder;
import org.dromara.property.domain.vo.CleanserverOrderVo;
import org.dromara.property.domain.bo.CleanserverOrderBo;
import org.dromara.property.domain.vo.cleanOrderVo.CleanserverOrderVo;
import org.dromara.property.domain.bo.cleanOrderBo.CleanserverOrderBo;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.mybatis.core.page.PageQuery;

11
ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AttendanceAreaDeviceServiceImpl.java → ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/attendanceImpl/AttendanceAreaDeviceServiceImpl.java
View File

@@ -1,7 +1,6 @@
package org.dromara.property.service.impl;
package org.dromara.property.service.impl.attendanceImpl;
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;
@@ -10,11 +9,11 @@ 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.AttendanceAreaDeviceBo;
import org.dromara.property.domain.vo.AttendanceAreaDeviceVo;
import org.dromara.property.domain.bo.attendanceBo.AttendanceAreaDeviceBo;
import org.dromara.property.domain.vo.attendanceVo.AttendanceAreaDeviceVo;
import org.dromara.property.domain.AttendanceAreaDevice;
import org.dromara.property.mapper.AttendanceAreaDeviceMapper;
import org.dromara.property.service.IAttendanceAreaDeviceService;
import org.dromara.property.mapper.attendanceMapper.AttendanceAreaDeviceMapper;
import org.dromara.property.service.attendanceService.IAttendanceAreaDeviceService;
import java.util.List;
import java.util.Map;

14
ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AttendanceAreaServiceImpl.java → ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/attendanceImpl/AttendanceAreaServiceImpl.java
View File

@@ -1,4 +1,4 @@
package org.dromara.property.service.impl;
package org.dromara.property.service.impl.attendanceImpl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -12,12 +12,12 @@ import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.property.domain.AttendanceArea;
import org.dromara.property.domain.AttendanceAreaDevice;
import org.dromara.property.domain.bo.AttendanceAreaBo;
import org.dromara.property.domain.vo.AttendanceAreaDeviceVo;
import org.dromara.property.domain.vo.AttendanceAreaVo;
import org.dromara.property.mapper.AttendanceAreaDeviceMapper;
import org.dromara.property.mapper.AttendanceAreaMapper;
import org.dromara.property.service.IAttendanceAreaService;
import org.dromara.property.domain.bo.attendanceBo.AttendanceAreaBo;
import org.dromara.property.domain.vo.attendanceVo.AttendanceAreaDeviceVo;
import org.dromara.property.domain.vo.attendanceVo.AttendanceAreaVo;
import org.dromara.property.mapper.attendanceMapper.AttendanceAreaDeviceMapper;
import org.dromara.property.mapper.attendanceMapper.AttendanceAreaMapper;
import org.dromara.property.service.attendanceService.IAttendanceAreaService;
import org.dromara.sis.api.RemoteDeviceService;
import org.dromara.sis.api.domain.RemoteSisDeviceManage;
import org.springframework.stereotype.Service;

11
ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AttendanceArrangementAreaServiceImpl.java → ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/attendanceImpl/AttendanceArrangementAreaServiceImpl.java
View File

@@ -1,7 +1,6 @@
package org.dromara.property.service.impl;
package org.dromara.property.service.impl.attendanceImpl;
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;
@@ -10,11 +9,11 @@ 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.AttendanceArrangementAreaBo;
import org.dromara.property.domain.vo.AttendanceArrangementAreaVo;
import org.dromara.property.domain.bo.attendanceBo.AttendanceArrangementAreaBo;
import org.dromara.property.domain.vo.attendanceVo.AttendanceArrangementAreaVo;
import org.dromara.property.domain.AttendanceArrangementArea;
import org.dromara.property.mapper.AttendanceArrangementAreaMapper;
import org.dromara.property.service.IAttendanceArrangementAreaService;
import org.dromara.property.mapper.attendanceMapper.AttendanceArrangementAreaMapper;
import org.dromara.property.service.attendanceService.IAttendanceArrangementAreaService;
import java.util.List;
import java.util.Map;

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

@@ -1,7 +1,6 @@
package org.dromara.property.service.impl;
package org.dromara.property.service.impl.attendanceImpl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.RequiredArgsConstructor;
@@ -12,19 +11,18 @@ 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.bo.attendanceBo.AttendanceArrangementBo;
import org.dromara.property.domain.constant.StatusConstant;
import org.dromara.property.domain.vo.AttendanceArrangementVo;
import org.dromara.property.domain.vo.AttendanceUserGroupVo;
import org.dromara.property.mapper.*;
import org.dromara.property.service.IAttendanceArrangementService;
import org.dromara.property.domain.vo.attendanceVo.AttendanceArrangementVo;
import org.dromara.property.domain.vo.attendanceVo.AttendanceUserGroupVo;
import org.dromara.property.mapper.attendanceMapper.*;
import org.dromara.property.service.attendanceService.IAttendanceArrangementService;
import org.dromara.system.api.RemoteUserService;
import org.dromara.system.api.domain.vo.RemoteUserVo;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.time.LocalDate;
import java.time.Month;
import java.time.ZoneId;
import java.util.*;
import java.util.stream.Collectors;

10
ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AttendanceClockDateServiceImpl.java → ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/attendanceImpl/AttendanceClockDateServiceImpl.java
View File

@@ -1,4 +1,4 @@
package org.dromara.property.service.impl;
package org.dromara.property.service.impl.attendanceImpl;
import org.dromara.common.core.utils.MapstructUtils;
import org.dromara.common.core.utils.StringUtils;
@@ -10,11 +10,11 @@ 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.AttendanceClockDateBo;
import org.dromara.property.domain.vo.AttendanceClockDateVo;
import org.dromara.property.domain.bo.attendanceBo.AttendanceClockDateBo;
import org.dromara.property.domain.vo.attendanceVo.AttendanceClockDateVo;
import org.dromara.property.domain.AttendanceClockDate;
import org.dromara.property.mapper.AttendanceClockDateMapper;
import org.dromara.property.service.IAttendanceClockDateService;
import org.dromara.property.mapper.attendanceMapper.AttendanceClockDateMapper;
import org.dromara.property.service.attendanceService.IAttendanceClockDateService;
import java.util.List;
import java.util.Map;

10
ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AttendanceFixedScheduleServiceImpl.java → ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/attendanceImpl/AttendanceFixedScheduleServiceImpl.java
View File

@@ -1,4 +1,4 @@
package org.dromara.property.service.impl;
package org.dromara.property.service.impl.attendanceImpl;
import org.dromara.common.core.utils.MapstructUtils;
import org.dromara.common.core.utils.StringUtils;
@@ -10,11 +10,11 @@ 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.AttendanceFixedScheduleBo;
import org.dromara.property.domain.vo.AttendanceFixedScheduleVo;
import org.dromara.property.domain.bo.attendanceBo.AttendanceFixedScheduleBo;
import org.dromara.property.domain.vo.attendanceVo.AttendanceFixedScheduleVo;
import org.dromara.property.domain.AttendanceFixedSchedule;
import org.dromara.property.mapper.AttendanceFixedScheduleMapper;
import org.dromara.property.service.IAttendanceFixedScheduleService;
import org.dromara.property.mapper.attendanceMapper.AttendanceFixedScheduleMapper;
import org.dromara.property.service.attendanceService.IAttendanceFixedScheduleService;
import java.util.List;
import java.util.Map;

10
ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AttendanceGroupServiceImpl.java → ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/attendanceImpl/AttendanceGroupServiceImpl.java
View File

@@ -1,4 +1,4 @@
package org.dromara.property.service.impl;
package org.dromara.property.service.impl.attendanceImpl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -10,11 +10,11 @@ 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.AttendanceGroupBo;
import org.dromara.property.domain.bo.attendanceBo.AttendanceGroupBo;
import org.dromara.property.domain.constant.StatusConstant;
import org.dromara.property.domain.vo.AttendanceGroupVo;
import org.dromara.property.mapper.*;
import org.dromara.property.service.IAttendanceGroupService;
import org.dromara.property.domain.vo.attendanceVo.AttendanceGroupVo;
import org.dromara.property.mapper.attendanceMapper.*;
import org.dromara.property.service.attendanceService.IAttendanceGroupService;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

11
ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AttendanceScheduleCycleServiceImpl.java → ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/attendanceImpl/AttendanceScheduleCycleServiceImpl.java
View File

@@ -1,7 +1,6 @@
package org.dromara.property.service.impl;
package org.dromara.property.service.impl.attendanceImpl;
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;
@@ -10,11 +9,11 @@ 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.AttendanceScheduleCycleBo;
import org.dromara.property.domain.vo.AttendanceScheduleCycleVo;
import org.dromara.property.domain.bo.attendanceBo.AttendanceScheduleCycleBo;
import org.dromara.property.domain.vo.attendanceVo.AttendanceScheduleCycleVo;
import org.dromara.property.domain.AttendanceScheduleCycle;
import org.dromara.property.mapper.AttendanceScheduleCycleMapper;
import org.dromara.property.service.IAttendanceScheduleCycleService;
import org.dromara.property.mapper.attendanceMapper.AttendanceScheduleCycleMapper;
import org.dromara.property.service.attendanceService.IAttendanceScheduleCycleService;
import java.util.List;
import java.util.Map;

10
ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AttendanceShiftScheduleServiceImpl.java → ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/attendanceImpl/AttendanceShiftScheduleServiceImpl.java
View File

@@ -1,4 +1,4 @@
package org.dromara.property.service.impl;
package org.dromara.property.service.impl.attendanceImpl;
import org.dromara.common.core.utils.MapstructUtils;
import org.dromara.common.core.utils.StringUtils;
@@ -10,11 +10,11 @@ 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.AttendanceShiftScheduleBo;
import org.dromara.property.domain.vo.AttendanceShiftScheduleVo;
import org.dromara.property.domain.bo.attendanceBo.AttendanceShiftScheduleBo;
import org.dromara.property.domain.vo.attendanceVo.AttendanceShiftScheduleVo;
import org.dromara.property.domain.AttendanceShiftSchedule;
import org.dromara.property.mapper.AttendanceShiftScheduleMapper;
import org.dromara.property.service.IAttendanceShiftScheduleService;
import org.dromara.property.mapper.attendanceMapper.AttendanceShiftScheduleMapper;
import org.dromara.property.service.attendanceService.IAttendanceShiftScheduleService;
import java.util.List;
import java.util.Map;

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

@@ -1,4 +1,4 @@
package org.dromara.property.service.impl;
package org.dromara.property.service.impl.attendanceImpl;
import org.dromara.common.core.utils.MapstructUtils;
import org.dromara.common.core.utils.StringUtils;
@@ -11,11 +11,11 @@ import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.dromara.property.domain.constant.StatusConstant;
import org.springframework.stereotype.Service;
import org.dromara.property.domain.bo.AttendanceShiftBo;
import org.dromara.property.domain.vo.AttendanceShiftVo;
import org.dromara.property.domain.bo.attendanceBo.AttendanceShiftBo;
import org.dromara.property.domain.vo.attendanceVo.AttendanceShiftVo;
import org.dromara.property.domain.AttendanceShift;
import org.dromara.property.mapper.AttendanceShiftMapper;
import org.dromara.property.service.IAttendanceShiftService;
import org.dromara.property.mapper.attendanceMapper.AttendanceShiftMapper;
import org.dromara.property.service.attendanceService.IAttendanceShiftService;
import java.util.List;
import java.util.Map;

10
ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AttendanceUserGroupServiceImpl.java → ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/attendanceImpl/AttendanceUserGroupServiceImpl.java
View File

@@ -1,4 +1,4 @@
package org.dromara.property.service.impl;
package org.dromara.property.service.impl.attendanceImpl;
import cn.hutool.core.collection.CollUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -11,11 +11,11 @@ import org.dromara.common.core.utils.MapstructUtils;
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.AttendanceUserGroupBo;
import org.dromara.property.domain.bo.attendanceBo.AttendanceUserGroupBo;
import org.dromara.property.domain.constant.StatusConstant;
import org.dromara.property.domain.vo.AttendanceUserGroupVo;
import org.dromara.property.mapper.*;
import org.dromara.property.service.IAttendanceUserGroupService;
import org.dromara.property.domain.vo.attendanceVo.AttendanceUserGroupVo;
import org.dromara.property.mapper.attendanceMapper.*;
import org.dromara.property.service.attendanceService.IAttendanceUserGroupService;
import org.dromara.system.api.RemoteDeptService;
import org.dromara.system.api.RemoteUserService;
import org.dromara.system.api.domain.vo.RemoteDeptVo;

11
ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AttendanceWeekSetServiceImpl.java → ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/attendanceImpl/AttendanceWeekSetServiceImpl.java
View File

@@ -1,7 +1,6 @@
package org.dromara.property.service.impl;
package org.dromara.property.service.impl.attendanceImpl;
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;
@@ -10,11 +9,11 @@ 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.AttendanceWeekSetBo;
import org.dromara.property.domain.vo.AttendanceWeekSetVo;
import org.dromara.property.domain.bo.attendanceBo.AttendanceWeekSetBo;
import org.dromara.property.domain.vo.attendanceVo.AttendanceWeekSetVo;
import org.dromara.property.domain.AttendanceWeekSet;
import org.dromara.property.mapper.AttendanceWeekSetMapper;
import org.dromara.property.service.IAttendanceWeekSetService;
import org.dromara.property.mapper.attendanceMapper.AttendanceWeekSetMapper;
import org.dromara.property.service.attendanceService.IAttendanceWeekSetService;
import java.util.List;
import java.util.Map;

Some files were not shown because too many files have changed in this diff Show More