From 7a5b9d1bea6d06153a596e2882e3ba0d7d18f1af Mon Sep 17 00:00:00 2001 From: zlwu <704541015@qq.com> Date: Mon, 30 Jun 2025 21:16:32 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=9B=AE=E5=BD=95=E7=BB=93?= =?UTF-8?q?=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/HqHallInfoController.java | 8 +- .../HqHallReservationController.java | 10 +- .../controller/HqSatCategoryController.java | 8 +- .../controller/HqSatDetailController.java | 8 +- .../controller/HqSatOptionController.java | 8 +- .../controller/HqSatQuestionController.java | 14 +- .../controller/HqSatRecordController.java | 8 +- .../controller/HqSatSurveyController.java | 14 +- .../HqSatSurveyQuestionController.java | 8 +- .../PmRepairAttachmentController.java | 10 +- .../PmRepairCategoryController.java | 10 +- .../controller/PmRepairOrderController.java | 14 +- .../zhxy/{ => hq}/domain/HqHallInfo.java | 2 +- .../{ => hq}/domain/HqHallReservation.java | 2 +- .../zhxy/{ => hq}/domain/HqSatCategory.java | 2 +- .../zhxy/{ => hq}/domain/HqSatDetail.java | 2 +- .../zhxy/{ => hq}/domain/HqSatOption.java | 2 +- .../zhxy/{ => hq}/domain/HqSatQuestion.java | 2 +- .../zhxy/{ => hq}/domain/HqSatRecord.java | 2 +- .../zhxy/{ => hq}/domain/HqSatSurvey.java | 2 +- .../{ => hq}/domain/HqSatSurveyQuestion.java | 2 +- .../{ => hq}/domain/PmRepairAttachment.java | 2 +- .../{ => hq}/domain/PmRepairCategory.java | 2 +- .../zhxy/{ => hq}/domain/PmRepairOrder.java | 2 +- .../{ => hq}/domain/PmRepairProgress.java | 2 +- .../{ => hq}/domain/PmServiceEvaluation.java | 2 +- .../zhxy/{ => hq}/domain/bo/HqHallInfoBo.java | 4 +- .../domain/bo/HqHallReservationAuditBo.java | 2 +- .../domain/bo/HqHallReservationBo.java | 4 +- .../domain/bo/HqSatAnswerSubmitBo.java | 2 +- .../{ => hq}/domain/bo/HqSatCategoryBo.java | 4 +- .../{ => hq}/domain/bo/HqSatDetailBo.java | 4 +- .../{ => hq}/domain/bo/HqSatOptionBo.java | 4 +- .../{ => hq}/domain/bo/HqSatQuestionBo.java | 4 +- .../{ => hq}/domain/bo/HqSatRecordBo.java | 4 +- .../{ => hq}/domain/bo/HqSatSurveyBo.java | 4 +- .../domain/bo/HqSatSurveyQuestionBo.java | 4 +- .../domain/bo/PmRepairAttachmentBo.java | 4 +- .../domain/bo/PmRepairCategoryBo.java | 4 +- .../{ => hq}/domain/bo/PmRepairOrderBo.java | 4 +- .../zhxy/{ => hq}/domain/vo/HqHallInfoVo.java | 4 +- .../domain/vo/HqHallReservationVo.java | 4 +- .../{ => hq}/domain/vo/HqSatCategoryVo.java | 4 +- .../{ => hq}/domain/vo/HqSatDetailVo.java | 4 +- .../{ => hq}/domain/vo/HqSatOptionVo.java | 4 +- .../{ => hq}/domain/vo/HqSatQuestionVo.java | 4 +- .../{ => hq}/domain/vo/HqSatRecordVo.java | 4 +- .../vo/HqSatSurveyQuestionDetailVo.java | 0 .../domain/vo/HqSatSurveyQuestionVo.java | 4 +- .../{ => hq}/domain/vo/HqSatSurveyVo.java | 4 +- .../domain/vo/PmRepairAttachmentVo.java | 4 +- .../domain/vo/PmRepairCategoryVo.java | 4 +- .../{ => hq}/domain/vo/PmRepairOrderVo.java | 4 +- .../{ => hq}/mapper/HqHallInfoMapper.java | 6 +- .../mapper/HqHallReservationMapper.java | 6 +- .../{ => hq}/mapper/HqSatCategoryMapper.java | 6 +- .../{ => hq}/mapper/HqSatDetailMapper.java | 6 +- .../{ => hq}/mapper/HqSatOptionMapper.java | 6 +- .../{ => hq}/mapper/HqSatQuestionMapper.java | 6 +- .../{ => hq}/mapper/HqSatRecordMapper.java | 6 +- .../{ => hq}/mapper/HqSatSurveyMapper.java | 6 +- .../mapper/HqSatSurveyQuestionMapper.java | 6 +- .../mapper/PmRepairAttachmentMapper.java | 6 +- .../mapper/PmRepairCategoryMapper.java | 6 +- .../{ => hq}/mapper/PmRepairOrderMapper.java | 6 +- .../mapper/PmRepairProgressMapper.java | 4 +- .../mapper/PmServiceEvaluationMapper.java | 4 +- .../{ => hq}/service/IHqHallInfoService.java | 6 +- .../service/IHqHallReservationService.java | 8 +- .../service/IHqSatCategoryService.java | 6 +- .../{ => hq}/service/IHqSatDetailService.java | 6 +- .../{ => hq}/service/IHqSatOptionService.java | 6 +- .../service/IHqSatQuestionService.java | 6 +- .../{ => hq}/service/IHqSatRecordService.java | 6 +- .../service/IHqSatSurveyQuestionService.java | 6 +- .../{ => hq}/service/IHqSatSurveyService.java | 12 +- .../service/IPmRepairAttachmentService.java | 6 +- .../service/IPmRepairCategoryService.java | 6 +- .../service/IPmRepairOrderService.java | 6 +- .../service/impl/HqHallInfoServiceImpl.java | 12 +- .../impl/HqHallReservationServiceImpl.java | 14 +- .../impl/HqSatCategoryServiceImpl.java | 12 +- .../service/impl/HqSatDetailServiceImpl.java | 12 +- .../service/impl/HqSatOptionServiceImpl.java | 12 +- .../impl/HqSatQuestionServiceImpl.java | 12 +- .../service/impl/HqSatRecordServiceImpl.java | 12 +- .../impl/HqSatSurveyQuestionServiceImpl.java | 12 +- .../service/impl/HqSatSurveyServiceImpl.java | 32 +- .../impl/PmRepairAttachmentServiceImpl.java | 20 +- .../impl/PmRepairCategoryServiceImpl.java | 12 +- .../impl/PmRepairOrderServiceImpl.java | 22 +- .../resources/mapper/hq/HqHallInfoMapper.xml | 2 +- .../mapper/hq/HqHallReservationMapper.xml | 2 +- .../mapper/hq/HqSatCategoryMapper.xml | 2 +- .../resources/mapper/hq/HqSatDetailMapper.xml | 2 +- .../resources/mapper/hq/HqSatOptionMapper.xml | 2 +- .../mapper/hq/HqSatQuestionMapper.xml | 2 +- .../resources/mapper/hq/HqSatRecordMapper.xml | 2 +- .../resources/mapper/hq/HqSatSurveyMapper.xml | 2 +- .../mapper/hq/HqSatSurveyQuestionMapper.xml | 4 +- .../{pm => hq}/PmRepairAttachmentMapper.xml | 4 +- .../{pm => hq}/PmRepairCategoryMapper.xml | 2 +- .../mapper/{pm => hq}/PmRepairOrderMapper.xml | 2 +- .../{pm => hq}/PmRepairProgressMapper.xml | 4 +- .../code-adjust-record-2025-06-30-zlwu.md | 489 +++++++++++++++++- docs/开发文档/API.md | 52 +- web/src/api/{ => hq}/pm/index.ts | 0 web/src/api/{ => hq}/pm/repairCategory.ts | 16 +- web/src/api/{ => hq}/pm/repairOrder.ts | 44 +- web/src/api/{ => hq}/pm/types.ts | 0 .../{ => hq}/pm/repairCategory/index.vue | 8 +- .../views/{ => hq}/pm/repairOrder/index.vue | 6 +- 112 files changed, 863 insertions(+), 376 deletions(-) rename backend/ruoyi-admin/src/main/java/org/dromara/zhxy/{ => hq}/controller/HqHallInfoController.java (94%) rename backend/ruoyi-admin/src/main/java/org/dromara/zhxy/{ => hq}/controller/HqHallReservationController.java (93%) rename backend/ruoyi-admin/src/main/java/org/dromara/zhxy/{ => hq}/controller/HqSatCategoryController.java (94%) rename backend/ruoyi-admin/src/main/java/org/dromara/zhxy/{ => hq}/controller/HqSatDetailController.java (94%) rename backend/ruoyi-admin/src/main/java/org/dromara/zhxy/{ => hq}/controller/HqSatOptionController.java (94%) rename backend/ruoyi-admin/src/main/java/org/dromara/zhxy/{ => hq}/controller/HqSatQuestionController.java (91%) rename backend/ruoyi-admin/src/main/java/org/dromara/zhxy/{ => hq}/controller/HqSatRecordController.java (94%) rename backend/ruoyi-admin/src/main/java/org/dromara/zhxy/{ => hq}/controller/HqSatSurveyController.java (95%) rename backend/ruoyi-admin/src/main/java/org/dromara/zhxy/{ => hq}/controller/HqSatSurveyQuestionController.java (94%) rename backend/ruoyi-admin/src/main/java/org/dromara/zhxy/{ => hq}/controller/PmRepairAttachmentController.java (96%) rename backend/ruoyi-admin/src/main/java/org/dromara/zhxy/{ => hq}/controller/PmRepairCategoryController.java (94%) rename backend/ruoyi-admin/src/main/java/org/dromara/zhxy/{ => hq}/controller/PmRepairOrderController.java (97%) rename backend/ruoyi-admin/src/main/java/org/dromara/zhxy/{ => hq}/domain/HqHallInfo.java (96%) rename backend/ruoyi-admin/src/main/java/org/dromara/zhxy/{ => hq}/domain/HqHallReservation.java (97%) rename backend/ruoyi-admin/src/main/java/org/dromara/zhxy/{ => hq}/domain/HqSatCategory.java (96%) rename backend/ruoyi-admin/src/main/java/org/dromara/zhxy/{ => hq}/domain/HqSatDetail.java (95%) rename backend/ruoyi-admin/src/main/java/org/dromara/zhxy/{ => hq}/domain/HqSatOption.java (96%) rename backend/ruoyi-admin/src/main/java/org/dromara/zhxy/{ => hq}/domain/HqSatQuestion.java (96%) rename backend/ruoyi-admin/src/main/java/org/dromara/zhxy/{ => hq}/domain/HqSatRecord.java (97%) rename backend/ruoyi-admin/src/main/java/org/dromara/zhxy/{ => hq}/domain/HqSatSurvey.java (97%) rename backend/ruoyi-admin/src/main/java/org/dromara/zhxy/{ => hq}/domain/HqSatSurveyQuestion.java (96%) rename backend/ruoyi-admin/src/main/java/org/dromara/zhxy/{ => hq}/domain/PmRepairAttachment.java (98%) rename backend/ruoyi-admin/src/main/java/org/dromara/zhxy/{ => hq}/domain/PmRepairCategory.java (98%) rename backend/ruoyi-admin/src/main/java/org/dromara/zhxy/{ => hq}/domain/PmRepairOrder.java (98%) rename backend/ruoyi-admin/src/main/java/org/dromara/zhxy/{ => hq}/domain/PmRepairProgress.java (98%) rename backend/ruoyi-admin/src/main/java/org/dromara/zhxy/{ => hq}/domain/PmServiceEvaluation.java (98%) rename backend/ruoyi-admin/src/main/java/org/dromara/zhxy/{ => hq}/domain/bo/HqHallInfoBo.java (93%) rename backend/ruoyi-admin/src/main/java/org/dromara/zhxy/{ => hq}/domain/bo/HqHallReservationAuditBo.java (94%) rename backend/ruoyi-admin/src/main/java/org/dromara/zhxy/{ => hq}/domain/bo/HqHallReservationBo.java (96%) rename backend/ruoyi-admin/src/main/java/org/dromara/zhxy/{ => hq}/domain/bo/HqSatAnswerSubmitBo.java (98%) rename backend/ruoyi-admin/src/main/java/org/dromara/zhxy/{ => hq}/domain/bo/HqSatCategoryBo.java (93%) rename backend/ruoyi-admin/src/main/java/org/dromara/zhxy/{ => hq}/domain/bo/HqSatDetailBo.java (93%) rename backend/ruoyi-admin/src/main/java/org/dromara/zhxy/{ => hq}/domain/bo/HqSatOptionBo.java (93%) rename backend/ruoyi-admin/src/main/java/org/dromara/zhxy/{ => hq}/domain/bo/HqSatQuestionBo.java (94%) rename backend/ruoyi-admin/src/main/java/org/dromara/zhxy/{ => hq}/domain/bo/HqSatRecordBo.java (94%) rename backend/ruoyi-admin/src/main/java/org/dromara/zhxy/{ => hq}/domain/bo/HqSatSurveyBo.java (96%) rename backend/ruoyi-admin/src/main/java/org/dromara/zhxy/{ => hq}/domain/bo/HqSatSurveyQuestionBo.java (93%) rename backend/ruoyi-admin/src/main/java/org/dromara/zhxy/{ => hq}/domain/bo/PmRepairAttachmentBo.java (96%) rename backend/ruoyi-admin/src/main/java/org/dromara/zhxy/{ => hq}/domain/bo/PmRepairCategoryBo.java (97%) rename backend/ruoyi-admin/src/main/java/org/dromara/zhxy/{ => hq}/domain/bo/PmRepairOrderBo.java (97%) rename backend/ruoyi-admin/src/main/java/org/dromara/zhxy/{ => hq}/domain/vo/HqHallInfoVo.java (94%) rename backend/ruoyi-admin/src/main/java/org/dromara/zhxy/{ => hq}/domain/vo/HqHallReservationVo.java (96%) rename backend/ruoyi-admin/src/main/java/org/dromara/zhxy/{ => hq}/domain/vo/HqSatCategoryVo.java (94%) rename backend/ruoyi-admin/src/main/java/org/dromara/zhxy/{ => hq}/domain/vo/HqSatDetailVo.java (94%) rename backend/ruoyi-admin/src/main/java/org/dromara/zhxy/{ => hq}/domain/vo/HqSatOptionVo.java (94%) rename backend/ruoyi-admin/src/main/java/org/dromara/zhxy/{ => hq}/domain/vo/HqSatQuestionVo.java (95%) rename backend/ruoyi-admin/src/main/java/org/dromara/zhxy/{ => hq}/domain/vo/HqSatRecordVo.java (95%) rename backend/ruoyi-admin/src/main/java/org/dromara/zhxy/{ => hq}/domain/vo/HqSatSurveyQuestionDetailVo.java (100%) rename backend/ruoyi-admin/src/main/java/org/dromara/zhxy/{ => hq}/domain/vo/HqSatSurveyQuestionVo.java (96%) rename backend/ruoyi-admin/src/main/java/org/dromara/zhxy/{ => hq}/domain/vo/HqSatSurveyVo.java (96%) rename backend/ruoyi-admin/src/main/java/org/dromara/zhxy/{ => hq}/domain/vo/PmRepairAttachmentVo.java (96%) rename backend/ruoyi-admin/src/main/java/org/dromara/zhxy/{ => hq}/domain/vo/PmRepairCategoryVo.java (97%) rename backend/ruoyi-admin/src/main/java/org/dromara/zhxy/{ => hq}/domain/vo/PmRepairOrderVo.java (98%) rename backend/ruoyi-admin/src/main/java/org/dromara/zhxy/{ => hq}/mapper/HqHallInfoMapper.java (63%) rename backend/ruoyi-admin/src/main/java/org/dromara/zhxy/{ => hq}/mapper/HqHallReservationMapper.java (63%) rename backend/ruoyi-admin/src/main/java/org/dromara/zhxy/{ => hq}/mapper/HqSatCategoryMapper.java (63%) rename backend/ruoyi-admin/src/main/java/org/dromara/zhxy/{ => hq}/mapper/HqSatDetailMapper.java (63%) rename backend/ruoyi-admin/src/main/java/org/dromara/zhxy/{ => hq}/mapper/HqSatOptionMapper.java (63%) rename backend/ruoyi-admin/src/main/java/org/dromara/zhxy/{ => hq}/mapper/HqSatQuestionMapper.java (62%) rename backend/ruoyi-admin/src/main/java/org/dromara/zhxy/{ => hq}/mapper/HqSatRecordMapper.java (63%) rename backend/ruoyi-admin/src/main/java/org/dromara/zhxy/{ => hq}/mapper/HqSatSurveyMapper.java (62%) rename backend/ruoyi-admin/src/main/java/org/dromara/zhxy/{ => hq}/mapper/HqSatSurveyQuestionMapper.java (78%) rename backend/ruoyi-admin/src/main/java/org/dromara/zhxy/{ => hq}/mapper/PmRepairAttachmentMapper.java (63%) rename backend/ruoyi-admin/src/main/java/org/dromara/zhxy/{ => hq}/mapper/PmRepairCategoryMapper.java (63%) rename backend/ruoyi-admin/src/main/java/org/dromara/zhxy/{ => hq}/mapper/PmRepairOrderMapper.java (76%) rename backend/ruoyi-admin/src/main/java/org/dromara/zhxy/{ => hq}/mapper/PmRepairProgressMapper.java (74%) rename backend/ruoyi-admin/src/main/java/org/dromara/zhxy/{ => hq}/mapper/PmServiceEvaluationMapper.java (73%) rename backend/ruoyi-admin/src/main/java/org/dromara/zhxy/{ => hq}/service/IHqHallInfoService.java (91%) rename backend/ruoyi-admin/src/main/java/org/dromara/zhxy/{ => hq}/service/IHqHallReservationService.java (88%) rename backend/ruoyi-admin/src/main/java/org/dromara/zhxy/{ => hq}/service/IHqSatCategoryService.java (91%) rename backend/ruoyi-admin/src/main/java/org/dromara/zhxy/{ => hq}/service/IHqSatDetailService.java (91%) rename backend/ruoyi-admin/src/main/java/org/dromara/zhxy/{ => hq}/service/IHqSatOptionService.java (91%) rename backend/ruoyi-admin/src/main/java/org/dromara/zhxy/{ => hq}/service/IHqSatQuestionService.java (90%) rename backend/ruoyi-admin/src/main/java/org/dromara/zhxy/{ => hq}/service/IHqSatRecordService.java (91%) rename backend/ruoyi-admin/src/main/java/org/dromara/zhxy/{ => hq}/service/IHqSatSurveyQuestionService.java (92%) rename backend/ruoyi-admin/src/main/java/org/dromara/zhxy/{ => hq}/service/IHqSatSurveyService.java (90%) rename backend/ruoyi-admin/src/main/java/org/dromara/zhxy/{ => hq}/service/IPmRepairAttachmentService.java (91%) rename backend/ruoyi-admin/src/main/java/org/dromara/zhxy/{ => hq}/service/IPmRepairCategoryService.java (92%) rename backend/ruoyi-admin/src/main/java/org/dromara/zhxy/{ => hq}/service/IPmRepairOrderService.java (96%) rename backend/ruoyi-admin/src/main/java/org/dromara/zhxy/{ => hq}/service/impl/HqHallInfoServiceImpl.java (92%) rename backend/ruoyi-admin/src/main/java/org/dromara/zhxy/{ => hq}/service/impl/HqHallReservationServiceImpl.java (95%) rename backend/ruoyi-admin/src/main/java/org/dromara/zhxy/{ => hq}/service/impl/HqSatCategoryServiceImpl.java (93%) rename backend/ruoyi-admin/src/main/java/org/dromara/zhxy/{ => hq}/service/impl/HqSatDetailServiceImpl.java (92%) rename backend/ruoyi-admin/src/main/java/org/dromara/zhxy/{ => hq}/service/impl/HqSatOptionServiceImpl.java (93%) rename backend/ruoyi-admin/src/main/java/org/dromara/zhxy/{ => hq}/service/impl/HqSatQuestionServiceImpl.java (93%) rename backend/ruoyi-admin/src/main/java/org/dromara/zhxy/{ => hq}/service/impl/HqSatRecordServiceImpl.java (93%) rename backend/ruoyi-admin/src/main/java/org/dromara/zhxy/{ => hq}/service/impl/HqSatSurveyQuestionServiceImpl.java (93%) rename backend/ruoyi-admin/src/main/java/org/dromara/zhxy/{ => hq}/service/impl/HqSatSurveyServiceImpl.java (97%) rename backend/ruoyi-admin/src/main/java/org/dromara/zhxy/{ => hq}/service/impl/PmRepairAttachmentServiceImpl.java (94%) rename backend/ruoyi-admin/src/main/java/org/dromara/zhxy/{ => hq}/service/impl/PmRepairCategoryServiceImpl.java (96%) rename backend/ruoyi-admin/src/main/java/org/dromara/zhxy/{ => hq}/service/impl/PmRepairOrderServiceImpl.java (98%) rename backend/ruoyi-admin/src/main/resources/mapper/{pm => hq}/PmRepairAttachmentMapper.xml (91%) rename backend/ruoyi-admin/src/main/resources/mapper/{pm => hq}/PmRepairCategoryMapper.xml (69%) rename backend/ruoyi-admin/src/main/resources/mapper/{pm => hq}/PmRepairOrderMapper.xml (93%) rename backend/ruoyi-admin/src/main/resources/mapper/{pm => hq}/PmRepairProgressMapper.xml (92%) rename web/src/api/{ => hq}/pm/index.ts (100%) rename web/src/api/{ => hq}/pm/repairCategory.ts (82%) rename web/src/api/{ => hq}/pm/repairOrder.ts (85%) rename web/src/api/{ => hq}/pm/types.ts (100%) rename web/src/views/{ => hq}/pm/repairCategory/index.vue (99%) rename web/src/views/{ => hq}/pm/repairOrder/index.vue (99%) diff --git a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/controller/HqHallInfoController.java b/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/controller/HqHallInfoController.java similarity index 94% rename from backend/ruoyi-admin/src/main/java/org/dromara/zhxy/controller/HqHallInfoController.java rename to backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/controller/HqHallInfoController.java index 36e6d04d..d0dea3ba 100644 --- a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/controller/HqHallInfoController.java +++ b/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/controller/HqHallInfoController.java @@ -1,4 +1,4 @@ -package org.dromara.zhxy.controller; +package org.dromara.zhxy.hq.controller; 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.zhxy.domain.vo.HqHallInfoVo; -import org.dromara.zhxy.domain.bo.HqHallInfoBo; -import org.dromara.zhxy.service.IHqHallInfoService; +import org.dromara.zhxy.hq.domain.vo.HqHallInfoVo; +import org.dromara.zhxy.hq.domain.bo.HqHallInfoBo; +import org.dromara.zhxy.hq.service.IHqHallInfoService; import org.dromara.common.mybatis.core.page.TableDataInfo; /** diff --git a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/controller/HqHallReservationController.java b/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/controller/HqHallReservationController.java similarity index 93% rename from backend/ruoyi-admin/src/main/java/org/dromara/zhxy/controller/HqHallReservationController.java rename to backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/controller/HqHallReservationController.java index 405b0e5b..c57db5f1 100644 --- a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/controller/HqHallReservationController.java +++ b/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/controller/HqHallReservationController.java @@ -1,4 +1,4 @@ -package org.dromara.zhxy.controller; +package org.dromara.zhxy.hq.controller; import java.util.List; @@ -17,10 +17,10 @@ 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.zhxy.domain.vo.HqHallReservationVo; -import org.dromara.zhxy.domain.bo.HqHallReservationBo; -import org.dromara.zhxy.domain.bo.HqHallReservationAuditBo; -import org.dromara.zhxy.service.IHqHallReservationService; +import org.dromara.zhxy.hq.domain.vo.HqHallReservationVo; +import org.dromara.zhxy.hq.domain.bo.HqHallReservationBo; +import org.dromara.zhxy.hq.domain.bo.HqHallReservationAuditBo; +import org.dromara.zhxy.hq.service.IHqHallReservationService; import org.dromara.common.mybatis.core.page.TableDataInfo; /** diff --git a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/controller/HqSatCategoryController.java b/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/controller/HqSatCategoryController.java similarity index 94% rename from backend/ruoyi-admin/src/main/java/org/dromara/zhxy/controller/HqSatCategoryController.java rename to backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/controller/HqSatCategoryController.java index e6c7cb5d..0e285aba 100644 --- a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/controller/HqSatCategoryController.java +++ b/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/controller/HqSatCategoryController.java @@ -1,4 +1,4 @@ -package org.dromara.zhxy.controller; +package org.dromara.zhxy.hq.controller; 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.zhxy.domain.vo.HqSatCategoryVo; -import org.dromara.zhxy.domain.bo.HqSatCategoryBo; -import org.dromara.zhxy.service.IHqSatCategoryService; +import org.dromara.zhxy.hq.domain.vo.HqSatCategoryVo; +import org.dromara.zhxy.hq.domain.bo.HqSatCategoryBo; +import org.dromara.zhxy.hq.service.IHqSatCategoryService; import org.dromara.common.mybatis.core.page.TableDataInfo; /** diff --git a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/controller/HqSatDetailController.java b/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/controller/HqSatDetailController.java similarity index 94% rename from backend/ruoyi-admin/src/main/java/org/dromara/zhxy/controller/HqSatDetailController.java rename to backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/controller/HqSatDetailController.java index 05bf09fb..74486a02 100644 --- a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/controller/HqSatDetailController.java +++ b/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/controller/HqSatDetailController.java @@ -1,4 +1,4 @@ -package org.dromara.zhxy.controller; +package org.dromara.zhxy.hq.controller; 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.zhxy.domain.vo.HqSatDetailVo; -import org.dromara.zhxy.domain.bo.HqSatDetailBo; -import org.dromara.zhxy.service.IHqSatDetailService; +import org.dromara.zhxy.hq.domain.vo.HqSatDetailVo; +import org.dromara.zhxy.hq.domain.bo.HqSatDetailBo; +import org.dromara.zhxy.hq.service.IHqSatDetailService; import org.dromara.common.mybatis.core.page.TableDataInfo; /** diff --git a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/controller/HqSatOptionController.java b/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/controller/HqSatOptionController.java similarity index 94% rename from backend/ruoyi-admin/src/main/java/org/dromara/zhxy/controller/HqSatOptionController.java rename to backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/controller/HqSatOptionController.java index 68276a0e..d9c1a495 100644 --- a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/controller/HqSatOptionController.java +++ b/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/controller/HqSatOptionController.java @@ -1,4 +1,4 @@ -package org.dromara.zhxy.controller; +package org.dromara.zhxy.hq.controller; 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.zhxy.domain.vo.HqSatOptionVo; -import org.dromara.zhxy.domain.bo.HqSatOptionBo; -import org.dromara.zhxy.service.IHqSatOptionService; +import org.dromara.zhxy.hq.domain.vo.HqSatOptionVo; +import org.dromara.zhxy.hq.domain.bo.HqSatOptionBo; +import org.dromara.zhxy.hq.service.IHqSatOptionService; import org.dromara.common.mybatis.core.page.TableDataInfo; /** diff --git a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/controller/HqSatQuestionController.java b/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/controller/HqSatQuestionController.java similarity index 91% rename from backend/ruoyi-admin/src/main/java/org/dromara/zhxy/controller/HqSatQuestionController.java rename to backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/controller/HqSatQuestionController.java index 38b40555..07570ebe 100644 --- a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/controller/HqSatQuestionController.java +++ b/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/controller/HqSatQuestionController.java @@ -1,4 +1,4 @@ -package org.dromara.zhxy.controller; +package org.dromara.zhxy.hq.controller; import java.util.List; @@ -17,12 +17,12 @@ 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.zhxy.domain.vo.HqSatQuestionVo; -import org.dromara.zhxy.domain.bo.HqSatQuestionBo; -import org.dromara.zhxy.service.IHqSatQuestionService; -import org.dromara.zhxy.service.IHqSatOptionService; -import org.dromara.zhxy.domain.vo.HqSatOptionVo; -import org.dromara.zhxy.domain.bo.HqSatOptionBo; +import org.dromara.zhxy.hq.domain.vo.HqSatQuestionVo; +import org.dromara.zhxy.hq.domain.bo.HqSatQuestionBo; +import org.dromara.zhxy.hq.service.IHqSatQuestionService; +import org.dromara.zhxy.hq.service.IHqSatOptionService; +import org.dromara.zhxy.hq.domain.vo.HqSatOptionVo; +import org.dromara.zhxy.hq.domain.bo.HqSatOptionBo; import org.dromara.common.mybatis.core.page.TableDataInfo; /** diff --git a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/controller/HqSatRecordController.java b/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/controller/HqSatRecordController.java similarity index 94% rename from backend/ruoyi-admin/src/main/java/org/dromara/zhxy/controller/HqSatRecordController.java rename to backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/controller/HqSatRecordController.java index 964cc44c..7b8bb478 100644 --- a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/controller/HqSatRecordController.java +++ b/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/controller/HqSatRecordController.java @@ -1,4 +1,4 @@ -package org.dromara.zhxy.controller; +package org.dromara.zhxy.hq.controller; 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.zhxy.domain.vo.HqSatRecordVo; -import org.dromara.zhxy.domain.bo.HqSatRecordBo; -import org.dromara.zhxy.service.IHqSatRecordService; +import org.dromara.zhxy.hq.domain.vo.HqSatRecordVo; +import org.dromara.zhxy.hq.domain.bo.HqSatRecordBo; +import org.dromara.zhxy.hq.service.IHqSatRecordService; import org.dromara.common.mybatis.core.page.TableDataInfo; /** diff --git a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/controller/HqSatSurveyController.java b/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/controller/HqSatSurveyController.java similarity index 95% rename from backend/ruoyi-admin/src/main/java/org/dromara/zhxy/controller/HqSatSurveyController.java rename to backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/controller/HqSatSurveyController.java index 1d62fd73..84a0f984 100644 --- a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/controller/HqSatSurveyController.java +++ b/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/controller/HqSatSurveyController.java @@ -1,4 +1,4 @@ -package org.dromara.zhxy.controller; +package org.dromara.zhxy.hq.controller; import java.util.List; @@ -17,12 +17,12 @@ 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.zhxy.domain.vo.HqSatSurveyVo; -import org.dromara.zhxy.domain.bo.HqSatSurveyBo; -import org.dromara.zhxy.domain.bo.HqSatAnswerSubmitBo; -import org.dromara.zhxy.service.IHqSatSurveyService; -import org.dromara.zhxy.domain.vo.HqSatSurveyQuestionVo; -import org.dromara.zhxy.domain.vo.HqSatRecordVo; +import org.dromara.zhxy.hq.domain.vo.HqSatSurveyVo; +import org.dromara.zhxy.hq.domain.bo.HqSatSurveyBo; +import org.dromara.zhxy.hq.domain.bo.HqSatAnswerSubmitBo; +import org.dromara.zhxy.hq.service.IHqSatSurveyService; +import org.dromara.zhxy.hq.domain.vo.HqSatSurveyQuestionVo; +import org.dromara.zhxy.hq.domain.vo.HqSatRecordVo; import org.dromara.common.mybatis.core.page.TableDataInfo; /** diff --git a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/controller/HqSatSurveyQuestionController.java b/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/controller/HqSatSurveyQuestionController.java similarity index 94% rename from backend/ruoyi-admin/src/main/java/org/dromara/zhxy/controller/HqSatSurveyQuestionController.java rename to backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/controller/HqSatSurveyQuestionController.java index 742da8dc..a44646a3 100644 --- a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/controller/HqSatSurveyQuestionController.java +++ b/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/controller/HqSatSurveyQuestionController.java @@ -1,4 +1,4 @@ -package org.dromara.zhxy.controller; +package org.dromara.zhxy.hq.controller; 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.zhxy.domain.vo.HqSatSurveyQuestionVo; -import org.dromara.zhxy.domain.bo.HqSatSurveyQuestionBo; -import org.dromara.zhxy.service.IHqSatSurveyQuestionService; +import org.dromara.zhxy.hq.domain.vo.HqSatSurveyQuestionVo; +import org.dromara.zhxy.hq.domain.bo.HqSatSurveyQuestionBo; +import org.dromara.zhxy.hq.service.IHqSatSurveyQuestionService; import org.dromara.common.mybatis.core.page.TableDataInfo; /** diff --git a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/controller/PmRepairAttachmentController.java b/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/controller/PmRepairAttachmentController.java similarity index 96% rename from backend/ruoyi-admin/src/main/java/org/dromara/zhxy/controller/PmRepairAttachmentController.java rename to backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/controller/PmRepairAttachmentController.java index 4da314e4..107dd4ae 100644 --- a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/controller/PmRepairAttachmentController.java +++ b/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/controller/PmRepairAttachmentController.java @@ -1,4 +1,4 @@ -package org.dromara.zhxy.controller; +package org.dromara.zhxy.hq.controller; 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.zhxy.domain.bo.PmRepairAttachmentBo; -import org.dromara.zhxy.domain.vo.PmRepairAttachmentVo; -import org.dromara.zhxy.service.IPmRepairAttachmentService; +import org.dromara.zhxy.hq.domain.bo.PmRepairAttachmentBo; +import org.dromara.zhxy.hq.domain.vo.PmRepairAttachmentVo; +import org.dromara.zhxy.hq.service.IPmRepairAttachmentService; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; @@ -34,7 +34,7 @@ import java.util.List; @Validated @RequiredArgsConstructor @RestController -@RequestMapping("/pm/attachment") +@RequestMapping("/hq/pm/attachment") public class PmRepairAttachmentController extends BaseController { private final IPmRepairAttachmentService attachmentService; diff --git a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/controller/PmRepairCategoryController.java b/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/controller/PmRepairCategoryController.java similarity index 94% rename from backend/ruoyi-admin/src/main/java/org/dromara/zhxy/controller/PmRepairCategoryController.java rename to backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/controller/PmRepairCategoryController.java index 03600792..ac082811 100644 --- a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/controller/PmRepairCategoryController.java +++ b/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/controller/PmRepairCategoryController.java @@ -1,4 +1,4 @@ -package org.dromara.zhxy.controller; +package org.dromara.zhxy.hq.controller; 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.zhxy.domain.vo.PmRepairCategoryVo; -import org.dromara.zhxy.domain.bo.PmRepairCategoryBo; -import org.dromara.zhxy.service.IPmRepairCategoryService; +import org.dromara.zhxy.hq.domain.vo.PmRepairCategoryVo; +import org.dromara.zhxy.hq.domain.bo.PmRepairCategoryBo; +import org.dromara.zhxy.hq.service.IPmRepairCategoryService; import org.dromara.common.mybatis.core.page.TableDataInfo; /** @@ -31,7 +31,7 @@ import org.dromara.common.mybatis.core.page.TableDataInfo; @Validated @RequiredArgsConstructor @RestController -@RequestMapping("/pm/repairCategory") +@RequestMapping("/hq/pm/repairCategory") public class PmRepairCategoryController extends BaseController { private final IPmRepairCategoryService repairCategoryService; diff --git a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/controller/PmRepairOrderController.java b/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/controller/PmRepairOrderController.java similarity index 97% rename from backend/ruoyi-admin/src/main/java/org/dromara/zhxy/controller/PmRepairOrderController.java rename to backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/controller/PmRepairOrderController.java index 32356e01..484b9466 100644 --- a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/controller/PmRepairOrderController.java +++ b/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/controller/PmRepairOrderController.java @@ -1,4 +1,4 @@ -package org.dromara.zhxy.controller; +package org.dromara.zhxy.hq.controller; import java.util.List; @@ -17,11 +17,11 @@ 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.zhxy.domain.vo.PmRepairOrderVo; -import org.dromara.zhxy.domain.bo.PmRepairOrderBo; -import org.dromara.zhxy.domain.vo.PmRepairAttachmentVo; -import org.dromara.zhxy.service.IPmRepairOrderService; -import org.dromara.zhxy.service.IPmRepairAttachmentService; +import org.dromara.zhxy.hq.domain.vo.PmRepairOrderVo; +import org.dromara.zhxy.hq.domain.bo.PmRepairOrderBo; +import org.dromara.zhxy.hq.domain.vo.PmRepairAttachmentVo; +import org.dromara.zhxy.hq.service.IPmRepairOrderService; +import org.dromara.zhxy.hq.service.IPmRepairAttachmentService; import org.dromara.common.mybatis.core.page.TableDataInfo; /** @@ -33,7 +33,7 @@ import org.dromara.common.mybatis.core.page.TableDataInfo; @Validated @RequiredArgsConstructor @RestController -@RequestMapping("/pm/repairOrder") +@RequestMapping("/hq/pm/repairOrder") public class PmRepairOrderController extends BaseController { private final IPmRepairOrderService repairOrderService; diff --git a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/domain/HqHallInfo.java b/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/HqHallInfo.java similarity index 96% rename from backend/ruoyi-admin/src/main/java/org/dromara/zhxy/domain/HqHallInfo.java rename to backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/HqHallInfo.java index bcdc1bb4..5f1fe4bd 100644 --- a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/domain/HqHallInfo.java +++ b/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/HqHallInfo.java @@ -1,4 +1,4 @@ -package org.dromara.zhxy.domain; +package org.dromara.zhxy.hq.domain; import org.dromara.common.tenant.core.TenantEntity; import com.baomidou.mybatisplus.annotation.*; diff --git a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/domain/HqHallReservation.java b/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/HqHallReservation.java similarity index 97% rename from backend/ruoyi-admin/src/main/java/org/dromara/zhxy/domain/HqHallReservation.java rename to backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/HqHallReservation.java index 25974b1b..31466a49 100644 --- a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/domain/HqHallReservation.java +++ b/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/HqHallReservation.java @@ -1,4 +1,4 @@ -package org.dromara.zhxy.domain; +package org.dromara.zhxy.hq.domain; import org.dromara.common.tenant.core.TenantEntity; import com.baomidou.mybatisplus.annotation.*; diff --git a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/domain/HqSatCategory.java b/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/HqSatCategory.java similarity index 96% rename from backend/ruoyi-admin/src/main/java/org/dromara/zhxy/domain/HqSatCategory.java rename to backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/HqSatCategory.java index a5ca451e..3e6dfe42 100644 --- a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/domain/HqSatCategory.java +++ b/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/HqSatCategory.java @@ -1,4 +1,4 @@ -package org.dromara.zhxy.domain; +package org.dromara.zhxy.hq.domain; import org.dromara.common.tenant.core.TenantEntity; import com.baomidou.mybatisplus.annotation.*; diff --git a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/domain/HqSatDetail.java b/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/HqSatDetail.java similarity index 95% rename from backend/ruoyi-admin/src/main/java/org/dromara/zhxy/domain/HqSatDetail.java rename to backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/HqSatDetail.java index 8150c85e..fcabc690 100644 --- a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/domain/HqSatDetail.java +++ b/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/HqSatDetail.java @@ -1,4 +1,4 @@ -package org.dromara.zhxy.domain; +package org.dromara.zhxy.hq.domain; import org.dromara.common.tenant.core.TenantEntity; import com.baomidou.mybatisplus.annotation.*; diff --git a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/domain/HqSatOption.java b/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/HqSatOption.java similarity index 96% rename from backend/ruoyi-admin/src/main/java/org/dromara/zhxy/domain/HqSatOption.java rename to backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/HqSatOption.java index 964f0014..34a0c7c0 100644 --- a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/domain/HqSatOption.java +++ b/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/HqSatOption.java @@ -1,4 +1,4 @@ -package org.dromara.zhxy.domain; +package org.dromara.zhxy.hq.domain; import org.dromara.common.tenant.core.TenantEntity; import com.baomidou.mybatisplus.annotation.*; diff --git a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/domain/HqSatQuestion.java b/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/HqSatQuestion.java similarity index 96% rename from backend/ruoyi-admin/src/main/java/org/dromara/zhxy/domain/HqSatQuestion.java rename to backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/HqSatQuestion.java index 577452f2..fa6e05eb 100644 --- a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/domain/HqSatQuestion.java +++ b/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/HqSatQuestion.java @@ -1,4 +1,4 @@ -package org.dromara.zhxy.domain; +package org.dromara.zhxy.hq.domain; import org.dromara.common.tenant.core.TenantEntity; import com.baomidou.mybatisplus.annotation.*; diff --git a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/domain/HqSatRecord.java b/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/HqSatRecord.java similarity index 97% rename from backend/ruoyi-admin/src/main/java/org/dromara/zhxy/domain/HqSatRecord.java rename to backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/HqSatRecord.java index 4e0f4ec4..60cd2a38 100644 --- a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/domain/HqSatRecord.java +++ b/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/HqSatRecord.java @@ -1,4 +1,4 @@ -package org.dromara.zhxy.domain; +package org.dromara.zhxy.hq.domain; import org.dromara.common.tenant.core.TenantEntity; import com.baomidou.mybatisplus.annotation.*; diff --git a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/domain/HqSatSurvey.java b/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/HqSatSurvey.java similarity index 97% rename from backend/ruoyi-admin/src/main/java/org/dromara/zhxy/domain/HqSatSurvey.java rename to backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/HqSatSurvey.java index f921c112..367b6cf0 100644 --- a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/domain/HqSatSurvey.java +++ b/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/HqSatSurvey.java @@ -1,4 +1,4 @@ -package org.dromara.zhxy.domain; +package org.dromara.zhxy.hq.domain; import org.dromara.common.tenant.core.TenantEntity; import com.baomidou.mybatisplus.annotation.*; diff --git a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/domain/HqSatSurveyQuestion.java b/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/HqSatSurveyQuestion.java similarity index 96% rename from backend/ruoyi-admin/src/main/java/org/dromara/zhxy/domain/HqSatSurveyQuestion.java rename to backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/HqSatSurveyQuestion.java index 1d507b0f..2c2ada14 100644 --- a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/domain/HqSatSurveyQuestion.java +++ b/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/HqSatSurveyQuestion.java @@ -1,4 +1,4 @@ -package org.dromara.zhxy.domain; +package org.dromara.zhxy.hq.domain; import org.dromara.common.tenant.core.TenantEntity; import com.baomidou.mybatisplus.annotation.*; diff --git a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/domain/PmRepairAttachment.java b/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/PmRepairAttachment.java similarity index 98% rename from backend/ruoyi-admin/src/main/java/org/dromara/zhxy/domain/PmRepairAttachment.java rename to backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/PmRepairAttachment.java index e582e145..d406840e 100644 --- a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/domain/PmRepairAttachment.java +++ b/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/PmRepairAttachment.java @@ -1,4 +1,4 @@ -package org.dromara.zhxy.domain; +package org.dromara.zhxy.hq.domain; import org.dromara.common.tenant.core.TenantEntity; import com.baomidou.mybatisplus.annotation.*; diff --git a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/domain/PmRepairCategory.java b/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/PmRepairCategory.java similarity index 98% rename from backend/ruoyi-admin/src/main/java/org/dromara/zhxy/domain/PmRepairCategory.java rename to backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/PmRepairCategory.java index f21e263c..f2177012 100644 --- a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/domain/PmRepairCategory.java +++ b/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/PmRepairCategory.java @@ -1,4 +1,4 @@ -package org.dromara.zhxy.domain; +package org.dromara.zhxy.hq.domain; import org.dromara.common.tenant.core.TenantEntity; import com.baomidou.mybatisplus.annotation.*; diff --git a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/domain/PmRepairOrder.java b/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/PmRepairOrder.java similarity index 98% rename from backend/ruoyi-admin/src/main/java/org/dromara/zhxy/domain/PmRepairOrder.java rename to backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/PmRepairOrder.java index 434c1fad..9566150a 100644 --- a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/domain/PmRepairOrder.java +++ b/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/PmRepairOrder.java @@ -1,4 +1,4 @@ -package org.dromara.zhxy.domain; +package org.dromara.zhxy.hq.domain; import org.dromara.common.tenant.core.TenantEntity; import com.baomidou.mybatisplus.annotation.*; diff --git a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/domain/PmRepairProgress.java b/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/PmRepairProgress.java similarity index 98% rename from backend/ruoyi-admin/src/main/java/org/dromara/zhxy/domain/PmRepairProgress.java rename to backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/PmRepairProgress.java index be6e4a6d..29c690b1 100644 --- a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/domain/PmRepairProgress.java +++ b/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/PmRepairProgress.java @@ -1,4 +1,4 @@ -package org.dromara.zhxy.domain; +package org.dromara.zhxy.hq.domain; import org.dromara.common.tenant.core.TenantEntity; import com.baomidou.mybatisplus.annotation.*; diff --git a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/domain/PmServiceEvaluation.java b/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/PmServiceEvaluation.java similarity index 98% rename from backend/ruoyi-admin/src/main/java/org/dromara/zhxy/domain/PmServiceEvaluation.java rename to backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/PmServiceEvaluation.java index 142c6b48..b20f1627 100644 --- a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/domain/PmServiceEvaluation.java +++ b/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/PmServiceEvaluation.java @@ -1,4 +1,4 @@ -package org.dromara.zhxy.domain; +package org.dromara.zhxy.hq.domain; import org.dromara.common.tenant.core.TenantEntity; import com.baomidou.mybatisplus.annotation.*; diff --git a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/domain/bo/HqHallInfoBo.java b/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/bo/HqHallInfoBo.java similarity index 93% rename from backend/ruoyi-admin/src/main/java/org/dromara/zhxy/domain/bo/HqHallInfoBo.java rename to backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/bo/HqHallInfoBo.java index 0a0f3143..73edf756 100644 --- a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/domain/bo/HqHallInfoBo.java +++ b/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/bo/HqHallInfoBo.java @@ -1,6 +1,6 @@ -package org.dromara.zhxy.domain.bo; +package org.dromara.zhxy.hq.domain.bo; -import org.dromara.zhxy.domain.HqHallInfo; +import org.dromara.zhxy.hq.domain.HqHallInfo; import org.dromara.common.mybatis.core.domain.BaseEntity; import org.dromara.common.core.validate.AddGroup; import org.dromara.common.core.validate.EditGroup; diff --git a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/domain/bo/HqHallReservationAuditBo.java b/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/bo/HqHallReservationAuditBo.java similarity index 94% rename from backend/ruoyi-admin/src/main/java/org/dromara/zhxy/domain/bo/HqHallReservationAuditBo.java rename to backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/bo/HqHallReservationAuditBo.java index 6ee8490d..b7e25331 100644 --- a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/domain/bo/HqHallReservationAuditBo.java +++ b/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/bo/HqHallReservationAuditBo.java @@ -1,4 +1,4 @@ -package org.dromara.zhxy.domain.bo; +package org.dromara.zhxy.hq.domain.bo; import lombok.Data; import jakarta.validation.constraints.NotEmpty; diff --git a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/domain/bo/HqHallReservationBo.java b/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/bo/HqHallReservationBo.java similarity index 96% rename from backend/ruoyi-admin/src/main/java/org/dromara/zhxy/domain/bo/HqHallReservationBo.java rename to backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/bo/HqHallReservationBo.java index 25b0141f..eabd8c68 100644 --- a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/domain/bo/HqHallReservationBo.java +++ b/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/bo/HqHallReservationBo.java @@ -1,6 +1,6 @@ -package org.dromara.zhxy.domain.bo; +package org.dromara.zhxy.hq.domain.bo; -import org.dromara.zhxy.domain.HqHallReservation; +import org.dromara.zhxy.hq.domain.HqHallReservation; import org.dromara.common.mybatis.core.domain.BaseEntity; import org.dromara.common.core.validate.AddGroup; import org.dromara.common.core.validate.EditGroup; diff --git a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/domain/bo/HqSatAnswerSubmitBo.java b/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/bo/HqSatAnswerSubmitBo.java similarity index 98% rename from backend/ruoyi-admin/src/main/java/org/dromara/zhxy/domain/bo/HqSatAnswerSubmitBo.java rename to backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/bo/HqSatAnswerSubmitBo.java index cd0fa4fb..2b033ce4 100644 --- a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/domain/bo/HqSatAnswerSubmitBo.java +++ b/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/bo/HqSatAnswerSubmitBo.java @@ -1,4 +1,4 @@ -package org.dromara.zhxy.domain.bo; +package org.dromara.zhxy.hq.domain.bo; import lombok.Data; import jakarta.validation.constraints.NotNull; diff --git a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/domain/bo/HqSatCategoryBo.java b/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/bo/HqSatCategoryBo.java similarity index 93% rename from backend/ruoyi-admin/src/main/java/org/dromara/zhxy/domain/bo/HqSatCategoryBo.java rename to backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/bo/HqSatCategoryBo.java index c6294355..a6315952 100644 --- a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/domain/bo/HqSatCategoryBo.java +++ b/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/bo/HqSatCategoryBo.java @@ -1,6 +1,6 @@ -package org.dromara.zhxy.domain.bo; +package org.dromara.zhxy.hq.domain.bo; -import org.dromara.zhxy.domain.HqSatCategory; +import org.dromara.zhxy.hq.domain.HqSatCategory; import org.dromara.common.mybatis.core.domain.BaseEntity; import org.dromara.common.core.validate.AddGroup; import org.dromara.common.core.validate.EditGroup; diff --git a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/domain/bo/HqSatDetailBo.java b/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/bo/HqSatDetailBo.java similarity index 93% rename from backend/ruoyi-admin/src/main/java/org/dromara/zhxy/domain/bo/HqSatDetailBo.java rename to backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/bo/HqSatDetailBo.java index 567e22d4..4e627750 100644 --- a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/domain/bo/HqSatDetailBo.java +++ b/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/bo/HqSatDetailBo.java @@ -1,6 +1,6 @@ -package org.dromara.zhxy.domain.bo; +package org.dromara.zhxy.hq.domain.bo; -import org.dromara.zhxy.domain.HqSatDetail; +import org.dromara.zhxy.hq.domain.HqSatDetail; import org.dromara.common.mybatis.core.domain.BaseEntity; import org.dromara.common.core.validate.AddGroup; import org.dromara.common.core.validate.EditGroup; diff --git a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/domain/bo/HqSatOptionBo.java b/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/bo/HqSatOptionBo.java similarity index 93% rename from backend/ruoyi-admin/src/main/java/org/dromara/zhxy/domain/bo/HqSatOptionBo.java rename to backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/bo/HqSatOptionBo.java index 8452bf40..0f314a86 100644 --- a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/domain/bo/HqSatOptionBo.java +++ b/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/bo/HqSatOptionBo.java @@ -1,6 +1,6 @@ -package org.dromara.zhxy.domain.bo; +package org.dromara.zhxy.hq.domain.bo; -import org.dromara.zhxy.domain.HqSatOption; +import org.dromara.zhxy.hq.domain.HqSatOption; import org.dromara.common.mybatis.core.domain.BaseEntity; import org.dromara.common.core.validate.AddGroup; import org.dromara.common.core.validate.EditGroup; diff --git a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/domain/bo/HqSatQuestionBo.java b/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/bo/HqSatQuestionBo.java similarity index 94% rename from backend/ruoyi-admin/src/main/java/org/dromara/zhxy/domain/bo/HqSatQuestionBo.java rename to backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/bo/HqSatQuestionBo.java index 158bc90a..b0807ca6 100644 --- a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/domain/bo/HqSatQuestionBo.java +++ b/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/bo/HqSatQuestionBo.java @@ -1,6 +1,6 @@ -package org.dromara.zhxy.domain.bo; +package org.dromara.zhxy.hq.domain.bo; -import org.dromara.zhxy.domain.HqSatQuestion; +import org.dromara.zhxy.hq.domain.HqSatQuestion; import org.dromara.common.mybatis.core.domain.BaseEntity; import org.dromara.common.core.validate.AddGroup; import org.dromara.common.core.validate.EditGroup; diff --git a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/domain/bo/HqSatRecordBo.java b/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/bo/HqSatRecordBo.java similarity index 94% rename from backend/ruoyi-admin/src/main/java/org/dromara/zhxy/domain/bo/HqSatRecordBo.java rename to backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/bo/HqSatRecordBo.java index 202d39d8..b2091fd9 100644 --- a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/domain/bo/HqSatRecordBo.java +++ b/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/bo/HqSatRecordBo.java @@ -1,6 +1,6 @@ -package org.dromara.zhxy.domain.bo; +package org.dromara.zhxy.hq.domain.bo; -import org.dromara.zhxy.domain.HqSatRecord; +import org.dromara.zhxy.hq.domain.HqSatRecord; import org.dromara.common.mybatis.core.domain.BaseEntity; import org.dromara.common.core.validate.AddGroup; import org.dromara.common.core.validate.EditGroup; diff --git a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/domain/bo/HqSatSurveyBo.java b/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/bo/HqSatSurveyBo.java similarity index 96% rename from backend/ruoyi-admin/src/main/java/org/dromara/zhxy/domain/bo/HqSatSurveyBo.java rename to backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/bo/HqSatSurveyBo.java index db072e4c..bc3177a2 100644 --- a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/domain/bo/HqSatSurveyBo.java +++ b/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/bo/HqSatSurveyBo.java @@ -1,6 +1,6 @@ -package org.dromara.zhxy.domain.bo; +package org.dromara.zhxy.hq.domain.bo; -import org.dromara.zhxy.domain.HqSatSurvey; +import org.dromara.zhxy.hq.domain.HqSatSurvey; import org.dromara.common.mybatis.core.domain.BaseEntity; import org.dromara.common.core.validate.AddGroup; import org.dromara.common.core.validate.EditGroup; diff --git a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/domain/bo/HqSatSurveyQuestionBo.java b/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/bo/HqSatSurveyQuestionBo.java similarity index 93% rename from backend/ruoyi-admin/src/main/java/org/dromara/zhxy/domain/bo/HqSatSurveyQuestionBo.java rename to backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/bo/HqSatSurveyQuestionBo.java index 712a7c17..640857e8 100644 --- a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/domain/bo/HqSatSurveyQuestionBo.java +++ b/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/bo/HqSatSurveyQuestionBo.java @@ -1,6 +1,6 @@ -package org.dromara.zhxy.domain.bo; +package org.dromara.zhxy.hq.domain.bo; -import org.dromara.zhxy.domain.HqSatSurveyQuestion; +import org.dromara.zhxy.hq.domain.HqSatSurveyQuestion; import org.dromara.common.mybatis.core.domain.BaseEntity; import org.dromara.common.core.validate.AddGroup; import org.dromara.common.core.validate.EditGroup; diff --git a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/domain/bo/PmRepairAttachmentBo.java b/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/bo/PmRepairAttachmentBo.java similarity index 96% rename from backend/ruoyi-admin/src/main/java/org/dromara/zhxy/domain/bo/PmRepairAttachmentBo.java rename to backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/bo/PmRepairAttachmentBo.java index ecb13eef..ff225c08 100644 --- a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/domain/bo/PmRepairAttachmentBo.java +++ b/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/bo/PmRepairAttachmentBo.java @@ -1,4 +1,4 @@ -package org.dromara.zhxy.domain.bo; +package org.dromara.zhxy.hq.domain.bo; import com.fasterxml.jackson.annotation.JsonFormat; import io.github.linpeilie.annotations.AutoMapper; @@ -9,7 +9,7 @@ import lombok.EqualsAndHashCode; import org.dromara.common.core.validate.AddGroup; import org.dromara.common.core.validate.EditGroup; import org.dromara.common.mybatis.core.domain.BaseEntity; -import org.dromara.zhxy.domain.PmRepairAttachment; +import org.dromara.zhxy.hq.domain.PmRepairAttachment; import java.util.Date; diff --git a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/domain/bo/PmRepairCategoryBo.java b/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/bo/PmRepairCategoryBo.java similarity index 97% rename from backend/ruoyi-admin/src/main/java/org/dromara/zhxy/domain/bo/PmRepairCategoryBo.java rename to backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/bo/PmRepairCategoryBo.java index 744c5ffe..21433dd5 100644 --- a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/domain/bo/PmRepairCategoryBo.java +++ b/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/bo/PmRepairCategoryBo.java @@ -1,6 +1,6 @@ -package org.dromara.zhxy.domain.bo; +package org.dromara.zhxy.hq.domain.bo; -import org.dromara.zhxy.domain.PmRepairCategory; +import org.dromara.zhxy.hq.domain.PmRepairCategory; import org.dromara.common.mybatis.core.domain.BaseEntity; import org.dromara.common.core.validate.AddGroup; import org.dromara.common.core.validate.EditGroup; diff --git a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/domain/bo/PmRepairOrderBo.java b/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/bo/PmRepairOrderBo.java similarity index 97% rename from backend/ruoyi-admin/src/main/java/org/dromara/zhxy/domain/bo/PmRepairOrderBo.java rename to backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/bo/PmRepairOrderBo.java index 3c028bd5..7e6b0d5d 100644 --- a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/domain/bo/PmRepairOrderBo.java +++ b/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/bo/PmRepairOrderBo.java @@ -1,6 +1,6 @@ -package org.dromara.zhxy.domain.bo; +package org.dromara.zhxy.hq.domain.bo; -import org.dromara.zhxy.domain.PmRepairOrder; +import org.dromara.zhxy.hq.domain.PmRepairOrder; import org.dromara.common.mybatis.core.domain.BaseEntity; import org.dromara.common.core.validate.AddGroup; import org.dromara.common.core.validate.EditGroup; diff --git a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/domain/vo/HqHallInfoVo.java b/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/vo/HqHallInfoVo.java similarity index 94% rename from backend/ruoyi-admin/src/main/java/org/dromara/zhxy/domain/vo/HqHallInfoVo.java rename to backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/vo/HqHallInfoVo.java index 53a9d118..1d7d7a9a 100644 --- a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/domain/vo/HqHallInfoVo.java +++ b/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/vo/HqHallInfoVo.java @@ -1,8 +1,8 @@ -package org.dromara.zhxy.domain.vo; +package org.dromara.zhxy.hq.domain.vo; import org.dromara.common.translation.annotation.Translation; import org.dromara.common.translation.constant.TransConstant; -import org.dromara.zhxy.domain.HqHallInfo; +import org.dromara.zhxy.hq.domain.HqHallInfo; import cn.idev.excel.annotation.ExcelIgnoreUnannotated; import cn.idev.excel.annotation.ExcelProperty; import org.dromara.common.excel.annotation.ExcelDictFormat; diff --git a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/domain/vo/HqHallReservationVo.java b/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/vo/HqHallReservationVo.java similarity index 96% rename from backend/ruoyi-admin/src/main/java/org/dromara/zhxy/domain/vo/HqHallReservationVo.java rename to backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/vo/HqHallReservationVo.java index b36caa39..5b2850ba 100644 --- a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/domain/vo/HqHallReservationVo.java +++ b/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/vo/HqHallReservationVo.java @@ -1,8 +1,8 @@ -package org.dromara.zhxy.domain.vo; +package org.dromara.zhxy.hq.domain.vo; import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; -import org.dromara.zhxy.domain.HqHallReservation; +import org.dromara.zhxy.hq.domain.HqHallReservation; import cn.idev.excel.annotation.ExcelIgnoreUnannotated; import cn.idev.excel.annotation.ExcelProperty; import org.dromara.common.excel.annotation.ExcelDictFormat; diff --git a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/domain/vo/HqSatCategoryVo.java b/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/vo/HqSatCategoryVo.java similarity index 94% rename from backend/ruoyi-admin/src/main/java/org/dromara/zhxy/domain/vo/HqSatCategoryVo.java rename to backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/vo/HqSatCategoryVo.java index aa533d88..25e07541 100644 --- a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/domain/vo/HqSatCategoryVo.java +++ b/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/vo/HqSatCategoryVo.java @@ -1,6 +1,6 @@ -package org.dromara.zhxy.domain.vo; +package org.dromara.zhxy.hq.domain.vo; -import org.dromara.zhxy.domain.HqSatCategory; +import org.dromara.zhxy.hq.domain.HqSatCategory; import cn.idev.excel.annotation.ExcelIgnoreUnannotated; import cn.idev.excel.annotation.ExcelProperty; import org.dromara.common.excel.annotation.ExcelDictFormat; diff --git a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/domain/vo/HqSatDetailVo.java b/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/vo/HqSatDetailVo.java similarity index 94% rename from backend/ruoyi-admin/src/main/java/org/dromara/zhxy/domain/vo/HqSatDetailVo.java rename to backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/vo/HqSatDetailVo.java index 65a4dd0b..9a91e5bf 100644 --- a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/domain/vo/HqSatDetailVo.java +++ b/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/vo/HqSatDetailVo.java @@ -1,6 +1,6 @@ -package org.dromara.zhxy.domain.vo; +package org.dromara.zhxy.hq.domain.vo; -import org.dromara.zhxy.domain.HqSatDetail; +import org.dromara.zhxy.hq.domain.HqSatDetail; import cn.idev.excel.annotation.ExcelIgnoreUnannotated; import cn.idev.excel.annotation.ExcelProperty; import org.dromara.common.excel.annotation.ExcelDictFormat; diff --git a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/domain/vo/HqSatOptionVo.java b/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/vo/HqSatOptionVo.java similarity index 94% rename from backend/ruoyi-admin/src/main/java/org/dromara/zhxy/domain/vo/HqSatOptionVo.java rename to backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/vo/HqSatOptionVo.java index acaf0ac6..a5aff874 100644 --- a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/domain/vo/HqSatOptionVo.java +++ b/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/vo/HqSatOptionVo.java @@ -1,6 +1,6 @@ -package org.dromara.zhxy.domain.vo; +package org.dromara.zhxy.hq.domain.vo; -import org.dromara.zhxy.domain.HqSatOption; +import org.dromara.zhxy.hq.domain.HqSatOption; import cn.idev.excel.annotation.ExcelIgnoreUnannotated; import cn.idev.excel.annotation.ExcelProperty; import org.dromara.common.excel.annotation.ExcelDictFormat; diff --git a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/domain/vo/HqSatQuestionVo.java b/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/vo/HqSatQuestionVo.java similarity index 95% rename from backend/ruoyi-admin/src/main/java/org/dromara/zhxy/domain/vo/HqSatQuestionVo.java rename to backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/vo/HqSatQuestionVo.java index bb4ff166..02991c27 100644 --- a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/domain/vo/HqSatQuestionVo.java +++ b/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/vo/HqSatQuestionVo.java @@ -1,6 +1,6 @@ -package org.dromara.zhxy.domain.vo; +package org.dromara.zhxy.hq.domain.vo; -import org.dromara.zhxy.domain.HqSatQuestion; +import org.dromara.zhxy.hq.domain.HqSatQuestion; import cn.idev.excel.annotation.ExcelIgnoreUnannotated; import cn.idev.excel.annotation.ExcelProperty; import org.dromara.common.excel.annotation.ExcelDictFormat; diff --git a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/domain/vo/HqSatRecordVo.java b/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/vo/HqSatRecordVo.java similarity index 95% rename from backend/ruoyi-admin/src/main/java/org/dromara/zhxy/domain/vo/HqSatRecordVo.java rename to backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/vo/HqSatRecordVo.java index 004e293f..7d758962 100644 --- a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/domain/vo/HqSatRecordVo.java +++ b/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/vo/HqSatRecordVo.java @@ -1,8 +1,8 @@ -package org.dromara.zhxy.domain.vo; +package org.dromara.zhxy.hq.domain.vo; import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; -import org.dromara.zhxy.domain.HqSatRecord; +import org.dromara.zhxy.hq.domain.HqSatRecord; import cn.idev.excel.annotation.ExcelIgnoreUnannotated; import cn.idev.excel.annotation.ExcelProperty; import org.dromara.common.excel.annotation.ExcelDictFormat; diff --git a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/domain/vo/HqSatSurveyQuestionDetailVo.java b/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/vo/HqSatSurveyQuestionDetailVo.java similarity index 100% rename from backend/ruoyi-admin/src/main/java/org/dromara/zhxy/domain/vo/HqSatSurveyQuestionDetailVo.java rename to backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/vo/HqSatSurveyQuestionDetailVo.java diff --git a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/domain/vo/HqSatSurveyQuestionVo.java b/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/vo/HqSatSurveyQuestionVo.java similarity index 96% rename from backend/ruoyi-admin/src/main/java/org/dromara/zhxy/domain/vo/HqSatSurveyQuestionVo.java rename to backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/vo/HqSatSurveyQuestionVo.java index 43af9bbc..c29d9cc5 100644 --- a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/domain/vo/HqSatSurveyQuestionVo.java +++ b/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/vo/HqSatSurveyQuestionVo.java @@ -1,6 +1,6 @@ -package org.dromara.zhxy.domain.vo; +package org.dromara.zhxy.hq.domain.vo; -import org.dromara.zhxy.domain.HqSatSurveyQuestion; +import org.dromara.zhxy.hq.domain.HqSatSurveyQuestion; import cn.idev.excel.annotation.ExcelIgnoreUnannotated; import cn.idev.excel.annotation.ExcelProperty; import org.dromara.common.excel.annotation.ExcelDictFormat; diff --git a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/domain/vo/HqSatSurveyVo.java b/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/vo/HqSatSurveyVo.java similarity index 96% rename from backend/ruoyi-admin/src/main/java/org/dromara/zhxy/domain/vo/HqSatSurveyVo.java rename to backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/vo/HqSatSurveyVo.java index eccbe737..dccde46b 100644 --- a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/domain/vo/HqSatSurveyVo.java +++ b/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/vo/HqSatSurveyVo.java @@ -1,8 +1,8 @@ -package org.dromara.zhxy.domain.vo; +package org.dromara.zhxy.hq.domain.vo; import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; -import org.dromara.zhxy.domain.HqSatSurvey; +import org.dromara.zhxy.hq.domain.HqSatSurvey; import cn.idev.excel.annotation.ExcelIgnoreUnannotated; import cn.idev.excel.annotation.ExcelProperty; import org.dromara.common.excel.annotation.ExcelDictFormat; diff --git a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/domain/vo/PmRepairAttachmentVo.java b/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/vo/PmRepairAttachmentVo.java similarity index 96% rename from backend/ruoyi-admin/src/main/java/org/dromara/zhxy/domain/vo/PmRepairAttachmentVo.java rename to backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/vo/PmRepairAttachmentVo.java index d57414fa..8f692bbe 100644 --- a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/domain/vo/PmRepairAttachmentVo.java +++ b/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/vo/PmRepairAttachmentVo.java @@ -1,11 +1,11 @@ -package org.dromara.zhxy.domain.vo; +package org.dromara.zhxy.hq.domain.vo; import cn.idev.excel.annotation.ExcelIgnoreUnannotated; import cn.idev.excel.annotation.ExcelProperty; import com.fasterxml.jackson.annotation.JsonFormat; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; -import org.dromara.zhxy.domain.PmRepairAttachment; +import org.dromara.zhxy.hq.domain.PmRepairAttachment; import java.io.Serial; import java.io.Serializable; diff --git a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/domain/vo/PmRepairCategoryVo.java b/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/vo/PmRepairCategoryVo.java similarity index 97% rename from backend/ruoyi-admin/src/main/java/org/dromara/zhxy/domain/vo/PmRepairCategoryVo.java rename to backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/vo/PmRepairCategoryVo.java index dab0d3da..913e2b35 100644 --- a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/domain/vo/PmRepairCategoryVo.java +++ b/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/vo/PmRepairCategoryVo.java @@ -1,10 +1,10 @@ -package org.dromara.zhxy.domain.vo; +package org.dromara.zhxy.hq.domain.vo; import java.util.Date; import java.math.BigDecimal; import java.util.List; import com.fasterxml.jackson.annotation.JsonFormat; -import org.dromara.zhxy.domain.PmRepairCategory; +import org.dromara.zhxy.hq.domain.PmRepairCategory; import cn.idev.excel.annotation.ExcelIgnoreUnannotated; import cn.idev.excel.annotation.ExcelProperty; import org.dromara.common.excel.annotation.ExcelDictFormat; diff --git a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/domain/vo/PmRepairOrderVo.java b/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/vo/PmRepairOrderVo.java similarity index 98% rename from backend/ruoyi-admin/src/main/java/org/dromara/zhxy/domain/vo/PmRepairOrderVo.java rename to backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/vo/PmRepairOrderVo.java index 6f47d093..1828afa8 100644 --- a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/domain/vo/PmRepairOrderVo.java +++ b/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/vo/PmRepairOrderVo.java @@ -1,9 +1,9 @@ -package org.dromara.zhxy.domain.vo; +package org.dromara.zhxy.hq.domain.vo; import java.util.Date; import java.math.BigDecimal; import com.fasterxml.jackson.annotation.JsonFormat; -import org.dromara.zhxy.domain.PmRepairOrder; +import org.dromara.zhxy.hq.domain.PmRepairOrder; import cn.idev.excel.annotation.ExcelIgnoreUnannotated; import cn.idev.excel.annotation.ExcelProperty; import org.dromara.common.excel.annotation.ExcelDictFormat; diff --git a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/mapper/HqHallInfoMapper.java b/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/mapper/HqHallInfoMapper.java similarity index 63% rename from backend/ruoyi-admin/src/main/java/org/dromara/zhxy/mapper/HqHallInfoMapper.java rename to backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/mapper/HqHallInfoMapper.java index c4ea19cd..05c0b9e2 100644 --- a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/mapper/HqHallInfoMapper.java +++ b/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/mapper/HqHallInfoMapper.java @@ -1,7 +1,7 @@ -package org.dromara.zhxy.mapper; +package org.dromara.zhxy.hq.mapper; -import org.dromara.zhxy.domain.HqHallInfo; -import org.dromara.zhxy.domain.vo.HqHallInfoVo; +import org.dromara.zhxy.hq.domain.HqHallInfo; +import org.dromara.zhxy.hq.domain.vo.HqHallInfoVo; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; /** diff --git a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/mapper/HqHallReservationMapper.java b/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/mapper/HqHallReservationMapper.java similarity index 63% rename from backend/ruoyi-admin/src/main/java/org/dromara/zhxy/mapper/HqHallReservationMapper.java rename to backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/mapper/HqHallReservationMapper.java index 500edefa..45b7a9fd 100644 --- a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/mapper/HqHallReservationMapper.java +++ b/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/mapper/HqHallReservationMapper.java @@ -1,7 +1,7 @@ -package org.dromara.zhxy.mapper; +package org.dromara.zhxy.hq.mapper; -import org.dromara.zhxy.domain.HqHallReservation; -import org.dromara.zhxy.domain.vo.HqHallReservationVo; +import org.dromara.zhxy.hq.domain.HqHallReservation; +import org.dromara.zhxy.hq.domain.vo.HqHallReservationVo; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; /** diff --git a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/mapper/HqSatCategoryMapper.java b/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/mapper/HqSatCategoryMapper.java similarity index 63% rename from backend/ruoyi-admin/src/main/java/org/dromara/zhxy/mapper/HqSatCategoryMapper.java rename to backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/mapper/HqSatCategoryMapper.java index 7ce719dd..d21741d3 100644 --- a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/mapper/HqSatCategoryMapper.java +++ b/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/mapper/HqSatCategoryMapper.java @@ -1,7 +1,7 @@ -package org.dromara.zhxy.mapper; +package org.dromara.zhxy.hq.mapper; -import org.dromara.zhxy.domain.HqSatCategory; -import org.dromara.zhxy.domain.vo.HqSatCategoryVo; +import org.dromara.zhxy.hq.domain.HqSatCategory; +import org.dromara.zhxy.hq.domain.vo.HqSatCategoryVo; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; /** diff --git a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/mapper/HqSatDetailMapper.java b/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/mapper/HqSatDetailMapper.java similarity index 63% rename from backend/ruoyi-admin/src/main/java/org/dromara/zhxy/mapper/HqSatDetailMapper.java rename to backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/mapper/HqSatDetailMapper.java index 4fe17b08..cd791089 100644 --- a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/mapper/HqSatDetailMapper.java +++ b/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/mapper/HqSatDetailMapper.java @@ -1,7 +1,7 @@ -package org.dromara.zhxy.mapper; +package org.dromara.zhxy.hq.mapper; -import org.dromara.zhxy.domain.HqSatDetail; -import org.dromara.zhxy.domain.vo.HqSatDetailVo; +import org.dromara.zhxy.hq.domain.HqSatDetail; +import org.dromara.zhxy.hq.domain.vo.HqSatDetailVo; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; /** diff --git a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/mapper/HqSatOptionMapper.java b/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/mapper/HqSatOptionMapper.java similarity index 63% rename from backend/ruoyi-admin/src/main/java/org/dromara/zhxy/mapper/HqSatOptionMapper.java rename to backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/mapper/HqSatOptionMapper.java index cf56e76c..0a0d527e 100644 --- a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/mapper/HqSatOptionMapper.java +++ b/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/mapper/HqSatOptionMapper.java @@ -1,7 +1,7 @@ -package org.dromara.zhxy.mapper; +package org.dromara.zhxy.hq.mapper; -import org.dromara.zhxy.domain.HqSatOption; -import org.dromara.zhxy.domain.vo.HqSatOptionVo; +import org.dromara.zhxy.hq.domain.HqSatOption; +import org.dromara.zhxy.hq.domain.vo.HqSatOptionVo; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; /** diff --git a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/mapper/HqSatQuestionMapper.java b/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/mapper/HqSatQuestionMapper.java similarity index 62% rename from backend/ruoyi-admin/src/main/java/org/dromara/zhxy/mapper/HqSatQuestionMapper.java rename to backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/mapper/HqSatQuestionMapper.java index 5e8a8ff8..edacce02 100644 --- a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/mapper/HqSatQuestionMapper.java +++ b/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/mapper/HqSatQuestionMapper.java @@ -1,7 +1,7 @@ -package org.dromara.zhxy.mapper; +package org.dromara.zhxy.hq.mapper; -import org.dromara.zhxy.domain.HqSatQuestion; -import org.dromara.zhxy.domain.vo.HqSatQuestionVo; +import org.dromara.zhxy.hq.domain.HqSatQuestion; +import org.dromara.zhxy.hq.domain.vo.HqSatQuestionVo; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; /** diff --git a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/mapper/HqSatRecordMapper.java b/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/mapper/HqSatRecordMapper.java similarity index 63% rename from backend/ruoyi-admin/src/main/java/org/dromara/zhxy/mapper/HqSatRecordMapper.java rename to backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/mapper/HqSatRecordMapper.java index f48bbf04..e59641c1 100644 --- a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/mapper/HqSatRecordMapper.java +++ b/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/mapper/HqSatRecordMapper.java @@ -1,7 +1,7 @@ -package org.dromara.zhxy.mapper; +package org.dromara.zhxy.hq.mapper; -import org.dromara.zhxy.domain.HqSatRecord; -import org.dromara.zhxy.domain.vo.HqSatRecordVo; +import org.dromara.zhxy.hq.domain.HqSatRecord; +import org.dromara.zhxy.hq.domain.vo.HqSatRecordVo; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; /** diff --git a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/mapper/HqSatSurveyMapper.java b/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/mapper/HqSatSurveyMapper.java similarity index 62% rename from backend/ruoyi-admin/src/main/java/org/dromara/zhxy/mapper/HqSatSurveyMapper.java rename to backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/mapper/HqSatSurveyMapper.java index d014579a..045a061e 100644 --- a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/mapper/HqSatSurveyMapper.java +++ b/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/mapper/HqSatSurveyMapper.java @@ -1,7 +1,7 @@ -package org.dromara.zhxy.mapper; +package org.dromara.zhxy.hq.mapper; -import org.dromara.zhxy.domain.HqSatSurvey; -import org.dromara.zhxy.domain.vo.HqSatSurveyVo; +import org.dromara.zhxy.hq.domain.HqSatSurvey; +import org.dromara.zhxy.hq.domain.vo.HqSatSurveyVo; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; /** diff --git a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/mapper/HqSatSurveyQuestionMapper.java b/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/mapper/HqSatSurveyQuestionMapper.java similarity index 78% rename from backend/ruoyi-admin/src/main/java/org/dromara/zhxy/mapper/HqSatSurveyQuestionMapper.java rename to backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/mapper/HqSatSurveyQuestionMapper.java index a784817a..f013479e 100644 --- a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/mapper/HqSatSurveyQuestionMapper.java +++ b/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/mapper/HqSatSurveyQuestionMapper.java @@ -1,8 +1,8 @@ -package org.dromara.zhxy.mapper; +package org.dromara.zhxy.hq.mapper; import org.apache.ibatis.annotations.Param; -import org.dromara.zhxy.domain.HqSatSurveyQuestion; -import org.dromara.zhxy.domain.vo.HqSatSurveyQuestionVo; +import org.dromara.zhxy.hq.domain.HqSatSurveyQuestion; +import org.dromara.zhxy.hq.domain.vo.HqSatSurveyQuestionVo; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; import java.util.List; diff --git a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/mapper/PmRepairAttachmentMapper.java b/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/mapper/PmRepairAttachmentMapper.java similarity index 63% rename from backend/ruoyi-admin/src/main/java/org/dromara/zhxy/mapper/PmRepairAttachmentMapper.java rename to backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/mapper/PmRepairAttachmentMapper.java index 5985c912..22652ca0 100644 --- a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/mapper/PmRepairAttachmentMapper.java +++ b/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/mapper/PmRepairAttachmentMapper.java @@ -1,7 +1,7 @@ -package org.dromara.zhxy.mapper; +package org.dromara.zhxy.hq.mapper; -import org.dromara.zhxy.domain.PmRepairAttachment; -import org.dromara.zhxy.domain.vo.PmRepairAttachmentVo; +import org.dromara.zhxy.hq.domain.PmRepairAttachment; +import org.dromara.zhxy.hq.domain.vo.PmRepairAttachmentVo; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; /** diff --git a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/mapper/PmRepairCategoryMapper.java b/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/mapper/PmRepairCategoryMapper.java similarity index 63% rename from backend/ruoyi-admin/src/main/java/org/dromara/zhxy/mapper/PmRepairCategoryMapper.java rename to backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/mapper/PmRepairCategoryMapper.java index a6b71af0..12522ce2 100644 --- a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/mapper/PmRepairCategoryMapper.java +++ b/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/mapper/PmRepairCategoryMapper.java @@ -1,7 +1,7 @@ -package org.dromara.zhxy.mapper; +package org.dromara.zhxy.hq.mapper; -import org.dromara.zhxy.domain.PmRepairCategory; -import org.dromara.zhxy.domain.vo.PmRepairCategoryVo; +import org.dromara.zhxy.hq.domain.PmRepairCategory; +import org.dromara.zhxy.hq.domain.vo.PmRepairCategoryVo; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; /** diff --git a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/mapper/PmRepairOrderMapper.java b/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/mapper/PmRepairOrderMapper.java similarity index 76% rename from backend/ruoyi-admin/src/main/java/org/dromara/zhxy/mapper/PmRepairOrderMapper.java rename to backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/mapper/PmRepairOrderMapper.java index 8fe5ac05..14e52f14 100644 --- a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/mapper/PmRepairOrderMapper.java +++ b/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/mapper/PmRepairOrderMapper.java @@ -1,7 +1,7 @@ -package org.dromara.zhxy.mapper; +package org.dromara.zhxy.hq.mapper; -import org.dromara.zhxy.domain.PmRepairOrder; -import org.dromara.zhxy.domain.vo.PmRepairOrderVo; +import org.dromara.zhxy.hq.domain.PmRepairOrder; +import org.dromara.zhxy.hq.domain.vo.PmRepairOrderVo; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; import java.util.List; diff --git a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/mapper/PmRepairProgressMapper.java b/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/mapper/PmRepairProgressMapper.java similarity index 74% rename from backend/ruoyi-admin/src/main/java/org/dromara/zhxy/mapper/PmRepairProgressMapper.java rename to backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/mapper/PmRepairProgressMapper.java index babae9c3..98d5c134 100644 --- a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/mapper/PmRepairProgressMapper.java +++ b/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/mapper/PmRepairProgressMapper.java @@ -1,6 +1,6 @@ -package org.dromara.zhxy.mapper; +package org.dromara.zhxy.hq.mapper; -import org.dromara.zhxy.domain.PmRepairProgress; +import org.dromara.zhxy.hq.domain.PmRepairProgress; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; /** diff --git a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/mapper/PmServiceEvaluationMapper.java b/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/mapper/PmServiceEvaluationMapper.java similarity index 73% rename from backend/ruoyi-admin/src/main/java/org/dromara/zhxy/mapper/PmServiceEvaluationMapper.java rename to backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/mapper/PmServiceEvaluationMapper.java index 1ca6093a..f18e5b88 100644 --- a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/mapper/PmServiceEvaluationMapper.java +++ b/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/mapper/PmServiceEvaluationMapper.java @@ -1,6 +1,6 @@ -package org.dromara.zhxy.mapper; +package org.dromara.zhxy.hq.mapper; -import org.dromara.zhxy.domain.PmServiceEvaluation; +import org.dromara.zhxy.hq.domain.PmServiceEvaluation; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; /** diff --git a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/service/IHqHallInfoService.java b/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/service/IHqHallInfoService.java similarity index 91% rename from backend/ruoyi-admin/src/main/java/org/dromara/zhxy/service/IHqHallInfoService.java rename to backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/service/IHqHallInfoService.java index bfe4a332..cb166bc6 100644 --- a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/service/IHqHallInfoService.java +++ b/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/service/IHqHallInfoService.java @@ -1,7 +1,7 @@ -package org.dromara.zhxy.service; +package org.dromara.zhxy.hq.service; -import org.dromara.zhxy.domain.vo.HqHallInfoVo; -import org.dromara.zhxy.domain.bo.HqHallInfoBo; +import org.dromara.zhxy.hq.domain.vo.HqHallInfoVo; +import org.dromara.zhxy.hq.domain.bo.HqHallInfoBo; import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.mybatis.core.page.PageQuery; diff --git a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/service/IHqHallReservationService.java b/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/service/IHqHallReservationService.java similarity index 88% rename from backend/ruoyi-admin/src/main/java/org/dromara/zhxy/service/IHqHallReservationService.java rename to backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/service/IHqHallReservationService.java index 26b9007a..7f3e7acf 100644 --- a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/service/IHqHallReservationService.java +++ b/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/service/IHqHallReservationService.java @@ -1,8 +1,8 @@ -package org.dromara.zhxy.service; +package org.dromara.zhxy.hq.service; -import org.dromara.zhxy.domain.vo.HqHallReservationVo; -import org.dromara.zhxy.domain.bo.HqHallReservationBo; -import org.dromara.zhxy.domain.bo.HqHallReservationAuditBo; +import org.dromara.zhxy.hq.domain.vo.HqHallReservationVo; +import org.dromara.zhxy.hq.domain.bo.HqHallReservationBo; +import org.dromara.zhxy.hq.domain.bo.HqHallReservationAuditBo; import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.mybatis.core.page.PageQuery; diff --git a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/service/IHqSatCategoryService.java b/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/service/IHqSatCategoryService.java similarity index 91% rename from backend/ruoyi-admin/src/main/java/org/dromara/zhxy/service/IHqSatCategoryService.java rename to backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/service/IHqSatCategoryService.java index 023c9c26..1e49f60e 100644 --- a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/service/IHqSatCategoryService.java +++ b/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/service/IHqSatCategoryService.java @@ -1,7 +1,7 @@ -package org.dromara.zhxy.service; +package org.dromara.zhxy.hq.service; -import org.dromara.zhxy.domain.vo.HqSatCategoryVo; -import org.dromara.zhxy.domain.bo.HqSatCategoryBo; +import org.dromara.zhxy.hq.domain.vo.HqSatCategoryVo; +import org.dromara.zhxy.hq.domain.bo.HqSatCategoryBo; import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.mybatis.core.page.PageQuery; diff --git a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/service/IHqSatDetailService.java b/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/service/IHqSatDetailService.java similarity index 91% rename from backend/ruoyi-admin/src/main/java/org/dromara/zhxy/service/IHqSatDetailService.java rename to backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/service/IHqSatDetailService.java index e34ff4c0..c72ce5d9 100644 --- a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/service/IHqSatDetailService.java +++ b/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/service/IHqSatDetailService.java @@ -1,7 +1,7 @@ -package org.dromara.zhxy.service; +package org.dromara.zhxy.hq.service; -import org.dromara.zhxy.domain.vo.HqSatDetailVo; -import org.dromara.zhxy.domain.bo.HqSatDetailBo; +import org.dromara.zhxy.hq.domain.vo.HqSatDetailVo; +import org.dromara.zhxy.hq.domain.bo.HqSatDetailBo; import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.mybatis.core.page.PageQuery; diff --git a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/service/IHqSatOptionService.java b/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/service/IHqSatOptionService.java similarity index 91% rename from backend/ruoyi-admin/src/main/java/org/dromara/zhxy/service/IHqSatOptionService.java rename to backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/service/IHqSatOptionService.java index 742f8516..c0d341e2 100644 --- a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/service/IHqSatOptionService.java +++ b/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/service/IHqSatOptionService.java @@ -1,7 +1,7 @@ -package org.dromara.zhxy.service; +package org.dromara.zhxy.hq.service; -import org.dromara.zhxy.domain.vo.HqSatOptionVo; -import org.dromara.zhxy.domain.bo.HqSatOptionBo; +import org.dromara.zhxy.hq.domain.vo.HqSatOptionVo; +import org.dromara.zhxy.hq.domain.bo.HqSatOptionBo; import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.mybatis.core.page.PageQuery; diff --git a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/service/IHqSatQuestionService.java b/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/service/IHqSatQuestionService.java similarity index 90% rename from backend/ruoyi-admin/src/main/java/org/dromara/zhxy/service/IHqSatQuestionService.java rename to backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/service/IHqSatQuestionService.java index ab711198..a4f5ffb9 100644 --- a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/service/IHqSatQuestionService.java +++ b/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/service/IHqSatQuestionService.java @@ -1,7 +1,7 @@ -package org.dromara.zhxy.service; +package org.dromara.zhxy.hq.service; -import org.dromara.zhxy.domain.vo.HqSatQuestionVo; -import org.dromara.zhxy.domain.bo.HqSatQuestionBo; +import org.dromara.zhxy.hq.domain.vo.HqSatQuestionVo; +import org.dromara.zhxy.hq.domain.bo.HqSatQuestionBo; import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.mybatis.core.page.PageQuery; diff --git a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/service/IHqSatRecordService.java b/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/service/IHqSatRecordService.java similarity index 91% rename from backend/ruoyi-admin/src/main/java/org/dromara/zhxy/service/IHqSatRecordService.java rename to backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/service/IHqSatRecordService.java index e0ee9636..9fcef400 100644 --- a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/service/IHqSatRecordService.java +++ b/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/service/IHqSatRecordService.java @@ -1,7 +1,7 @@ -package org.dromara.zhxy.service; +package org.dromara.zhxy.hq.service; -import org.dromara.zhxy.domain.vo.HqSatRecordVo; -import org.dromara.zhxy.domain.bo.HqSatRecordBo; +import org.dromara.zhxy.hq.domain.vo.HqSatRecordVo; +import org.dromara.zhxy.hq.domain.bo.HqSatRecordBo; import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.mybatis.core.page.PageQuery; diff --git a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/service/IHqSatSurveyQuestionService.java b/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/service/IHqSatSurveyQuestionService.java similarity index 92% rename from backend/ruoyi-admin/src/main/java/org/dromara/zhxy/service/IHqSatSurveyQuestionService.java rename to backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/service/IHqSatSurveyQuestionService.java index 6ccd89c6..ed59102c 100644 --- a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/service/IHqSatSurveyQuestionService.java +++ b/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/service/IHqSatSurveyQuestionService.java @@ -1,7 +1,7 @@ -package org.dromara.zhxy.service; +package org.dromara.zhxy.hq.service; -import org.dromara.zhxy.domain.vo.HqSatSurveyQuestionVo; -import org.dromara.zhxy.domain.bo.HqSatSurveyQuestionBo; +import org.dromara.zhxy.hq.domain.vo.HqSatSurveyQuestionVo; +import org.dromara.zhxy.hq.domain.bo.HqSatSurveyQuestionBo; import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.mybatis.core.page.PageQuery; diff --git a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/service/IHqSatSurveyService.java b/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/service/IHqSatSurveyService.java similarity index 90% rename from backend/ruoyi-admin/src/main/java/org/dromara/zhxy/service/IHqSatSurveyService.java rename to backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/service/IHqSatSurveyService.java index 25b14d19..6e264773 100644 --- a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/service/IHqSatSurveyService.java +++ b/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/service/IHqSatSurveyService.java @@ -1,10 +1,10 @@ -package org.dromara.zhxy.service; +package org.dromara.zhxy.hq.service; -import org.dromara.zhxy.domain.vo.HqSatSurveyVo; -import org.dromara.zhxy.domain.bo.HqSatSurveyBo; -import org.dromara.zhxy.domain.bo.HqSatAnswerSubmitBo; -import org.dromara.zhxy.domain.vo.HqSatSurveyQuestionVo; -import org.dromara.zhxy.domain.vo.HqSatRecordVo; +import org.dromara.zhxy.hq.domain.vo.HqSatSurveyVo; +import org.dromara.zhxy.hq.domain.bo.HqSatSurveyBo; +import org.dromara.zhxy.hq.domain.bo.HqSatAnswerSubmitBo; +import org.dromara.zhxy.hq.domain.vo.HqSatSurveyQuestionVo; +import org.dromara.zhxy.hq.domain.vo.HqSatRecordVo; import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.mybatis.core.page.PageQuery; diff --git a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/service/IPmRepairAttachmentService.java b/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/service/IPmRepairAttachmentService.java similarity index 91% rename from backend/ruoyi-admin/src/main/java/org/dromara/zhxy/service/IPmRepairAttachmentService.java rename to backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/service/IPmRepairAttachmentService.java index 9427ffbc..bafe885d 100644 --- a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/service/IPmRepairAttachmentService.java +++ b/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/service/IPmRepairAttachmentService.java @@ -1,7 +1,7 @@ -package org.dromara.zhxy.service; +package org.dromara.zhxy.hq.service; -import org.dromara.zhxy.domain.vo.PmRepairAttachmentVo; -import org.dromara.zhxy.domain.bo.PmRepairAttachmentBo; +import org.dromara.zhxy.hq.domain.vo.PmRepairAttachmentVo; +import org.dromara.zhxy.hq.domain.bo.PmRepairAttachmentBo; import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.mybatis.core.page.PageQuery; import org.springframework.web.multipart.MultipartFile; diff --git a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/service/IPmRepairCategoryService.java b/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/service/IPmRepairCategoryService.java similarity index 92% rename from backend/ruoyi-admin/src/main/java/org/dromara/zhxy/service/IPmRepairCategoryService.java rename to backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/service/IPmRepairCategoryService.java index 6c916bfe..8552624a 100644 --- a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/service/IPmRepairCategoryService.java +++ b/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/service/IPmRepairCategoryService.java @@ -1,7 +1,7 @@ -package org.dromara.zhxy.service; +package org.dromara.zhxy.hq.service; -import org.dromara.zhxy.domain.vo.PmRepairCategoryVo; -import org.dromara.zhxy.domain.bo.PmRepairCategoryBo; +import org.dromara.zhxy.hq.domain.vo.PmRepairCategoryVo; +import org.dromara.zhxy.hq.domain.bo.PmRepairCategoryBo; import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.mybatis.core.page.PageQuery; diff --git a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/service/IPmRepairOrderService.java b/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/service/IPmRepairOrderService.java similarity index 96% rename from backend/ruoyi-admin/src/main/java/org/dromara/zhxy/service/IPmRepairOrderService.java rename to backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/service/IPmRepairOrderService.java index 877658a7..92308248 100644 --- a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/service/IPmRepairOrderService.java +++ b/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/service/IPmRepairOrderService.java @@ -1,7 +1,7 @@ -package org.dromara.zhxy.service; +package org.dromara.zhxy.hq.service; -import org.dromara.zhxy.domain.vo.PmRepairOrderVo; -import org.dromara.zhxy.domain.bo.PmRepairOrderBo; +import org.dromara.zhxy.hq.domain.vo.PmRepairOrderVo; +import org.dromara.zhxy.hq.domain.bo.PmRepairOrderBo; import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.mybatis.core.page.PageQuery; diff --git a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/service/impl/HqHallInfoServiceImpl.java b/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/service/impl/HqHallInfoServiceImpl.java similarity index 92% rename from backend/ruoyi-admin/src/main/java/org/dromara/zhxy/service/impl/HqHallInfoServiceImpl.java rename to backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/service/impl/HqHallInfoServiceImpl.java index 647937b8..28f4c59a 100644 --- a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/service/impl/HqHallInfoServiceImpl.java +++ b/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/service/impl/HqHallInfoServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.zhxy.service.impl; +package org.dromara.zhxy.hq.service.impl; 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.zhxy.domain.bo.HqHallInfoBo; -import org.dromara.zhxy.domain.vo.HqHallInfoVo; -import org.dromara.zhxy.domain.HqHallInfo; -import org.dromara.zhxy.mapper.HqHallInfoMapper; -import org.dromara.zhxy.service.IHqHallInfoService; +import org.dromara.zhxy.hq.domain.bo.HqHallInfoBo; +import org.dromara.zhxy.hq.domain.vo.HqHallInfoVo; +import org.dromara.zhxy.hq.domain.HqHallInfo; +import org.dromara.zhxy.hq.mapper.HqHallInfoMapper; +import org.dromara.zhxy.hq.service.IHqHallInfoService; import java.util.List; import java.util.Map; diff --git a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/service/impl/HqHallReservationServiceImpl.java b/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/service/impl/HqHallReservationServiceImpl.java similarity index 95% rename from backend/ruoyi-admin/src/main/java/org/dromara/zhxy/service/impl/HqHallReservationServiceImpl.java rename to backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/service/impl/HqHallReservationServiceImpl.java index b099259c..0387a7b8 100644 --- a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/service/impl/HqHallReservationServiceImpl.java +++ b/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/service/impl/HqHallReservationServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.zhxy.service.impl; +package org.dromara.zhxy.hq.service.impl; import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.StringUtils; @@ -10,12 +10,12 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; -import org.dromara.zhxy.domain.bo.HqHallReservationBo; -import org.dromara.zhxy.domain.bo.HqHallReservationAuditBo; -import org.dromara.zhxy.domain.vo.HqHallReservationVo; -import org.dromara.zhxy.domain.HqHallReservation; -import org.dromara.zhxy.mapper.HqHallReservationMapper; -import org.dromara.zhxy.service.IHqHallReservationService; +import org.dromara.zhxy.hq.domain.bo.HqHallReservationBo; +import org.dromara.zhxy.hq.domain.bo.HqHallReservationAuditBo; +import org.dromara.zhxy.hq.domain.vo.HqHallReservationVo; +import org.dromara.zhxy.hq.domain.HqHallReservation; +import org.dromara.zhxy.hq.mapper.HqHallReservationMapper; +import org.dromara.zhxy.hq.service.IHqHallReservationService; import java.util.List; import java.util.Map; diff --git a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/service/impl/HqSatCategoryServiceImpl.java b/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/service/impl/HqSatCategoryServiceImpl.java similarity index 93% rename from backend/ruoyi-admin/src/main/java/org/dromara/zhxy/service/impl/HqSatCategoryServiceImpl.java rename to backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/service/impl/HqSatCategoryServiceImpl.java index d692a62b..06a30988 100644 --- a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/service/impl/HqSatCategoryServiceImpl.java +++ b/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/service/impl/HqSatCategoryServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.zhxy.service.impl; +package org.dromara.zhxy.hq.service.impl; 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.zhxy.domain.bo.HqSatCategoryBo; -import org.dromara.zhxy.domain.vo.HqSatCategoryVo; -import org.dromara.zhxy.domain.HqSatCategory; -import org.dromara.zhxy.mapper.HqSatCategoryMapper; -import org.dromara.zhxy.service.IHqSatCategoryService; +import org.dromara.zhxy.hq.domain.bo.HqSatCategoryBo; +import org.dromara.zhxy.hq.domain.vo.HqSatCategoryVo; +import org.dromara.zhxy.hq.domain.HqSatCategory; +import org.dromara.zhxy.hq.mapper.HqSatCategoryMapper; +import org.dromara.zhxy.hq.service.IHqSatCategoryService; import java.util.List; import java.util.Map; diff --git a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/service/impl/HqSatDetailServiceImpl.java b/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/service/impl/HqSatDetailServiceImpl.java similarity index 92% rename from backend/ruoyi-admin/src/main/java/org/dromara/zhxy/service/impl/HqSatDetailServiceImpl.java rename to backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/service/impl/HqSatDetailServiceImpl.java index 0c8a428a..0ba4dd08 100644 --- a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/service/impl/HqSatDetailServiceImpl.java +++ b/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/service/impl/HqSatDetailServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.zhxy.service.impl; +package org.dromara.zhxy.hq.service.impl; 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.zhxy.domain.bo.HqSatDetailBo; -import org.dromara.zhxy.domain.vo.HqSatDetailVo; -import org.dromara.zhxy.domain.HqSatDetail; -import org.dromara.zhxy.mapper.HqSatDetailMapper; -import org.dromara.zhxy.service.IHqSatDetailService; +import org.dromara.zhxy.hq.domain.bo.HqSatDetailBo; +import org.dromara.zhxy.hq.domain.vo.HqSatDetailVo; +import org.dromara.zhxy.hq.domain.HqSatDetail; +import org.dromara.zhxy.hq.mapper.HqSatDetailMapper; +import org.dromara.zhxy.hq.service.IHqSatDetailService; import java.util.List; import java.util.Map; diff --git a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/service/impl/HqSatOptionServiceImpl.java b/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/service/impl/HqSatOptionServiceImpl.java similarity index 93% rename from backend/ruoyi-admin/src/main/java/org/dromara/zhxy/service/impl/HqSatOptionServiceImpl.java rename to backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/service/impl/HqSatOptionServiceImpl.java index f93e17a0..af7f6d16 100644 --- a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/service/impl/HqSatOptionServiceImpl.java +++ b/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/service/impl/HqSatOptionServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.zhxy.service.impl; +package org.dromara.zhxy.hq.service.impl; 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.zhxy.domain.bo.HqSatOptionBo; -import org.dromara.zhxy.domain.vo.HqSatOptionVo; -import org.dromara.zhxy.domain.HqSatOption; -import org.dromara.zhxy.mapper.HqSatOptionMapper; -import org.dromara.zhxy.service.IHqSatOptionService; +import org.dromara.zhxy.hq.domain.bo.HqSatOptionBo; +import org.dromara.zhxy.hq.domain.vo.HqSatOptionVo; +import org.dromara.zhxy.hq.domain.HqSatOption; +import org.dromara.zhxy.hq.mapper.HqSatOptionMapper; +import org.dromara.zhxy.hq.service.IHqSatOptionService; import java.util.List; import java.util.Map; diff --git a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/service/impl/HqSatQuestionServiceImpl.java b/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/service/impl/HqSatQuestionServiceImpl.java similarity index 93% rename from backend/ruoyi-admin/src/main/java/org/dromara/zhxy/service/impl/HqSatQuestionServiceImpl.java rename to backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/service/impl/HqSatQuestionServiceImpl.java index 4e18ce27..f0280ef5 100644 --- a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/service/impl/HqSatQuestionServiceImpl.java +++ b/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/service/impl/HqSatQuestionServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.zhxy.service.impl; +package org.dromara.zhxy.hq.service.impl; 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.zhxy.domain.bo.HqSatQuestionBo; -import org.dromara.zhxy.domain.vo.HqSatQuestionVo; -import org.dromara.zhxy.domain.HqSatQuestion; -import org.dromara.zhxy.mapper.HqSatQuestionMapper; -import org.dromara.zhxy.service.IHqSatQuestionService; +import org.dromara.zhxy.hq.domain.bo.HqSatQuestionBo; +import org.dromara.zhxy.hq.domain.vo.HqSatQuestionVo; +import org.dromara.zhxy.hq.domain.HqSatQuestion; +import org.dromara.zhxy.hq.mapper.HqSatQuestionMapper; +import org.dromara.zhxy.hq.service.IHqSatQuestionService; import java.util.List; import java.util.Map; diff --git a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/service/impl/HqSatRecordServiceImpl.java b/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/service/impl/HqSatRecordServiceImpl.java similarity index 93% rename from backend/ruoyi-admin/src/main/java/org/dromara/zhxy/service/impl/HqSatRecordServiceImpl.java rename to backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/service/impl/HqSatRecordServiceImpl.java index 69d2d254..1fdd8764 100644 --- a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/service/impl/HqSatRecordServiceImpl.java +++ b/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/service/impl/HqSatRecordServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.zhxy.service.impl; +package org.dromara.zhxy.hq.service.impl; 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.zhxy.domain.bo.HqSatRecordBo; -import org.dromara.zhxy.domain.vo.HqSatRecordVo; -import org.dromara.zhxy.domain.HqSatRecord; -import org.dromara.zhxy.mapper.HqSatRecordMapper; -import org.dromara.zhxy.service.IHqSatRecordService; +import org.dromara.zhxy.hq.domain.bo.HqSatRecordBo; +import org.dromara.zhxy.hq.domain.vo.HqSatRecordVo; +import org.dromara.zhxy.hq.domain.HqSatRecord; +import org.dromara.zhxy.hq.mapper.HqSatRecordMapper; +import org.dromara.zhxy.hq.service.IHqSatRecordService; import java.util.List; import java.util.Map; diff --git a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/service/impl/HqSatSurveyQuestionServiceImpl.java b/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/service/impl/HqSatSurveyQuestionServiceImpl.java similarity index 93% rename from backend/ruoyi-admin/src/main/java/org/dromara/zhxy/service/impl/HqSatSurveyQuestionServiceImpl.java rename to backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/service/impl/HqSatSurveyQuestionServiceImpl.java index 6d587305..2933185a 100644 --- a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/service/impl/HqSatSurveyQuestionServiceImpl.java +++ b/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/service/impl/HqSatSurveyQuestionServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.zhxy.service.impl; +package org.dromara.zhxy.hq.service.impl; 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.zhxy.domain.bo.HqSatSurveyQuestionBo; -import org.dromara.zhxy.domain.vo.HqSatSurveyQuestionVo; -import org.dromara.zhxy.domain.HqSatSurveyQuestion; -import org.dromara.zhxy.mapper.HqSatSurveyQuestionMapper; -import org.dromara.zhxy.service.IHqSatSurveyQuestionService; +import org.dromara.zhxy.hq.domain.bo.HqSatSurveyQuestionBo; +import org.dromara.zhxy.hq.domain.vo.HqSatSurveyQuestionVo; +import org.dromara.zhxy.hq.domain.HqSatSurveyQuestion; +import org.dromara.zhxy.hq.mapper.HqSatSurveyQuestionMapper; +import org.dromara.zhxy.hq.service.IHqSatSurveyQuestionService; import java.util.List; import java.util.Map; diff --git a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/service/impl/HqSatSurveyServiceImpl.java b/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/service/impl/HqSatSurveyServiceImpl.java similarity index 97% rename from backend/ruoyi-admin/src/main/java/org/dromara/zhxy/service/impl/HqSatSurveyServiceImpl.java rename to backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/service/impl/HqSatSurveyServiceImpl.java index a71be1da..67a8b613 100644 --- a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/service/impl/HqSatSurveyServiceImpl.java +++ b/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/service/impl/HqSatSurveyServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.zhxy.service.impl; +package org.dromara.zhxy.hq.service.impl; import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.StringUtils; @@ -11,21 +11,21 @@ import cn.hutool.core.collection.CollUtil; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; -import org.dromara.zhxy.domain.bo.HqSatSurveyBo; -import org.dromara.zhxy.domain.bo.HqSatAnswerSubmitBo; -import org.dromara.zhxy.domain.bo.HqSatRecordBo; -import org.dromara.zhxy.domain.bo.HqSatDetailBo; -import org.dromara.zhxy.domain.vo.HqSatSurveyVo; -import org.dromara.zhxy.domain.vo.HqSatRecordVo; -import org.dromara.zhxy.domain.HqSatSurvey; -import org.dromara.zhxy.mapper.HqSatSurveyMapper; -import org.dromara.zhxy.service.IHqSatSurveyService; -import org.dromara.zhxy.service.IHqSatSurveyQuestionService; -import org.dromara.zhxy.service.IHqSatRecordService; -import org.dromara.zhxy.service.IHqSatDetailService; -import org.dromara.zhxy.domain.bo.HqSatSurveyQuestionBo; -import org.dromara.zhxy.domain.vo.HqSatSurveyQuestionVo; -import org.dromara.zhxy.domain.vo.HqSatDetailVo; +import org.dromara.zhxy.hq.domain.bo.HqSatSurveyBo; +import org.dromara.zhxy.hq.domain.bo.HqSatAnswerSubmitBo; +import org.dromara.zhxy.hq.domain.bo.HqSatRecordBo; +import org.dromara.zhxy.hq.domain.bo.HqSatDetailBo; +import org.dromara.zhxy.hq.domain.vo.HqSatSurveyVo; +import org.dromara.zhxy.hq.domain.vo.HqSatRecordVo; +import org.dromara.zhxy.hq.domain.HqSatSurvey; +import org.dromara.zhxy.hq.mapper.HqSatSurveyMapper; +import org.dromara.zhxy.hq.service.IHqSatSurveyService; +import org.dromara.zhxy.hq.service.IHqSatSurveyQuestionService; +import org.dromara.zhxy.hq.service.IHqSatRecordService; +import org.dromara.zhxy.hq.service.IHqSatDetailService; +import org.dromara.zhxy.hq.domain.bo.HqSatSurveyQuestionBo; +import org.dromara.zhxy.hq.domain.vo.HqSatSurveyQuestionVo; +import org.dromara.zhxy.hq.domain.vo.HqSatDetailVo; import java.util.List; import java.util.Map; diff --git a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/service/impl/PmRepairAttachmentServiceImpl.java b/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/service/impl/PmRepairAttachmentServiceImpl.java similarity index 94% rename from backend/ruoyi-admin/src/main/java/org/dromara/zhxy/service/impl/PmRepairAttachmentServiceImpl.java rename to backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/service/impl/PmRepairAttachmentServiceImpl.java index be672d09..234e51be 100644 --- a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/service/impl/PmRepairAttachmentServiceImpl.java +++ b/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/service/impl/PmRepairAttachmentServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.zhxy.service.impl; +package org.dromara.zhxy.hq.service.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.util.StrUtil; @@ -16,12 +16,12 @@ import org.dromara.common.oss.core.OssClient; import org.dromara.common.oss.entity.UploadResult; import org.dromara.common.oss.factory.OssFactory; import org.dromara.common.satoken.utils.LoginHelper; -import org.dromara.zhxy.domain.PmRepairAttachment; -import org.dromara.zhxy.domain.bo.PmRepairAttachmentBo; -import org.dromara.zhxy.domain.vo.PmRepairAttachmentVo; -import org.dromara.zhxy.mapper.PmRepairAttachmentMapper; -import org.dromara.zhxy.mapper.PmRepairOrderMapper; -import org.dromara.zhxy.service.IPmRepairAttachmentService; +import org.dromara.zhxy.hq.domain.PmRepairAttachment; +import org.dromara.zhxy.hq.domain.bo.PmRepairAttachmentBo; +import org.dromara.zhxy.hq.domain.vo.PmRepairAttachmentVo; +import org.dromara.zhxy.hq.mapper.PmRepairAttachmentMapper; +import org.dromara.zhxy.hq.mapper.PmRepairOrderMapper; +import org.dromara.zhxy.hq.service.IPmRepairAttachmentService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.multipart.MultipartFile; @@ -297,9 +297,9 @@ public class PmRepairAttachmentServiceImpl implements IPmRepairAttachmentService long count = baseMapper.selectCount(lqw); // 更新工单的附件数量 - LambdaUpdateWrapper updateWrapper = Wrappers.lambdaUpdate(); - updateWrapper.eq(org.dromara.zhxy.domain.PmRepairOrder::getId, orderId) - .set(org.dromara.zhxy.domain.PmRepairOrder::getAttachmentCount, (int) count); + LambdaUpdateWrapper updateWrapper = Wrappers.lambdaUpdate(); + updateWrapper.eq(org.dromara.zhxy.hq.domain.PmRepairOrder::getId, orderId) + .set(org.dromara.zhxy.hq.domain.PmRepairOrder::getAttachmentCount, (int) count); repairOrderMapper.update(null, updateWrapper); } diff --git a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/service/impl/PmRepairCategoryServiceImpl.java b/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/service/impl/PmRepairCategoryServiceImpl.java similarity index 96% rename from backend/ruoyi-admin/src/main/java/org/dromara/zhxy/service/impl/PmRepairCategoryServiceImpl.java rename to backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/service/impl/PmRepairCategoryServiceImpl.java index ef8cccb4..bc48b619 100644 --- a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/service/impl/PmRepairCategoryServiceImpl.java +++ b/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/service/impl/PmRepairCategoryServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.zhxy.service.impl; +package org.dromara.zhxy.hq.service.impl; import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.StringUtils; @@ -11,11 +11,11 @@ import cn.hutool.core.collection.CollUtil; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; -import org.dromara.zhxy.domain.bo.PmRepairCategoryBo; -import org.dromara.zhxy.domain.vo.PmRepairCategoryVo; -import org.dromara.zhxy.domain.PmRepairCategory; -import org.dromara.zhxy.mapper.PmRepairCategoryMapper; -import org.dromara.zhxy.service.IPmRepairCategoryService; +import org.dromara.zhxy.hq.domain.bo.PmRepairCategoryBo; +import org.dromara.zhxy.hq.domain.vo.PmRepairCategoryVo; +import org.dromara.zhxy.hq.domain.PmRepairCategory; +import org.dromara.zhxy.hq.mapper.PmRepairCategoryMapper; +import org.dromara.zhxy.hq.service.IPmRepairCategoryService; import org.dromara.common.core.exception.ServiceException; import java.util.List; diff --git a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/service/impl/PmRepairOrderServiceImpl.java b/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/service/impl/PmRepairOrderServiceImpl.java similarity index 98% rename from backend/ruoyi-admin/src/main/java/org/dromara/zhxy/service/impl/PmRepairOrderServiceImpl.java rename to backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/service/impl/PmRepairOrderServiceImpl.java index efff242e..86e9f78c 100644 --- a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/service/impl/PmRepairOrderServiceImpl.java +++ b/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/service/impl/PmRepairOrderServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.zhxy.service.impl; +package org.dromara.zhxy.hq.service.impl; import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.StringUtils; @@ -12,16 +12,16 @@ import cn.hutool.core.date.DateUtil; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; -import org.dromara.zhxy.domain.bo.PmRepairOrderBo; -import org.dromara.zhxy.domain.vo.PmRepairOrderVo; -import org.dromara.zhxy.domain.PmRepairOrder; -import org.dromara.zhxy.domain.PmRepairProgress; -import org.dromara.zhxy.domain.PmServiceEvaluation; -import org.dromara.zhxy.mapper.PmRepairOrderMapper; -import org.dromara.zhxy.mapper.PmRepairProgressMapper; -import org.dromara.zhxy.mapper.PmServiceEvaluationMapper; -import org.dromara.zhxy.service.IPmRepairOrderService; -import org.dromara.zhxy.service.IPmRepairCategoryService; +import org.dromara.zhxy.hq.domain.bo.PmRepairOrderBo; +import org.dromara.zhxy.hq.domain.vo.PmRepairOrderVo; +import org.dromara.zhxy.hq.domain.PmRepairOrder; +import org.dromara.zhxy.hq.domain.PmRepairProgress; +import org.dromara.zhxy.hq.domain.PmServiceEvaluation; +import org.dromara.zhxy.hq.mapper.PmRepairOrderMapper; +import org.dromara.zhxy.hq.mapper.PmRepairProgressMapper; +import org.dromara.zhxy.hq.mapper.PmServiceEvaluationMapper; +import org.dromara.zhxy.hq.service.IPmRepairOrderService; +import org.dromara.zhxy.hq.service.IPmRepairCategoryService; import org.dromara.common.satoken.utils.LoginHelper; import org.dromara.common.core.exception.ServiceException; import org.dromara.common.core.service.UserService; diff --git a/backend/ruoyi-admin/src/main/resources/mapper/hq/HqHallInfoMapper.xml b/backend/ruoyi-admin/src/main/resources/mapper/hq/HqHallInfoMapper.xml index 713fc4f4..d8977c40 100644 --- a/backend/ruoyi-admin/src/main/resources/mapper/hq/HqHallInfoMapper.xml +++ b/backend/ruoyi-admin/src/main/resources/mapper/hq/HqHallInfoMapper.xml @@ -2,6 +2,6 @@ - + diff --git a/backend/ruoyi-admin/src/main/resources/mapper/hq/HqHallReservationMapper.xml b/backend/ruoyi-admin/src/main/resources/mapper/hq/HqHallReservationMapper.xml index ea0cf7c9..d41b863f 100644 --- a/backend/ruoyi-admin/src/main/resources/mapper/hq/HqHallReservationMapper.xml +++ b/backend/ruoyi-admin/src/main/resources/mapper/hq/HqHallReservationMapper.xml @@ -2,6 +2,6 @@ - + diff --git a/backend/ruoyi-admin/src/main/resources/mapper/hq/HqSatCategoryMapper.xml b/backend/ruoyi-admin/src/main/resources/mapper/hq/HqSatCategoryMapper.xml index 5578db09..bfb3fe45 100644 --- a/backend/ruoyi-admin/src/main/resources/mapper/hq/HqSatCategoryMapper.xml +++ b/backend/ruoyi-admin/src/main/resources/mapper/hq/HqSatCategoryMapper.xml @@ -2,6 +2,6 @@ - + diff --git a/backend/ruoyi-admin/src/main/resources/mapper/hq/HqSatDetailMapper.xml b/backend/ruoyi-admin/src/main/resources/mapper/hq/HqSatDetailMapper.xml index 149ccbfa..dcb1330b 100644 --- a/backend/ruoyi-admin/src/main/resources/mapper/hq/HqSatDetailMapper.xml +++ b/backend/ruoyi-admin/src/main/resources/mapper/hq/HqSatDetailMapper.xml @@ -2,6 +2,6 @@ - + diff --git a/backend/ruoyi-admin/src/main/resources/mapper/hq/HqSatOptionMapper.xml b/backend/ruoyi-admin/src/main/resources/mapper/hq/HqSatOptionMapper.xml index ad39a6d1..567c025f 100644 --- a/backend/ruoyi-admin/src/main/resources/mapper/hq/HqSatOptionMapper.xml +++ b/backend/ruoyi-admin/src/main/resources/mapper/hq/HqSatOptionMapper.xml @@ -2,6 +2,6 @@ - + diff --git a/backend/ruoyi-admin/src/main/resources/mapper/hq/HqSatQuestionMapper.xml b/backend/ruoyi-admin/src/main/resources/mapper/hq/HqSatQuestionMapper.xml index 08dc58ab..962b41ea 100644 --- a/backend/ruoyi-admin/src/main/resources/mapper/hq/HqSatQuestionMapper.xml +++ b/backend/ruoyi-admin/src/main/resources/mapper/hq/HqSatQuestionMapper.xml @@ -2,6 +2,6 @@ - + diff --git a/backend/ruoyi-admin/src/main/resources/mapper/hq/HqSatRecordMapper.xml b/backend/ruoyi-admin/src/main/resources/mapper/hq/HqSatRecordMapper.xml index b112641f..6af8e002 100644 --- a/backend/ruoyi-admin/src/main/resources/mapper/hq/HqSatRecordMapper.xml +++ b/backend/ruoyi-admin/src/main/resources/mapper/hq/HqSatRecordMapper.xml @@ -2,6 +2,6 @@ - + diff --git a/backend/ruoyi-admin/src/main/resources/mapper/hq/HqSatSurveyMapper.xml b/backend/ruoyi-admin/src/main/resources/mapper/hq/HqSatSurveyMapper.xml index 10a43661..1d1bb077 100644 --- a/backend/ruoyi-admin/src/main/resources/mapper/hq/HqSatSurveyMapper.xml +++ b/backend/ruoyi-admin/src/main/resources/mapper/hq/HqSatSurveyMapper.xml @@ -2,6 +2,6 @@ - + diff --git a/backend/ruoyi-admin/src/main/resources/mapper/hq/HqSatSurveyQuestionMapper.xml b/backend/ruoyi-admin/src/main/resources/mapper/hq/HqSatSurveyQuestionMapper.xml index f3a9c0e0..2bb3a370 100644 --- a/backend/ruoyi-admin/src/main/resources/mapper/hq/HqSatSurveyQuestionMapper.xml +++ b/backend/ruoyi-admin/src/main/resources/mapper/hq/HqSatSurveyQuestionMapper.xml @@ -2,10 +2,10 @@ - + - SELECT sq.id, sq.deleted, diff --git a/backend/ruoyi-admin/src/main/resources/mapper/pm/PmRepairAttachmentMapper.xml b/backend/ruoyi-admin/src/main/resources/mapper/hq/PmRepairAttachmentMapper.xml similarity index 91% rename from backend/ruoyi-admin/src/main/resources/mapper/pm/PmRepairAttachmentMapper.xml rename to backend/ruoyi-admin/src/main/resources/mapper/hq/PmRepairAttachmentMapper.xml index 27d600be..a6c27f74 100644 --- a/backend/ruoyi-admin/src/main/resources/mapper/pm/PmRepairAttachmentMapper.xml +++ b/backend/ruoyi-admin/src/main/resources/mapper/hq/PmRepairAttachmentMapper.xml @@ -2,9 +2,9 @@ - + - + diff --git a/backend/ruoyi-admin/src/main/resources/mapper/pm/PmRepairCategoryMapper.xml b/backend/ruoyi-admin/src/main/resources/mapper/hq/PmRepairCategoryMapper.xml similarity index 69% rename from backend/ruoyi-admin/src/main/resources/mapper/pm/PmRepairCategoryMapper.xml rename to backend/ruoyi-admin/src/main/resources/mapper/hq/PmRepairCategoryMapper.xml index 37fbac52..a12f653e 100644 --- a/backend/ruoyi-admin/src/main/resources/mapper/pm/PmRepairCategoryMapper.xml +++ b/backend/ruoyi-admin/src/main/resources/mapper/hq/PmRepairCategoryMapper.xml @@ -2,6 +2,6 @@ - + diff --git a/backend/ruoyi-admin/src/main/resources/mapper/pm/PmRepairOrderMapper.xml b/backend/ruoyi-admin/src/main/resources/mapper/hq/PmRepairOrderMapper.xml similarity index 93% rename from backend/ruoyi-admin/src/main/resources/mapper/pm/PmRepairOrderMapper.xml rename to backend/ruoyi-admin/src/main/resources/mapper/hq/PmRepairOrderMapper.xml index dfe0d15c..001ec8a3 100644 --- a/backend/ruoyi-admin/src/main/resources/mapper/pm/PmRepairOrderMapper.xml +++ b/backend/ruoyi-admin/src/main/resources/mapper/hq/PmRepairOrderMapper.xml @@ -2,7 +2,7 @@ - +