diff --git a/.cursor/cursorrules-backend.md b/.cursor/cursorrules-backend.md index 2c757fb5..26d3cc7f 100644 --- a/.cursor/cursorrules-backend.md +++ b/.cursor/cursorrules-backend.md @@ -40,11 +40,262 @@ backend/ ├── ruoyi-modules/ # 业务模块组 │ ├── ruoyi-system/ # 系统管理模块 │ ├── ruoyi-demo/ # 示例模块 +│ ├── ruoyi-hq/ # 后勤管理模块 (hq) +│ ├── ruoyi-rs/ # 人事管理模块 (rs) +│ ├── ruoyi-cw/ # 财务管理模块 (cw) +│ ├── ruoyi-aqbw/ # 安全保卫管理模块 (aqbw) +│ ├── ruoyi-zsjy/ # 招生就业管理模块 (zsjy) +│ ├── ruoyi-xg/ # 学工管理模块 (xg) │ └── ... (其他业务模块) ├── ruoyi-extend/ # 扩展模块组 └── script/ # 脚本和SQL ``` +## 🔴 模块工程管理规范（强制性，2025-01-23新增） + +### 📦 模块工程创建规范 + +**⚠️ 基于ruoyi-hq工程实践制定，后续所有新模块必须遵循此规范！** + +#### 🏗️ 模块命名和位置规范 + +**模块位置**: `backend/ruoyi-modules/ruoyi-{模块简称}/` + +**已规划模块列表**: +- ✅ `ruoyi-hq` - 后勤管理模块 (已完成) +- 🚧 `ruoyi-rs` - 人事管理模块 +- 🚧 `ruoyi-cw` - 财务管理模块 +- 🚧 `ruoyi-aqbw` - 安全保卫管理模块 +- 🚧 `ruoyi-zsjy` - 招生就业管理模块 +- 🚧 `ruoyi-xg` - 学工管理模块 + +#### 📋 Maven配置规范 + +**pom.xml标准模板**: +```xml + + + + ruoyi-modules + org.dromara + ${revision} + + 4.0.0 + + ruoyi-{模块简称} + + {模块名称}管理模块 + + + + + + org.dromara + ruoyi-common-core + + + org.dromara + ruoyi-common-doc + + + org.dromara + ruoyi-common-mybatis + + + org.dromara + ruoyi-common-log + + + org.dromara + ruoyi-common-security + + + org.dromara + ruoyi-common-web + + + org.dromara + ruoyi-common-excel + + + org.dromara + ruoyi-common-idempotent + + + org.dromara + ruoyi-common-tenant + + + org.dromara + ruoyi-common-social + + + org.dromara + ruoyi-common-ratelimiter + + + org.dromara + ruoyi-common-mail + + + + + org.dromara + ruoyi-system + + + org.dromara + ruoyi-job + + + + + org.dromara + ruoyi-generator + + + + + org.dromara + ruoyi-demo + + + + + org.dromara + ruoyi-workflow + + + +``` + +#### 🏛️ 包结构规范 + +**Java包结构**: `org.dromara.{模块简称}` + +**标准目录结构**: +``` +ruoyi-{模块简称}/ +├── pom.xml +└── src/main/ + ├── java/org/dromara/{模块简称}/ + │ ├── controller/ # REST API控制器层 + │ ├── service/ # 业务服务接口层 + │ │ └── impl/ # 业务服务实现层 + │ ├── mapper/ # 数据访问层接口 + │ └── domain/ # 数据对象层 + │ ├── [Entity].java # 实体类 (继承TenantEntity) + │ ├── bo/ # 业务对象 (Business Object) + │ └── vo/ # 视图对象 (View Object) + └── resources/ + └── mapper/ # MyBatis XML映射文件 +``` + +#### 🎯 代码规范要求 + +**Entity实体类**: +```java +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("表名") +public class EntityName extends TenantEntity { + @Serial + private static final long serialVersionUID = 1L; + + @TableId(value = "id") + private Long id; + + // 业务字段... +} +``` + +**Service接口**: +```java +public interface IEntityService { + EntityVo queryById(Long id); + TableDataInfo queryPageList(EntityBo bo, PageQuery pageQuery); + List queryList(EntityBo bo); + Boolean insertByBo(EntityBo bo); + Boolean updateByBo(EntityBo bo); + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} +``` + +**Controller控制器**: +```java +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/{模块简称}/entity") +public class EntityController extends BaseController { + + private final IEntityService entityService; + + @SaCheckPermission("{模块简称}:entity:list") + @GetMapping("/list") + public TableDataInfo list(EntityBo bo, PageQuery pageQuery) { + return entityService.queryPageList(bo, pageQuery); + } + + // 其他标准接口... +} +``` + +**Mapper接口**: +```java +public interface EntityMapper extends BaseMapperPlus { + // 自定义查询方法... +} +``` + +#### 🔐 权限命名规范 + +**权限编码格式**: `{模块简称}:{功能}:{操作}` + +**示例**: +- `hq:repair:list` - 后勤模块报修列表查询权限 +- `rs:employee:add` - 人事模块员工新增权限 +- `cw:budget:export` - 财务模块预算导出权限 + +#### 📚 模块开发最佳实践 + +**1. 遵循ruoyi-hq标准模式**: +- 继承TenantEntity支持多租户 +- 使用@SaCheckPermission进行权限控制 +- 遵循TableDataInfo分页响应格式 +- 使用MapstructUtils进行对象转换 + +**2. 代码质量要求**: +- 使用Lombok减少样板代码 +- 完整的中文注释和文档 +- 统一的异常处理机制 +- 完善的参数校验 + +**3. 模块间解耦**: +- 模块间通过Service接口交互 +- 避免直接依赖其他模块的内部实现 +- 共用功能提取到common模块 + +**4. 数据库设计**: +- 必须遵循数据库规范基础字段 +- 支持逻辑删除和多租户 +- 合理的索引设计 +- 完整的数据字典配置 + +#### 🚨 模块创建检查清单 + +**创建新模块前必须检查**: +- [ ] 模块名称符合规范？(`ruoyi-{简称}`) +- [ ] Maven配置是否正确？ +- [ ] 包结构是否遵循标准？ +- [ ] 是否包含完整的分层架构？ +- [ ] 权限编码是否符合规范？ +- [ ] 是否遵循ruoyi-hq的最佳实践？ +- [ ] 数据库设计是否符合规范？ +- [ ] 是否添加了相关文档？ + ## 3. 开发规范 ### 代码规范 @@ -71,6 +322,93 @@ backend/ 5. **完整的中文注释是必须的** 6. **禁止使用数据库外键约束**，关联关系通过应用层维护 +#### 🔴 表命名规范（强制性） + +**⚠️ 超级重要：所有数据库表必须按业务模块使用统一前缀命名！** + +**模块表名前缀规范**： +- **后勤管理**：`hq_` 开头 (如：`hq_repair`, `hq_maintenance`) +- **人事管理**：`rs_` 开头 (如：`rs_employee`, `rs_department`) +- **财务管理**：`cw_` 开头 (如：`cw_budget`, `cw_expense`) +- **学工管理**：`xg_` 开头 (如：`xg_student`, `xg_dormitory`) +- **招生就业**：`zsjy_` 开头 (如：`zsjy_application`, `zsjy_job`) +- **安全保卫**：`aqbw_` 开头 (如：`aqbw_security`, `aqbw_patrol`) +- **系统公共**：`common_` 开头 (如：`common_dict`, `common_config`) + +**命名示例**： +```sql +-- 后勤管理模块表 +CREATE TABLE `hq_repair` ( + `id` bigint(20) NOT NULL COMMENT '报修ID', + -- 其他字段... +) COMMENT='报修管理表'; + +-- 人事管理模块表 +CREATE TABLE `rs_employee` ( + `id` bigint(20) NOT NULL COMMENT '员工ID', + -- 其他字段... +) COMMENT='员工信息表'; + +-- 财务管理模块表 +CREATE TABLE `cw_budget` ( + `id` bigint(20) NOT NULL COMMENT '预算ID', + -- 其他字段... +) COMMENT='预算管理表'; + +-- 学工管理模块表 +CREATE TABLE `xg_student` ( + `id` bigint(20) NOT NULL COMMENT '学生ID', + -- 其他字段... +) COMMENT='学生信息表'; + +-- 招生就业模块表 +CREATE TABLE `zsjy_application` ( + `id` bigint(20) NOT NULL COMMENT '申请ID', + -- 其他字段... +) COMMENT='招生申请表'; + +-- 安全保卫模块表 +CREATE TABLE `aqbw_security` ( + `id` bigint(20) NOT NULL COMMENT '安全记录ID', + -- 其他字段... +) COMMENT='安全管理表'; + +-- 系统公共模块表 +CREATE TABLE `common_dict` ( + `id` bigint(20) NOT NULL COMMENT '字典ID', + -- 其他字段... +) COMMENT='数据字典表'; +``` + +**强制性要求**： +- ✅ 新建表时必须使用对应模块前缀 +- ✅ 表名采用下划线命名法（snake_case） +- ✅ 表名必须是英文，禁止使用中文或拼音 +- ✅ 表注释必须用中文清楚说明表的用途 +- ❌ 禁止跨模块混用前缀（如人事模块不能创建 cw_ 开头的表） +- ❌ 禁止使用无前缀的表名（系统核心表除外） + +**实体类命名对应**： +```java +// 表名: hq_repair -> 实体类: HqRepair +@TableName("hq_repair") +public class HqRepair extends TenantEntity { + // ... +} + +// 表名: rs_employee -> 实体类: RsEmployee +@TableName("rs_employee") +public class RsEmployee extends TenantEntity { + // ... +} + +// 表名: cw_budget -> 实体类: CwBudget +@TableName("cw_budget") +public class CwBudget extends TenantEntity { + // ... +} +``` + #### 🔴 强制性基础字段模板 ```sql @@ -1156,7 +1494,7 @@ testPermissions(token, permissionTests).then((results) => { ``` org.mybatis.spring.MyBatisSystemException: -Could not set property 'createBy' of 'class org.dromara.venue.domain.vo.HqVenueReservationVo' +Could not set property 'createBy' of 'class org.dromara.hq.domain.vo.HqVenueReservationVo' with value '1' Cause: There is no setter for property named 'createBy' ``` diff --git a/.cursor/cursorrules-frontend.md b/.cursor/cursorrules-frontend.md index 7e364df5..14c8639d 100644 --- a/.cursor/cursorrules-frontend.md +++ b/.cursor/cursorrules-frontend.md @@ -33,6 +33,176 @@ - **前端访问**: http://localhost (默认 80 端口) - **后端服务**: http://localhost:8080 +## 🔴 前端模块管理规范（强制性，2025-01-23新增） + +### 📦 前端模块文件夹规范 + +**⚠️ 基于后端模块工程统一规划，前端必须建立对应的模块文件夹结构！** + +#### 🏗️ 模块命名和位置规范 + +**界面文件夹位置**: `web/src/views/{模块简称}/` +**API文件夹位置**: `web/src/api/{模块简称}/` + +**已规划模块列表**: +- ✅ `hq` - 后勤管理模块 (已完成) +- ✅ `rs` - 人事管理模块 +- ✅ `cw` - 财务管理模块 +- ✅ `aqbw` - 安全保卫管理模块 +- ✅ `zsjy` - 招生就业管理模块 +- ✅ `xg` - 学工管理模块 + +#### 📁 标准目录结构 + +**界面文件夹结构** (web/src/views/{模块简称}/): +``` +web/src/views/{模块简称}/ +├── README.md # 模块说明文档 +├── {功能模块1}/ # 按功能模块细分 +│ ├── index.vue # 列表页面 +│ ├── add.vue # 新增页面 +│ ├── edit.vue # 编辑页面 +│ └── detail.vue # 详情页面 +├── {功能模块2}/ +│ └── ... +└── components/ # 模块内公共组件 + └── ... +``` + +**API文件夹结构** (web/src/api/{模块简称}/): +``` +web/src/api/{模块简称}/ +├── index.ts # API入口文件 +├── README.md # API接口说明文档 +├── types.ts # 类型定义文件 +├── {功能模块1}/ # 按功能模块细分 +│ └── index.ts # 功能模块API接口 +├── {功能模块2}/ +│ └── index.ts +└── ... +``` + +#### 🎯 文件命名规范 + +**Vue组件文件**: +- 页面组件: PascalCase (如: `UserList.vue`) +- 组件文件: kebab-case (如: `user-form.vue`) + +**TypeScript文件**: +- API文件: kebab-case (如: `user-api.ts`) +- 类型文件: kebab-case (如: `user-types.ts`) + +**路由命名**: +- 路由路径: kebab-case (如: `/rs/employee-list`) +- 路由名称: camelCase (如: `rsEmployeeList`) + +#### 🔐 权限命名规范 + +**前端权限指令格式**: `v-hasPermi="'{模块简称}:{功能}:{操作}'"` + +**示例**: +```vue + +新增员工 + + +查看预算 + + +编辑 +``` + +#### 📋 路由配置规范 + +**路由路径格式**: `/{模块简称}/{功能模块}` + +**router配置示例**: +```typescript +// router/modules/rs.ts - 人事管理模块路由 +export default { + path: '/rs', + name: 'Rs', + component: () => import('@/layout/index.vue'), + redirect: '/rs/employee', + meta: { + title: '人事管理', + icon: 'peoples', + rank: 3 + }, + children: [ + { + path: '/rs/employee', + name: 'RsEmployee', + component: () => import('@/views/rs/employee/index.vue'), + meta: { + title: '员工管理', + keepAlive: true + } + }, + { + path: '/rs/department', + name: 'RsDepartment', + component: () => import('@/views/rs/department/index.vue'), + meta: { + title: '部门管理', + keepAlive: true + } + } + ] +} +``` + +#### 🚨 前端模块开发检查清单 + +**创建新模块前必须检查**: +- [ ] 模块文件夹是否按规范命名？(`web/src/views/{简称}/`) +- [ ] API文件夹是否对应创建？(`web/src/api/{简称}/`) +- [ ] 是否创建了模块说明文档？(README.md) +- [ ] 路由配置是否符合规范？ +- [ ] 权限指令是否使用正确的编码格式？ +- [ ] 是否遵循前端开发规范和UI设计标准？ +- [ ] 组件和文件命名是否符合规范？ +- [ ] API接口类型定义是否与后端VO保持一致？ + +#### 💡 模块开发最佳实践 + +**1. 组件复用**: +- 模块内公共组件放在`components/`目录 +- 跨模块公共组件放在`@/components/`目录 +- 使用组合式API提高代码复用性 + +**2. 状态管理**: +- 模块相关状态使用Pinia store管理 +- Store文件命名：`@/stores/{模块简称}.ts` +- 避免不同模块间的状态耦合 + +**3. 样式管理**: +- 使用SCSS变量和mixin提高样式复用 +- 遵循Art Design Pro UI设计规范 +- 统一使用轮廓式按钮设计 + +**4. 类型安全**: +- 所有API接口必须定义TypeScript类型 +- 类型定义与后端VO对象保持一致 +- 使用泛型提高类型复用性 + +#### 📝 注意事项 + +**模块间解耦**: +- 避免模块间直接依赖，通过事件总线或状态管理通信 +- API接口按模块严格分离 +- 路由按模块独立配置，避免交叉引用 + +**性能优化**: +- 页面组件使用懒加载 +- 合理使用keep-alive缓存页面状态 +- 图片资源优化和懒加载 + +**用户体验**: +- 统一的加载状态和错误处理 +- 合理的页面过渡动画 +- 响应式设计支持多设备访问 + ## 2. Art Design Pro UI 规范 ### 设计理念 diff --git a/.serena/memories/code_style_conventions.md b/.serena/memories/code_style_conventions.md index 2ec6ab24..4ceba76f 100644 --- a/.serena/memories/code_style_conventions.md +++ b/.serena/memories/code_style_conventions.md @@ -6,7 +6,7 @@ - **类名**: 使用PascalCase，如 `PmRepairOrderController` - **方法名**: 使用camelCase，如 `updateRepairOrder` - **常量**: 使用UPPER_SNAKE_CASE，如 `DEFAULT_PAGE_SIZE` -- **包名**: 使用小写，如 `org.dromara.zhxy.hq.service` +- **包名**: 使用小写，如 `org.dromara.hq.service` ### 项目结构模式 ``` diff --git a/backend/pom.xml b/backend/pom.xml index a289723e..2f24aa5d 100644 --- a/backend/pom.xml +++ b/backend/pom.xml @@ -357,13 +357,45 @@ ${revision} - + org.dromara - ruoyi-venue + ruoyi-hq ${revision} + + + org.dromara + ruoyi-rs + ${revision} + + + + org.dromara + ruoyi-cw + ${revision} + + + + org.dromara + ruoyi-xg + ${revision} + + + + org.dromara + ruoyi-zsjy + ${revision} + + + + org.dromara + ruoyi-aqbw + ${revision} + + + diff --git a/backend/ruoyi-admin/pom.xml b/backend/ruoyi-admin/pom.xml index 491d909c..6d32c6fb 100644 --- a/backend/ruoyi-admin/pom.xml +++ b/backend/ruoyi-admin/pom.xml @@ -92,10 +92,35 @@ ruoyi-workflow - + org.dromara - ruoyi-venue + ruoyi-hq + + + + org.dromara + ruoyi-rs + + + + org.dromara + ruoyi-cw + + + + org.dromara + ruoyi-xg + + + + org.dromara + ruoyi-zsjy + + + + org.dromara + ruoyi-aqbw diff --git a/backend/ruoyi-admin/src/main/resources/mapper/hq/HqHallReservationMapper.xml b/backend/ruoyi-admin/src/main/resources/mapper/hq/HqHallReservationMapper.xml deleted file mode 100644 index d41b863f..00000000 --- a/backend/ruoyi-admin/src/main/resources/mapper/hq/HqHallReservationMapper.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/backend/ruoyi-admin/src/main/resources/mapper/hq/HqSatCategoryMapper.xml b/backend/ruoyi-admin/src/main/resources/mapper/hq/HqSatCategoryMapper.xml deleted file mode 100644 index bfb3fe45..00000000 --- a/backend/ruoyi-admin/src/main/resources/mapper/hq/HqSatCategoryMapper.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/backend/ruoyi-admin/src/main/resources/mapper/hq/HqSatQuestionMapper.xml b/backend/ruoyi-admin/src/main/resources/mapper/hq/HqSatQuestionMapper.xml deleted file mode 100644 index 962b41ea..00000000 --- a/backend/ruoyi-admin/src/main/resources/mapper/hq/HqSatQuestionMapper.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/backend/ruoyi-admin/src/main/resources/mapper/hq/PmRepairCategoryMapper.xml b/backend/ruoyi-admin/src/main/resources/mapper/hq/PmRepairCategoryMapper.xml deleted file mode 100644 index a12f653e..00000000 --- a/backend/ruoyi-admin/src/main/resources/mapper/hq/PmRepairCategoryMapper.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/backend/ruoyi-modules/pom.xml b/backend/ruoyi-modules/pom.xml index 6307d5be..c3b2b3a7 100644 --- a/backend/ruoyi-modules/pom.xml +++ b/backend/ruoyi-modules/pom.xml @@ -14,7 +14,12 @@ ruoyi-job ruoyi-system ruoyi-workflow - ruoyi-venue + ruoyi-hq + ruoyi-rs + ruoyi-cw + ruoyi-aqbw + ruoyi-zsjy + ruoyi-xg ruoyi-modules diff --git a/backend/ruoyi-modules/ruoyi-aqbw/pom.xml b/backend/ruoyi-modules/ruoyi-aqbw/pom.xml new file mode 100644 index 00000000..10119be5 --- /dev/null +++ b/backend/ruoyi-modules/ruoyi-aqbw/pom.xml @@ -0,0 +1,109 @@ + + + + ruoyi-modules + org.dromara + ${revision} + + 4.0.0 + + ruoyi-aqbw + + 安全保卫管理模块 + + + + + + + org.dromara + ruoyi-common-core + + + + org.dromara + ruoyi-common-doc + + + + org.dromara + ruoyi-common-mybatis + + + + org.dromara + ruoyi-common-log + + + + org.dromara + ruoyi-common-security + + + + org.dromara + ruoyi-common-web + + + + org.dromara + ruoyi-common-excel + + + + org.dromara + ruoyi-common-idempotent + + + + org.dromara + ruoyi-common-tenant + + + + org.dromara + ruoyi-common-social + + + + org.dromara + ruoyi-common-ratelimiter + + + + org.dromara + ruoyi-common-mail + + + + org.dromara + ruoyi-system + + + + org.dromara + ruoyi-job + + + + + org.dromara + ruoyi-generator + + + + + org.dromara + ruoyi-demo + + + + + org.dromara + ruoyi-workflow + + + + + diff --git a/backend/ruoyi-modules/ruoyi-aqbw/src/main/java/org/dromara/aqbw/controller/.gitkeep b/backend/ruoyi-modules/ruoyi-aqbw/src/main/java/org/dromara/aqbw/controller/.gitkeep new file mode 100644 index 00000000..c8d5d0c2 --- /dev/null +++ b/backend/ruoyi-modules/ruoyi-aqbw/src/main/java/org/dromara/aqbw/controller/.gitkeep @@ -0,0 +1,2 @@ +# 安全保卫管理模块 - 控制器层 +# 此目录用于存放REST API控制器类 diff --git a/backend/ruoyi-modules/ruoyi-aqbw/src/main/java/org/dromara/aqbw/domain/.gitkeep b/backend/ruoyi-modules/ruoyi-aqbw/src/main/java/org/dromara/aqbw/domain/.gitkeep new file mode 100644 index 00000000..4e920e26 --- /dev/null +++ b/backend/ruoyi-modules/ruoyi-aqbw/src/main/java/org/dromara/aqbw/domain/.gitkeep @@ -0,0 +1,2 @@ +# 安全保卫管理模块 - 实体类 +# 此目录用于存放数据库实体类，对应数据库表结构 diff --git a/backend/ruoyi-modules/ruoyi-aqbw/src/main/java/org/dromara/aqbw/domain/bo/.gitkeep b/backend/ruoyi-modules/ruoyi-aqbw/src/main/java/org/dromara/aqbw/domain/bo/.gitkeep new file mode 100644 index 00000000..8fc2864c --- /dev/null +++ b/backend/ruoyi-modules/ruoyi-aqbw/src/main/java/org/dromara/aqbw/domain/bo/.gitkeep @@ -0,0 +1,2 @@ +# 安全保卫管理模块 - 业务对象(Business Object) +# 此目录用于存放业务对象类，用于接收前端参数和业务逻辑处理 diff --git a/backend/ruoyi-modules/ruoyi-aqbw/src/main/java/org/dromara/aqbw/domain/vo/.gitkeep b/backend/ruoyi-modules/ruoyi-aqbw/src/main/java/org/dromara/aqbw/domain/vo/.gitkeep new file mode 100644 index 00000000..8a7a4775 --- /dev/null +++ b/backend/ruoyi-modules/ruoyi-aqbw/src/main/java/org/dromara/aqbw/domain/vo/.gitkeep @@ -0,0 +1,2 @@ +# 安全保卫管理模块 - 视图对象(View Object) +# 此目录用于存放视图对象类，用于返回给前端的数据结构 diff --git a/backend/ruoyi-modules/ruoyi-aqbw/src/main/java/org/dromara/aqbw/mapper/.gitkeep b/backend/ruoyi-modules/ruoyi-aqbw/src/main/java/org/dromara/aqbw/mapper/.gitkeep new file mode 100644 index 00000000..044b2f6c --- /dev/null +++ b/backend/ruoyi-modules/ruoyi-aqbw/src/main/java/org/dromara/aqbw/mapper/.gitkeep @@ -0,0 +1,2 @@ +# 安全保卫管理模块 - 数据访问层 +# 此目录用于存放MyBatis Mapper接口 diff --git a/backend/ruoyi-modules/ruoyi-aqbw/src/main/java/org/dromara/aqbw/service/.gitkeep b/backend/ruoyi-modules/ruoyi-aqbw/src/main/java/org/dromara/aqbw/service/.gitkeep new file mode 100644 index 00000000..77ea3288 --- /dev/null +++ b/backend/ruoyi-modules/ruoyi-aqbw/src/main/java/org/dromara/aqbw/service/.gitkeep @@ -0,0 +1,2 @@ +# 安全保卫管理模块 - 业务服务接口层 +# 此目录用于存放Service接口定义 diff --git a/backend/ruoyi-modules/ruoyi-aqbw/src/main/java/org/dromara/aqbw/service/impl/.gitkeep b/backend/ruoyi-modules/ruoyi-aqbw/src/main/java/org/dromara/aqbw/service/impl/.gitkeep new file mode 100644 index 00000000..c30a9bac --- /dev/null +++ b/backend/ruoyi-modules/ruoyi-aqbw/src/main/java/org/dromara/aqbw/service/impl/.gitkeep @@ -0,0 +1,2 @@ +# 安全保卫管理模块 - 业务服务实现层 +# 此目录用于存放Service接口的实现类 diff --git a/backend/ruoyi-modules/ruoyi-aqbw/src/main/resources/mapper/.gitkeep b/backend/ruoyi-modules/ruoyi-aqbw/src/main/resources/mapper/.gitkeep new file mode 100644 index 00000000..1cd01dbf --- /dev/null +++ b/backend/ruoyi-modules/ruoyi-aqbw/src/main/resources/mapper/.gitkeep @@ -0,0 +1,2 @@ +# 安全保卫管理模块 - MyBatis映射文件 +# 此目录用于存放MyBatis XML映射文件 diff --git a/backend/ruoyi-modules/ruoyi-venue/pom.xml b/backend/ruoyi-modules/ruoyi-cw/pom.xml similarity index 59% rename from backend/ruoyi-modules/ruoyi-venue/pom.xml rename to backend/ruoyi-modules/ruoyi-cw/pom.xml index ff240d69..4c32e285 100644 --- a/backend/ruoyi-modules/ruoyi-venue/pom.xml +++ b/backend/ruoyi-modules/ruoyi-cw/pom.xml @@ -8,9 +8,9 @@ 4.0.0 - ruoyi-venue + ruoyi-cw - 场地预约模块 + 财务管理模块 @@ -61,6 +61,49 @@ ruoyi-common-tenant + + org.dromara + ruoyi-common-social + + + + org.dromara + ruoyi-common-ratelimiter + + + + org.dromara + ruoyi-common-mail + + + + org.dromara + ruoyi-system + + + + org.dromara + ruoyi-job + + + + + org.dromara + ruoyi-generator + + + + + org.dromara + ruoyi-demo + + + + + org.dromara + ruoyi-workflow + + diff --git a/backend/ruoyi-modules/ruoyi-cw/src/main/java/org/dromara/cw/controller/.gitkeep b/backend/ruoyi-modules/ruoyi-cw/src/main/java/org/dromara/cw/controller/.gitkeep new file mode 100644 index 00000000..4820366e --- /dev/null +++ b/backend/ruoyi-modules/ruoyi-cw/src/main/java/org/dromara/cw/controller/.gitkeep @@ -0,0 +1,2 @@ +# 财务管理模块 - 控制器层 +# 此目录用于存放REST API控制器类 diff --git a/backend/ruoyi-modules/ruoyi-cw/src/main/java/org/dromara/cw/domain/.gitkeep b/backend/ruoyi-modules/ruoyi-cw/src/main/java/org/dromara/cw/domain/.gitkeep new file mode 100644 index 00000000..7d53fe29 --- /dev/null +++ b/backend/ruoyi-modules/ruoyi-cw/src/main/java/org/dromara/cw/domain/.gitkeep @@ -0,0 +1,2 @@ +# 财务管理模块 - 实体类 +# 此目录用于存放数据库实体类，对应数据库表结构 diff --git a/backend/ruoyi-modules/ruoyi-cw/src/main/java/org/dromara/cw/domain/bo/.gitkeep b/backend/ruoyi-modules/ruoyi-cw/src/main/java/org/dromara/cw/domain/bo/.gitkeep new file mode 100644 index 00000000..fccfc111 --- /dev/null +++ b/backend/ruoyi-modules/ruoyi-cw/src/main/java/org/dromara/cw/domain/bo/.gitkeep @@ -0,0 +1,2 @@ +# 财务管理模块 - 业务对象(Business Object) +# 此目录用于存放业务对象类，用于接收前端参数和业务逻辑处理 diff --git a/backend/ruoyi-modules/ruoyi-cw/src/main/java/org/dromara/cw/domain/vo/.gitkeep b/backend/ruoyi-modules/ruoyi-cw/src/main/java/org/dromara/cw/domain/vo/.gitkeep new file mode 100644 index 00000000..7b578938 --- /dev/null +++ b/backend/ruoyi-modules/ruoyi-cw/src/main/java/org/dromara/cw/domain/vo/.gitkeep @@ -0,0 +1,2 @@ +# 财务管理模块 - 视图对象(View Object) +# 此目录用于存放视图对象类，用于返回给前端的数据结构 diff --git a/backend/ruoyi-modules/ruoyi-cw/src/main/java/org/dromara/cw/mapper/.gitkeep b/backend/ruoyi-modules/ruoyi-cw/src/main/java/org/dromara/cw/mapper/.gitkeep new file mode 100644 index 00000000..027f2ad9 --- /dev/null +++ b/backend/ruoyi-modules/ruoyi-cw/src/main/java/org/dromara/cw/mapper/.gitkeep @@ -0,0 +1,2 @@ +# 财务管理模块 - 数据访问层 +# 此目录用于存放MyBatis Mapper接口 diff --git a/backend/ruoyi-modules/ruoyi-cw/src/main/java/org/dromara/cw/service/.gitkeep b/backend/ruoyi-modules/ruoyi-cw/src/main/java/org/dromara/cw/service/.gitkeep new file mode 100644 index 00000000..519e1a34 --- /dev/null +++ b/backend/ruoyi-modules/ruoyi-cw/src/main/java/org/dromara/cw/service/.gitkeep @@ -0,0 +1,2 @@ +# 财务管理模块 - 业务服务接口层 +# 此目录用于存放Service接口定义 diff --git a/backend/ruoyi-modules/ruoyi-cw/src/main/java/org/dromara/cw/service/impl/.gitkeep b/backend/ruoyi-modules/ruoyi-cw/src/main/java/org/dromara/cw/service/impl/.gitkeep new file mode 100644 index 00000000..c2af7dbc --- /dev/null +++ b/backend/ruoyi-modules/ruoyi-cw/src/main/java/org/dromara/cw/service/impl/.gitkeep @@ -0,0 +1,2 @@ +# 财务管理模块 - 业务服务实现层 +# 此目录用于存放Service接口的实现类 diff --git a/backend/ruoyi-modules/ruoyi-cw/src/main/resources/mapper/.gitkeep b/backend/ruoyi-modules/ruoyi-cw/src/main/resources/mapper/.gitkeep new file mode 100644 index 00000000..6dfd2d9e --- /dev/null +++ b/backend/ruoyi-modules/ruoyi-cw/src/main/resources/mapper/.gitkeep @@ -0,0 +1,2 @@ +# 财务管理模块 - MyBatis映射文件 +# 此目录用于存放MyBatis XML映射文件 diff --git a/backend/ruoyi-modules/ruoyi-hq/pom.xml b/backend/ruoyi-modules/ruoyi-hq/pom.xml new file mode 100644 index 00000000..a45e4998 --- /dev/null +++ b/backend/ruoyi-modules/ruoyi-hq/pom.xml @@ -0,0 +1,109 @@ + + + + ruoyi-modules + org.dromara + ${revision} + + 4.0.0 + + ruoyi-hq + + 后勤管理模块 + + + + + + + org.dromara + ruoyi-common-core + + + + org.dromara + ruoyi-common-doc + + + + org.dromara + ruoyi-common-mybatis + + + + org.dromara + ruoyi-common-log + + + + org.dromara + ruoyi-common-security + + + + org.dromara + ruoyi-common-web + + + + org.dromara + ruoyi-common-excel + + + + org.dromara + ruoyi-common-idempotent + + + + org.dromara + ruoyi-common-tenant + + + + org.dromara + ruoyi-common-social + + + + org.dromara + ruoyi-common-ratelimiter + + + + org.dromara + ruoyi-common-mail + + + + org.dromara + ruoyi-system + + + + org.dromara + ruoyi-job + + + + + org.dromara + ruoyi-generator + + + + + org.dromara + ruoyi-demo + + + + + org.dromara + ruoyi-workflow + + + + + diff --git a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/controller/HqHallInfoController.java b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/controller/HqHallInfoController.java similarity index 94% rename from backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/controller/HqHallInfoController.java rename to backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/controller/HqHallInfoController.java index d0dea3ba..0952cffe 100644 --- a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/controller/HqHallInfoController.java +++ b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/controller/HqHallInfoController.java @@ -1,4 +1,4 @@ -package org.dromara.zhxy.hq.controller; +package org.dromara.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.hq.domain.vo.HqHallInfoVo; -import org.dromara.zhxy.hq.domain.bo.HqHallInfoBo; -import org.dromara.zhxy.hq.service.IHqHallInfoService; +import org.dromara.hq.domain.vo.HqHallInfoVo; +import org.dromara.hq.domain.bo.HqHallInfoBo; +import org.dromara.hq.service.IHqHallInfoService; import org.dromara.common.mybatis.core.page.TableDataInfo; /** diff --git a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/controller/HqHallReservationController.java b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/controller/HqHallReservationController.java similarity index 93% rename from backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/controller/HqHallReservationController.java rename to backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/controller/HqHallReservationController.java index c57db5f1..f77a8021 100644 --- a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/controller/HqHallReservationController.java +++ b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/controller/HqHallReservationController.java @@ -1,4 +1,4 @@ -package org.dromara.zhxy.hq.controller; +package org.dromara.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.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.hq.domain.vo.HqHallReservationVo; +import org.dromara.hq.domain.bo.HqHallReservationBo; +import org.dromara.hq.domain.bo.HqHallReservationAuditBo; +import org.dromara.hq.service.IHqHallReservationService; import org.dromara.common.mybatis.core.page.TableDataInfo; /** diff --git a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/controller/HqSatCategoryController.java b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/controller/HqSatCategoryController.java similarity index 94% rename from backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/controller/HqSatCategoryController.java rename to backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/controller/HqSatCategoryController.java index 0e285aba..490d3a88 100644 --- a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/controller/HqSatCategoryController.java +++ b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/controller/HqSatCategoryController.java @@ -1,4 +1,4 @@ -package org.dromara.zhxy.hq.controller; +package org.dromara.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.hq.domain.vo.HqSatCategoryVo; -import org.dromara.zhxy.hq.domain.bo.HqSatCategoryBo; -import org.dromara.zhxy.hq.service.IHqSatCategoryService; +import org.dromara.hq.domain.vo.HqSatCategoryVo; +import org.dromara.hq.domain.bo.HqSatCategoryBo; +import org.dromara.hq.service.IHqSatCategoryService; import org.dromara.common.mybatis.core.page.TableDataInfo; /** diff --git a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/controller/HqSatDetailController.java b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/controller/HqSatDetailController.java similarity index 94% rename from backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/controller/HqSatDetailController.java rename to backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/controller/HqSatDetailController.java index 74486a02..96c9f8e7 100644 --- a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/controller/HqSatDetailController.java +++ b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/controller/HqSatDetailController.java @@ -1,4 +1,4 @@ -package org.dromara.zhxy.hq.controller; +package org.dromara.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.hq.domain.vo.HqSatDetailVo; -import org.dromara.zhxy.hq.domain.bo.HqSatDetailBo; -import org.dromara.zhxy.hq.service.IHqSatDetailService; +import org.dromara.hq.domain.vo.HqSatDetailVo; +import org.dromara.hq.domain.bo.HqSatDetailBo; +import org.dromara.hq.service.IHqSatDetailService; import org.dromara.common.mybatis.core.page.TableDataInfo; /** diff --git a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/controller/HqSatOptionController.java b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/controller/HqSatOptionController.java similarity index 94% rename from backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/controller/HqSatOptionController.java rename to backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/controller/HqSatOptionController.java index d9c1a495..9a7e6eb6 100644 --- a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/controller/HqSatOptionController.java +++ b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/controller/HqSatOptionController.java @@ -1,4 +1,4 @@ -package org.dromara.zhxy.hq.controller; +package org.dromara.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.hq.domain.vo.HqSatOptionVo; -import org.dromara.zhxy.hq.domain.bo.HqSatOptionBo; -import org.dromara.zhxy.hq.service.IHqSatOptionService; +import org.dromara.hq.domain.vo.HqSatOptionVo; +import org.dromara.hq.domain.bo.HqSatOptionBo; +import org.dromara.hq.service.IHqSatOptionService; import org.dromara.common.mybatis.core.page.TableDataInfo; /** diff --git a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/controller/HqSatQuestionController.java b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/controller/HqSatQuestionController.java similarity index 91% rename from backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/controller/HqSatQuestionController.java rename to backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/controller/HqSatQuestionController.java index 07570ebe..1316fec8 100644 --- a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/controller/HqSatQuestionController.java +++ b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/controller/HqSatQuestionController.java @@ -1,4 +1,4 @@ -package org.dromara.zhxy.hq.controller; +package org.dromara.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.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.hq.domain.vo.HqSatQuestionVo; +import org.dromara.hq.domain.bo.HqSatQuestionBo; +import org.dromara.hq.service.IHqSatQuestionService; +import org.dromara.hq.service.IHqSatOptionService; +import org.dromara.hq.domain.vo.HqSatOptionVo; +import org.dromara.hq.domain.bo.HqSatOptionBo; import org.dromara.common.mybatis.core.page.TableDataInfo; /** diff --git a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/controller/HqSatRecordController.java b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/controller/HqSatRecordController.java similarity index 94% rename from backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/controller/HqSatRecordController.java rename to backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/controller/HqSatRecordController.java index 7b8bb478..09337730 100644 --- a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/controller/HqSatRecordController.java +++ b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/controller/HqSatRecordController.java @@ -1,4 +1,4 @@ -package org.dromara.zhxy.hq.controller; +package org.dromara.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.hq.domain.vo.HqSatRecordVo; -import org.dromara.zhxy.hq.domain.bo.HqSatRecordBo; -import org.dromara.zhxy.hq.service.IHqSatRecordService; +import org.dromara.hq.domain.vo.HqSatRecordVo; +import org.dromara.hq.domain.bo.HqSatRecordBo; +import org.dromara.hq.service.IHqSatRecordService; import org.dromara.common.mybatis.core.page.TableDataInfo; /** diff --git a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/controller/HqSatSurveyController.java b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/controller/HqSatSurveyController.java similarity index 95% rename from backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/controller/HqSatSurveyController.java rename to backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/controller/HqSatSurveyController.java index 84a0f984..73d84061 100644 --- a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/controller/HqSatSurveyController.java +++ b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/controller/HqSatSurveyController.java @@ -1,4 +1,4 @@ -package org.dromara.zhxy.hq.controller; +package org.dromara.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.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.hq.domain.vo.HqSatSurveyVo; +import org.dromara.hq.domain.bo.HqSatSurveyBo; +import org.dromara.hq.domain.bo.HqSatAnswerSubmitBo; +import org.dromara.hq.service.IHqSatSurveyService; +import org.dromara.hq.domain.vo.HqSatSurveyQuestionVo; +import org.dromara.hq.domain.vo.HqSatRecordVo; import org.dromara.common.mybatis.core.page.TableDataInfo; /** diff --git a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/controller/HqSatSurveyQuestionController.java b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/controller/HqSatSurveyQuestionController.java similarity index 94% rename from backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/controller/HqSatSurveyQuestionController.java rename to backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/controller/HqSatSurveyQuestionController.java index a44646a3..040781e0 100644 --- a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/controller/HqSatSurveyQuestionController.java +++ b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/controller/HqSatSurveyQuestionController.java @@ -1,4 +1,4 @@ -package org.dromara.zhxy.hq.controller; +package org.dromara.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.hq.domain.vo.HqSatSurveyQuestionVo; -import org.dromara.zhxy.hq.domain.bo.HqSatSurveyQuestionBo; -import org.dromara.zhxy.hq.service.IHqSatSurveyQuestionService; +import org.dromara.hq.domain.vo.HqSatSurveyQuestionVo; +import org.dromara.hq.domain.bo.HqSatSurveyQuestionBo; +import org.dromara.hq.service.IHqSatSurveyQuestionService; import org.dromara.common.mybatis.core.page.TableDataInfo; /** diff --git a/backend/ruoyi-modules/ruoyi-venue/src/main/java/org/dromara/venue/controller/HqVenueInfoController.java b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/controller/HqVenueInfoController.java similarity index 95% rename from backend/ruoyi-modules/ruoyi-venue/src/main/java/org/dromara/venue/controller/HqVenueInfoController.java rename to backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/controller/HqVenueInfoController.java index 547417cb..8f88f0ec 100644 --- a/backend/ruoyi-modules/ruoyi-venue/src/main/java/org/dromara/venue/controller/HqVenueInfoController.java +++ b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/controller/HqVenueInfoController.java @@ -1,4 +1,4 @@ -package org.dromara.venue.controller; +package org.dromara.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.venue.domain.bo.HqVenueInfoBo; -import org.dromara.venue.domain.vo.HqVenueInfoVo; -import org.dromara.venue.service.IHqVenueInfoService; +import org.dromara.hq.domain.bo.HqVenueInfoBo; +import org.dromara.hq.domain.vo.HqVenueInfoVo; +import org.dromara.hq.service.IHqVenueInfoService; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; diff --git a/backend/ruoyi-modules/ruoyi-venue/src/main/java/org/dromara/venue/controller/HqVenueReservationController.java b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/controller/HqVenueReservationController.java similarity index 94% rename from backend/ruoyi-modules/ruoyi-venue/src/main/java/org/dromara/venue/controller/HqVenueReservationController.java rename to backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/controller/HqVenueReservationController.java index 1e178f72..bd91bde1 100644 --- a/backend/ruoyi-modules/ruoyi-venue/src/main/java/org/dromara/venue/controller/HqVenueReservationController.java +++ b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/controller/HqVenueReservationController.java @@ -1,4 +1,4 @@ -package org.dromara.venue.controller; +package org.dromara.hq.controller; import cn.dev33.satoken.annotation.SaCheckPermission; import jakarta.servlet.http.HttpServletResponse; @@ -15,10 +15,10 @@ 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.venue.domain.bo.HqVenueReservationApproveBo; -import org.dromara.venue.domain.bo.HqVenueReservationBo; -import org.dromara.venue.domain.vo.HqVenueReservationVo; -import org.dromara.venue.service.IHqVenueReservationService; +import org.dromara.hq.domain.bo.HqVenueReservationApproveBo; +import org.dromara.hq.domain.bo.HqVenueReservationBo; +import org.dromara.hq.domain.vo.HqVenueReservationVo; +import org.dromara.hq.service.IHqVenueReservationService; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; diff --git a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/controller/PmRepairAttachmentController.java b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/controller/PmRepairAttachmentController.java similarity index 96% rename from backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/controller/PmRepairAttachmentController.java rename to backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/controller/PmRepairAttachmentController.java index 107dd4ae..bad2181f 100644 --- a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/controller/PmRepairAttachmentController.java +++ b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/controller/PmRepairAttachmentController.java @@ -1,4 +1,4 @@ -package org.dromara.zhxy.hq.controller; +package org.dromara.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.hq.domain.bo.PmRepairAttachmentBo; -import org.dromara.zhxy.hq.domain.vo.PmRepairAttachmentVo; -import org.dromara.zhxy.hq.service.IPmRepairAttachmentService; +import org.dromara.hq.domain.bo.PmRepairAttachmentBo; +import org.dromara.hq.domain.vo.PmRepairAttachmentVo; +import org.dromara.hq.service.IPmRepairAttachmentService; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; @@ -183,4 +183,4 @@ public class PmRepairAttachmentController extends BaseController { } } -} \ No newline at end of file +} diff --git a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/controller/PmRepairCategoryController.java b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/controller/PmRepairCategoryController.java similarity index 95% rename from backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/controller/PmRepairCategoryController.java rename to backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/controller/PmRepairCategoryController.java index ac082811..103f5378 100644 --- a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/controller/PmRepairCategoryController.java +++ b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/controller/PmRepairCategoryController.java @@ -1,4 +1,4 @@ -package org.dromara.zhxy.hq.controller; +package org.dromara.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.hq.domain.vo.PmRepairCategoryVo; -import org.dromara.zhxy.hq.domain.bo.PmRepairCategoryBo; -import org.dromara.zhxy.hq.service.IPmRepairCategoryService; +import org.dromara.hq.domain.vo.PmRepairCategoryVo; +import org.dromara.hq.domain.bo.PmRepairCategoryBo; +import org.dromara.hq.service.IPmRepairCategoryService; import org.dromara.common.mybatis.core.page.TableDataInfo; /** diff --git a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/controller/PmRepairOrderController.java b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/controller/PmRepairOrderController.java similarity index 97% rename from backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/controller/PmRepairOrderController.java rename to backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/controller/PmRepairOrderController.java index 484b9466..efb88379 100644 --- a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/controller/PmRepairOrderController.java +++ b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/controller/PmRepairOrderController.java @@ -1,4 +1,4 @@ -package org.dromara.zhxy.hq.controller; +package org.dromara.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.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.hq.domain.vo.PmRepairOrderVo; +import org.dromara.hq.domain.bo.PmRepairOrderBo; +import org.dromara.hq.domain.vo.PmRepairAttachmentVo; +import org.dromara.hq.service.IPmRepairOrderService; +import org.dromara.hq.service.IPmRepairAttachmentService; import org.dromara.common.mybatis.core.page.TableDataInfo; /** diff --git a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/HqHallInfo.java b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/domain/HqHallInfo.java similarity index 96% rename from backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/HqHallInfo.java rename to backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/domain/HqHallInfo.java index 5f1fe4bd..3551afa0 100644 --- a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/HqHallInfo.java +++ b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/domain/HqHallInfo.java @@ -1,4 +1,4 @@ -package org.dromara.zhxy.hq.domain; +package org.dromara.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/hq/domain/HqHallReservation.java b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/domain/HqHallReservation.java similarity index 97% rename from backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/HqHallReservation.java rename to backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/domain/HqHallReservation.java index 31466a49..50b6c960 100644 --- a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/HqHallReservation.java +++ b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/domain/HqHallReservation.java @@ -1,4 +1,4 @@ -package org.dromara.zhxy.hq.domain; +package org.dromara.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/hq/domain/HqSatCategory.java b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/domain/HqSatCategory.java similarity index 96% rename from backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/HqSatCategory.java rename to backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/domain/HqSatCategory.java index 3e6dfe42..7850a038 100644 --- a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/HqSatCategory.java +++ b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/domain/HqSatCategory.java @@ -1,4 +1,4 @@ -package org.dromara.zhxy.hq.domain; +package org.dromara.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/hq/domain/HqSatDetail.java b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/domain/HqSatDetail.java similarity index 95% rename from backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/HqSatDetail.java rename to backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/domain/HqSatDetail.java index fcabc690..24e78fc6 100644 --- a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/HqSatDetail.java +++ b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/domain/HqSatDetail.java @@ -1,4 +1,4 @@ -package org.dromara.zhxy.hq.domain; +package org.dromara.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/hq/domain/HqSatOption.java b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/domain/HqSatOption.java similarity index 96% rename from backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/HqSatOption.java rename to backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/domain/HqSatOption.java index 34a0c7c0..79503334 100644 --- a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/HqSatOption.java +++ b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/domain/HqSatOption.java @@ -1,4 +1,4 @@ -package org.dromara.zhxy.hq.domain; +package org.dromara.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/hq/domain/HqSatQuestion.java b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/domain/HqSatQuestion.java similarity index 96% rename from backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/HqSatQuestion.java rename to backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/domain/HqSatQuestion.java index fa6e05eb..4061d59f 100644 --- a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/HqSatQuestion.java +++ b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/domain/HqSatQuestion.java @@ -1,4 +1,4 @@ -package org.dromara.zhxy.hq.domain; +package org.dromara.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/hq/domain/HqSatRecord.java b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/domain/HqSatRecord.java similarity index 97% rename from backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/HqSatRecord.java rename to backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/domain/HqSatRecord.java index 60cd2a38..1d461174 100644 --- a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/HqSatRecord.java +++ b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/domain/HqSatRecord.java @@ -1,4 +1,4 @@ -package org.dromara.zhxy.hq.domain; +package org.dromara.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/hq/domain/HqSatSurvey.java b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/domain/HqSatSurvey.java similarity index 97% rename from backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/HqSatSurvey.java rename to backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/domain/HqSatSurvey.java index 367b6cf0..4d031b48 100644 --- a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/HqSatSurvey.java +++ b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/domain/HqSatSurvey.java @@ -1,4 +1,4 @@ -package org.dromara.zhxy.hq.domain; +package org.dromara.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/hq/domain/HqSatSurveyQuestion.java b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/domain/HqSatSurveyQuestion.java similarity index 96% rename from backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/HqSatSurveyQuestion.java rename to backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/domain/HqSatSurveyQuestion.java index 2c2ada14..c6e2d48c 100644 --- a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/HqSatSurveyQuestion.java +++ b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/domain/HqSatSurveyQuestion.java @@ -1,4 +1,4 @@ -package org.dromara.zhxy.hq.domain; +package org.dromara.hq.domain; import org.dromara.common.tenant.core.TenantEntity; import com.baomidou.mybatisplus.annotation.*; diff --git a/backend/ruoyi-modules/ruoyi-venue/src/main/java/org/dromara/venue/domain/HqVenueInfo.java b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/domain/HqVenueInfo.java similarity index 97% rename from backend/ruoyi-modules/ruoyi-venue/src/main/java/org/dromara/venue/domain/HqVenueInfo.java rename to backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/domain/HqVenueInfo.java index 1a9cd98a..0aacc421 100644 --- a/backend/ruoyi-modules/ruoyi-venue/src/main/java/org/dromara/venue/domain/HqVenueInfo.java +++ b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/domain/HqVenueInfo.java @@ -1,4 +1,4 @@ -package org.dromara.venue.domain; +package org.dromara.hq.domain; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/backend/ruoyi-modules/ruoyi-venue/src/main/java/org/dromara/venue/domain/HqVenueReservation.java b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/domain/HqVenueReservation.java similarity index 98% rename from backend/ruoyi-modules/ruoyi-venue/src/main/java/org/dromara/venue/domain/HqVenueReservation.java rename to backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/domain/HqVenueReservation.java index 41552c57..11ee2095 100644 --- a/backend/ruoyi-modules/ruoyi-venue/src/main/java/org/dromara/venue/domain/HqVenueReservation.java +++ b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/domain/HqVenueReservation.java @@ -1,4 +1,4 @@ -package org.dromara.venue.domain; +package org.dromara.hq.domain; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableLogic; diff --git a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/PmRepairAttachment.java b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/domain/PmRepairAttachment.java similarity index 98% rename from backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/PmRepairAttachment.java rename to backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/domain/PmRepairAttachment.java index d406840e..7477645c 100644 --- a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/PmRepairAttachment.java +++ b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/domain/PmRepairAttachment.java @@ -1,4 +1,4 @@ -package org.dromara.zhxy.hq.domain; +package org.dromara.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/hq/domain/PmRepairCategory.java b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/domain/PmRepairCategory.java similarity index 98% rename from backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/PmRepairCategory.java rename to backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/domain/PmRepairCategory.java index f2177012..ee9b0f87 100644 --- a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/PmRepairCategory.java +++ b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/domain/PmRepairCategory.java @@ -1,4 +1,4 @@ -package org.dromara.zhxy.hq.domain; +package org.dromara.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/hq/domain/PmRepairOrder.java b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/domain/PmRepairOrder.java similarity index 98% rename from backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/PmRepairOrder.java rename to backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/domain/PmRepairOrder.java index 9566150a..c621b227 100644 --- a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/PmRepairOrder.java +++ b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/domain/PmRepairOrder.java @@ -1,4 +1,4 @@ -package org.dromara.zhxy.hq.domain; +package org.dromara.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/hq/domain/PmRepairProgress.java b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/domain/PmRepairProgress.java similarity index 98% rename from backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/PmRepairProgress.java rename to backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/domain/PmRepairProgress.java index 29c690b1..090f7101 100644 --- a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/PmRepairProgress.java +++ b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/domain/PmRepairProgress.java @@ -1,4 +1,4 @@ -package org.dromara.zhxy.hq.domain; +package org.dromara.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/hq/domain/PmServiceEvaluation.java b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/domain/PmServiceEvaluation.java similarity index 98% rename from backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/PmServiceEvaluation.java rename to backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/domain/PmServiceEvaluation.java index b20f1627..c312ee56 100644 --- a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/PmServiceEvaluation.java +++ b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/domain/PmServiceEvaluation.java @@ -1,4 +1,4 @@ -package org.dromara.zhxy.hq.domain; +package org.dromara.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/hq/domain/bo/HqHallInfoBo.java b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/domain/bo/HqHallInfoBo.java similarity index 93% rename from backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/bo/HqHallInfoBo.java rename to backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/domain/bo/HqHallInfoBo.java index 73edf756..1fd3eaf3 100644 --- a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/bo/HqHallInfoBo.java +++ b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/domain/bo/HqHallInfoBo.java @@ -1,6 +1,6 @@ -package org.dromara.zhxy.hq.domain.bo; +package org.dromara.hq.domain.bo; -import org.dromara.zhxy.hq.domain.HqHallInfo; +import org.dromara.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/hq/domain/bo/HqHallReservationAuditBo.java b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/domain/bo/HqHallReservationAuditBo.java similarity index 94% rename from backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/bo/HqHallReservationAuditBo.java rename to backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/domain/bo/HqHallReservationAuditBo.java index b7e25331..43b8a7aa 100644 --- a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/bo/HqHallReservationAuditBo.java +++ b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/domain/bo/HqHallReservationAuditBo.java @@ -1,4 +1,4 @@ -package org.dromara.zhxy.hq.domain.bo; +package org.dromara.hq.domain.bo; import lombok.Data; import jakarta.validation.constraints.NotEmpty; diff --git a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/bo/HqHallReservationBo.java b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/domain/bo/HqHallReservationBo.java similarity index 96% rename from backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/bo/HqHallReservationBo.java rename to backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/domain/bo/HqHallReservationBo.java index eabd8c68..355cf967 100644 --- a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/bo/HqHallReservationBo.java +++ b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/domain/bo/HqHallReservationBo.java @@ -1,6 +1,6 @@ -package org.dromara.zhxy.hq.domain.bo; +package org.dromara.hq.domain.bo; -import org.dromara.zhxy.hq.domain.HqHallReservation; +import org.dromara.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/hq/domain/bo/HqSatAnswerSubmitBo.java b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/domain/bo/HqSatAnswerSubmitBo.java similarity index 98% rename from backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/bo/HqSatAnswerSubmitBo.java rename to backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/domain/bo/HqSatAnswerSubmitBo.java index 2b033ce4..6c646f3c 100644 --- a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/bo/HqSatAnswerSubmitBo.java +++ b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/domain/bo/HqSatAnswerSubmitBo.java @@ -1,4 +1,4 @@ -package org.dromara.zhxy.hq.domain.bo; +package org.dromara.hq.domain.bo; import lombok.Data; import jakarta.validation.constraints.NotNull; diff --git a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/bo/HqSatCategoryBo.java b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/domain/bo/HqSatCategoryBo.java similarity index 93% rename from backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/bo/HqSatCategoryBo.java rename to backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/domain/bo/HqSatCategoryBo.java index a6315952..d7230a4a 100644 --- a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/bo/HqSatCategoryBo.java +++ b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/domain/bo/HqSatCategoryBo.java @@ -1,6 +1,6 @@ -package org.dromara.zhxy.hq.domain.bo; +package org.dromara.hq.domain.bo; -import org.dromara.zhxy.hq.domain.HqSatCategory; +import org.dromara.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/hq/domain/bo/HqSatDetailBo.java b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/domain/bo/HqSatDetailBo.java similarity index 93% rename from backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/bo/HqSatDetailBo.java rename to backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/domain/bo/HqSatDetailBo.java index 4e627750..680da159 100644 --- a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/bo/HqSatDetailBo.java +++ b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/domain/bo/HqSatDetailBo.java @@ -1,6 +1,6 @@ -package org.dromara.zhxy.hq.domain.bo; +package org.dromara.hq.domain.bo; -import org.dromara.zhxy.hq.domain.HqSatDetail; +import org.dromara.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/hq/domain/bo/HqSatOptionBo.java b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/domain/bo/HqSatOptionBo.java similarity index 93% rename from backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/bo/HqSatOptionBo.java rename to backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/domain/bo/HqSatOptionBo.java index 0f314a86..877b5d10 100644 --- a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/bo/HqSatOptionBo.java +++ b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/domain/bo/HqSatOptionBo.java @@ -1,6 +1,6 @@ -package org.dromara.zhxy.hq.domain.bo; +package org.dromara.hq.domain.bo; -import org.dromara.zhxy.hq.domain.HqSatOption; +import org.dromara.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/hq/domain/bo/HqSatQuestionBo.java b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/domain/bo/HqSatQuestionBo.java similarity index 94% rename from backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/bo/HqSatQuestionBo.java rename to backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/domain/bo/HqSatQuestionBo.java index b0807ca6..96153fff 100644 --- a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/bo/HqSatQuestionBo.java +++ b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/domain/bo/HqSatQuestionBo.java @@ -1,6 +1,6 @@ -package org.dromara.zhxy.hq.domain.bo; +package org.dromara.hq.domain.bo; -import org.dromara.zhxy.hq.domain.HqSatQuestion; +import org.dromara.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/hq/domain/bo/HqSatRecordBo.java b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/domain/bo/HqSatRecordBo.java similarity index 94% rename from backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/bo/HqSatRecordBo.java rename to backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/domain/bo/HqSatRecordBo.java index b2091fd9..6b7df45f 100644 --- a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/bo/HqSatRecordBo.java +++ b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/domain/bo/HqSatRecordBo.java @@ -1,6 +1,6 @@ -package org.dromara.zhxy.hq.domain.bo; +package org.dromara.hq.domain.bo; -import org.dromara.zhxy.hq.domain.HqSatRecord; +import org.dromara.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/hq/domain/bo/HqSatSurveyBo.java b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/domain/bo/HqSatSurveyBo.java similarity index 96% rename from backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/bo/HqSatSurveyBo.java rename to backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/domain/bo/HqSatSurveyBo.java index bc3177a2..76fe174f 100644 --- a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/bo/HqSatSurveyBo.java +++ b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/domain/bo/HqSatSurveyBo.java @@ -1,6 +1,6 @@ -package org.dromara.zhxy.hq.domain.bo; +package org.dromara.hq.domain.bo; -import org.dromara.zhxy.hq.domain.HqSatSurvey; +import org.dromara.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/hq/domain/bo/HqSatSurveyQuestionBo.java b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/domain/bo/HqSatSurveyQuestionBo.java similarity index 93% rename from backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/bo/HqSatSurveyQuestionBo.java rename to backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/domain/bo/HqSatSurveyQuestionBo.java index 640857e8..07b4015a 100644 --- a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/bo/HqSatSurveyQuestionBo.java +++ b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/domain/bo/HqSatSurveyQuestionBo.java @@ -1,6 +1,6 @@ -package org.dromara.zhxy.hq.domain.bo; +package org.dromara.hq.domain.bo; -import org.dromara.zhxy.hq.domain.HqSatSurveyQuestion; +import org.dromara.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-modules/ruoyi-venue/src/main/java/org/dromara/venue/domain/bo/HqVenueInfoBo.java b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/domain/bo/HqVenueInfoBo.java similarity index 97% rename from backend/ruoyi-modules/ruoyi-venue/src/main/java/org/dromara/venue/domain/bo/HqVenueInfoBo.java rename to backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/domain/bo/HqVenueInfoBo.java index 596fffbb..64e15291 100644 --- a/backend/ruoyi-modules/ruoyi-venue/src/main/java/org/dromara/venue/domain/bo/HqVenueInfoBo.java +++ b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/domain/bo/HqVenueInfoBo.java @@ -1,4 +1,4 @@ -package org.dromara.venue.domain.bo; +package org.dromara.hq.domain.bo; import io.github.linpeilie.annotations.AutoMapper; import jakarta.validation.constraints.*; @@ -7,7 +7,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.venue.domain.HqVenueInfo; +import org.dromara.hq.domain.HqVenueInfo; /** * 场地信息业务对象 hq_venue_info diff --git a/backend/ruoyi-modules/ruoyi-venue/src/main/java/org/dromara/venue/domain/bo/HqVenueReservationApproveBo.java b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/domain/bo/HqVenueReservationApproveBo.java similarity index 95% rename from backend/ruoyi-modules/ruoyi-venue/src/main/java/org/dromara/venue/domain/bo/HqVenueReservationApproveBo.java rename to backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/domain/bo/HqVenueReservationApproveBo.java index 6b5c8a96..e4280113 100644 --- a/backend/ruoyi-modules/ruoyi-venue/src/main/java/org/dromara/venue/domain/bo/HqVenueReservationApproveBo.java +++ b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/domain/bo/HqVenueReservationApproveBo.java @@ -1,4 +1,4 @@ -package org.dromara.venue.domain.bo; +package org.dromara.hq.domain.bo; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; diff --git a/backend/ruoyi-modules/ruoyi-venue/src/main/java/org/dromara/venue/domain/bo/HqVenueReservationBo.java b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/domain/bo/HqVenueReservationBo.java similarity index 97% rename from backend/ruoyi-modules/ruoyi-venue/src/main/java/org/dromara/venue/domain/bo/HqVenueReservationBo.java rename to backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/domain/bo/HqVenueReservationBo.java index 5f5add76..00bfec54 100644 --- a/backend/ruoyi-modules/ruoyi-venue/src/main/java/org/dromara/venue/domain/bo/HqVenueReservationBo.java +++ b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/domain/bo/HqVenueReservationBo.java @@ -1,4 +1,4 @@ -package org.dromara.venue.domain.bo; +package org.dromara.hq.domain.bo; import io.github.linpeilie.annotations.AutoMapper; import jakarta.validation.constraints.*; @@ -7,7 +7,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.venue.domain.HqVenueReservation; +import org.dromara.hq.domain.HqVenueReservation; import java.time.LocalDate; import java.time.LocalDateTime; diff --git a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/bo/PmRepairAttachmentBo.java b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/domain/bo/PmRepairAttachmentBo.java similarity index 96% rename from backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/bo/PmRepairAttachmentBo.java rename to backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/domain/bo/PmRepairAttachmentBo.java index ff225c08..444c291b 100644 --- a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/bo/PmRepairAttachmentBo.java +++ b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/domain/bo/PmRepairAttachmentBo.java @@ -1,4 +1,4 @@ -package org.dromara.zhxy.hq.domain.bo; +package org.dromara.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.hq.domain.PmRepairAttachment; +import org.dromara.hq.domain.PmRepairAttachment; import java.util.Date; @@ -112,4 +112,4 @@ public class PmRepairAttachmentBo extends BaseEntity { */ private Integer sortOrder; -} \ No newline at end of file +} diff --git a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/bo/PmRepairCategoryBo.java b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/domain/bo/PmRepairCategoryBo.java similarity index 97% rename from backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/bo/PmRepairCategoryBo.java rename to backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/domain/bo/PmRepairCategoryBo.java index 21433dd5..9bd214ed 100644 --- a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/bo/PmRepairCategoryBo.java +++ b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/domain/bo/PmRepairCategoryBo.java @@ -1,6 +1,6 @@ -package org.dromara.zhxy.hq.domain.bo; +package org.dromara.hq.domain.bo; -import org.dromara.zhxy.hq.domain.PmRepairCategory; +import org.dromara.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/hq/domain/bo/PmRepairOrderBo.java b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/domain/bo/PmRepairOrderBo.java similarity index 97% rename from backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/bo/PmRepairOrderBo.java rename to backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/domain/bo/PmRepairOrderBo.java index 7e6b0d5d..bcb7f069 100644 --- a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/bo/PmRepairOrderBo.java +++ b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/domain/bo/PmRepairOrderBo.java @@ -1,6 +1,6 @@ -package org.dromara.zhxy.hq.domain.bo; +package org.dromara.hq.domain.bo; -import org.dromara.zhxy.hq.domain.PmRepairOrder; +import org.dromara.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/hq/domain/vo/HqHallInfoVo.java b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/domain/vo/HqHallInfoVo.java similarity index 94% rename from backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/vo/HqHallInfoVo.java rename to backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/domain/vo/HqHallInfoVo.java index 1d7d7a9a..072dd841 100644 --- a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/vo/HqHallInfoVo.java +++ b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/domain/vo/HqHallInfoVo.java @@ -1,8 +1,8 @@ -package org.dromara.zhxy.hq.domain.vo; +package org.dromara.hq.domain.vo; import org.dromara.common.translation.annotation.Translation; import org.dromara.common.translation.constant.TransConstant; -import org.dromara.zhxy.hq.domain.HqHallInfo; +import org.dromara.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/hq/domain/vo/HqHallReservationVo.java b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/domain/vo/HqHallReservationVo.java similarity index 96% rename from backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/vo/HqHallReservationVo.java rename to backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/domain/vo/HqHallReservationVo.java index 5b2850ba..71d7dcf0 100644 --- a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/vo/HqHallReservationVo.java +++ b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/domain/vo/HqHallReservationVo.java @@ -1,8 +1,8 @@ -package org.dromara.zhxy.hq.domain.vo; +package org.dromara.hq.domain.vo; import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; -import org.dromara.zhxy.hq.domain.HqHallReservation; +import org.dromara.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/hq/domain/vo/HqSatCategoryVo.java b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/domain/vo/HqSatCategoryVo.java similarity index 94% rename from backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/vo/HqSatCategoryVo.java rename to backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/domain/vo/HqSatCategoryVo.java index 25e07541..fd0087c8 100644 --- a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/vo/HqSatCategoryVo.java +++ b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/domain/vo/HqSatCategoryVo.java @@ -1,6 +1,6 @@ -package org.dromara.zhxy.hq.domain.vo; +package org.dromara.hq.domain.vo; -import org.dromara.zhxy.hq.domain.HqSatCategory; +import org.dromara.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/hq/domain/vo/HqSatDetailVo.java b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/domain/vo/HqSatDetailVo.java similarity index 94% rename from backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/vo/HqSatDetailVo.java rename to backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/domain/vo/HqSatDetailVo.java index 9a91e5bf..e2a2355a 100644 --- a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/vo/HqSatDetailVo.java +++ b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/domain/vo/HqSatDetailVo.java @@ -1,6 +1,6 @@ -package org.dromara.zhxy.hq.domain.vo; +package org.dromara.hq.domain.vo; -import org.dromara.zhxy.hq.domain.HqSatDetail; +import org.dromara.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/hq/domain/vo/HqSatOptionVo.java b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/domain/vo/HqSatOptionVo.java similarity index 94% rename from backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/vo/HqSatOptionVo.java rename to backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/domain/vo/HqSatOptionVo.java index a5aff874..fbe13e62 100644 --- a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/vo/HqSatOptionVo.java +++ b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/domain/vo/HqSatOptionVo.java @@ -1,6 +1,6 @@ -package org.dromara.zhxy.hq.domain.vo; +package org.dromara.hq.domain.vo; -import org.dromara.zhxy.hq.domain.HqSatOption; +import org.dromara.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/hq/domain/vo/HqSatQuestionVo.java b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/domain/vo/HqSatQuestionVo.java similarity index 95% rename from backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/vo/HqSatQuestionVo.java rename to backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/domain/vo/HqSatQuestionVo.java index 02991c27..5c6d1e32 100644 --- a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/vo/HqSatQuestionVo.java +++ b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/domain/vo/HqSatQuestionVo.java @@ -1,6 +1,6 @@ -package org.dromara.zhxy.hq.domain.vo; +package org.dromara.hq.domain.vo; -import org.dromara.zhxy.hq.domain.HqSatQuestion; +import org.dromara.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/hq/domain/vo/HqSatRecordVo.java b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/domain/vo/HqSatRecordVo.java similarity index 95% rename from backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/vo/HqSatRecordVo.java rename to backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/domain/vo/HqSatRecordVo.java index 7d758962..fefafa55 100644 --- a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/vo/HqSatRecordVo.java +++ b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/domain/vo/HqSatRecordVo.java @@ -1,8 +1,8 @@ -package org.dromara.zhxy.hq.domain.vo; +package org.dromara.hq.domain.vo; import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; -import org.dromara.zhxy.hq.domain.HqSatRecord; +import org.dromara.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/hq/domain/vo/HqSatSurveyQuestionDetailVo.java b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/domain/vo/HqSatSurveyQuestionDetailVo.java similarity index 100% rename from backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/vo/HqSatSurveyQuestionDetailVo.java rename to backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/domain/vo/HqSatSurveyQuestionDetailVo.java diff --git a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/vo/HqSatSurveyQuestionVo.java b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/domain/vo/HqSatSurveyQuestionVo.java similarity index 96% rename from backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/vo/HqSatSurveyQuestionVo.java rename to backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/domain/vo/HqSatSurveyQuestionVo.java index c29d9cc5..81a96a76 100644 --- a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/vo/HqSatSurveyQuestionVo.java +++ b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/domain/vo/HqSatSurveyQuestionVo.java @@ -1,6 +1,6 @@ -package org.dromara.zhxy.hq.domain.vo; +package org.dromara.hq.domain.vo; -import org.dromara.zhxy.hq.domain.HqSatSurveyQuestion; +import org.dromara.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/hq/domain/vo/HqSatSurveyVo.java b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/domain/vo/HqSatSurveyVo.java similarity index 96% rename from backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/vo/HqSatSurveyVo.java rename to backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/domain/vo/HqSatSurveyVo.java index dccde46b..372e1eee 100644 --- a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/vo/HqSatSurveyVo.java +++ b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/domain/vo/HqSatSurveyVo.java @@ -1,8 +1,8 @@ -package org.dromara.zhxy.hq.domain.vo; +package org.dromara.hq.domain.vo; import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; -import org.dromara.zhxy.hq.domain.HqSatSurvey; +import org.dromara.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-modules/ruoyi-venue/src/main/java/org/dromara/venue/domain/vo/HqVenueInfoVo.java b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/domain/vo/HqVenueInfoVo.java similarity index 96% rename from backend/ruoyi-modules/ruoyi-venue/src/main/java/org/dromara/venue/domain/vo/HqVenueInfoVo.java rename to backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/domain/vo/HqVenueInfoVo.java index 305b6ffd..f9ad1b78 100644 --- a/backend/ruoyi-modules/ruoyi-venue/src/main/java/org/dromara/venue/domain/vo/HqVenueInfoVo.java +++ b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/domain/vo/HqVenueInfoVo.java @@ -1,4 +1,4 @@ -package org.dromara.venue.domain.vo; +package org.dromara.hq.domain.vo; import cn.idev.excel.annotation.ExcelIgnoreUnannotated; import cn.idev.excel.annotation.ExcelProperty; @@ -7,7 +7,7 @@ import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; import org.dromara.common.excel.annotation.ExcelDictFormat; import org.dromara.common.excel.convert.ExcelDictConvert; -import org.dromara.venue.domain.HqVenueInfo; +import org.dromara.hq.domain.HqVenueInfo; import java.io.Serial; import java.io.Serializable; diff --git a/backend/ruoyi-modules/ruoyi-venue/src/main/java/org/dromara/venue/domain/vo/HqVenueReservationVo.java b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/domain/vo/HqVenueReservationVo.java similarity index 97% rename from backend/ruoyi-modules/ruoyi-venue/src/main/java/org/dromara/venue/domain/vo/HqVenueReservationVo.java rename to backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/domain/vo/HqVenueReservationVo.java index a927ad92..113585e1 100644 --- a/backend/ruoyi-modules/ruoyi-venue/src/main/java/org/dromara/venue/domain/vo/HqVenueReservationVo.java +++ b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/domain/vo/HqVenueReservationVo.java @@ -1,4 +1,4 @@ -package org.dromara.venue.domain.vo; +package org.dromara.hq.domain.vo; import cn.idev.excel.annotation.ExcelIgnoreUnannotated; import cn.idev.excel.annotation.ExcelProperty; @@ -7,7 +7,7 @@ import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; import org.dromara.common.excel.annotation.ExcelDictFormat; import org.dromara.common.excel.convert.ExcelDictConvert; -import org.dromara.venue.domain.HqVenueReservation; +import org.dromara.hq.domain.HqVenueReservation; import java.io.Serial; import java.io.Serializable; diff --git a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/vo/PmRepairAttachmentVo.java b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/domain/vo/PmRepairAttachmentVo.java similarity index 96% rename from backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/vo/PmRepairAttachmentVo.java rename to backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/domain/vo/PmRepairAttachmentVo.java index 8f692bbe..efe7316e 100644 --- a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/vo/PmRepairAttachmentVo.java +++ b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/domain/vo/PmRepairAttachmentVo.java @@ -1,11 +1,11 @@ -package org.dromara.zhxy.hq.domain.vo; +package org.dromara.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.hq.domain.PmRepairAttachment; +import org.dromara.hq.domain.PmRepairAttachment; import java.io.Serial; import java.io.Serializable; @@ -128,4 +128,4 @@ public class PmRepairAttachmentVo implements Serializable { @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date createTime; -} \ No newline at end of file +} diff --git a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/vo/PmRepairCategoryVo.java b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/domain/vo/PmRepairCategoryVo.java similarity index 97% rename from backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/vo/PmRepairCategoryVo.java rename to backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/domain/vo/PmRepairCategoryVo.java index 913e2b35..be0abd13 100644 --- a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/vo/PmRepairCategoryVo.java +++ b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/domain/vo/PmRepairCategoryVo.java @@ -1,10 +1,10 @@ -package org.dromara.zhxy.hq.domain.vo; +package org.dromara.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.hq.domain.PmRepairCategory; +import org.dromara.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/hq/domain/vo/PmRepairOrderVo.java b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/domain/vo/PmRepairOrderVo.java similarity index 98% rename from backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/vo/PmRepairOrderVo.java rename to backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/domain/vo/PmRepairOrderVo.java index 1828afa8..65f971f7 100644 --- a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/domain/vo/PmRepairOrderVo.java +++ b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/domain/vo/PmRepairOrderVo.java @@ -1,9 +1,9 @@ -package org.dromara.zhxy.hq.domain.vo; +package org.dromara.hq.domain.vo; import java.util.Date; import java.math.BigDecimal; import com.fasterxml.jackson.annotation.JsonFormat; -import org.dromara.zhxy.hq.domain.PmRepairOrder; +import org.dromara.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/hq/mapper/HqHallInfoMapper.java b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/mapper/HqHallInfoMapper.java similarity index 63% rename from backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/mapper/HqHallInfoMapper.java rename to backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/mapper/HqHallInfoMapper.java index 05c0b9e2..1e11de76 100644 --- a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/mapper/HqHallInfoMapper.java +++ b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/mapper/HqHallInfoMapper.java @@ -1,7 +1,7 @@ -package org.dromara.zhxy.hq.mapper; +package org.dromara.hq.mapper; -import org.dromara.zhxy.hq.domain.HqHallInfo; -import org.dromara.zhxy.hq.domain.vo.HqHallInfoVo; +import org.dromara.hq.domain.HqHallInfo; +import org.dromara.hq.domain.vo.HqHallInfoVo; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; /** diff --git a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/mapper/HqHallReservationMapper.java b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/mapper/HqHallReservationMapper.java similarity index 63% rename from backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/mapper/HqHallReservationMapper.java rename to backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/mapper/HqHallReservationMapper.java index 45b7a9fd..d7f3d9b7 100644 --- a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/mapper/HqHallReservationMapper.java +++ b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/mapper/HqHallReservationMapper.java @@ -1,7 +1,7 @@ -package org.dromara.zhxy.hq.mapper; +package org.dromara.hq.mapper; -import org.dromara.zhxy.hq.domain.HqHallReservation; -import org.dromara.zhxy.hq.domain.vo.HqHallReservationVo; +import org.dromara.hq.domain.HqHallReservation; +import org.dromara.hq.domain.vo.HqHallReservationVo; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; /** diff --git a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/mapper/HqSatCategoryMapper.java b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/mapper/HqSatCategoryMapper.java similarity index 63% rename from backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/mapper/HqSatCategoryMapper.java rename to backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/mapper/HqSatCategoryMapper.java index d21741d3..5de2a55c 100644 --- a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/mapper/HqSatCategoryMapper.java +++ b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/mapper/HqSatCategoryMapper.java @@ -1,7 +1,7 @@ -package org.dromara.zhxy.hq.mapper; +package org.dromara.hq.mapper; -import org.dromara.zhxy.hq.domain.HqSatCategory; -import org.dromara.zhxy.hq.domain.vo.HqSatCategoryVo; +import org.dromara.hq.domain.HqSatCategory; +import org.dromara.hq.domain.vo.HqSatCategoryVo; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; /** diff --git a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/mapper/HqSatDetailMapper.java b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/mapper/HqSatDetailMapper.java similarity index 63% rename from backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/mapper/HqSatDetailMapper.java rename to backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/mapper/HqSatDetailMapper.java index cd791089..bd572fa6 100644 --- a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/mapper/HqSatDetailMapper.java +++ b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/mapper/HqSatDetailMapper.java @@ -1,7 +1,7 @@ -package org.dromara.zhxy.hq.mapper; +package org.dromara.hq.mapper; -import org.dromara.zhxy.hq.domain.HqSatDetail; -import org.dromara.zhxy.hq.domain.vo.HqSatDetailVo; +import org.dromara.hq.domain.HqSatDetail; +import org.dromara.hq.domain.vo.HqSatDetailVo; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; /** diff --git a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/mapper/HqSatOptionMapper.java b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/mapper/HqSatOptionMapper.java similarity index 63% rename from backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/mapper/HqSatOptionMapper.java rename to backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/mapper/HqSatOptionMapper.java index 0a0d527e..8cdb62ba 100644 --- a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/mapper/HqSatOptionMapper.java +++ b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/mapper/HqSatOptionMapper.java @@ -1,7 +1,7 @@ -package org.dromara.zhxy.hq.mapper; +package org.dromara.hq.mapper; -import org.dromara.zhxy.hq.domain.HqSatOption; -import org.dromara.zhxy.hq.domain.vo.HqSatOptionVo; +import org.dromara.hq.domain.HqSatOption; +import org.dromara.hq.domain.vo.HqSatOptionVo; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; /** diff --git a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/mapper/HqSatQuestionMapper.java b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/mapper/HqSatQuestionMapper.java similarity index 62% rename from backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/mapper/HqSatQuestionMapper.java rename to backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/mapper/HqSatQuestionMapper.java index edacce02..f5b6f30e 100644 --- a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/mapper/HqSatQuestionMapper.java +++ b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/mapper/HqSatQuestionMapper.java @@ -1,7 +1,7 @@ -package org.dromara.zhxy.hq.mapper; +package org.dromara.hq.mapper; -import org.dromara.zhxy.hq.domain.HqSatQuestion; -import org.dromara.zhxy.hq.domain.vo.HqSatQuestionVo; +import org.dromara.hq.domain.HqSatQuestion; +import org.dromara.hq.domain.vo.HqSatQuestionVo; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; /** diff --git a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/mapper/HqSatRecordMapper.java b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/mapper/HqSatRecordMapper.java similarity index 63% rename from backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/mapper/HqSatRecordMapper.java rename to backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/mapper/HqSatRecordMapper.java index e59641c1..0eb946d2 100644 --- a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/mapper/HqSatRecordMapper.java +++ b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/mapper/HqSatRecordMapper.java @@ -1,7 +1,7 @@ -package org.dromara.zhxy.hq.mapper; +package org.dromara.hq.mapper; -import org.dromara.zhxy.hq.domain.HqSatRecord; -import org.dromara.zhxy.hq.domain.vo.HqSatRecordVo; +import org.dromara.hq.domain.HqSatRecord; +import org.dromara.hq.domain.vo.HqSatRecordVo; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; /** diff --git a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/mapper/HqSatSurveyMapper.java b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/mapper/HqSatSurveyMapper.java similarity index 62% rename from backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/mapper/HqSatSurveyMapper.java rename to backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/mapper/HqSatSurveyMapper.java index 045a061e..2fe11ee1 100644 --- a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/mapper/HqSatSurveyMapper.java +++ b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/mapper/HqSatSurveyMapper.java @@ -1,7 +1,7 @@ -package org.dromara.zhxy.hq.mapper; +package org.dromara.hq.mapper; -import org.dromara.zhxy.hq.domain.HqSatSurvey; -import org.dromara.zhxy.hq.domain.vo.HqSatSurveyVo; +import org.dromara.hq.domain.HqSatSurvey; +import org.dromara.hq.domain.vo.HqSatSurveyVo; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; /** diff --git a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/mapper/HqSatSurveyQuestionMapper.java b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/mapper/HqSatSurveyQuestionMapper.java similarity index 78% rename from backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/mapper/HqSatSurveyQuestionMapper.java rename to backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/mapper/HqSatSurveyQuestionMapper.java index f013479e..b460a981 100644 --- a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/mapper/HqSatSurveyQuestionMapper.java +++ b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/mapper/HqSatSurveyQuestionMapper.java @@ -1,8 +1,8 @@ -package org.dromara.zhxy.hq.mapper; +package org.dromara.hq.mapper; import org.apache.ibatis.annotations.Param; -import org.dromara.zhxy.hq.domain.HqSatSurveyQuestion; -import org.dromara.zhxy.hq.domain.vo.HqSatSurveyQuestionVo; +import org.dromara.hq.domain.HqSatSurveyQuestion; +import org.dromara.hq.domain.vo.HqSatSurveyQuestionVo; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; import java.util.List; diff --git a/backend/ruoyi-modules/ruoyi-venue/src/main/java/org/dromara/venue/mapper/HqVenueInfoMapper.java b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/mapper/HqVenueInfoMapper.java similarity index 85% rename from backend/ruoyi-modules/ruoyi-venue/src/main/java/org/dromara/venue/mapper/HqVenueInfoMapper.java rename to backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/mapper/HqVenueInfoMapper.java index d90ac255..290d3966 100644 --- a/backend/ruoyi-modules/ruoyi-venue/src/main/java/org/dromara/venue/mapper/HqVenueInfoMapper.java +++ b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/mapper/HqVenueInfoMapper.java @@ -1,12 +1,12 @@ -package org.dromara.venue.mapper; +package org.dromara.hq.mapper; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; -import org.dromara.venue.domain.HqVenueInfo; -import org.dromara.venue.domain.vo.HqVenueInfoVo; +import org.dromara.hq.domain.HqVenueInfo; +import org.dromara.hq.domain.vo.HqVenueInfoVo; /** * 场地信息Mapper接口 diff --git a/backend/ruoyi-modules/ruoyi-venue/src/main/java/org/dromara/venue/mapper/HqVenueReservationMapper.java b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/mapper/HqVenueReservationMapper.java similarity index 91% rename from backend/ruoyi-modules/ruoyi-venue/src/main/java/org/dromara/venue/mapper/HqVenueReservationMapper.java rename to backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/mapper/HqVenueReservationMapper.java index 3ddaf79b..a62f3a2b 100644 --- a/backend/ruoyi-modules/ruoyi-venue/src/main/java/org/dromara/venue/mapper/HqVenueReservationMapper.java +++ b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/mapper/HqVenueReservationMapper.java @@ -1,12 +1,12 @@ -package org.dromara.venue.mapper; +package org.dromara.hq.mapper; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; -import org.dromara.venue.domain.HqVenueReservation; -import org.dromara.venue.domain.vo.HqVenueReservationVo; +import org.dromara.hq.domain.HqVenueReservation; +import org.dromara.hq.domain.vo.HqVenueReservationVo; import java.time.LocalDateTime; import java.util.List; diff --git a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/mapper/PmRepairAttachmentMapper.java b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/mapper/PmRepairAttachmentMapper.java similarity index 62% rename from backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/mapper/PmRepairAttachmentMapper.java rename to backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/mapper/PmRepairAttachmentMapper.java index 22652ca0..cae5b6d9 100644 --- a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/mapper/PmRepairAttachmentMapper.java +++ b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/mapper/PmRepairAttachmentMapper.java @@ -1,7 +1,7 @@ -package org.dromara.zhxy.hq.mapper; +package org.dromara.hq.mapper; -import org.dromara.zhxy.hq.domain.PmRepairAttachment; -import org.dromara.zhxy.hq.domain.vo.PmRepairAttachmentVo; +import org.dromara.hq.domain.PmRepairAttachment; +import org.dromara.hq.domain.vo.PmRepairAttachmentVo; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; /** @@ -12,4 +12,4 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; */ public interface PmRepairAttachmentMapper extends BaseMapperPlus { -} \ No newline at end of file +} diff --git a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/mapper/PmRepairCategoryMapper.java b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/mapper/PmRepairCategoryMapper.java similarity index 63% rename from backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/mapper/PmRepairCategoryMapper.java rename to backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/mapper/PmRepairCategoryMapper.java index 12522ce2..adab271a 100644 --- a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/mapper/PmRepairCategoryMapper.java +++ b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/mapper/PmRepairCategoryMapper.java @@ -1,7 +1,7 @@ -package org.dromara.zhxy.hq.mapper; +package org.dromara.hq.mapper; -import org.dromara.zhxy.hq.domain.PmRepairCategory; -import org.dromara.zhxy.hq.domain.vo.PmRepairCategoryVo; +import org.dromara.hq.domain.PmRepairCategory; +import org.dromara.hq.domain.vo.PmRepairCategoryVo; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; /** diff --git a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/mapper/PmRepairOrderMapper.java b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/mapper/PmRepairOrderMapper.java similarity index 76% rename from backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/mapper/PmRepairOrderMapper.java rename to backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/mapper/PmRepairOrderMapper.java index 14e52f14..e8a1ebda 100644 --- a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/mapper/PmRepairOrderMapper.java +++ b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/mapper/PmRepairOrderMapper.java @@ -1,7 +1,7 @@ -package org.dromara.zhxy.hq.mapper; +package org.dromara.hq.mapper; -import org.dromara.zhxy.hq.domain.PmRepairOrder; -import org.dromara.zhxy.hq.domain.vo.PmRepairOrderVo; +import org.dromara.hq.domain.PmRepairOrder; +import org.dromara.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/hq/mapper/PmRepairProgressMapper.java b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/mapper/PmRepairProgressMapper.java similarity index 73% rename from backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/mapper/PmRepairProgressMapper.java rename to backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/mapper/PmRepairProgressMapper.java index 98d5c134..2ca1ea0f 100644 --- a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/mapper/PmRepairProgressMapper.java +++ b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/mapper/PmRepairProgressMapper.java @@ -1,6 +1,6 @@ -package org.dromara.zhxy.hq.mapper; +package org.dromara.hq.mapper; -import org.dromara.zhxy.hq.domain.PmRepairProgress; +import org.dromara.hq.domain.PmRepairProgress; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; /** @@ -11,4 +11,4 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; */ public interface PmRepairProgressMapper extends BaseMapperPlus { -} \ No newline at end of file +} diff --git a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/mapper/PmServiceEvaluationMapper.java b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/mapper/PmServiceEvaluationMapper.java similarity index 73% rename from backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/mapper/PmServiceEvaluationMapper.java rename to backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/mapper/PmServiceEvaluationMapper.java index f18e5b88..4605784e 100644 --- a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/mapper/PmServiceEvaluationMapper.java +++ b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/mapper/PmServiceEvaluationMapper.java @@ -1,6 +1,6 @@ -package org.dromara.zhxy.hq.mapper; +package org.dromara.hq.mapper; -import org.dromara.zhxy.hq.domain.PmServiceEvaluation; +import org.dromara.hq.domain.PmServiceEvaluation; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; /** @@ -11,4 +11,4 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; */ public interface PmServiceEvaluationMapper extends BaseMapperPlus { -} \ No newline at end of file +} diff --git a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/service/IHqHallInfoService.java b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/service/IHqHallInfoService.java similarity index 91% rename from backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/service/IHqHallInfoService.java rename to backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/service/IHqHallInfoService.java index cb166bc6..7df7f389 100644 --- a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/service/IHqHallInfoService.java +++ b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/service/IHqHallInfoService.java @@ -1,7 +1,7 @@ -package org.dromara.zhxy.hq.service; +package org.dromara.hq.service; -import org.dromara.zhxy.hq.domain.vo.HqHallInfoVo; -import org.dromara.zhxy.hq.domain.bo.HqHallInfoBo; +import org.dromara.hq.domain.vo.HqHallInfoVo; +import org.dromara.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/hq/service/IHqHallReservationService.java b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/service/IHqHallReservationService.java similarity index 88% rename from backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/service/IHqHallReservationService.java rename to backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/service/IHqHallReservationService.java index 7f3e7acf..80a22da2 100644 --- a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/service/IHqHallReservationService.java +++ b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/service/IHqHallReservationService.java @@ -1,8 +1,8 @@ -package org.dromara.zhxy.hq.service; +package org.dromara.hq.service; -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.hq.domain.vo.HqHallReservationVo; +import org.dromara.hq.domain.bo.HqHallReservationBo; +import org.dromara.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/hq/service/IHqSatCategoryService.java b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/service/IHqSatCategoryService.java similarity index 91% rename from backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/service/IHqSatCategoryService.java rename to backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/service/IHqSatCategoryService.java index 1e49f60e..d5a09ef4 100644 --- a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/service/IHqSatCategoryService.java +++ b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/service/IHqSatCategoryService.java @@ -1,7 +1,7 @@ -package org.dromara.zhxy.hq.service; +package org.dromara.hq.service; -import org.dromara.zhxy.hq.domain.vo.HqSatCategoryVo; -import org.dromara.zhxy.hq.domain.bo.HqSatCategoryBo; +import org.dromara.hq.domain.vo.HqSatCategoryVo; +import org.dromara.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/hq/service/IHqSatDetailService.java b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/service/IHqSatDetailService.java similarity index 91% rename from backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/service/IHqSatDetailService.java rename to backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/service/IHqSatDetailService.java index c72ce5d9..369bed67 100644 --- a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/service/IHqSatDetailService.java +++ b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/service/IHqSatDetailService.java @@ -1,7 +1,7 @@ -package org.dromara.zhxy.hq.service; +package org.dromara.hq.service; -import org.dromara.zhxy.hq.domain.vo.HqSatDetailVo; -import org.dromara.zhxy.hq.domain.bo.HqSatDetailBo; +import org.dromara.hq.domain.vo.HqSatDetailVo; +import org.dromara.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/hq/service/IHqSatOptionService.java b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/service/IHqSatOptionService.java similarity index 91% rename from backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/service/IHqSatOptionService.java rename to backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/service/IHqSatOptionService.java index c0d341e2..fc0fc860 100644 --- a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/service/IHqSatOptionService.java +++ b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/service/IHqSatOptionService.java @@ -1,7 +1,7 @@ -package org.dromara.zhxy.hq.service; +package org.dromara.hq.service; -import org.dromara.zhxy.hq.domain.vo.HqSatOptionVo; -import org.dromara.zhxy.hq.domain.bo.HqSatOptionBo; +import org.dromara.hq.domain.vo.HqSatOptionVo; +import org.dromara.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/hq/service/IHqSatQuestionService.java b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/service/IHqSatQuestionService.java similarity index 90% rename from backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/service/IHqSatQuestionService.java rename to backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/service/IHqSatQuestionService.java index a4f5ffb9..795536f4 100644 --- a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/service/IHqSatQuestionService.java +++ b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/service/IHqSatQuestionService.java @@ -1,7 +1,7 @@ -package org.dromara.zhxy.hq.service; +package org.dromara.hq.service; -import org.dromara.zhxy.hq.domain.vo.HqSatQuestionVo; -import org.dromara.zhxy.hq.domain.bo.HqSatQuestionBo; +import org.dromara.hq.domain.vo.HqSatQuestionVo; +import org.dromara.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/hq/service/IHqSatRecordService.java b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/service/IHqSatRecordService.java similarity index 91% rename from backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/service/IHqSatRecordService.java rename to backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/service/IHqSatRecordService.java index 9fcef400..85feb40e 100644 --- a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/service/IHqSatRecordService.java +++ b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/service/IHqSatRecordService.java @@ -1,7 +1,7 @@ -package org.dromara.zhxy.hq.service; +package org.dromara.hq.service; -import org.dromara.zhxy.hq.domain.vo.HqSatRecordVo; -import org.dromara.zhxy.hq.domain.bo.HqSatRecordBo; +import org.dromara.hq.domain.vo.HqSatRecordVo; +import org.dromara.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/hq/service/IHqSatSurveyQuestionService.java b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/service/IHqSatSurveyQuestionService.java similarity index 92% rename from backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/service/IHqSatSurveyQuestionService.java rename to backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/service/IHqSatSurveyQuestionService.java index ed59102c..163d8a99 100644 --- a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/service/IHqSatSurveyQuestionService.java +++ b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/service/IHqSatSurveyQuestionService.java @@ -1,7 +1,7 @@ -package org.dromara.zhxy.hq.service; +package org.dromara.hq.service; -import org.dromara.zhxy.hq.domain.vo.HqSatSurveyQuestionVo; -import org.dromara.zhxy.hq.domain.bo.HqSatSurveyQuestionBo; +import org.dromara.hq.domain.vo.HqSatSurveyQuestionVo; +import org.dromara.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/hq/service/IHqSatSurveyService.java b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/service/IHqSatSurveyService.java similarity index 90% rename from backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/service/IHqSatSurveyService.java rename to backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/service/IHqSatSurveyService.java index 6e264773..111b7031 100644 --- a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/service/IHqSatSurveyService.java +++ b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/service/IHqSatSurveyService.java @@ -1,10 +1,10 @@ -package org.dromara.zhxy.hq.service; +package org.dromara.hq.service; -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.hq.domain.vo.HqSatSurveyVo; +import org.dromara.hq.domain.bo.HqSatSurveyBo; +import org.dromara.hq.domain.bo.HqSatAnswerSubmitBo; +import org.dromara.hq.domain.vo.HqSatSurveyQuestionVo; +import org.dromara.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-modules/ruoyi-venue/src/main/java/org/dromara/venue/service/IHqVenueInfoService.java b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/service/IHqVenueInfoService.java similarity index 92% rename from backend/ruoyi-modules/ruoyi-venue/src/main/java/org/dromara/venue/service/IHqVenueInfoService.java rename to backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/service/IHqVenueInfoService.java index b8df4581..cd4c0e52 100644 --- a/backend/ruoyi-modules/ruoyi-venue/src/main/java/org/dromara/venue/service/IHqVenueInfoService.java +++ b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/service/IHqVenueInfoService.java @@ -1,9 +1,9 @@ -package org.dromara.venue.service; +package org.dromara.hq.service; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.venue.domain.bo.HqVenueInfoBo; -import org.dromara.venue.domain.vo.HqVenueInfoVo; +import org.dromara.hq.domain.bo.HqVenueInfoBo; +import org.dromara.hq.domain.vo.HqVenueInfoVo; import java.util.Collection; import java.util.List; diff --git a/backend/ruoyi-modules/ruoyi-venue/src/main/java/org/dromara/venue/service/IHqVenueReservationService.java b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/service/IHqVenueReservationService.java similarity index 92% rename from backend/ruoyi-modules/ruoyi-venue/src/main/java/org/dromara/venue/service/IHqVenueReservationService.java rename to backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/service/IHqVenueReservationService.java index 30d70772..b51e7c1f 100644 --- a/backend/ruoyi-modules/ruoyi-venue/src/main/java/org/dromara/venue/service/IHqVenueReservationService.java +++ b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/service/IHqVenueReservationService.java @@ -1,10 +1,10 @@ -package org.dromara.venue.service; +package org.dromara.hq.service; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.venue.domain.bo.HqVenueReservationApproveBo; -import org.dromara.venue.domain.bo.HqVenueReservationBo; -import org.dromara.venue.domain.vo.HqVenueReservationVo; +import org.dromara.hq.domain.bo.HqVenueReservationApproveBo; +import org.dromara.hq.domain.bo.HqVenueReservationBo; +import org.dromara.hq.domain.vo.HqVenueReservationVo; import java.time.LocalDateTime; import java.util.Collection; diff --git a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/service/IPmRepairAttachmentService.java b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/service/IPmRepairAttachmentService.java similarity index 91% rename from backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/service/IPmRepairAttachmentService.java rename to backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/service/IPmRepairAttachmentService.java index bafe885d..0cae449e 100644 --- a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/service/IPmRepairAttachmentService.java +++ b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/service/IPmRepairAttachmentService.java @@ -1,7 +1,7 @@ -package org.dromara.zhxy.hq.service; +package org.dromara.hq.service; -import org.dromara.zhxy.hq.domain.vo.PmRepairAttachmentVo; -import org.dromara.zhxy.hq.domain.bo.PmRepairAttachmentBo; +import org.dromara.hq.domain.vo.PmRepairAttachmentVo; +import org.dromara.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; @@ -73,4 +73,4 @@ public interface IPmRepairAttachmentService { */ void updateOrderAttachmentCount(Long orderId); -} \ No newline at end of file +} diff --git a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/service/IPmRepairCategoryService.java b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/service/IPmRepairCategoryService.java similarity index 92% rename from backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/service/IPmRepairCategoryService.java rename to backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/service/IPmRepairCategoryService.java index 8552624a..3b9013ce 100644 --- a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/service/IPmRepairCategoryService.java +++ b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/service/IPmRepairCategoryService.java @@ -1,7 +1,7 @@ -package org.dromara.zhxy.hq.service; +package org.dromara.hq.service; -import org.dromara.zhxy.hq.domain.vo.PmRepairCategoryVo; -import org.dromara.zhxy.hq.domain.bo.PmRepairCategoryBo; +import org.dromara.hq.domain.vo.PmRepairCategoryVo; +import org.dromara.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/hq/service/IPmRepairOrderService.java b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/service/IPmRepairOrderService.java similarity index 96% rename from backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/service/IPmRepairOrderService.java rename to backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/service/IPmRepairOrderService.java index 92308248..a2656408 100644 --- a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/service/IPmRepairOrderService.java +++ b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/service/IPmRepairOrderService.java @@ -1,7 +1,7 @@ -package org.dromara.zhxy.hq.service; +package org.dromara.hq.service; -import org.dromara.zhxy.hq.domain.vo.PmRepairOrderVo; -import org.dromara.zhxy.hq.domain.bo.PmRepairOrderBo; +import org.dromara.hq.domain.vo.PmRepairOrderVo; +import org.dromara.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/hq/service/impl/HqHallInfoServiceImpl.java b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/service/impl/HqHallInfoServiceImpl.java similarity index 92% rename from backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/service/impl/HqHallInfoServiceImpl.java rename to backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/service/impl/HqHallInfoServiceImpl.java index 28f4c59a..e65796f7 100644 --- a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/service/impl/HqHallInfoServiceImpl.java +++ b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/service/impl/HqHallInfoServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.zhxy.hq.service.impl; +package org.dromara.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.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 org.dromara.hq.domain.bo.HqHallInfoBo; +import org.dromara.hq.domain.vo.HqHallInfoVo; +import org.dromara.hq.domain.HqHallInfo; +import org.dromara.hq.mapper.HqHallInfoMapper; +import org.dromara.hq.service.IHqHallInfoService; import java.util.List; import java.util.Map; diff --git a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/service/impl/HqHallReservationServiceImpl.java b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/service/impl/HqHallReservationServiceImpl.java similarity index 95% rename from backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/service/impl/HqHallReservationServiceImpl.java rename to backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/service/impl/HqHallReservationServiceImpl.java index 0387a7b8..9ddf29c8 100644 --- a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/service/impl/HqHallReservationServiceImpl.java +++ b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/service/impl/HqHallReservationServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.zhxy.hq.service.impl; +package org.dromara.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.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 org.dromara.hq.domain.bo.HqHallReservationBo; +import org.dromara.hq.domain.bo.HqHallReservationAuditBo; +import org.dromara.hq.domain.vo.HqHallReservationVo; +import org.dromara.hq.domain.HqHallReservation; +import org.dromara.hq.mapper.HqHallReservationMapper; +import org.dromara.hq.service.IHqHallReservationService; import java.util.List; import java.util.Map; diff --git a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/service/impl/HqSatCategoryServiceImpl.java b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/service/impl/HqSatCategoryServiceImpl.java similarity index 93% rename from backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/service/impl/HqSatCategoryServiceImpl.java rename to backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/service/impl/HqSatCategoryServiceImpl.java index 06a30988..916f6059 100644 --- a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/service/impl/HqSatCategoryServiceImpl.java +++ b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/service/impl/HqSatCategoryServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.zhxy.hq.service.impl; +package org.dromara.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.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 org.dromara.hq.domain.bo.HqSatCategoryBo; +import org.dromara.hq.domain.vo.HqSatCategoryVo; +import org.dromara.hq.domain.HqSatCategory; +import org.dromara.hq.mapper.HqSatCategoryMapper; +import org.dromara.hq.service.IHqSatCategoryService; import java.util.List; import java.util.Map; diff --git a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/service/impl/HqSatDetailServiceImpl.java b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/service/impl/HqSatDetailServiceImpl.java similarity index 92% rename from backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/service/impl/HqSatDetailServiceImpl.java rename to backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/service/impl/HqSatDetailServiceImpl.java index 0ba4dd08..b8e42a8e 100644 --- a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/service/impl/HqSatDetailServiceImpl.java +++ b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/service/impl/HqSatDetailServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.zhxy.hq.service.impl; +package org.dromara.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.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 org.dromara.hq.domain.bo.HqSatDetailBo; +import org.dromara.hq.domain.vo.HqSatDetailVo; +import org.dromara.hq.domain.HqSatDetail; +import org.dromara.hq.mapper.HqSatDetailMapper; +import org.dromara.hq.service.IHqSatDetailService; import java.util.List; import java.util.Map; diff --git a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/service/impl/HqSatOptionServiceImpl.java b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/service/impl/HqSatOptionServiceImpl.java similarity index 93% rename from backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/service/impl/HqSatOptionServiceImpl.java rename to backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/service/impl/HqSatOptionServiceImpl.java index af7f6d16..1dbe2779 100644 --- a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/service/impl/HqSatOptionServiceImpl.java +++ b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/service/impl/HqSatOptionServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.zhxy.hq.service.impl; +package org.dromara.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.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 org.dromara.hq.domain.bo.HqSatOptionBo; +import org.dromara.hq.domain.vo.HqSatOptionVo; +import org.dromara.hq.domain.HqSatOption; +import org.dromara.hq.mapper.HqSatOptionMapper; +import org.dromara.hq.service.IHqSatOptionService; import java.util.List; import java.util.Map; diff --git a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/service/impl/HqSatQuestionServiceImpl.java b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/service/impl/HqSatQuestionServiceImpl.java similarity index 93% rename from backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/service/impl/HqSatQuestionServiceImpl.java rename to backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/service/impl/HqSatQuestionServiceImpl.java index f0280ef5..19745501 100644 --- a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/service/impl/HqSatQuestionServiceImpl.java +++ b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/service/impl/HqSatQuestionServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.zhxy.hq.service.impl; +package org.dromara.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.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 org.dromara.hq.domain.bo.HqSatQuestionBo; +import org.dromara.hq.domain.vo.HqSatQuestionVo; +import org.dromara.hq.domain.HqSatQuestion; +import org.dromara.hq.mapper.HqSatQuestionMapper; +import org.dromara.hq.service.IHqSatQuestionService; import java.util.List; import java.util.Map; diff --git a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/service/impl/HqSatRecordServiceImpl.java b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/service/impl/HqSatRecordServiceImpl.java similarity index 93% rename from backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/service/impl/HqSatRecordServiceImpl.java rename to backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/service/impl/HqSatRecordServiceImpl.java index 1fdd8764..93ea4e9f 100644 --- a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/service/impl/HqSatRecordServiceImpl.java +++ b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/service/impl/HqSatRecordServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.zhxy.hq.service.impl; +package org.dromara.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.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 org.dromara.hq.domain.bo.HqSatRecordBo; +import org.dromara.hq.domain.vo.HqSatRecordVo; +import org.dromara.hq.domain.HqSatRecord; +import org.dromara.hq.mapper.HqSatRecordMapper; +import org.dromara.hq.service.IHqSatRecordService; import java.util.List; import java.util.Map; diff --git a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/service/impl/HqSatSurveyQuestionServiceImpl.java b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/service/impl/HqSatSurveyQuestionServiceImpl.java similarity index 93% rename from backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/service/impl/HqSatSurveyQuestionServiceImpl.java rename to backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/service/impl/HqSatSurveyQuestionServiceImpl.java index 2933185a..8f166700 100644 --- a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/service/impl/HqSatSurveyQuestionServiceImpl.java +++ b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/service/impl/HqSatSurveyQuestionServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.zhxy.hq.service.impl; +package org.dromara.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.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 org.dromara.hq.domain.bo.HqSatSurveyQuestionBo; +import org.dromara.hq.domain.vo.HqSatSurveyQuestionVo; +import org.dromara.hq.domain.HqSatSurveyQuestion; +import org.dromara.hq.mapper.HqSatSurveyQuestionMapper; +import org.dromara.hq.service.IHqSatSurveyQuestionService; import java.util.List; import java.util.Map; diff --git a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/service/impl/HqSatSurveyServiceImpl.java b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/service/impl/HqSatSurveyServiceImpl.java similarity index 97% rename from backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/service/impl/HqSatSurveyServiceImpl.java rename to backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/service/impl/HqSatSurveyServiceImpl.java index 67a8b613..9b7706d2 100644 --- a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/service/impl/HqSatSurveyServiceImpl.java +++ b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/service/impl/HqSatSurveyServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.zhxy.hq.service.impl; +package org.dromara.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.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 org.dromara.hq.domain.bo.HqSatSurveyBo; +import org.dromara.hq.domain.bo.HqSatAnswerSubmitBo; +import org.dromara.hq.domain.bo.HqSatRecordBo; +import org.dromara.hq.domain.bo.HqSatDetailBo; +import org.dromara.hq.domain.vo.HqSatSurveyVo; +import org.dromara.hq.domain.vo.HqSatRecordVo; +import org.dromara.hq.domain.HqSatSurvey; +import org.dromara.hq.mapper.HqSatSurveyMapper; +import org.dromara.hq.service.IHqSatSurveyService; +import org.dromara.hq.service.IHqSatSurveyQuestionService; +import org.dromara.hq.service.IHqSatRecordService; +import org.dromara.hq.service.IHqSatDetailService; +import org.dromara.hq.domain.bo.HqSatSurveyQuestionBo; +import org.dromara.hq.domain.vo.HqSatSurveyQuestionVo; +import org.dromara.hq.domain.vo.HqSatDetailVo; import java.util.List; import java.util.Map; diff --git a/backend/ruoyi-modules/ruoyi-venue/src/main/java/org/dromara/venue/service/impl/HqVenueInfoServiceImpl.java b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/service/impl/HqVenueInfoServiceImpl.java similarity index 94% rename from backend/ruoyi-modules/ruoyi-venue/src/main/java/org/dromara/venue/service/impl/HqVenueInfoServiceImpl.java rename to backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/service/impl/HqVenueInfoServiceImpl.java index 02efc1ee..613ddf0c 100644 --- a/backend/ruoyi-modules/ruoyi-venue/src/main/java/org/dromara/venue/service/impl/HqVenueInfoServiceImpl.java +++ b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/service/impl/HqVenueInfoServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.venue.service.impl; +package org.dromara.hq.service.impl; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -9,11 +9,11 @@ import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.StringUtils; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.venue.domain.HqVenueInfo; -import org.dromara.venue.domain.bo.HqVenueInfoBo; -import org.dromara.venue.domain.vo.HqVenueInfoVo; -import org.dromara.venue.mapper.HqVenueInfoMapper; -import org.dromara.venue.service.IHqVenueInfoService; +import org.dromara.hq.domain.HqVenueInfo; +import org.dromara.hq.domain.bo.HqVenueInfoBo; +import org.dromara.hq.domain.vo.HqVenueInfoVo; +import org.dromara.hq.mapper.HqVenueInfoMapper; +import org.dromara.hq.service.IHqVenueInfoService; import org.springframework.stereotype.Service; import java.util.Collection; diff --git a/backend/ruoyi-modules/ruoyi-venue/src/main/java/org/dromara/venue/service/impl/HqVenueReservationServiceImpl.java b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/service/impl/HqVenueReservationServiceImpl.java similarity index 94% rename from backend/ruoyi-modules/ruoyi-venue/src/main/java/org/dromara/venue/service/impl/HqVenueReservationServiceImpl.java rename to backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/service/impl/HqVenueReservationServiceImpl.java index 2b520fcc..61a274ef 100644 --- a/backend/ruoyi-modules/ruoyi-venue/src/main/java/org/dromara/venue/service/impl/HqVenueReservationServiceImpl.java +++ b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/service/impl/HqVenueReservationServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.venue.service.impl; +package org.dromara.hq.service.impl; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -10,14 +10,14 @@ import org.dromara.common.core.utils.StringUtils; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.satoken.utils.LoginHelper; -import org.dromara.venue.domain.HqVenueReservation; -import org.dromara.venue.domain.bo.HqVenueReservationApproveBo; -import org.dromara.venue.domain.bo.HqVenueReservationBo; -import org.dromara.venue.domain.vo.HqVenueInfoVo; -import org.dromara.venue.domain.vo.HqVenueReservationVo; -import org.dromara.venue.mapper.HqVenueReservationMapper; -import org.dromara.venue.service.IHqVenueInfoService; -import org.dromara.venue.service.IHqVenueReservationService; +import org.dromara.hq.domain.HqVenueReservation; +import org.dromara.hq.domain.bo.HqVenueReservationApproveBo; +import org.dromara.hq.domain.bo.HqVenueReservationBo; +import org.dromara.hq.domain.vo.HqVenueInfoVo; +import org.dromara.hq.domain.vo.HqVenueReservationVo; +import org.dromara.hq.mapper.HqVenueReservationMapper; +import org.dromara.hq.service.IHqVenueInfoService; +import org.dromara.hq.service.IHqVenueReservationService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/service/impl/PmRepairAttachmentServiceImpl.java b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/service/impl/PmRepairAttachmentServiceImpl.java similarity index 94% rename from backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/service/impl/PmRepairAttachmentServiceImpl.java rename to backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/service/impl/PmRepairAttachmentServiceImpl.java index 234e51be..46b0b57c 100644 --- a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/service/impl/PmRepairAttachmentServiceImpl.java +++ b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/service/impl/PmRepairAttachmentServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.zhxy.hq.service.impl; +package org.dromara.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.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.dromara.hq.domain.PmRepairAttachment; +import org.dromara.hq.domain.bo.PmRepairAttachmentBo; +import org.dromara.hq.domain.vo.PmRepairAttachmentVo; +import org.dromara.hq.mapper.PmRepairAttachmentMapper; +import org.dromara.hq.mapper.PmRepairOrderMapper; +import org.dromara.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.hq.domain.PmRepairOrder::getId, orderId) - .set(org.dromara.zhxy.hq.domain.PmRepairOrder::getAttachmentCount, (int) count); + LambdaUpdateWrapper updateWrapper = Wrappers.lambdaUpdate(); + updateWrapper.eq(org.dromara.hq.domain.PmRepairOrder::getId, orderId) + .set(org.dromara.hq.domain.PmRepairOrder::getAttachmentCount, (int) count); repairOrderMapper.update(null, updateWrapper); } @@ -324,4 +324,4 @@ public class PmRepairAttachmentServiceImpl implements IPmRepairAttachmentService } } -} \ No newline at end of file +} diff --git a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/service/impl/PmRepairCategoryServiceImpl.java b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/service/impl/PmRepairCategoryServiceImpl.java similarity index 96% rename from backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/service/impl/PmRepairCategoryServiceImpl.java rename to backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/service/impl/PmRepairCategoryServiceImpl.java index bc48b619..aca3efbc 100644 --- a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/service/impl/PmRepairCategoryServiceImpl.java +++ b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/service/impl/PmRepairCategoryServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.zhxy.hq.service.impl; +package org.dromara.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.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.hq.domain.bo.PmRepairCategoryBo; +import org.dromara.hq.domain.vo.PmRepairCategoryVo; +import org.dromara.hq.domain.PmRepairCategory; +import org.dromara.hq.mapper.PmRepairCategoryMapper; +import org.dromara.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/hq/service/impl/PmRepairOrderServiceImpl.java b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/service/impl/PmRepairOrderServiceImpl.java similarity index 98% rename from backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/service/impl/PmRepairOrderServiceImpl.java rename to backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/service/impl/PmRepairOrderServiceImpl.java index 86e9f78c..c1db8e73 100644 --- a/backend/ruoyi-admin/src/main/java/org/dromara/zhxy/hq/service/impl/PmRepairOrderServiceImpl.java +++ b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/service/impl/PmRepairOrderServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.zhxy.hq.service.impl; +package org.dromara.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.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.hq.domain.bo.PmRepairOrderBo; +import org.dromara.hq.domain.vo.PmRepairOrderVo; +import org.dromara.hq.domain.PmRepairOrder; +import org.dromara.hq.domain.PmRepairProgress; +import org.dromara.hq.domain.PmServiceEvaluation; +import org.dromara.hq.mapper.PmRepairOrderMapper; +import org.dromara.hq.mapper.PmRepairProgressMapper; +import org.dromara.hq.mapper.PmServiceEvaluationMapper; +import org.dromara.hq.service.IPmRepairOrderService; +import org.dromara.hq.service.IPmRepairCategoryService; import org.dromara.common.satoken.utils.LoginHelper; import org.dromara.common.core.exception.ServiceException; import org.dromara.common.core.service.UserService; @@ -286,7 +286,7 @@ public class PmRepairOrderServiceImpl implements IPmRepairOrderService { /** * 自动填充报修人信息 - * + * * @param order 报修工单 */ private void fillReporterInfo(PmRepairOrder order) { diff --git a/backend/ruoyi-admin/src/main/resources/mapper/hq/HqHallInfoMapper.xml b/backend/ruoyi-modules/ruoyi-hq/src/main/resources/mapper/HqHallInfoMapper.xml similarity index 70% rename from backend/ruoyi-admin/src/main/resources/mapper/hq/HqHallInfoMapper.xml rename to backend/ruoyi-modules/ruoyi-hq/src/main/resources/mapper/HqHallInfoMapper.xml index d8977c40..b317b2ff 100644 --- a/backend/ruoyi-admin/src/main/resources/mapper/hq/HqHallInfoMapper.xml +++ b/backend/ruoyi-modules/ruoyi-hq/src/main/resources/mapper/HqHallInfoMapper.xml @@ -2,6 +2,6 @@ - + diff --git a/backend/ruoyi-modules/ruoyi-hq/src/main/resources/mapper/HqHallReservationMapper.xml b/backend/ruoyi-modules/ruoyi-hq/src/main/resources/mapper/HqHallReservationMapper.xml new file mode 100644 index 00000000..038d341b --- /dev/null +++ b/backend/ruoyi-modules/ruoyi-hq/src/main/resources/mapper/HqHallReservationMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/backend/ruoyi-modules/ruoyi-hq/src/main/resources/mapper/HqSatCategoryMapper.xml b/backend/ruoyi-modules/ruoyi-hq/src/main/resources/mapper/HqSatCategoryMapper.xml new file mode 100644 index 00000000..15f40df7 --- /dev/null +++ b/backend/ruoyi-modules/ruoyi-hq/src/main/resources/mapper/HqSatCategoryMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/backend/ruoyi-admin/src/main/resources/mapper/hq/HqSatDetailMapper.xml b/backend/ruoyi-modules/ruoyi-hq/src/main/resources/mapper/HqSatDetailMapper.xml similarity index 70% rename from backend/ruoyi-admin/src/main/resources/mapper/hq/HqSatDetailMapper.xml rename to backend/ruoyi-modules/ruoyi-hq/src/main/resources/mapper/HqSatDetailMapper.xml index dcb1330b..d5c5013a 100644 --- a/backend/ruoyi-admin/src/main/resources/mapper/hq/HqSatDetailMapper.xml +++ b/backend/ruoyi-modules/ruoyi-hq/src/main/resources/mapper/HqSatDetailMapper.xml @@ -2,6 +2,6 @@ - + diff --git a/backend/ruoyi-admin/src/main/resources/mapper/hq/HqSatOptionMapper.xml b/backend/ruoyi-modules/ruoyi-hq/src/main/resources/mapper/HqSatOptionMapper.xml similarity index 70% rename from backend/ruoyi-admin/src/main/resources/mapper/hq/HqSatOptionMapper.xml rename to backend/ruoyi-modules/ruoyi-hq/src/main/resources/mapper/HqSatOptionMapper.xml index 567c025f..cf747536 100644 --- a/backend/ruoyi-admin/src/main/resources/mapper/hq/HqSatOptionMapper.xml +++ b/backend/ruoyi-modules/ruoyi-hq/src/main/resources/mapper/HqSatOptionMapper.xml @@ -2,6 +2,6 @@ - + diff --git a/backend/ruoyi-modules/ruoyi-hq/src/main/resources/mapper/HqSatQuestionMapper.xml b/backend/ruoyi-modules/ruoyi-hq/src/main/resources/mapper/HqSatQuestionMapper.xml new file mode 100644 index 00000000..a63a7e30 --- /dev/null +++ b/backend/ruoyi-modules/ruoyi-hq/src/main/resources/mapper/HqSatQuestionMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/backend/ruoyi-modules/ruoyi-hq/src/main/resources/mapper/HqSatRecordMapper.xml b/backend/ruoyi-modules/ruoyi-hq/src/main/resources/mapper/HqSatRecordMapper.xml new file mode 100644 index 00000000..e18e3369 --- /dev/null +++ b/backend/ruoyi-modules/ruoyi-hq/src/main/resources/mapper/HqSatRecordMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/backend/ruoyi-admin/src/main/resources/mapper/hq/HqSatSurveyMapper.xml b/backend/ruoyi-modules/ruoyi-hq/src/main/resources/mapper/HqSatSurveyMapper.xml similarity index 70% rename from backend/ruoyi-admin/src/main/resources/mapper/hq/HqSatSurveyMapper.xml rename to backend/ruoyi-modules/ruoyi-hq/src/main/resources/mapper/HqSatSurveyMapper.xml index 1d1bb077..cb59af0a 100644 --- a/backend/ruoyi-admin/src/main/resources/mapper/hq/HqSatSurveyMapper.xml +++ b/backend/ruoyi-modules/ruoyi-hq/src/main/resources/mapper/HqSatSurveyMapper.xml @@ -2,6 +2,6 @@ - + diff --git a/backend/ruoyi-admin/src/main/resources/mapper/hq/HqSatSurveyQuestionMapper.xml b/backend/ruoyi-modules/ruoyi-hq/src/main/resources/mapper/HqSatSurveyQuestionMapper.xml similarity index 89% rename from backend/ruoyi-admin/src/main/resources/mapper/hq/HqSatSurveyQuestionMapper.xml rename to backend/ruoyi-modules/ruoyi-hq/src/main/resources/mapper/HqSatSurveyQuestionMapper.xml index 2bb3a370..8d4e5961 100644 --- a/backend/ruoyi-admin/src/main/resources/mapper/hq/HqSatSurveyQuestionMapper.xml +++ b/backend/ruoyi-modules/ruoyi-hq/src/main/resources/mapper/HqSatSurveyQuestionMapper.xml @@ -2,10 +2,10 @@ - + - SELECT sq.id, sq.deleted, diff --git a/backend/ruoyi-modules/ruoyi-venue/src/main/resources/mapper/HqVenueInfoMapper.xml b/backend/ruoyi-modules/ruoyi-hq/src/main/resources/mapper/HqVenueInfoMapper.xml similarity index 88% rename from backend/ruoyi-modules/ruoyi-venue/src/main/resources/mapper/HqVenueInfoMapper.xml rename to backend/ruoyi-modules/ruoyi-hq/src/main/resources/mapper/HqVenueInfoMapper.xml index 7a797cae..8495f689 100644 --- a/backend/ruoyi-modules/ruoyi-venue/src/main/resources/mapper/HqVenueInfoMapper.xml +++ b/backend/ruoyi-modules/ruoyi-hq/src/main/resources/mapper/HqVenueInfoMapper.xml @@ -1,8 +1,8 @@ - + - + @@ -27,7 +27,7 @@ from hq_venue_info - and deleted = 0 diff --git a/backend/ruoyi-modules/ruoyi-venue/src/main/resources/mapper/HqVenueReservationMapper.xml b/backend/ruoyi-modules/ruoyi-hq/src/main/resources/mapper/HqVenueReservationMapper.xml similarity index 92% rename from backend/ruoyi-modules/ruoyi-venue/src/main/resources/mapper/HqVenueReservationMapper.xml rename to backend/ruoyi-modules/ruoyi-hq/src/main/resources/mapper/HqVenueReservationMapper.xml index e4827f53..c22105eb 100644 --- a/backend/ruoyi-modules/ruoyi-venue/src/main/resources/mapper/HqVenueReservationMapper.xml +++ b/backend/ruoyi-modules/ruoyi-hq/src/main/resources/mapper/HqVenueReservationMapper.xml @@ -1,8 +1,8 @@ - + - + @@ -34,7 +34,7 @@ from hq_venue_reservation - deleted = 0 diff --git a/backend/ruoyi-admin/src/main/resources/mapper/hq/PmRepairAttachmentMapper.xml b/backend/ruoyi-modules/ruoyi-hq/src/main/resources/mapper/PmRepairAttachmentMapper.xml similarity index 91% rename from backend/ruoyi-admin/src/main/resources/mapper/hq/PmRepairAttachmentMapper.xml rename to backend/ruoyi-modules/ruoyi-hq/src/main/resources/mapper/PmRepairAttachmentMapper.xml index a6c27f74..99fbb56d 100644 --- a/backend/ruoyi-admin/src/main/resources/mapper/hq/PmRepairAttachmentMapper.xml +++ b/backend/ruoyi-modules/ruoyi-hq/src/main/resources/mapper/PmRepairAttachmentMapper.xml @@ -2,9 +2,9 @@ - + - + @@ -34,4 +34,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select id, order_id, file_name, file_path, file_size, file_type, file_extension, file_mime_type, upload_stage, uploader_id, uploader_name, thumbnail_path, duration, resolution, description, sort_order, tenant_id, create_dept, create_by, create_time, update_by, update_time, deleted from pm_repair_attachment - \ No newline at end of file + diff --git a/backend/ruoyi-admin/src/main/resources/mapper/hq/HqSatRecordMapper.xml b/backend/ruoyi-modules/ruoyi-hq/src/main/resources/mapper/PmRepairCategoryMapper.xml similarity index 71% rename from backend/ruoyi-admin/src/main/resources/mapper/hq/HqSatRecordMapper.xml rename to backend/ruoyi-modules/ruoyi-hq/src/main/resources/mapper/PmRepairCategoryMapper.xml index 6af8e002..d9f0dcf4 100644 --- a/backend/ruoyi-admin/src/main/resources/mapper/hq/HqSatRecordMapper.xml +++ b/backend/ruoyi-modules/ruoyi-hq/src/main/resources/mapper/PmRepairCategoryMapper.xml @@ -2,6 +2,6 @@ - + diff --git a/backend/ruoyi-admin/src/main/resources/mapper/hq/PmRepairOrderMapper.xml b/backend/ruoyi-modules/ruoyi-hq/src/main/resources/mapper/PmRepairOrderMapper.xml similarity index 83% rename from backend/ruoyi-admin/src/main/resources/mapper/hq/PmRepairOrderMapper.xml rename to backend/ruoyi-modules/ruoyi-hq/src/main/resources/mapper/PmRepairOrderMapper.xml index 001ec8a3..67bec4ce 100644 --- a/backend/ruoyi-admin/src/main/resources/mapper/hq/PmRepairOrderMapper.xml +++ b/backend/ruoyi-modules/ruoyi-hq/src/main/resources/mapper/PmRepairOrderMapper.xml @@ -2,7 +2,7 @@ - +