From 5c9672dc1810c4fddb7632d871abd518ba3777db Mon Sep 17 00:00:00 2001 From: dy <2389062315@qq.com> Date: Wed, 20 Aug 2025 23:51:53 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=86=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AttendanceAreaController.java | 8 ++++---- .../AttendanceAreaDeviceController.java | 8 ++++---- .../AttendanceArrangementAreaController.java | 8 ++++---- .../AttendanceArrangementController.java | 8 ++++---- .../AttendanceClockDateController.java | 8 ++++---- .../AttendanceFixedScheduleController.java | 8 ++++---- .../AttendanceGroupController.java | 8 ++++---- .../AttendanceScheduleCycleController.java | 8 ++++---- .../AttendanceShiftController.java | 8 ++++---- .../AttendanceShiftScheduleController.java | 8 ++++---- .../AttendanceUserGroupController.java | 8 ++++---- .../AttendanceWeekSetController.java | 8 ++++---- .../AttendanceWeeksetShiftController.java | 8 ++++---- .../{ => cleanOrder}/CleanController.java | 8 ++++---- .../{ => cleanOrder}/CleanOrderController.java | 9 ++++----- .../CleanserverOrderController.java | 8 ++++---- .../property/domain/AttendanceArrangement.java | 2 -- .../property/domain/AttendanceClockDate.java | 1 - .../property/domain/AttendanceGroup.java | 1 - .../property/domain/AttendanceShift.java | 4 ---- .../bo/{ => attendanceBo}/AttendanceAreaBo.java | 3 +-- .../AttendanceAreaDeviceBo.java | 3 +-- .../AttendanceArrangementAreaBo.java | 3 +-- .../AttendanceArrangementBo.java | 3 +-- .../AttendanceClockDateBo.java | 4 +--- .../AttendanceFixedScheduleBo.java | 3 +-- .../{ => attendanceBo}/AttendanceGroupBo.java | 4 +--- .../AttendanceScheduleCycleBo.java | 3 +-- .../{ => attendanceBo}/AttendanceShiftBo.java | 8 ++------ .../AttendanceShiftScheduleBo.java | 2 +- .../AttendanceUserGroupBo.java | 4 +--- .../{ => attendanceBo}/AttendanceWeekSetBo.java | 3 +-- .../AttendanceWeeksetShiftBo.java | 3 +-- .../domain/bo/{ => cleanOrderBo}/CleanBo.java | 4 +--- .../bo/{ => cleanOrderBo}/CleanOrderBo.java | 5 +---- .../bo/{ => cleanOrderBo}/CleanRelationBo.java | 3 +-- .../{ => cleanOrderBo}/CleanserverOrderBo.java | 3 +-- .../AttendanceAreaDeviceVo.java | 6 +----- .../vo/{ => attendanceVo}/AttendanceAreaVo.java | 6 +----- .../AttendanceArrangementAreaVo.java | 6 +----- .../AttendanceArrangementVo.java | 3 +-- .../AttendanceClockDateVo.java | 6 ++---- .../AttendanceFixedScheduleVo.java | 6 +----- .../{ => attendanceVo}/AttendanceGroupVo.java | 7 ++----- .../AttendanceScheduleCycleVo.java | 6 +----- .../AttendanceShiftScheduleVo.java | 6 +----- .../{ => attendanceVo}/AttendanceShiftVo.java | 7 +------ .../AttendanceUserGroupVo.java | 2 +- .../{ => attendanceVo}/AttendanceWeekSetVo.java | 4 +--- .../AttendanceWeeksetShiftVo.java | 6 +----- .../vo/{ => cleanOrderVo}/CleanOrderVo.java | 9 +-------- .../vo/{ => cleanOrderVo}/CleanRelationVo.java | 2 +- .../domain/vo/{ => cleanOrderVo}/CleanVo.java | 9 +-------- .../{ => cleanOrderVo}/CleanserverOrderVo.java | 6 +----- .../dubbo/RemoteAttendanceServiceImpl.java | 5 ++--- .../AttendanceAreaDeviceMapper.java | 4 ++-- .../AttendanceAreaMapper.java | 4 ++-- .../AttendanceArrangementAreaMapper.java | 4 ++-- .../AttendanceArrangementMapper.java | 4 ++-- .../AttendanceClockDateMapper.java | 4 ++-- .../AttendanceFixedScheduleMapper.java | 4 ++-- .../AttendanceGroupMapper.java | 4 ++-- .../AttendanceScheduleCycleMapper.java | 4 ++-- .../AttendanceShiftMapper.java | 4 ++-- .../AttendanceShiftScheduleMapper.java | 4 ++-- .../AttendanceUserGroupMapper.java | 4 ++-- .../AttendanceWeekSetMapper.java | 4 ++-- .../AttendanceWeeksetShiftMapper.java | 4 ++-- .../{ => cleanOrderMapper}/CleanMapper.java | 7 ++----- .../CleanOrderMapper.java | 4 ++-- .../CleanRelationMapper.java | 4 ++-- .../CleanserverOrderMapper.java | 4 ++-- .../IAttendanceAreaDeviceService.java | 7 +++---- .../IAttendanceAreaService.java | 7 +++---- .../IAttendanceArrangementAreaService.java | 7 +++---- .../IAttendanceArrangementService.java | 7 +++---- .../IAttendanceClockDateService.java | 7 +++---- .../IAttendanceFixedScheduleService.java | 7 +++---- .../IAttendanceGroupService.java | 7 +++---- .../IAttendanceScheduleCycleService.java | 7 +++---- .../IAttendanceShiftScheduleService.java | 7 +++---- .../IAttendanceShiftService.java | 7 +++---- .../IAttendanceUserGroupService.java | 7 +++---- .../IAttendanceWeekSetService.java | 7 +++---- .../IAttendanceWeeksetShiftService.java | 7 +++---- .../ICleanOrderService.java | 7 +++---- .../{ => cleanOrderService}/ICleanService.java | 7 +++---- .../ICleanserverOrderService.java | 7 +++---- .../AttendanceAreaDeviceServiceImpl.java | 11 +++++------ .../AttendanceAreaServiceImpl.java | 14 +++++++------- .../AttendanceArrangementAreaServiceImpl.java | 11 +++++------ .../AttendanceArrangementServiceImpl.java | 14 ++++++-------- .../AttendanceClockDateServiceImpl.java | 10 +++++----- .../AttendanceFixedScheduleServiceImpl.java | 10 +++++----- .../AttendanceGroupServiceImpl.java | 10 +++++----- .../AttendanceScheduleCycleServiceImpl.java | 11 +++++------ .../AttendanceShiftScheduleServiceImpl.java | 10 +++++----- .../AttendanceShiftServiceImpl.java | 10 +++++----- .../AttendanceUserGroupServiceImpl.java | 10 +++++----- .../AttendanceWeekSetServiceImpl.java | 11 +++++------ .../AttendanceWeeksetShiftServiceImpl.java | 11 +++++------ .../CleanOrderServiceImpl.java | 17 ++++++++--------- .../{ => cleanOrderImpl}/CleanServiceImpl.java | 10 +++++----- .../CleanserverOrderServiceImpl.java | 11 +++++------ .../property/tasks/ServiceWorkOrderTasks.java | 5 +---- .../Property/AttendanceArrangementMapper.xml | 2 +- .../Property/AttendanceClockDateMapper.xml | 2 +- .../Property/AttendanceFixedScheduleMapper.xml | 2 +- .../mapper/Property/AttendanceGroupMapper.xml | 2 +- .../Property/AttendanceScheduleCycleMapper.xml | 2 +- .../mapper/Property/AttendanceShiftMapper.xml | 2 +- .../Property/AttendanceShiftScheduleMapper.xml | 2 +- .../Property/AttendanceUserGroupMapper.xml | 2 +- .../mapper/Property/AttendanceWeekSetMapper.xml | 2 +- .../Property/AttendanceWeeksetShiftMapper.xml | 2 +- .../resources/mapper/Property/CleanMapper.xml | 2 +- .../mapper/Property/CleanOrderMapper.xml | 6 +++--- .../mapper/Property/CleanserverOrderMapper.xml | 2 +- 118 files changed, 287 insertions(+), 412 deletions(-) rename ruoyi-modules/Property/src/main/java/org/dromara/property/controller/{ => attendance}/AttendanceAreaController.java (92%) rename ruoyi-modules/Property/src/main/java/org/dromara/property/controller/{ => attendance}/AttendanceAreaDeviceController.java (92%) rename ruoyi-modules/Property/src/main/java/org/dromara/property/controller/{ => attendance}/AttendanceArrangementAreaController.java (92%) rename ruoyi-modules/Property/src/main/java/org/dromara/property/controller/{ => attendance}/AttendanceArrangementController.java (92%) rename ruoyi-modules/Property/src/main/java/org/dromara/property/controller/{ => attendance}/AttendanceClockDateController.java (92%) rename ruoyi-modules/Property/src/main/java/org/dromara/property/controller/{ => attendance}/AttendanceFixedScheduleController.java (92%) rename ruoyi-modules/Property/src/main/java/org/dromara/property/controller/{ => attendance}/AttendanceGroupController.java (93%) rename ruoyi-modules/Property/src/main/java/org/dromara/property/controller/{ => attendance}/AttendanceScheduleCycleController.java (92%) rename ruoyi-modules/Property/src/main/java/org/dromara/property/controller/{ => attendance}/AttendanceShiftController.java (92%) rename ruoyi-modules/Property/src/main/java/org/dromara/property/controller/{ => attendance}/AttendanceShiftScheduleController.java (92%) rename ruoyi-modules/Property/src/main/java/org/dromara/property/controller/{ => attendance}/AttendanceUserGroupController.java (93%) rename ruoyi-modules/Property/src/main/java/org/dromara/property/controller/{ => attendance}/AttendanceWeekSetController.java (92%) rename ruoyi-modules/Property/src/main/java/org/dromara/property/controller/{ => attendance}/AttendanceWeeksetShiftController.java (92%) rename ruoyi-modules/Property/src/main/java/org/dromara/property/controller/{ => cleanOrder}/CleanController.java (93%) rename ruoyi-modules/Property/src/main/java/org/dromara/property/controller/{ => cleanOrder}/CleanOrderController.java (92%) rename ruoyi-modules/Property/src/main/java/org/dromara/property/controller/{ => cleanOrder}/CleanserverOrderController.java (92%) rename ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/{ => attendanceBo}/AttendanceAreaBo.java (91%) rename ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/{ => attendanceBo}/AttendanceAreaDeviceBo.java (90%) rename ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/{ => attendanceBo}/AttendanceArrangementAreaBo.java (90%) rename ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/{ => attendanceBo}/AttendanceArrangementBo.java (97%) rename ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/{ => attendanceBo}/AttendanceClockDateBo.java (89%) rename ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/{ => attendanceBo}/AttendanceFixedScheduleBo.java (90%) rename ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/{ => attendanceBo}/AttendanceGroupBo.java (91%) rename ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/{ => attendanceBo}/AttendanceScheduleCycleBo.java (91%) rename ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/{ => attendanceBo}/AttendanceShiftBo.java (86%) rename ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/{ => attendanceBo}/AttendanceShiftScheduleBo.java (94%) rename ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/{ => attendanceBo}/AttendanceUserGroupBo.java (89%) rename ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/{ => attendanceBo}/AttendanceWeekSetBo.java (91%) rename ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/{ => attendanceBo}/AttendanceWeeksetShiftBo.java (91%) rename ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/{ => cleanOrderBo}/CleanBo.java (94%) rename ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/{ => cleanOrderBo}/CleanOrderBo.java (96%) rename ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/{ => cleanOrderBo}/CleanRelationBo.java (91%) rename ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/{ => cleanOrderBo}/CleanserverOrderBo.java (90%) rename ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/{ => attendanceVo}/AttendanceAreaDeviceVo.java (84%) rename ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/{ => attendanceVo}/AttendanceAreaVo.java (81%) rename ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/{ => attendanceVo}/AttendanceArrangementAreaVo.java (83%) rename ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/{ => attendanceVo}/AttendanceArrangementVo.java (97%) rename ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/{ => attendanceVo}/AttendanceClockDateVo.java (94%) rename ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/{ => attendanceVo}/AttendanceFixedScheduleVo.java (83%) rename ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/{ => attendanceVo}/AttendanceGroupVo.java (88%) rename ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/{ => attendanceVo}/AttendanceScheduleCycleVo.java (85%) rename ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/{ => attendanceVo}/AttendanceShiftScheduleVo.java (83%) rename ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/{ => attendanceVo}/AttendanceShiftVo.java (91%) rename ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/{ => attendanceVo}/AttendanceUserGroupVo.java (97%) rename ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/{ => attendanceVo}/AttendanceWeekSetVo.java (95%) rename ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/{ => attendanceVo}/AttendanceWeeksetShiftVo.java (85%) rename ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/{ => cleanOrderVo}/CleanOrderVo.java (89%) rename ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/{ => cleanOrderVo}/CleanRelationVo.java (95%) rename ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/{ => cleanOrderVo}/CleanVo.java (84%) rename ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/{ => cleanOrderVo}/CleanserverOrderVo.java (83%) rename ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/{ => attendanceMapper}/AttendanceAreaDeviceMapper.java (71%) rename ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/{ => attendanceMapper}/AttendanceAreaMapper.java (70%) rename ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/{ => attendanceMapper}/AttendanceArrangementAreaMapper.java (71%) rename ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/{ => attendanceMapper}/AttendanceArrangementMapper.java (92%) rename ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/{ => attendanceMapper}/AttendanceClockDateMapper.java (71%) rename ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/{ => attendanceMapper}/AttendanceFixedScheduleMapper.java (71%) rename ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/{ => attendanceMapper}/AttendanceGroupMapper.java (71%) rename ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/{ => attendanceMapper}/AttendanceScheduleCycleMapper.java (71%) rename ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/{ => attendanceMapper}/AttendanceShiftMapper.java (70%) rename ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/{ => attendanceMapper}/AttendanceShiftScheduleMapper.java (71%) rename ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/{ => attendanceMapper}/AttendanceUserGroupMapper.java (70%) rename ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/{ => attendanceMapper}/AttendanceWeekSetMapper.java (70%) rename ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/{ => attendanceMapper}/AttendanceWeeksetShiftMapper.java (71%) rename ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/{ => cleanOrderMapper}/CleanMapper.java (66%) rename ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/{ => cleanOrderMapper}/CleanOrderMapper.java (83%) rename ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/{ => cleanOrderMapper}/CleanRelationMapper.java (82%) rename ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/{ => cleanOrderMapper}/CleanserverOrderMapper.java (74%) rename ruoyi-modules/Property/src/main/java/org/dromara/property/service/{ => attendanceService}/IAttendanceAreaDeviceService.java (88%) rename ruoyi-modules/Property/src/main/java/org/dromara/property/service/{ => attendanceService}/IAttendanceAreaService.java (88%) rename ruoyi-modules/Property/src/main/java/org/dromara/property/service/{ => attendanceService}/IAttendanceArrangementAreaService.java (87%) rename ruoyi-modules/Property/src/main/java/org/dromara/property/service/{ => attendanceService}/IAttendanceArrangementService.java (88%) rename ruoyi-modules/Property/src/main/java/org/dromara/property/service/{ => attendanceService}/IAttendanceClockDateService.java (88%) rename ruoyi-modules/Property/src/main/java/org/dromara/property/service/{ => attendanceService}/IAttendanceFixedScheduleService.java (87%) rename ruoyi-modules/Property/src/main/java/org/dromara/property/service/{ => attendanceService}/IAttendanceGroupService.java (89%) rename ruoyi-modules/Property/src/main/java/org/dromara/property/service/{ => attendanceService}/IAttendanceScheduleCycleService.java (87%) rename ruoyi-modules/Property/src/main/java/org/dromara/property/service/{ => attendanceService}/IAttendanceShiftScheduleService.java (87%) rename ruoyi-modules/Property/src/main/java/org/dromara/property/service/{ => attendanceService}/IAttendanceShiftService.java (87%) rename ruoyi-modules/Property/src/main/java/org/dromara/property/service/{ => attendanceService}/IAttendanceUserGroupService.java (89%) rename ruoyi-modules/Property/src/main/java/org/dromara/property/service/{ => attendanceService}/IAttendanceWeekSetService.java (87%) rename ruoyi-modules/Property/src/main/java/org/dromara/property/service/{ => attendanceService}/IAttendanceWeeksetShiftService.java (87%) rename ruoyi-modules/Property/src/main/java/org/dromara/property/service/{ => cleanOrderService}/ICleanOrderService.java (88%) rename ruoyi-modules/Property/src/main/java/org/dromara/property/service/{ => cleanOrderService}/ICleanService.java (88%) rename ruoyi-modules/Property/src/main/java/org/dromara/property/service/{ => cleanOrderService}/ICleanserverOrderService.java (88%) rename ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/{ => attendanceImpl}/AttendanceAreaDeviceServiceImpl.java (91%) rename ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/{ => attendanceImpl}/AttendanceAreaServiceImpl.java (93%) rename ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/{ => attendanceImpl}/AttendanceArrangementAreaServiceImpl.java (91%) rename ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/{ => attendanceImpl}/AttendanceArrangementServiceImpl.java (98%) rename ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/{ => attendanceImpl}/AttendanceClockDateServiceImpl.java (92%) rename ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/{ => attendanceImpl}/AttendanceFixedScheduleServiceImpl.java (91%) rename ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/{ => attendanceImpl}/AttendanceGroupServiceImpl.java (98%) rename ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/{ => attendanceImpl}/AttendanceScheduleCycleServiceImpl.java (91%) rename ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/{ => attendanceImpl}/AttendanceShiftScheduleServiceImpl.java (91%) rename ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/{ => attendanceImpl}/AttendanceShiftServiceImpl.java (93%) rename ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/{ => attendanceImpl}/AttendanceUserGroupServiceImpl.java (97%) rename ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/{ => attendanceImpl}/AttendanceWeekSetServiceImpl.java (91%) rename ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/{ => attendanceImpl}/AttendanceWeeksetShiftServiceImpl.java (91%) rename ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/{ => cleanOrderImpl}/CleanOrderServiceImpl.java (94%) rename ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/{ => cleanOrderImpl}/CleanServiceImpl.java (92%) rename ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/{ => cleanOrderImpl}/CleanserverOrderServiceImpl.java (91%) diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/AttendanceAreaController.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/attendance/AttendanceAreaController.java similarity index 92% rename from ruoyi-modules/Property/src/main/java/org/dromara/property/controller/AttendanceAreaController.java rename to ruoyi-modules/Property/src/main/java/org/dromara/property/controller/attendance/AttendanceAreaController.java index e8a851a7..d6652797 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/AttendanceAreaController.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/attendance/AttendanceAreaController.java @@ -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; /** diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/AttendanceAreaDeviceController.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/attendance/AttendanceAreaDeviceController.java similarity index 92% rename from ruoyi-modules/Property/src/main/java/org/dromara/property/controller/AttendanceAreaDeviceController.java rename to ruoyi-modules/Property/src/main/java/org/dromara/property/controller/attendance/AttendanceAreaDeviceController.java index 27b1723c..b5f0d0eb 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/AttendanceAreaDeviceController.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/attendance/AttendanceAreaDeviceController.java @@ -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; /** diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/AttendanceArrangementAreaController.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/attendance/AttendanceArrangementAreaController.java similarity index 92% rename from ruoyi-modules/Property/src/main/java/org/dromara/property/controller/AttendanceArrangementAreaController.java rename to ruoyi-modules/Property/src/main/java/org/dromara/property/controller/attendance/AttendanceArrangementAreaController.java index 1c3c224a..0900b253 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/AttendanceArrangementAreaController.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/attendance/AttendanceArrangementAreaController.java @@ -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; /** diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/AttendanceArrangementController.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/attendance/AttendanceArrangementController.java similarity index 92% rename from ruoyi-modules/Property/src/main/java/org/dromara/property/controller/AttendanceArrangementController.java rename to ruoyi-modules/Property/src/main/java/org/dromara/property/controller/attendance/AttendanceArrangementController.java index eaeb2018..a729bde7 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/AttendanceArrangementController.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/attendance/AttendanceArrangementController.java @@ -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.*; diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/AttendanceClockDateController.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/attendance/AttendanceClockDateController.java similarity index 92% rename from ruoyi-modules/Property/src/main/java/org/dromara/property/controller/AttendanceClockDateController.java rename to ruoyi-modules/Property/src/main/java/org/dromara/property/controller/attendance/AttendanceClockDateController.java index c53a8530..21f780aa 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/AttendanceClockDateController.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/attendance/AttendanceClockDateController.java @@ -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; /** diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/AttendanceFixedScheduleController.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/attendance/AttendanceFixedScheduleController.java similarity index 92% rename from ruoyi-modules/Property/src/main/java/org/dromara/property/controller/AttendanceFixedScheduleController.java rename to ruoyi-modules/Property/src/main/java/org/dromara/property/controller/attendance/AttendanceFixedScheduleController.java index 6df6a500..40af77d3 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/AttendanceFixedScheduleController.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/attendance/AttendanceFixedScheduleController.java @@ -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.*; diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/AttendanceGroupController.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/attendance/AttendanceGroupController.java similarity index 93% rename from ruoyi-modules/Property/src/main/java/org/dromara/property/controller/AttendanceGroupController.java rename to ruoyi-modules/Property/src/main/java/org/dromara/property/controller/attendance/AttendanceGroupController.java index 805057dc..c4a8e248 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/AttendanceGroupController.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/attendance/AttendanceGroupController.java @@ -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; /** diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/AttendanceScheduleCycleController.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/attendance/AttendanceScheduleCycleController.java similarity index 92% rename from ruoyi-modules/Property/src/main/java/org/dromara/property/controller/AttendanceScheduleCycleController.java rename to ruoyi-modules/Property/src/main/java/org/dromara/property/controller/attendance/AttendanceScheduleCycleController.java index 601a801c..a0fd9b4d 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/AttendanceScheduleCycleController.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/attendance/AttendanceScheduleCycleController.java @@ -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; /** diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/AttendanceShiftController.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/attendance/AttendanceShiftController.java similarity index 92% rename from ruoyi-modules/Property/src/main/java/org/dromara/property/controller/AttendanceShiftController.java rename to ruoyi-modules/Property/src/main/java/org/dromara/property/controller/attendance/AttendanceShiftController.java index 505dceb3..f330d57e 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/AttendanceShiftController.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/attendance/AttendanceShiftController.java @@ -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; /** diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/AttendanceShiftScheduleController.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/attendance/AttendanceShiftScheduleController.java similarity index 92% rename from ruoyi-modules/Property/src/main/java/org/dromara/property/controller/AttendanceShiftScheduleController.java rename to ruoyi-modules/Property/src/main/java/org/dromara/property/controller/attendance/AttendanceShiftScheduleController.java index b47c4734..51934988 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/AttendanceShiftScheduleController.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/attendance/AttendanceShiftScheduleController.java @@ -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; /** diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/AttendanceUserGroupController.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/attendance/AttendanceUserGroupController.java similarity index 93% rename from ruoyi-modules/Property/src/main/java/org/dromara/property/controller/AttendanceUserGroupController.java rename to ruoyi-modules/Property/src/main/java/org/dromara/property/controller/attendance/AttendanceUserGroupController.java index a933eb1c..e960bf1b 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/AttendanceUserGroupController.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/attendance/AttendanceUserGroupController.java @@ -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.*; diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/AttendanceWeekSetController.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/attendance/AttendanceWeekSetController.java similarity index 92% rename from ruoyi-modules/Property/src/main/java/org/dromara/property/controller/AttendanceWeekSetController.java rename to ruoyi-modules/Property/src/main/java/org/dromara/property/controller/attendance/AttendanceWeekSetController.java index dc367ade..44411b56 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/AttendanceWeekSetController.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/attendance/AttendanceWeekSetController.java @@ -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; /** diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/AttendanceWeeksetShiftController.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/attendance/AttendanceWeeksetShiftController.java similarity index 92% rename from ruoyi-modules/Property/src/main/java/org/dromara/property/controller/AttendanceWeeksetShiftController.java rename to ruoyi-modules/Property/src/main/java/org/dromara/property/controller/attendance/AttendanceWeeksetShiftController.java index 804b5526..59536ae6 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/AttendanceWeeksetShiftController.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/attendance/AttendanceWeeksetShiftController.java @@ -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; /** diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/CleanController.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/cleanOrder/CleanController.java similarity index 93% rename from ruoyi-modules/Property/src/main/java/org/dromara/property/controller/CleanController.java rename to ruoyi-modules/Property/src/main/java/org/dromara/property/controller/cleanOrder/CleanController.java index 096c935d..405073fc 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/CleanController.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/cleanOrder/CleanController.java @@ -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; /** diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/CleanOrderController.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/cleanOrder/CleanOrderController.java similarity index 92% rename from ruoyi-modules/Property/src/main/java/org/dromara/property/controller/CleanOrderController.java rename to ruoyi-modules/Property/src/main/java/org/dromara/property/controller/cleanOrder/CleanOrderController.java index b435024d..2d3f5a13 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/CleanOrderController.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/cleanOrder/CleanOrderController.java @@ -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; /** diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/CleanserverOrderController.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/cleanOrder/CleanserverOrderController.java similarity index 92% rename from ruoyi-modules/Property/src/main/java/org/dromara/property/controller/CleanserverOrderController.java rename to ruoyi-modules/Property/src/main/java/org/dromara/property/controller/cleanOrder/CleanserverOrderController.java index 424fe27a..a465c922 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/CleanserverOrderController.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/cleanOrder/CleanserverOrderController.java @@ -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; /** diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/AttendanceArrangement.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/AttendanceArrangement.java index 610c9ff7..236eaa63 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/AttendanceArrangement.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/AttendanceArrangement.java @@ -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 diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/AttendanceClockDate.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/AttendanceClockDate.java index 8676cb2a..443d0829 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/AttendanceClockDate.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/AttendanceClockDate.java @@ -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; diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/AttendanceGroup.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/AttendanceGroup.java index f1962dd9..bb28f1e0 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/AttendanceGroup.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/AttendanceGroup.java @@ -6,7 +6,6 @@ import lombok.Data; import lombok.EqualsAndHashCode; import java.io.Serial; -import java.util.List; /** * 考勤组基本信息对象 attendance_group diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/AttendanceShift.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/AttendanceShift.java index 459ae578..84bc708e 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/AttendanceShift.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/AttendanceShift.java @@ -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; diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/AttendanceAreaBo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/attendanceBo/AttendanceAreaBo.java similarity index 91% rename from ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/AttendanceAreaBo.java rename to ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/attendanceBo/AttendanceAreaBo.java index bd67c836..0b8709a7 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/AttendanceAreaBo.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/attendanceBo/AttendanceAreaBo.java @@ -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; diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/AttendanceAreaDeviceBo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/attendanceBo/AttendanceAreaDeviceBo.java similarity index 90% rename from ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/AttendanceAreaDeviceBo.java rename to ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/attendanceBo/AttendanceAreaDeviceBo.java index be7c4bf9..9f129d50 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/AttendanceAreaDeviceBo.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/attendanceBo/AttendanceAreaDeviceBo.java @@ -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; diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/AttendanceArrangementAreaBo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/attendanceBo/AttendanceArrangementAreaBo.java similarity index 90% rename from ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/AttendanceArrangementAreaBo.java rename to ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/attendanceBo/AttendanceArrangementAreaBo.java index 3a1d8bcc..7d634029 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/AttendanceArrangementAreaBo.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/attendanceBo/AttendanceArrangementAreaBo.java @@ -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; diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/AttendanceArrangementBo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/attendanceBo/AttendanceArrangementBo.java similarity index 97% rename from ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/AttendanceArrangementBo.java rename to ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/attendanceBo/AttendanceArrangementBo.java index 8de8f3eb..24d3a59b 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/AttendanceArrangementBo.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/attendanceBo/AttendanceArrangementBo.java @@ -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; diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/AttendanceClockDateBo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/attendanceBo/AttendanceClockDateBo.java similarity index 89% rename from ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/AttendanceClockDateBo.java rename to ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/attendanceBo/AttendanceClockDateBo.java index f39d6b46..17a40d96 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/AttendanceClockDateBo.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/attendanceBo/AttendanceClockDateBo.java @@ -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 diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/AttendanceFixedScheduleBo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/attendanceBo/AttendanceFixedScheduleBo.java similarity index 90% rename from ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/AttendanceFixedScheduleBo.java rename to ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/attendanceBo/AttendanceFixedScheduleBo.java index e10fd67b..c249e3d5 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/AttendanceFixedScheduleBo.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/attendanceBo/AttendanceFixedScheduleBo.java @@ -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; diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/AttendanceGroupBo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/attendanceBo/AttendanceGroupBo.java similarity index 91% rename from ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/AttendanceGroupBo.java rename to ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/attendanceBo/AttendanceGroupBo.java index 222f8a81..41a2f7f8 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/AttendanceGroupBo.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/attendanceBo/AttendanceGroupBo.java @@ -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; /** diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/AttendanceScheduleCycleBo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/attendanceBo/AttendanceScheduleCycleBo.java similarity index 91% rename from ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/AttendanceScheduleCycleBo.java rename to ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/attendanceBo/AttendanceScheduleCycleBo.java index ee74d996..067500c8 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/AttendanceScheduleCycleBo.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/attendanceBo/AttendanceScheduleCycleBo.java @@ -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; diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/AttendanceShiftBo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/attendanceBo/AttendanceShiftBo.java similarity index 86% rename from ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/AttendanceShiftBo.java rename to ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/attendanceBo/AttendanceShiftBo.java index cf4f513d..56d7b82a 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/AttendanceShiftBo.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/attendanceBo/AttendanceShiftBo.java @@ -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; /** diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/AttendanceShiftScheduleBo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/attendanceBo/AttendanceShiftScheduleBo.java similarity index 94% rename from ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/AttendanceShiftScheduleBo.java rename to ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/attendanceBo/AttendanceShiftScheduleBo.java index 4bcd784b..ce6b4e18 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/AttendanceShiftScheduleBo.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/attendanceBo/AttendanceShiftScheduleBo.java @@ -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; diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/AttendanceUserGroupBo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/attendanceBo/AttendanceUserGroupBo.java similarity index 89% rename from ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/AttendanceUserGroupBo.java rename to ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/attendanceBo/AttendanceUserGroupBo.java index 44f51f94..18a22fb1 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/AttendanceUserGroupBo.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/attendanceBo/AttendanceUserGroupBo.java @@ -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; diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/AttendanceWeekSetBo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/attendanceBo/AttendanceWeekSetBo.java similarity index 91% rename from ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/AttendanceWeekSetBo.java rename to ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/attendanceBo/AttendanceWeekSetBo.java index f5dfa168..e78a60a5 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/AttendanceWeekSetBo.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/attendanceBo/AttendanceWeekSetBo.java @@ -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; diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/AttendanceWeeksetShiftBo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/attendanceBo/AttendanceWeeksetShiftBo.java similarity index 91% rename from ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/AttendanceWeeksetShiftBo.java rename to ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/attendanceBo/AttendanceWeeksetShiftBo.java index f399d03a..186954dd 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/AttendanceWeeksetShiftBo.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/attendanceBo/AttendanceWeeksetShiftBo.java @@ -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; diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/CleanBo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/cleanOrderBo/CleanBo.java similarity index 94% rename from ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/CleanBo.java rename to ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/cleanOrderBo/CleanBo.java index 3ae4180b..ca4e407a 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/CleanBo.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/cleanOrderBo/CleanBo.java @@ -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; diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/CleanOrderBo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/cleanOrderBo/CleanOrderBo.java similarity index 96% rename from ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/CleanOrderBo.java rename to ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/cleanOrderBo/CleanOrderBo.java index 1d407561..3727d0d7 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/CleanOrderBo.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/cleanOrderBo/CleanOrderBo.java @@ -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; diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/CleanRelationBo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/cleanOrderBo/CleanRelationBo.java similarity index 91% rename from ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/CleanRelationBo.java rename to ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/cleanOrderBo/CleanRelationBo.java index 7c0d225e..30b09c31 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/CleanRelationBo.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/cleanOrderBo/CleanRelationBo.java @@ -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; diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/CleanserverOrderBo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/cleanOrderBo/CleanserverOrderBo.java similarity index 90% rename from ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/CleanserverOrderBo.java rename to ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/cleanOrderBo/CleanserverOrderBo.java index 70667e5a..8ed9093d 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/CleanserverOrderBo.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/cleanOrderBo/CleanserverOrderBo.java @@ -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; diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/AttendanceAreaDeviceVo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/attendanceVo/AttendanceAreaDeviceVo.java similarity index 84% rename from ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/AttendanceAreaDeviceVo.java rename to ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/attendanceVo/AttendanceAreaDeviceVo.java index 79f8c15e..3dec0c99 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/AttendanceAreaDeviceVo.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/attendanceVo/AttendanceAreaDeviceVo.java @@ -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; - /** diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/AttendanceAreaVo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/attendanceVo/AttendanceAreaVo.java similarity index 81% rename from ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/AttendanceAreaVo.java rename to ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/attendanceVo/AttendanceAreaVo.java index 0528524d..b164165d 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/AttendanceAreaVo.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/attendanceVo/AttendanceAreaVo.java @@ -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; diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/AttendanceArrangementAreaVo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/attendanceVo/AttendanceArrangementAreaVo.java similarity index 83% rename from ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/AttendanceArrangementAreaVo.java rename to ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/attendanceVo/AttendanceArrangementAreaVo.java index 09340d88..d448df64 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/AttendanceArrangementAreaVo.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/attendanceVo/AttendanceArrangementAreaVo.java @@ -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; - /** diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/AttendanceArrangementVo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/attendanceVo/AttendanceArrangementVo.java similarity index 97% rename from ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/AttendanceArrangementVo.java rename to ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/attendanceVo/AttendanceArrangementVo.java index 82007f55..a491d1a3 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/AttendanceArrangementVo.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/attendanceVo/AttendanceArrangementVo.java @@ -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; diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/AttendanceClockDateVo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/attendanceVo/AttendanceClockDateVo.java similarity index 94% rename from ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/AttendanceClockDateVo.java rename to ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/attendanceVo/AttendanceClockDateVo.java index 961052d9..6b9cafc2 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/AttendanceClockDateVo.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/attendanceVo/AttendanceClockDateVo.java @@ -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; - /** diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/AttendanceFixedScheduleVo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/attendanceVo/AttendanceFixedScheduleVo.java similarity index 83% rename from ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/AttendanceFixedScheduleVo.java rename to ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/attendanceVo/AttendanceFixedScheduleVo.java index 743bbaf0..ac5e3865 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/AttendanceFixedScheduleVo.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/attendanceVo/AttendanceFixedScheduleVo.java @@ -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; - /** diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/AttendanceGroupVo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/attendanceVo/AttendanceGroupVo.java similarity index 88% rename from ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/AttendanceGroupVo.java rename to ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/attendanceVo/AttendanceGroupVo.java index b8ae3945..473c3b4e 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/AttendanceGroupVo.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/attendanceVo/AttendanceGroupVo.java @@ -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; diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/AttendanceScheduleCycleVo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/attendanceVo/AttendanceScheduleCycleVo.java similarity index 85% rename from ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/AttendanceScheduleCycleVo.java rename to ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/attendanceVo/AttendanceScheduleCycleVo.java index 02b067f5..6230263e 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/AttendanceScheduleCycleVo.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/attendanceVo/AttendanceScheduleCycleVo.java @@ -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; - /** diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/AttendanceShiftScheduleVo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/attendanceVo/AttendanceShiftScheduleVo.java similarity index 83% rename from ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/AttendanceShiftScheduleVo.java rename to ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/attendanceVo/AttendanceShiftScheduleVo.java index ce9eb4f7..0b98fb1f 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/AttendanceShiftScheduleVo.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/attendanceVo/AttendanceShiftScheduleVo.java @@ -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; - /** diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/AttendanceShiftVo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/attendanceVo/AttendanceShiftVo.java similarity index 91% rename from ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/AttendanceShiftVo.java rename to ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/attendanceVo/AttendanceShiftVo.java index 6bf0f594..9911777b 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/AttendanceShiftVo.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/attendanceVo/AttendanceShiftVo.java @@ -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; - /** diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/AttendanceUserGroupVo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/attendanceVo/AttendanceUserGroupVo.java similarity index 97% rename from ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/AttendanceUserGroupVo.java rename to ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/attendanceVo/AttendanceUserGroupVo.java index 3185512e..a3bedb25 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/AttendanceUserGroupVo.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/attendanceVo/AttendanceUserGroupVo.java @@ -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; diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/AttendanceWeekSetVo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/attendanceVo/AttendanceWeekSetVo.java similarity index 95% rename from ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/AttendanceWeekSetVo.java rename to ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/attendanceVo/AttendanceWeekSetVo.java index c4a7d0d2..b8830124 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/AttendanceWeekSetVo.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/attendanceVo/AttendanceWeekSetVo.java @@ -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; - /** diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/AttendanceWeeksetShiftVo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/attendanceVo/AttendanceWeeksetShiftVo.java similarity index 85% rename from ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/AttendanceWeeksetShiftVo.java rename to ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/attendanceVo/AttendanceWeeksetShiftVo.java index 5bc15a14..81d748da 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/AttendanceWeeksetShiftVo.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/attendanceVo/AttendanceWeeksetShiftVo.java @@ -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; - /** diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/CleanOrderVo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/cleanOrderVo/CleanOrderVo.java similarity index 89% rename from ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/CleanOrderVo.java rename to ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/cleanOrderVo/CleanOrderVo.java index ca959c81..e9bc10ac 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/CleanOrderVo.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/cleanOrderVo/CleanOrderVo.java @@ -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; diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/CleanRelationVo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/cleanOrderVo/CleanRelationVo.java similarity index 95% rename from ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/CleanRelationVo.java rename to ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/cleanOrderVo/CleanRelationVo.java index b8fc9817..c46d57f1 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/CleanRelationVo.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/cleanOrderVo/CleanRelationVo.java @@ -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; diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/CleanVo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/cleanOrderVo/CleanVo.java similarity index 84% rename from ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/CleanVo.java rename to ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/cleanOrderVo/CleanVo.java index b683bb7e..ac360e89 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/CleanVo.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/cleanOrderVo/CleanVo.java @@ -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; /** diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/CleanserverOrderVo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/cleanOrderVo/CleanserverOrderVo.java similarity index 83% rename from ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/CleanserverOrderVo.java rename to ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/cleanOrderVo/CleanserverOrderVo.java index 55bcc360..d0efa65e 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/CleanserverOrderVo.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/cleanOrderVo/CleanserverOrderVo.java @@ -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; - /** diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/dubbo/RemoteAttendanceServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/dubbo/RemoteAttendanceServiceImpl.java index c3955a05..0acb754b 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/dubbo/RemoteAttendanceServiceImpl.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/dubbo/RemoteAttendanceServiceImpl.java @@ -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; diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/AttendanceAreaDeviceMapper.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/attendanceMapper/AttendanceAreaDeviceMapper.java similarity index 71% rename from ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/AttendanceAreaDeviceMapper.java rename to ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/attendanceMapper/AttendanceAreaDeviceMapper.java index 33883222..e19aec86 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/AttendanceAreaDeviceMapper.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/attendanceMapper/AttendanceAreaDeviceMapper.java @@ -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; /** diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/AttendanceAreaMapper.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/attendanceMapper/AttendanceAreaMapper.java similarity index 70% rename from ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/AttendanceAreaMapper.java rename to ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/attendanceMapper/AttendanceAreaMapper.java index cd78801b..27d00e41 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/AttendanceAreaMapper.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/attendanceMapper/AttendanceAreaMapper.java @@ -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; /** diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/AttendanceArrangementAreaMapper.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/attendanceMapper/AttendanceArrangementAreaMapper.java similarity index 71% rename from ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/AttendanceArrangementAreaMapper.java rename to ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/attendanceMapper/AttendanceArrangementAreaMapper.java index 91975d83..aecaf683 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/AttendanceArrangementAreaMapper.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/attendanceMapper/AttendanceArrangementAreaMapper.java @@ -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; /** diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/AttendanceArrangementMapper.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/attendanceMapper/AttendanceArrangementMapper.java similarity index 92% rename from ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/AttendanceArrangementMapper.java rename to ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/attendanceMapper/AttendanceArrangementMapper.java index f8f409e7..fc8d8abc 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/AttendanceArrangementMapper.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/attendanceMapper/AttendanceArrangementMapper.java @@ -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; diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/AttendanceClockDateMapper.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/attendanceMapper/AttendanceClockDateMapper.java similarity index 71% rename from ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/AttendanceClockDateMapper.java rename to ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/attendanceMapper/AttendanceClockDateMapper.java index be17e180..e2a83f8d 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/AttendanceClockDateMapper.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/attendanceMapper/AttendanceClockDateMapper.java @@ -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; /** diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/AttendanceFixedScheduleMapper.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/attendanceMapper/AttendanceFixedScheduleMapper.java similarity index 71% rename from ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/AttendanceFixedScheduleMapper.java rename to ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/attendanceMapper/AttendanceFixedScheduleMapper.java index 026cdf5d..3a12d12d 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/AttendanceFixedScheduleMapper.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/attendanceMapper/AttendanceFixedScheduleMapper.java @@ -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; /** diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/AttendanceGroupMapper.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/attendanceMapper/AttendanceGroupMapper.java similarity index 71% rename from ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/AttendanceGroupMapper.java rename to ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/attendanceMapper/AttendanceGroupMapper.java index e18a6f80..97933201 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/AttendanceGroupMapper.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/attendanceMapper/AttendanceGroupMapper.java @@ -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; /** diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/AttendanceScheduleCycleMapper.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/attendanceMapper/AttendanceScheduleCycleMapper.java similarity index 71% rename from ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/AttendanceScheduleCycleMapper.java rename to ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/attendanceMapper/AttendanceScheduleCycleMapper.java index 07460c54..14c1fed8 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/AttendanceScheduleCycleMapper.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/attendanceMapper/AttendanceScheduleCycleMapper.java @@ -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; /** diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/AttendanceShiftMapper.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/attendanceMapper/AttendanceShiftMapper.java similarity index 70% rename from ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/AttendanceShiftMapper.java rename to ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/attendanceMapper/AttendanceShiftMapper.java index febc4514..2611555a 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/AttendanceShiftMapper.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/attendanceMapper/AttendanceShiftMapper.java @@ -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; /** diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/AttendanceShiftScheduleMapper.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/attendanceMapper/AttendanceShiftScheduleMapper.java similarity index 71% rename from ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/AttendanceShiftScheduleMapper.java rename to ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/attendanceMapper/AttendanceShiftScheduleMapper.java index 2b2cb473..787b7992 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/AttendanceShiftScheduleMapper.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/attendanceMapper/AttendanceShiftScheduleMapper.java @@ -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; /** diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/AttendanceUserGroupMapper.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/attendanceMapper/AttendanceUserGroupMapper.java similarity index 70% rename from ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/AttendanceUserGroupMapper.java rename to ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/attendanceMapper/AttendanceUserGroupMapper.java index 2220f533..209320db 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/AttendanceUserGroupMapper.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/attendanceMapper/AttendanceUserGroupMapper.java @@ -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; /** diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/AttendanceWeekSetMapper.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/attendanceMapper/AttendanceWeekSetMapper.java similarity index 70% rename from ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/AttendanceWeekSetMapper.java rename to ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/attendanceMapper/AttendanceWeekSetMapper.java index 1937bda4..0784bd2a 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/AttendanceWeekSetMapper.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/attendanceMapper/AttendanceWeekSetMapper.java @@ -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; /** diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/AttendanceWeeksetShiftMapper.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/attendanceMapper/AttendanceWeeksetShiftMapper.java similarity index 71% rename from ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/AttendanceWeeksetShiftMapper.java rename to ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/attendanceMapper/AttendanceWeeksetShiftMapper.java index 555039b3..56c4d88f 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/AttendanceWeeksetShiftMapper.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/attendanceMapper/AttendanceWeeksetShiftMapper.java @@ -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; /** diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/CleanMapper.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/cleanOrderMapper/CleanMapper.java similarity index 66% rename from ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/CleanMapper.java rename to ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/cleanOrderMapper/CleanMapper.java index 80170b51..1bc13216 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/CleanMapper.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/cleanOrderMapper/CleanMapper.java @@ -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接口 * diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/CleanOrderMapper.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/cleanOrderMapper/CleanOrderMapper.java similarity index 83% rename from ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/CleanOrderMapper.java rename to ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/cleanOrderMapper/CleanOrderMapper.java index 37a26dd1..716a0324 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/CleanOrderMapper.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/cleanOrderMapper/CleanOrderMapper.java @@ -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; /** diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/CleanRelationMapper.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/cleanOrderMapper/CleanRelationMapper.java similarity index 82% rename from ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/CleanRelationMapper.java rename to ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/cleanOrderMapper/CleanRelationMapper.java index 8e8b1fea..34c0c4c7 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/CleanRelationMapper.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/cleanOrderMapper/CleanRelationMapper.java @@ -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接口 diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/CleanserverOrderMapper.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/cleanOrderMapper/CleanserverOrderMapper.java similarity index 74% rename from ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/CleanserverOrderMapper.java rename to ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/cleanOrderMapper/CleanserverOrderMapper.java index 143b791f..d1ccfde4 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/CleanserverOrderMapper.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/cleanOrderMapper/CleanserverOrderMapper.java @@ -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; /** diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/IAttendanceAreaDeviceService.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/attendanceService/IAttendanceAreaDeviceService.java similarity index 88% rename from ruoyi-modules/Property/src/main/java/org/dromara/property/service/IAttendanceAreaDeviceService.java rename to ruoyi-modules/Property/src/main/java/org/dromara/property/service/attendanceService/IAttendanceAreaDeviceService.java index 12398977..e230c275 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/IAttendanceAreaDeviceService.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/attendanceService/IAttendanceAreaDeviceService.java @@ -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; diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/IAttendanceAreaService.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/attendanceService/IAttendanceAreaService.java similarity index 88% rename from ruoyi-modules/Property/src/main/java/org/dromara/property/service/IAttendanceAreaService.java rename to ruoyi-modules/Property/src/main/java/org/dromara/property/service/attendanceService/IAttendanceAreaService.java index d832b9d1..0a1fcf04 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/IAttendanceAreaService.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/attendanceService/IAttendanceAreaService.java @@ -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; diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/IAttendanceArrangementAreaService.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/attendanceService/IAttendanceArrangementAreaService.java similarity index 87% rename from ruoyi-modules/Property/src/main/java/org/dromara/property/service/IAttendanceArrangementAreaService.java rename to ruoyi-modules/Property/src/main/java/org/dromara/property/service/attendanceService/IAttendanceArrangementAreaService.java index d389dc15..8789d9d8 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/IAttendanceArrangementAreaService.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/attendanceService/IAttendanceArrangementAreaService.java @@ -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; diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/IAttendanceArrangementService.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/attendanceService/IAttendanceArrangementService.java similarity index 88% rename from ruoyi-modules/Property/src/main/java/org/dromara/property/service/IAttendanceArrangementService.java rename to ruoyi-modules/Property/src/main/java/org/dromara/property/service/attendanceService/IAttendanceArrangementService.java index c452f573..26de99eb 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/IAttendanceArrangementService.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/attendanceService/IAttendanceArrangementService.java @@ -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接口 diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/IAttendanceClockDateService.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/attendanceService/IAttendanceClockDateService.java similarity index 88% rename from ruoyi-modules/Property/src/main/java/org/dromara/property/service/IAttendanceClockDateService.java rename to ruoyi-modules/Property/src/main/java/org/dromara/property/service/attendanceService/IAttendanceClockDateService.java index a98605fe..4291aa67 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/IAttendanceClockDateService.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/attendanceService/IAttendanceClockDateService.java @@ -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; diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/IAttendanceFixedScheduleService.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/attendanceService/IAttendanceFixedScheduleService.java similarity index 87% rename from ruoyi-modules/Property/src/main/java/org/dromara/property/service/IAttendanceFixedScheduleService.java rename to ruoyi-modules/Property/src/main/java/org/dromara/property/service/attendanceService/IAttendanceFixedScheduleService.java index 073b14fc..337b48a4 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/IAttendanceFixedScheduleService.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/attendanceService/IAttendanceFixedScheduleService.java @@ -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; diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/IAttendanceGroupService.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/attendanceService/IAttendanceGroupService.java similarity index 89% rename from ruoyi-modules/Property/src/main/java/org/dromara/property/service/IAttendanceGroupService.java rename to ruoyi-modules/Property/src/main/java/org/dromara/property/service/attendanceService/IAttendanceGroupService.java index b9e57b67..507949aa 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/IAttendanceGroupService.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/attendanceService/IAttendanceGroupService.java @@ -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; diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/IAttendanceScheduleCycleService.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/attendanceService/IAttendanceScheduleCycleService.java similarity index 87% rename from ruoyi-modules/Property/src/main/java/org/dromara/property/service/IAttendanceScheduleCycleService.java rename to ruoyi-modules/Property/src/main/java/org/dromara/property/service/attendanceService/IAttendanceScheduleCycleService.java index 77aceaf5..e24659bc 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/IAttendanceScheduleCycleService.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/attendanceService/IAttendanceScheduleCycleService.java @@ -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; diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/IAttendanceShiftScheduleService.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/attendanceService/IAttendanceShiftScheduleService.java similarity index 87% rename from ruoyi-modules/Property/src/main/java/org/dromara/property/service/IAttendanceShiftScheduleService.java rename to ruoyi-modules/Property/src/main/java/org/dromara/property/service/attendanceService/IAttendanceShiftScheduleService.java index 1f430b68..ec6ce30b 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/IAttendanceShiftScheduleService.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/attendanceService/IAttendanceShiftScheduleService.java @@ -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; diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/IAttendanceShiftService.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/attendanceService/IAttendanceShiftService.java similarity index 87% rename from ruoyi-modules/Property/src/main/java/org/dromara/property/service/IAttendanceShiftService.java rename to ruoyi-modules/Property/src/main/java/org/dromara/property/service/attendanceService/IAttendanceShiftService.java index d6e8d6b6..e1d61ddc 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/IAttendanceShiftService.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/attendanceService/IAttendanceShiftService.java @@ -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; diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/IAttendanceUserGroupService.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/attendanceService/IAttendanceUserGroupService.java similarity index 89% rename from ruoyi-modules/Property/src/main/java/org/dromara/property/service/IAttendanceUserGroupService.java rename to ruoyi-modules/Property/src/main/java/org/dromara/property/service/attendanceService/IAttendanceUserGroupService.java index 5ba95298..b3855ffa 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/IAttendanceUserGroupService.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/attendanceService/IAttendanceUserGroupService.java @@ -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; diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/IAttendanceWeekSetService.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/attendanceService/IAttendanceWeekSetService.java similarity index 87% rename from ruoyi-modules/Property/src/main/java/org/dromara/property/service/IAttendanceWeekSetService.java rename to ruoyi-modules/Property/src/main/java/org/dromara/property/service/attendanceService/IAttendanceWeekSetService.java index 17009240..8c78f91b 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/IAttendanceWeekSetService.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/attendanceService/IAttendanceWeekSetService.java @@ -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; diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/IAttendanceWeeksetShiftService.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/attendanceService/IAttendanceWeeksetShiftService.java similarity index 87% rename from ruoyi-modules/Property/src/main/java/org/dromara/property/service/IAttendanceWeeksetShiftService.java rename to ruoyi-modules/Property/src/main/java/org/dromara/property/service/attendanceService/IAttendanceWeeksetShiftService.java index 24cf90fe..7e19d5e1 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/IAttendanceWeeksetShiftService.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/attendanceService/IAttendanceWeeksetShiftService.java @@ -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; diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/ICleanOrderService.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/cleanOrderService/ICleanOrderService.java similarity index 88% rename from ruoyi-modules/Property/src/main/java/org/dromara/property/service/ICleanOrderService.java rename to ruoyi-modules/Property/src/main/java/org/dromara/property/service/cleanOrderService/ICleanOrderService.java index e4f56189..6ca20505 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/ICleanOrderService.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/cleanOrderService/ICleanOrderService.java @@ -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; diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/ICleanService.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/cleanOrderService/ICleanService.java similarity index 88% rename from ruoyi-modules/Property/src/main/java/org/dromara/property/service/ICleanService.java rename to ruoyi-modules/Property/src/main/java/org/dromara/property/service/cleanOrderService/ICleanService.java index 6e0f4230..ffd4ae8b 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/ICleanService.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/cleanOrderService/ICleanService.java @@ -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; diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/ICleanserverOrderService.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/cleanOrderService/ICleanserverOrderService.java similarity index 88% rename from ruoyi-modules/Property/src/main/java/org/dromara/property/service/ICleanserverOrderService.java rename to ruoyi-modules/Property/src/main/java/org/dromara/property/service/cleanOrderService/ICleanserverOrderService.java index adc609a3..c7609cd1 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/ICleanserverOrderService.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/cleanOrderService/ICleanserverOrderService.java @@ -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; diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AttendanceAreaDeviceServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/attendanceImpl/AttendanceAreaDeviceServiceImpl.java similarity index 91% rename from ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AttendanceAreaDeviceServiceImpl.java rename to ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/attendanceImpl/AttendanceAreaDeviceServiceImpl.java index 88652770..e76dd8cc 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AttendanceAreaDeviceServiceImpl.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/attendanceImpl/AttendanceAreaDeviceServiceImpl.java @@ -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; diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AttendanceAreaServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/attendanceImpl/AttendanceAreaServiceImpl.java similarity index 93% rename from ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AttendanceAreaServiceImpl.java rename to ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/attendanceImpl/AttendanceAreaServiceImpl.java index c368f2ab..412fb53c 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AttendanceAreaServiceImpl.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/attendanceImpl/AttendanceAreaServiceImpl.java @@ -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; diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AttendanceArrangementAreaServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/attendanceImpl/AttendanceArrangementAreaServiceImpl.java similarity index 91% rename from ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AttendanceArrangementAreaServiceImpl.java rename to ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/attendanceImpl/AttendanceArrangementAreaServiceImpl.java index e647868c..045a395e 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AttendanceArrangementAreaServiceImpl.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/attendanceImpl/AttendanceArrangementAreaServiceImpl.java @@ -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; diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AttendanceArrangementServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/attendanceImpl/AttendanceArrangementServiceImpl.java similarity index 98% rename from ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AttendanceArrangementServiceImpl.java rename to ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/attendanceImpl/AttendanceArrangementServiceImpl.java index 0c8b54f2..588efe14 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AttendanceArrangementServiceImpl.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/attendanceImpl/AttendanceArrangementServiceImpl.java @@ -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; diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AttendanceClockDateServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/attendanceImpl/AttendanceClockDateServiceImpl.java similarity index 92% rename from ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AttendanceClockDateServiceImpl.java rename to ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/attendanceImpl/AttendanceClockDateServiceImpl.java index dcc7469f..0bc78098 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AttendanceClockDateServiceImpl.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/attendanceImpl/AttendanceClockDateServiceImpl.java @@ -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; diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AttendanceFixedScheduleServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/attendanceImpl/AttendanceFixedScheduleServiceImpl.java similarity index 91% rename from ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AttendanceFixedScheduleServiceImpl.java rename to ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/attendanceImpl/AttendanceFixedScheduleServiceImpl.java index a76bab3f..ce1eb116 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AttendanceFixedScheduleServiceImpl.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/attendanceImpl/AttendanceFixedScheduleServiceImpl.java @@ -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; diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AttendanceGroupServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/attendanceImpl/AttendanceGroupServiceImpl.java similarity index 98% rename from ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AttendanceGroupServiceImpl.java rename to ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/attendanceImpl/AttendanceGroupServiceImpl.java index 158d2dba..9daa09fc 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AttendanceGroupServiceImpl.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/attendanceImpl/AttendanceGroupServiceImpl.java @@ -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; diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AttendanceScheduleCycleServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/attendanceImpl/AttendanceScheduleCycleServiceImpl.java similarity index 91% rename from ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AttendanceScheduleCycleServiceImpl.java rename to ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/attendanceImpl/AttendanceScheduleCycleServiceImpl.java index f6b26f79..64353801 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AttendanceScheduleCycleServiceImpl.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/attendanceImpl/AttendanceScheduleCycleServiceImpl.java @@ -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; diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AttendanceShiftScheduleServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/attendanceImpl/AttendanceShiftScheduleServiceImpl.java similarity index 91% rename from ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AttendanceShiftScheduleServiceImpl.java rename to ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/attendanceImpl/AttendanceShiftScheduleServiceImpl.java index b8e6eb35..4468738a 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AttendanceShiftScheduleServiceImpl.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/attendanceImpl/AttendanceShiftScheduleServiceImpl.java @@ -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; diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AttendanceShiftServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/attendanceImpl/AttendanceShiftServiceImpl.java similarity index 93% rename from ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AttendanceShiftServiceImpl.java rename to ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/attendanceImpl/AttendanceShiftServiceImpl.java index 9b16d4d6..3a80f431 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AttendanceShiftServiceImpl.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/attendanceImpl/AttendanceShiftServiceImpl.java @@ -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; diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AttendanceUserGroupServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/attendanceImpl/AttendanceUserGroupServiceImpl.java similarity index 97% rename from ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AttendanceUserGroupServiceImpl.java rename to ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/attendanceImpl/AttendanceUserGroupServiceImpl.java index daea363f..50ec498b 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AttendanceUserGroupServiceImpl.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/attendanceImpl/AttendanceUserGroupServiceImpl.java @@ -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; diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AttendanceWeekSetServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/attendanceImpl/AttendanceWeekSetServiceImpl.java similarity index 91% rename from ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AttendanceWeekSetServiceImpl.java rename to ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/attendanceImpl/AttendanceWeekSetServiceImpl.java index 5d93970c..44a1cb94 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AttendanceWeekSetServiceImpl.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/attendanceImpl/AttendanceWeekSetServiceImpl.java @@ -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; diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AttendanceWeeksetShiftServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/attendanceImpl/AttendanceWeeksetShiftServiceImpl.java similarity index 91% rename from ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AttendanceWeeksetShiftServiceImpl.java rename to ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/attendanceImpl/AttendanceWeeksetShiftServiceImpl.java index cf79c340..fa47f785 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AttendanceWeeksetShiftServiceImpl.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/attendanceImpl/AttendanceWeeksetShiftServiceImpl.java @@ -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.AttendanceWeeksetShiftBo; -import org.dromara.property.domain.vo.AttendanceWeeksetShiftVo; +import org.dromara.property.domain.bo.attendanceBo.AttendanceWeeksetShiftBo; +import org.dromara.property.domain.vo.attendanceVo.AttendanceWeeksetShiftVo; import org.dromara.property.domain.AttendanceWeeksetShift; -import org.dromara.property.mapper.AttendanceWeeksetShiftMapper; -import org.dromara.property.service.IAttendanceWeeksetShiftService; +import org.dromara.property.mapper.attendanceMapper.AttendanceWeeksetShiftMapper; +import org.dromara.property.service.attendanceService.IAttendanceWeeksetShiftService; import java.util.List; import java.util.Map; diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/CleanOrderServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/cleanOrderImpl/CleanOrderServiceImpl.java similarity index 94% rename from ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/CleanOrderServiceImpl.java rename to ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/cleanOrderImpl/CleanOrderServiceImpl.java index 544446f2..96edb815 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/CleanOrderServiceImpl.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/cleanOrderImpl/CleanOrderServiceImpl.java @@ -1,6 +1,5 @@ -package org.dromara.property.service.impl; +package org.dromara.property.service.impl.cleanOrderImpl; -import cn.hutool.core.date.DateTime; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.baomidou.mybatisplus.core.toolkit.Wrappers; @@ -15,13 +14,13 @@ import org.dromara.property.domain.Clean; import org.dromara.property.domain.CleanOrder; import org.dromara.property.domain.CleanRelation; import org.dromara.property.domain.CleanserverOrder; -import org.dromara.property.domain.bo.CleanOrderBo; -import org.dromara.property.domain.vo.CleanOrderVo; -import org.dromara.property.mapper.CleanMapper; -import org.dromara.property.mapper.CleanOrderMapper; -import org.dromara.property.mapper.CleanRelationMapper; -import org.dromara.property.mapper.CleanserverOrderMapper; -import org.dromara.property.service.ICleanOrderService; +import org.dromara.property.domain.bo.cleanOrderBo.CleanOrderBo; +import org.dromara.property.domain.vo.cleanOrderVo.CleanOrderVo; +import org.dromara.property.mapper.cleanOrderMapper.CleanMapper; +import org.dromara.property.mapper.cleanOrderMapper.CleanOrderMapper; +import org.dromara.property.mapper.cleanOrderMapper.CleanRelationMapper; +import org.dromara.property.mapper.cleanOrderMapper.CleanserverOrderMapper; +import org.dromara.property.service.cleanOrderService.ICleanOrderService; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/CleanServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/cleanOrderImpl/CleanServiceImpl.java similarity index 92% rename from ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/CleanServiceImpl.java rename to ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/cleanOrderImpl/CleanServiceImpl.java index b2b93365..15f5eefc 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/CleanServiceImpl.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/cleanOrderImpl/CleanServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.property.service.impl; +package org.dromara.property.service.impl.cleanOrderImpl; 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.CleanBo; -import org.dromara.property.domain.vo.CleanVo; +import org.dromara.property.domain.bo.cleanOrderBo.CleanBo; +import org.dromara.property.domain.vo.cleanOrderVo.CleanVo; import org.dromara.property.domain.Clean; -import org.dromara.property.mapper.CleanMapper; -import org.dromara.property.service.ICleanService; +import org.dromara.property.mapper.cleanOrderMapper.CleanMapper; +import org.dromara.property.service.cleanOrderService.ICleanService; import java.util.List; import java.util.Map; diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/CleanserverOrderServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/cleanOrderImpl/CleanserverOrderServiceImpl.java similarity index 91% rename from ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/CleanserverOrderServiceImpl.java rename to ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/cleanOrderImpl/CleanserverOrderServiceImpl.java index a0ebe9c0..704f9951 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/CleanserverOrderServiceImpl.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/cleanOrderImpl/CleanserverOrderServiceImpl.java @@ -1,7 +1,6 @@ -package org.dromara.property.service.impl; +package org.dromara.property.service.impl.cleanOrderImpl; 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.CleanserverOrderBo; -import org.dromara.property.domain.vo.CleanserverOrderVo; +import org.dromara.property.domain.bo.cleanOrderBo.CleanserverOrderBo; +import org.dromara.property.domain.vo.cleanOrderVo.CleanserverOrderVo; import org.dromara.property.domain.CleanserverOrder; -import org.dromara.property.mapper.CleanserverOrderMapper; -import org.dromara.property.service.ICleanserverOrderService; +import org.dromara.property.mapper.cleanOrderMapper.CleanserverOrderMapper; +import org.dromara.property.service.cleanOrderService.ICleanserverOrderService; import java.util.List; import java.util.Map; diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/tasks/ServiceWorkOrderTasks.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/tasks/ServiceWorkOrderTasks.java index e4709fc1..dbc80433 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/tasks/ServiceWorkOrderTasks.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/tasks/ServiceWorkOrderTasks.java @@ -13,18 +13,15 @@ import org.dromara.property.domain.AttendanceUserGroup; import org.dromara.property.domain.ServiceWorkOrders; import org.dromara.property.domain.ServiceWorkOrdersRecord; import org.dromara.property.domain.enums.WorkOrderStatusEnum; -import org.dromara.property.mapper.AttendanceUserGroupMapper; +import org.dromara.property.mapper.attendanceMapper.AttendanceUserGroupMapper; import org.dromara.property.mapper.ServiceWorkOrdersMapper; import org.dromara.property.mapper.ServiceWorkOrdersRecordMapper; import org.springframework.scheduling.annotation.Scheduled; -import org.springframework.stereotype.Component; import java.time.LocalDate; import java.util.Date; import java.util.List; import org.springframework.transaction.annotation.Transactional; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; diff --git a/ruoyi-modules/Property/src/main/resources/mapper/Property/AttendanceArrangementMapper.xml b/ruoyi-modules/Property/src/main/resources/mapper/Property/AttendanceArrangementMapper.xml index 49ab5efa..e37fce0e 100644 --- a/ruoyi-modules/Property/src/main/resources/mapper/Property/AttendanceArrangementMapper.xml +++ b/ruoyi-modules/Property/src/main/resources/mapper/Property/AttendanceArrangementMapper.xml @@ -2,7 +2,7 @@ - + + - + diff --git a/ruoyi-modules/Property/src/main/resources/mapper/Property/CleanserverOrderMapper.xml b/ruoyi-modules/Property/src/main/resources/mapper/Property/CleanserverOrderMapper.xml index 75ad37fa..a77d6bec 100644 --- a/ruoyi-modules/Property/src/main/resources/mapper/Property/CleanserverOrderMapper.xml +++ b/ruoyi-modules/Property/src/main/resources/mapper/Property/CleanserverOrderMapper.xml @@ -2,6 +2,6 @@ - +