From 1cd87d269554de46ff92a2903d01ba74c79b29d3 Mon Sep 17 00:00:00 2001 From: wkc <978997012@qq.com> Date: Tue, 24 Feb 2026 17:12:11 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E9=87=8D=E5=91=BD=E5=90=8D=20ruoyi?= =?UTF-8?q?-ccdi=20=E6=A8=A1=E5=9D=97=E4=B8=BA=20ruoyi-info-collection?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Maven 模块从 ruoyi-ccdi 重命名为 ruoyi-info-collection - Java 包名从 com.ruoyi.ccdi 改为 com.ruoyi.info.collection - MyBatis XML 命名空间同步更新 - 保留数据库表名、API URL、权限标识中的 ccdi 前缀 - 更新项目文档中的模块引用 --- CLAUDE.md | 24 +- doc/implementation-notes.md | 6 +- .../employee-duplicate-detection-feature.md | 2 +- .../other/中介黑名单导入功能修复说明.md | 10 +- ...review-report-staff-enterprise-relation.md | 2 +- ...erprise-relation-implementation-summary.md | 28 +- ...f-enterprise-relation-status-fix-report.md | 4 +- .../中介黑名单导入唯一性校验优化说明_20260205.md | 2 +- .../员工导入状态持久化-最终代码审查报告.md | 4 +- doc/plans/2026-02-24-module-rename-design.md | 93 +++++ doc/plans/2026-02-24-module-rename-impl.md | 331 ++++++++++++++++++ .../2025-02-05-ccdi_staff_recruitment.md | 2 +- ...loyee-import-result-dialog-optimization.md | 2 +- ...4-intermediary-blacklist-implementation.md | 72 ++-- ...ry-blacklist-union-query-implementation.md | 24 +- ...iary-blacklist-union-query-mybatis-plus.md | 18 +- .../plans/2026-02-05-导入逻辑优化实施计划.md | 48 +-- .../plans/2026-02-05-导入逻辑优化设计.md | 22 +- ...06-ccdi_purchase_transaction-deployment.md | 16 +- ...02-06-ccdi_purchase_transaction-summary.md | 4 +- .../2026-02-06-ccdi_purchase_transaction.md | 62 ++-- ...2026-02-06-employee-async-import-design.md | 18 +- .../plans/2026-02-06-employee-async-import.md | 48 +-- ...-02-06-intermediary-async-import-design.md | 28 +- .../2026-02-06-intermediary-async-import.md | 84 ++--- ...6-02-06-recruitment-async-import-design.md | 16 +- ...termediary-import-upsert-implementation.md | 78 ++--- ...02-08-purchase-transaction-import-fixes.md | 10 +- .../2026-02-08-task-5-6-completion-report.md | 2 +- .../2026-02-08-中介导入异步化改造设计.md | 6 +- doc/requirements/原型图开发设计文档.md | 2 +- doc/reviews/2026-02-11-final-code-review.md | 8 +- ...-02-11-staff-relation-import-fix-review.md | 2 +- ...-02-11-staff-relation-import-supplement.md | 4 +- doc/reviews/2026-02-11-task-2-code-review.md | 4 +- .../员工调动记录唯一性校验实施总结.md | 2 +- doc/实施文档/员工调动记录实施总结.md | 2 +- pom.xml | 6 +- ruoyi-admin/pom.xml | 4 +- {ruoyi-ccdi => ruoyi-info-collection}/pom.xml | 4 +- .../collection}/annotation/EnumValid.java | 4 +- .../controller/CcdiBaseStaffController.java | 18 +- .../CcdiCustEnterpriseRelationController.java | 24 +- .../CcdiCustFmyRelationController.java | 24 +- .../controller/CcdiEnumController.java | 6 +- .../CcdiIntermediaryController.java | 18 +- .../CcdiPurchaseTransactionController.java | 24 +- ...CcdiStaffEnterpriseRelationController.java | 24 +- .../CcdiStaffFmyRelationController.java | 24 +- .../CcdiStaffRecruitmentController.java | 24 +- .../CcdiStaffTransferController.java | 24 +- .../collection}/domain/CcdiBaseStaff.java | 2 +- .../domain/CcdiBizIntermediary.java | 2 +- .../domain/CcdiCustEnterpriseRelation.java | 2 +- .../domain/CcdiCustFmyRelation.java | 2 +- .../domain/CcdiEnterpriseBaseInfo.java | 2 +- .../domain/CcdiPurchaseTransaction.java | 2 +- .../domain/CcdiStaffEnterpriseRelation.java | 2 +- .../domain/CcdiStaffFmyRelation.java | 2 +- .../domain/CcdiStaffRecruitment.java | 2 +- .../collection}/domain/CcdiStaffTransfer.java | 2 +- .../domain/dto/CcdiBaseStaffAddDTO.java | 2 +- .../domain/dto/CcdiBaseStaffEditDTO.java | 2 +- .../domain/dto/CcdiBaseStaffQueryDTO.java | 2 +- .../dto/CcdiCustEnterpriseRelationAddDTO.java | 2 +- .../CcdiCustEnterpriseRelationEditDTO.java | 2 +- .../CcdiCustEnterpriseRelationQueryDTO.java | 2 +- .../domain/dto/CcdiCustFmyRelationAddDTO.java | 2 +- .../dto/CcdiCustFmyRelationEditDTO.java | 2 +- .../dto/CcdiCustFmyRelationQueryDTO.java | 2 +- .../dto/CcdiIntermediaryEntityAddDTO.java | 2 +- .../dto/CcdiIntermediaryEntityEditDTO.java | 2 +- .../dto/CcdiIntermediaryPersonAddDTO.java | 2 +- .../dto/CcdiIntermediaryPersonEditDTO.java | 2 +- .../domain/dto/CcdiIntermediaryQueryDTO.java | 2 +- .../dto/CcdiPurchaseTransactionAddDTO.java | 2 +- .../dto/CcdiPurchaseTransactionEditDTO.java | 2 +- .../dto/CcdiPurchaseTransactionQueryDTO.java | 2 +- .../CcdiStaffEnterpriseRelationAddDTO.java | 2 +- .../CcdiStaffEnterpriseRelationEditDTO.java | 2 +- .../CcdiStaffEnterpriseRelationQueryDTO.java | 2 +- .../dto/CcdiStaffFmyRelationAddDTO.java | 2 +- .../dto/CcdiStaffFmyRelationEditDTO.java | 2 +- .../dto/CcdiStaffFmyRelationQueryDTO.java | 2 +- .../dto/CcdiStaffRecruitmentAddDTO.java | 6 +- .../dto/CcdiStaffRecruitmentEditDTO.java | 6 +- .../dto/CcdiStaffRecruitmentQueryDTO.java | 2 +- .../domain/dto/CcdiStaffTransferAddDTO.java | 2 +- .../domain/dto/CcdiStaffTransferEditDTO.java | 2 +- .../domain/dto/CcdiStaffTransferQueryDTO.java | 2 +- .../domain/dto/TransferUniqueKey.java | 2 +- .../domain/excel/CcdiBaseStaffExcel.java | 2 +- .../CcdiCustEnterpriseRelationExcel.java | 2 +- .../excel/CcdiCustFmyRelationExcel.java | 2 +- .../excel/CcdiIntermediaryEntityExcel.java | 2 +- .../excel/CcdiIntermediaryPersonExcel.java | 2 +- .../excel/CcdiPurchaseTransactionExcel.java | 2 +- .../CcdiStaffEnterpriseRelationExcel.java | 2 +- .../excel/CcdiStaffFmyRelationExcel.java | 2 +- .../excel/CcdiStaffRecruitmentExcel.java | 2 +- .../domain/excel/CcdiStaffTransferExcel.java | 2 +- .../domain/vo/CcdiBaseStaffOptionVO.java | 2 +- .../domain/vo/CcdiBaseStaffVO.java | 2 +- .../vo/CcdiCustEnterpriseRelationVO.java | 2 +- .../domain/vo/CcdiCustFmyRelationVO.java | 2 +- .../vo/CcdiIntermediaryEntityDetailVO.java | 2 +- .../vo/CcdiIntermediaryPersonDetailVO.java | 2 +- .../domain/vo/CcdiIntermediaryVO.java | 2 +- .../domain/vo/CcdiPurchaseTransactionVO.java | 2 +- .../vo/CcdiStaffEnterpriseRelationVO.java | 2 +- .../domain/vo/CcdiStaffFmyRelationVO.java | 2 +- .../domain/vo/CcdiStaffRecruitmentVO.java | 2 +- .../domain/vo/CcdiStaffTransferVO.java | 2 +- ...CustEnterpriseRelationImportFailureVO.java | 2 +- .../vo/CustFmyRelationImportFailureVO.java | 2 +- .../collection}/domain/vo/EnumOptionVO.java | 2 +- .../domain/vo/ImportFailureVO.java | 2 +- .../collection}/domain/vo/ImportResult.java | 2 +- .../collection}/domain/vo/ImportResultVO.java | 2 +- .../collection}/domain/vo/ImportStatusVO.java | 2 +- .../vo/IntermediaryEntityImportFailureVO.java | 2 +- .../vo/IntermediaryPersonImportFailureVO.java | 2 +- .../PurchaseTransactionImportFailureVO.java | 2 +- .../domain/vo/RecruitmentImportFailureVO.java | 2 +- ...taffEnterpriseRelationImportFailureVO.java | 2 +- .../vo/StaffFmyRelationImportFailureVO.java | 2 +- .../vo/StaffTransferImportFailureVO.java | 2 +- .../info/collection}/enums/AdmitStatus.java | 2 +- .../info/collection}/enums/CertType.java | 2 +- .../info/collection}/enums/CorpNature.java | 2 +- .../info/collection}/enums/CorpType.java | 2 +- .../info/collection}/enums/DataSource.java | 2 +- .../collection}/enums/EmployeeStatus.java | 2 +- .../ruoyi/info/collection}/enums/Gender.java | 2 +- .../info/collection}/enums/GenderEnum.java | 2 +- .../info/collection}/enums/IndivType.java | 2 +- .../collection}/enums/IntermediaryStatus.java | 2 +- .../collection}/enums/IntermediaryType.java | 2 +- .../info/collection}/enums/RelationType.java | 2 +- .../handler/DictDropdownWriteHandler.java | 2 +- .../handler/RequiredFieldWriteHandler.java | 2 +- .../mapper/CcdiBaseStaffMapper.java | 10 +- .../mapper/CcdiBizIntermediaryMapper.java | 4 +- .../CcdiCustEnterpriseRelationMapper.java | 8 +- .../mapper/CcdiCustFmyRelationMapper.java | 8 +- .../mapper/CcdiEnterpriseBaseInfoMapper.java | 4 +- .../mapper/CcdiIntermediaryMapper.java | 6 +- .../mapper/CcdiPurchaseTransactionMapper.java | 8 +- .../CcdiStaffEnterpriseRelationMapper.java | 8 +- .../mapper/CcdiStaffFmyRelationMapper.java | 8 +- .../mapper/CcdiStaffRecruitmentMapper.java | 8 +- .../mapper/CcdiStaffTransferMapper.java | 10 +- .../service/ICcdiBaseStaffImportService.java | 8 +- .../service/ICcdiBaseStaffService.java | 14 +- ...diCustEnterpriseRelationImportService.java | 8 +- .../ICcdiCustEnterpriseRelationService.java | 12 +- .../ICcdiCustFmyRelationImportService.java | 8 +- .../service/ICcdiCustFmyRelationService.java | 12 +- .../ICcdiIntermediaryEntityImportService.java | 8 +- .../ICcdiIntermediaryPersonImportService.java | 8 +- .../service/ICcdiIntermediaryService.java | 10 +- ...ICcdiPurchaseTransactionImportService.java | 8 +- .../ICcdiPurchaseTransactionService.java | 12 +- ...iStaffEnterpriseRelationImportService.java | 8 +- .../ICcdiStaffEnterpriseRelationService.java | 12 +- .../ICcdiStaffFmyRelationImportService.java | 8 +- .../service/ICcdiStaffFmyRelationService.java | 12 +- .../ICcdiStaffRecruitmentImportService.java | 8 +- .../service/ICcdiStaffRecruitmentService.java | 12 +- .../ICcdiStaffTransferImportService.java | 8 +- .../service/ICcdiStaffTransferService.java | 12 +- .../impl/CcdiBaseStaffImportServiceImpl.java | 20 +- .../impl/CcdiBaseStaffServiceImpl.java | 24 +- ...stEnterpriseRelationImportServiceImpl.java | 20 +- ...CcdiCustEnterpriseRelationServiceImpl.java | 20 +- .../CcdiCustFmyRelationImportServiceImpl.java | 18 +- .../impl/CcdiCustFmyRelationServiceImpl.java | 22 +- ...diIntermediaryEntityImportServiceImpl.java | 18 +- ...diIntermediaryPersonImportServiceImpl.java | 18 +- .../impl/CcdiIntermediaryServiceImpl.java | 30 +- ...iPurchaseTransactionImportServiceImpl.java | 20 +- .../CcdiPurchaseTransactionServiceImpl.java | 20 +- ...ffEnterpriseRelationImportServiceImpl.java | 24 +- ...cdiStaffEnterpriseRelationServiceImpl.java | 20 +- ...CcdiStaffFmyRelationImportServiceImpl.java | 26 +- .../impl/CcdiStaffFmyRelationServiceImpl.java | 20 +- ...CcdiStaffRecruitmentImportServiceImpl.java | 22 +- .../impl/CcdiStaffRecruitmentServiceImpl.java | 22 +- .../CcdiStaffTransferImportServiceImpl.java | 24 +- .../impl/CcdiStaffTransferServiceImpl.java | 24 +- .../info/collection}/utils/EasyExcelUtil.java | 6 +- .../collection}/utils/ImportLogUtils.java | 2 +- .../IntermediaryStatusConverter.java | 2 +- .../converter/IntermediaryTypeConverter.java | 2 +- .../collection}/validation/EnumValidator.java | 4 +- .../info/collection}/CcdiBaseStaffMapper.xml | 6 +- .../collection}/CcdiBizIntermediaryMapper.xml | 2 +- .../CcdiCustEnterpriseRelationMapper.xml | 4 +- .../collection}/CcdiCustFmyRelationMapper.xml | 6 +- .../CcdiEnterpriseBaseInfoMapper.xml | 2 +- .../collection}/CcdiIntermediaryMapper.xml | 4 +- .../CcdiPurchaseTransactionMapper.xml | 4 +- .../CcdiStaffEnterpriseRelationMapper.xml | 4 +- .../CcdiStaffFmyRelationMapper.xml | 6 +- .../CcdiStaffRecruitmentMapper.xml | 4 +- .../collection}/CcdiStaffTransferMapper.xml | 8 +- 206 files changed, 1339 insertions(+), 915 deletions(-) create mode 100644 doc/plans/2026-02-24-module-rename-design.md create mode 100644 doc/plans/2026-02-24-module-rename-impl.md rename {ruoyi-ccdi => ruoyi-info-collection}/pom.xml (96%) rename {ruoyi-ccdi/src/main/java/com/ruoyi/ccdi => ruoyi-info-collection/src/main/java/com/ruoyi/info/collection}/annotation/EnumValid.java (89%) rename {ruoyi-ccdi/src/main/java/com/ruoyi/ccdi => ruoyi-info-collection/src/main/java/com/ruoyi/info/collection}/controller/CcdiBaseStaffController.java (92%) rename {ruoyi-ccdi/src/main/java/com/ruoyi/ccdi => ruoyi-info-collection/src/main/java/com/ruoyi/info/collection}/controller/CcdiCustEnterpriseRelationController.java (90%) rename {ruoyi-ccdi/src/main/java/com/ruoyi/ccdi => ruoyi-info-collection/src/main/java/com/ruoyi/info/collection}/controller/CcdiCustFmyRelationController.java (89%) rename {ruoyi-ccdi/src/main/java/com/ruoyi/ccdi => ruoyi-info-collection/src/main/java/com/ruoyi/info/collection}/controller/CcdiEnumController.java (96%) rename {ruoyi-ccdi/src/main/java/com/ruoyi/ccdi => ruoyi-info-collection/src/main/java/com/ruoyi/info/collection}/controller/CcdiIntermediaryController.java (95%) rename {ruoyi-ccdi/src/main/java/com/ruoyi/ccdi => ruoyi-info-collection/src/main/java/com/ruoyi/info/collection}/controller/CcdiPurchaseTransactionController.java (90%) rename {ruoyi-ccdi/src/main/java/com/ruoyi/ccdi => ruoyi-info-collection/src/main/java/com/ruoyi/info/collection}/controller/CcdiStaffEnterpriseRelationController.java (90%) rename {ruoyi-ccdi/src/main/java/com/ruoyi/ccdi => ruoyi-info-collection/src/main/java/com/ruoyi/info/collection}/controller/CcdiStaffFmyRelationController.java (90%) rename {ruoyi-ccdi/src/main/java/com/ruoyi/ccdi => ruoyi-info-collection/src/main/java/com/ruoyi/info/collection}/controller/CcdiStaffRecruitmentController.java (90%) rename {ruoyi-ccdi/src/main/java/com/ruoyi/ccdi => ruoyi-info-collection/src/main/java/com/ruoyi/info/collection}/controller/CcdiStaffTransferController.java (90%) rename {ruoyi-ccdi/src/main/java/com/ruoyi/ccdi => ruoyi-info-collection/src/main/java/com/ruoyi/info/collection}/domain/CcdiBaseStaff.java (96%) rename {ruoyi-ccdi/src/main/java/com/ruoyi/ccdi => ruoyi-info-collection/src/main/java/com/ruoyi/info/collection}/domain/CcdiBizIntermediary.java (97%) rename {ruoyi-ccdi/src/main/java/com/ruoyi/ccdi => ruoyi-info-collection/src/main/java/com/ruoyi/info/collection}/domain/CcdiCustEnterpriseRelation.java (98%) rename {ruoyi-ccdi/src/main/java/com/ruoyi/ccdi => ruoyi-info-collection/src/main/java/com/ruoyi/info/collection}/domain/CcdiCustFmyRelation.java (98%) rename {ruoyi-ccdi/src/main/java/com/ruoyi/ccdi => ruoyi-info-collection/src/main/java/com/ruoyi/info/collection}/domain/CcdiEnterpriseBaseInfo.java (98%) rename {ruoyi-ccdi/src/main/java/com/ruoyi/ccdi => ruoyi-info-collection/src/main/java/com/ruoyi/info/collection}/domain/CcdiPurchaseTransaction.java (98%) rename {ruoyi-ccdi/src/main/java/com/ruoyi/ccdi => ruoyi-info-collection/src/main/java/com/ruoyi/info/collection}/domain/CcdiStaffEnterpriseRelation.java (98%) rename {ruoyi-ccdi/src/main/java/com/ruoyi/ccdi => ruoyi-info-collection/src/main/java/com/ruoyi/info/collection}/domain/CcdiStaffFmyRelation.java (98%) rename {ruoyi-ccdi/src/main/java/com/ruoyi/ccdi => ruoyi-info-collection/src/main/java/com/ruoyi/info/collection}/domain/CcdiStaffRecruitment.java (97%) rename {ruoyi-ccdi/src/main/java/com/ruoyi/ccdi => ruoyi-info-collection/src/main/java/com/ruoyi/info/collection}/domain/CcdiStaffTransfer.java (97%) rename {ruoyi-ccdi/src/main/java/com/ruoyi/ccdi => ruoyi-info-collection/src/main/java/com/ruoyi/info/collection}/domain/dto/CcdiBaseStaffAddDTO.java (96%) rename {ruoyi-ccdi/src/main/java/com/ruoyi/ccdi => ruoyi-info-collection/src/main/java/com/ruoyi/info/collection}/domain/dto/CcdiBaseStaffEditDTO.java (96%) rename {ruoyi-ccdi/src/main/java/com/ruoyi/ccdi => ruoyi-info-collection/src/main/java/com/ruoyi/info/collection}/domain/dto/CcdiBaseStaffQueryDTO.java (92%) rename {ruoyi-ccdi/src/main/java/com/ruoyi/ccdi => ruoyi-info-collection/src/main/java/com/ruoyi/info/collection}/domain/dto/CcdiCustEnterpriseRelationAddDTO.java (97%) rename {ruoyi-ccdi/src/main/java/com/ruoyi/ccdi => ruoyi-info-collection/src/main/java/com/ruoyi/info/collection}/domain/dto/CcdiCustEnterpriseRelationEditDTO.java (97%) rename {ruoyi-ccdi/src/main/java/com/ruoyi/ccdi => ruoyi-info-collection/src/main/java/com/ruoyi/info/collection}/domain/dto/CcdiCustEnterpriseRelationQueryDTO.java (95%) rename {ruoyi-ccdi/src/main/java/com/ruoyi/ccdi => ruoyi-info-collection/src/main/java/com/ruoyi/info/collection}/domain/dto/CcdiCustFmyRelationAddDTO.java (98%) rename {ruoyi-ccdi/src/main/java/com/ruoyi/ccdi => ruoyi-info-collection/src/main/java/com/ruoyi/info/collection}/domain/dto/CcdiCustFmyRelationEditDTO.java (98%) rename {ruoyi-ccdi/src/main/java/com/ruoyi/ccdi => ruoyi-info-collection/src/main/java/com/ruoyi/info/collection}/domain/dto/CcdiCustFmyRelationQueryDTO.java (96%) rename {ruoyi-ccdi/src/main/java/com/ruoyi/ccdi => ruoyi-info-collection/src/main/java/com/ruoyi/info/collection}/domain/dto/CcdiIntermediaryEntityAddDTO.java (98%) rename {ruoyi-ccdi/src/main/java/com/ruoyi/ccdi => ruoyi-info-collection/src/main/java/com/ruoyi/info/collection}/domain/dto/CcdiIntermediaryEntityEditDTO.java (98%) rename {ruoyi-ccdi/src/main/java/com/ruoyi/ccdi => ruoyi-info-collection/src/main/java/com/ruoyi/info/collection}/domain/dto/CcdiIntermediaryPersonAddDTO.java (98%) rename {ruoyi-ccdi/src/main/java/com/ruoyi/ccdi => ruoyi-info-collection/src/main/java/com/ruoyi/info/collection}/domain/dto/CcdiIntermediaryPersonEditDTO.java (98%) rename {ruoyi-ccdi/src/main/java/com/ruoyi/ccdi => ruoyi-info-collection/src/main/java/com/ruoyi/info/collection}/domain/dto/CcdiIntermediaryQueryDTO.java (93%) rename {ruoyi-ccdi/src/main/java/com/ruoyi/ccdi => ruoyi-info-collection/src/main/java/com/ruoyi/info/collection}/domain/dto/CcdiPurchaseTransactionAddDTO.java (99%) rename {ruoyi-ccdi/src/main/java/com/ruoyi/ccdi => ruoyi-info-collection/src/main/java/com/ruoyi/info/collection}/domain/dto/CcdiPurchaseTransactionEditDTO.java (99%) rename {ruoyi-ccdi/src/main/java/com/ruoyi/ccdi => ruoyi-info-collection/src/main/java/com/ruoyi/info/collection}/domain/dto/CcdiPurchaseTransactionQueryDTO.java (96%) rename {ruoyi-ccdi/src/main/java/com/ruoyi/ccdi => ruoyi-info-collection/src/main/java/com/ruoyi/info/collection}/domain/dto/CcdiStaffEnterpriseRelationAddDTO.java (98%) rename {ruoyi-ccdi/src/main/java/com/ruoyi/ccdi => ruoyi-info-collection/src/main/java/com/ruoyi/info/collection}/domain/dto/CcdiStaffEnterpriseRelationEditDTO.java (98%) rename {ruoyi-ccdi/src/main/java/com/ruoyi/ccdi => ruoyi-info-collection/src/main/java/com/ruoyi/info/collection}/domain/dto/CcdiStaffEnterpriseRelationQueryDTO.java (95%) rename {ruoyi-ccdi/src/main/java/com/ruoyi/ccdi => ruoyi-info-collection/src/main/java/com/ruoyi/info/collection}/domain/dto/CcdiStaffFmyRelationAddDTO.java (98%) rename {ruoyi-ccdi/src/main/java/com/ruoyi/ccdi => ruoyi-info-collection/src/main/java/com/ruoyi/info/collection}/domain/dto/CcdiStaffFmyRelationEditDTO.java (98%) rename {ruoyi-ccdi/src/main/java/com/ruoyi/ccdi => ruoyi-info-collection/src/main/java/com/ruoyi/info/collection}/domain/dto/CcdiStaffFmyRelationQueryDTO.java (96%) rename {ruoyi-ccdi/src/main/java/com/ruoyi/ccdi => ruoyi-info-collection/src/main/java/com/ruoyi/info/collection}/domain/dto/CcdiStaffRecruitmentAddDTO.java (95%) rename {ruoyi-ccdi/src/main/java/com/ruoyi/ccdi => ruoyi-info-collection/src/main/java/com/ruoyi/info/collection}/domain/dto/CcdiStaffRecruitmentEditDTO.java (94%) rename {ruoyi-ccdi/src/main/java/com/ruoyi/ccdi => ruoyi-info-collection/src/main/java/com/ruoyi/info/collection}/domain/dto/CcdiStaffRecruitmentQueryDTO.java (95%) rename {ruoyi-ccdi/src/main/java/com/ruoyi/ccdi => ruoyi-info-collection/src/main/java/com/ruoyi/info/collection}/domain/dto/CcdiStaffTransferAddDTO.java (98%) rename {ruoyi-ccdi/src/main/java/com/ruoyi/ccdi => ruoyi-info-collection/src/main/java/com/ruoyi/info/collection}/domain/dto/CcdiStaffTransferEditDTO.java (98%) rename {ruoyi-ccdi/src/main/java/com/ruoyi/ccdi => ruoyi-info-collection/src/main/java/com/ruoyi/info/collection}/domain/dto/CcdiStaffTransferQueryDTO.java (96%) rename {ruoyi-ccdi/src/main/java/com/ruoyi/ccdi => ruoyi-info-collection/src/main/java/com/ruoyi/info/collection}/domain/dto/TransferUniqueKey.java (98%) rename {ruoyi-ccdi/src/main/java/com/ruoyi/ccdi => ruoyi-info-collection/src/main/java/com/ruoyi/info/collection}/domain/excel/CcdiBaseStaffExcel.java (96%) rename {ruoyi-ccdi/src/main/java/com/ruoyi/ccdi => ruoyi-info-collection/src/main/java/com/ruoyi/info/collection}/domain/excel/CcdiCustEnterpriseRelationExcel.java (97%) rename {ruoyi-ccdi/src/main/java/com/ruoyi/ccdi => ruoyi-info-collection/src/main/java/com/ruoyi/info/collection}/domain/excel/CcdiCustFmyRelationExcel.java (98%) rename {ruoyi-ccdi/src/main/java/com/ruoyi/ccdi => ruoyi-info-collection/src/main/java/com/ruoyi/info/collection}/domain/excel/CcdiIntermediaryEntityExcel.java (98%) rename {ruoyi-ccdi/src/main/java/com/ruoyi/ccdi => ruoyi-info-collection/src/main/java/com/ruoyi/info/collection}/domain/excel/CcdiIntermediaryPersonExcel.java (98%) rename {ruoyi-ccdi/src/main/java/com/ruoyi/ccdi => ruoyi-info-collection/src/main/java/com/ruoyi/info/collection}/domain/excel/CcdiPurchaseTransactionExcel.java (99%) rename {ruoyi-ccdi/src/main/java/com/ruoyi/ccdi => ruoyi-info-collection/src/main/java/com/ruoyi/info/collection}/domain/excel/CcdiStaffEnterpriseRelationExcel.java (97%) rename {ruoyi-ccdi/src/main/java/com/ruoyi/ccdi => ruoyi-info-collection/src/main/java/com/ruoyi/info/collection}/domain/excel/CcdiStaffFmyRelationExcel.java (98%) rename {ruoyi-ccdi/src/main/java/com/ruoyi/ccdi => ruoyi-info-collection/src/main/java/com/ruoyi/info/collection}/domain/excel/CcdiStaffRecruitmentExcel.java (98%) rename {ruoyi-ccdi/src/main/java/com/ruoyi/ccdi => ruoyi-info-collection/src/main/java/com/ruoyi/info/collection}/domain/excel/CcdiStaffTransferExcel.java (97%) rename {ruoyi-ccdi/src/main/java/com/ruoyi/ccdi => ruoyi-info-collection/src/main/java/com/ruoyi/info/collection}/domain/vo/CcdiBaseStaffOptionVO.java (90%) rename {ruoyi-ccdi/src/main/java/com/ruoyi/ccdi => ruoyi-info-collection/src/main/java/com/ruoyi/info/collection}/domain/vo/CcdiBaseStaffVO.java (95%) rename {ruoyi-ccdi/src/main/java/com/ruoyi/ccdi => ruoyi-info-collection/src/main/java/com/ruoyi/info/collection}/domain/vo/CcdiCustEnterpriseRelationVO.java (98%) rename {ruoyi-ccdi/src/main/java/com/ruoyi/ccdi => ruoyi-info-collection/src/main/java/com/ruoyi/info/collection}/domain/vo/CcdiCustFmyRelationVO.java (98%) rename {ruoyi-ccdi/src/main/java/com/ruoyi/ccdi => ruoyi-info-collection/src/main/java/com/ruoyi/info/collection}/domain/vo/CcdiIntermediaryEntityDetailVO.java (98%) rename {ruoyi-ccdi/src/main/java/com/ruoyi/ccdi => ruoyi-info-collection/src/main/java/com/ruoyi/info/collection}/domain/vo/CcdiIntermediaryPersonDetailVO.java (97%) rename {ruoyi-ccdi/src/main/java/com/ruoyi/ccdi => ruoyi-info-collection/src/main/java/com/ruoyi/info/collection}/domain/vo/CcdiIntermediaryVO.java (96%) rename {ruoyi-ccdi/src/main/java/com/ruoyi/ccdi => ruoyi-info-collection/src/main/java/com/ruoyi/info/collection}/domain/vo/CcdiPurchaseTransactionVO.java (99%) rename {ruoyi-ccdi/src/main/java/com/ruoyi/ccdi => ruoyi-info-collection/src/main/java/com/ruoyi/info/collection}/domain/vo/CcdiStaffEnterpriseRelationVO.java (98%) rename {ruoyi-ccdi/src/main/java/com/ruoyi/ccdi => ruoyi-info-collection/src/main/java/com/ruoyi/info/collection}/domain/vo/CcdiStaffFmyRelationVO.java (98%) rename {ruoyi-ccdi/src/main/java/com/ruoyi/ccdi => ruoyi-info-collection/src/main/java/com/ruoyi/info/collection}/domain/vo/CcdiStaffRecruitmentVO.java (97%) rename {ruoyi-ccdi/src/main/java/com/ruoyi/ccdi => ruoyi-info-collection/src/main/java/com/ruoyi/info/collection}/domain/vo/CcdiStaffTransferVO.java (98%) rename {ruoyi-ccdi/src/main/java/com/ruoyi/ccdi => ruoyi-info-collection/src/main/java/com/ruoyi/info/collection}/domain/vo/CustEnterpriseRelationImportFailureVO.java (95%) rename {ruoyi-ccdi/src/main/java/com/ruoyi/ccdi => ruoyi-info-collection/src/main/java/com/ruoyi/info/collection}/domain/vo/CustFmyRelationImportFailureVO.java (95%) rename {ruoyi-ccdi/src/main/java/com/ruoyi/ccdi => ruoyi-info-collection/src/main/java/com/ruoyi/info/collection}/domain/vo/EnumOptionVO.java (90%) rename {ruoyi-ccdi/src/main/java/com/ruoyi/ccdi => ruoyi-info-collection/src/main/java/com/ruoyi/info/collection}/domain/vo/ImportFailureVO.java (94%) rename {ruoyi-ccdi/src/main/java/com/ruoyi/ccdi => ruoyi-info-collection/src/main/java/com/ruoyi/info/collection}/domain/vo/ImportResult.java (82%) rename {ruoyi-ccdi/src/main/java/com/ruoyi/ccdi => ruoyi-info-collection/src/main/java/com/ruoyi/info/collection}/domain/vo/ImportResultVO.java (91%) rename {ruoyi-ccdi/src/main/java/com/ruoyi/ccdi => ruoyi-info-collection/src/main/java/com/ruoyi/info/collection}/domain/vo/ImportStatusVO.java (94%) rename {ruoyi-ccdi/src/main/java/com/ruoyi/ccdi => ruoyi-info-collection/src/main/java/com/ruoyi/info/collection}/domain/vo/IntermediaryEntityImportFailureVO.java (95%) rename {ruoyi-ccdi/src/main/java/com/ruoyi/ccdi => ruoyi-info-collection/src/main/java/com/ruoyi/info/collection}/domain/vo/IntermediaryPersonImportFailureVO.java (95%) rename {ruoyi-ccdi/src/main/java/com/ruoyi/ccdi => ruoyi-info-collection/src/main/java/com/ruoyi/info/collection}/domain/vo/PurchaseTransactionImportFailureVO.java (96%) rename {ruoyi-ccdi/src/main/java/com/ruoyi/ccdi => ruoyi-info-collection/src/main/java/com/ruoyi/info/collection}/domain/vo/RecruitmentImportFailureVO.java (94%) rename {ruoyi-ccdi/src/main/java/com/ruoyi/ccdi => ruoyi-info-collection/src/main/java/com/ruoyi/info/collection}/domain/vo/StaffEnterpriseRelationImportFailureVO.java (95%) rename {ruoyi-ccdi/src/main/java/com/ruoyi/ccdi => ruoyi-info-collection/src/main/java/com/ruoyi/info/collection}/domain/vo/StaffFmyRelationImportFailureVO.java (96%) rename {ruoyi-ccdi/src/main/java/com/ruoyi/ccdi => ruoyi-info-collection/src/main/java/com/ruoyi/info/collection}/domain/vo/StaffTransferImportFailureVO.java (98%) rename {ruoyi-ccdi/src/main/java/com/ruoyi/ccdi => ruoyi-info-collection/src/main/java/com/ruoyi/info/collection}/enums/AdmitStatus.java (95%) rename {ruoyi-ccdi/src/main/java/com/ruoyi/ccdi => ruoyi-info-collection/src/main/java/com/ruoyi/info/collection}/enums/CertType.java (95%) rename {ruoyi-ccdi/src/main/java/com/ruoyi/ccdi => ruoyi-info-collection/src/main/java/com/ruoyi/info/collection}/enums/CorpNature.java (96%) rename {ruoyi-ccdi/src/main/java/com/ruoyi/ccdi => ruoyi-info-collection/src/main/java/com/ruoyi/info/collection}/enums/CorpType.java (97%) rename {ruoyi-ccdi/src/main/java/com/ruoyi/ccdi => ruoyi-info-collection/src/main/java/com/ruoyi/info/collection}/enums/DataSource.java (95%) rename {ruoyi-ccdi/src/main/java/com/ruoyi/ccdi => ruoyi-info-collection/src/main/java/com/ruoyi/info/collection}/enums/EmployeeStatus.java (94%) rename {ruoyi-ccdi/src/main/java/com/ruoyi/ccdi => ruoyi-info-collection/src/main/java/com/ruoyi/info/collection}/enums/Gender.java (94%) rename {ruoyi-ccdi/src/main/java/com/ruoyi/ccdi => ruoyi-info-collection/src/main/java/com/ruoyi/info/collection}/enums/GenderEnum.java (98%) rename {ruoyi-ccdi/src/main/java/com/ruoyi/ccdi => ruoyi-info-collection/src/main/java/com/ruoyi/info/collection}/enums/IndivType.java (96%) rename {ruoyi-ccdi/src/main/java/com/ruoyi/ccdi => ruoyi-info-collection/src/main/java/com/ruoyi/info/collection}/enums/IntermediaryStatus.java (94%) rename {ruoyi-ccdi/src/main/java/com/ruoyi/ccdi => ruoyi-info-collection/src/main/java/com/ruoyi/info/collection}/enums/IntermediaryType.java (94%) rename {ruoyi-ccdi/src/main/java/com/ruoyi/ccdi => ruoyi-info-collection/src/main/java/com/ruoyi/info/collection}/enums/RelationType.java (96%) rename {ruoyi-ccdi/src/main/java/com/ruoyi/ccdi => ruoyi-info-collection/src/main/java/com/ruoyi/info/collection}/handler/DictDropdownWriteHandler.java (99%) rename {ruoyi-ccdi/src/main/java/com/ruoyi/ccdi => ruoyi-info-collection/src/main/java/com/ruoyi/info/collection}/handler/RequiredFieldWriteHandler.java (99%) rename {ruoyi-ccdi/src/main/java/com/ruoyi/ccdi => ruoyi-info-collection/src/main/java/com/ruoyi/info/collection}/mapper/CcdiBaseStaffMapper.java (82%) rename {ruoyi-ccdi/src/main/java/com/ruoyi/ccdi => ruoyi-info-collection/src/main/java/com/ruoyi/info/collection}/mapper/CcdiBizIntermediaryMapper.java (89%) rename {ruoyi-ccdi/src/main/java/com/ruoyi/ccdi => ruoyi-info-collection/src/main/java/com/ruoyi/info/collection}/mapper/CcdiCustEnterpriseRelationMapper.java (89%) rename {ruoyi-ccdi/src/main/java/com/ruoyi/ccdi => ruoyi-info-collection/src/main/java/com/ruoyi/info/collection}/mapper/CcdiCustFmyRelationMapper.java (90%) rename {ruoyi-ccdi/src/main/java/com/ruoyi/ccdi => ruoyi-info-collection/src/main/java/com/ruoyi/info/collection}/mapper/CcdiEnterpriseBaseInfoMapper.java (89%) rename {ruoyi-ccdi/src/main/java/com/ruoyi/ccdi => ruoyi-info-collection/src/main/java/com/ruoyi/info/collection}/mapper/CcdiIntermediaryMapper.java (81%) rename {ruoyi-ccdi/src/main/java/com/ruoyi/ccdi => ruoyi-info-collection/src/main/java/com/ruoyi/info/collection}/mapper/CcdiPurchaseTransactionMapper.java (84%) rename {ruoyi-ccdi/src/main/java/com/ruoyi/ccdi => ruoyi-info-collection/src/main/java/com/ruoyi/info/collection}/mapper/CcdiStaffEnterpriseRelationMapper.java (88%) rename {ruoyi-ccdi/src/main/java/com/ruoyi/ccdi => ruoyi-info-collection/src/main/java/com/ruoyi/info/collection}/mapper/CcdiStaffFmyRelationMapper.java (88%) rename {ruoyi-ccdi/src/main/java/com/ruoyi/ccdi => ruoyi-info-collection/src/main/java/com/ruoyi/info/collection}/mapper/CcdiStaffRecruitmentMapper.java (84%) rename {ruoyi-ccdi/src/main/java/com/ruoyi/ccdi => ruoyi-info-collection/src/main/java/com/ruoyi/info/collection}/mapper/CcdiStaffTransferMapper.java (87%) rename {ruoyi-ccdi/src/main/java/com/ruoyi/ccdi => ruoyi-info-collection/src/main/java/com/ruoyi/info/collection}/service/ICcdiBaseStaffImportService.java (76%) rename {ruoyi-ccdi/src/main/java/com/ruoyi/ccdi => ruoyi-info-collection/src/main/java/com/ruoyi/info/collection}/service/ICcdiBaseStaffService.java (82%) rename {ruoyi-ccdi/src/main/java/com/ruoyi/ccdi => ruoyi-info-collection/src/main/java/com/ruoyi/info/collection}/service/ICcdiCustEnterpriseRelationImportService.java (76%) rename {ruoyi-ccdi/src/main/java/com/ruoyi/ccdi => ruoyi-info-collection/src/main/java/com/ruoyi/info/collection}/service/ICcdiCustEnterpriseRelationService.java (82%) rename {ruoyi-ccdi/src/main/java/com/ruoyi/ccdi => ruoyi-info-collection/src/main/java/com/ruoyi/info/collection}/service/ICcdiCustFmyRelationImportService.java (80%) rename {ruoyi-ccdi/src/main/java/com/ruoyi/ccdi => ruoyi-info-collection/src/main/java/com/ruoyi/info/collection}/service/ICcdiCustFmyRelationService.java (84%) rename {ruoyi-ccdi/src/main/java/com/ruoyi/ccdi => ruoyi-info-collection/src/main/java/com/ruoyi/info/collection}/service/ICcdiIntermediaryEntityImportService.java (77%) rename {ruoyi-ccdi/src/main/java/com/ruoyi/ccdi => ruoyi-info-collection/src/main/java/com/ruoyi/info/collection}/service/ICcdiIntermediaryPersonImportService.java (77%) rename {ruoyi-ccdi/src/main/java/com/ruoyi/ccdi => ruoyi-info-collection/src/main/java/com/ruoyi/info/collection}/service/ICcdiIntermediaryService.java (90%) rename {ruoyi-ccdi/src/main/java/com/ruoyi/ccdi => ruoyi-info-collection/src/main/java/com/ruoyi/info/collection}/service/ICcdiPurchaseTransactionImportService.java (76%) rename {ruoyi-ccdi/src/main/java/com/ruoyi/ccdi => ruoyi-info-collection/src/main/java/com/ruoyi/info/collection}/service/ICcdiPurchaseTransactionService.java (82%) rename {ruoyi-ccdi/src/main/java/com/ruoyi/ccdi => ruoyi-info-collection/src/main/java/com/ruoyi/info/collection}/service/ICcdiStaffEnterpriseRelationImportService.java (76%) rename {ruoyi-ccdi/src/main/java/com/ruoyi/ccdi => ruoyi-info-collection/src/main/java/com/ruoyi/info/collection}/service/ICcdiStaffEnterpriseRelationService.java (82%) rename {ruoyi-ccdi/src/main/java/com/ruoyi/ccdi => ruoyi-info-collection/src/main/java/com/ruoyi/info/collection}/service/ICcdiStaffFmyRelationImportService.java (76%) rename {ruoyi-ccdi/src/main/java/com/ruoyi/ccdi => ruoyi-info-collection/src/main/java/com/ruoyi/info/collection}/service/ICcdiStaffFmyRelationService.java (82%) rename {ruoyi-ccdi/src/main/java/com/ruoyi/ccdi => ruoyi-info-collection/src/main/java/com/ruoyi/info/collection}/service/ICcdiStaffRecruitmentImportService.java (77%) rename {ruoyi-ccdi/src/main/java/com/ruoyi/ccdi => ruoyi-info-collection/src/main/java/com/ruoyi/info/collection}/service/ICcdiStaffRecruitmentService.java (82%) rename {ruoyi-ccdi/src/main/java/com/ruoyi/ccdi => ruoyi-info-collection/src/main/java/com/ruoyi/info/collection}/service/ICcdiStaffTransferImportService.java (76%) rename {ruoyi-ccdi/src/main/java/com/ruoyi/ccdi => ruoyi-info-collection/src/main/java/com/ruoyi/info/collection}/service/ICcdiStaffTransferService.java (85%) rename {ruoyi-ccdi/src/main/java/com/ruoyi/ccdi => ruoyi-info-collection/src/main/java/com/ruoyi/info/collection}/service/impl/CcdiBaseStaffImportServiceImpl.java (95%) rename {ruoyi-ccdi/src/main/java/com/ruoyi/ccdi => ruoyi-info-collection/src/main/java/com/ruoyi/info/collection}/service/impl/CcdiBaseStaffServiceImpl.java (91%) rename {ruoyi-ccdi/src/main/java/com/ruoyi/ccdi => ruoyi-info-collection/src/main/java/com/ruoyi/info/collection}/service/impl/CcdiCustEnterpriseRelationImportServiceImpl.java (94%) rename {ruoyi-ccdi/src/main/java/com/ruoyi/ccdi => ruoyi-info-collection/src/main/java/com/ruoyi/info/collection}/service/impl/CcdiCustEnterpriseRelationServiceImpl.java (91%) rename {ruoyi-ccdi/src/main/java/com/ruoyi/ccdi => ruoyi-info-collection/src/main/java/com/ruoyi/info/collection}/service/impl/CcdiCustFmyRelationImportServiceImpl.java (95%) rename {ruoyi-ccdi/src/main/java/com/ruoyi/ccdi => ruoyi-info-collection/src/main/java/com/ruoyi/info/collection}/service/impl/CcdiCustFmyRelationServiceImpl.java (87%) rename {ruoyi-ccdi/src/main/java/com/ruoyi/ccdi => ruoyi-info-collection/src/main/java/com/ruoyi/info/collection}/service/impl/CcdiIntermediaryEntityImportServiceImpl.java (95%) rename {ruoyi-ccdi/src/main/java/com/ruoyi/ccdi => ruoyi-info-collection/src/main/java/com/ruoyi/info/collection}/service/impl/CcdiIntermediaryPersonImportServiceImpl.java (95%) rename {ruoyi-ccdi/src/main/java/com/ruoyi/ccdi => ruoyi-info-collection/src/main/java/com/ruoyi/info/collection}/service/impl/CcdiIntermediaryServiceImpl.java (90%) rename {ruoyi-ccdi/src/main/java/com/ruoyi/ccdi => ruoyi-info-collection/src/main/java/com/ruoyi/info/collection}/service/impl/CcdiPurchaseTransactionImportServiceImpl.java (95%) rename {ruoyi-ccdi/src/main/java/com/ruoyi/ccdi => ruoyi-info-collection/src/main/java/com/ruoyi/info/collection}/service/impl/CcdiPurchaseTransactionServiceImpl.java (89%) rename {ruoyi-ccdi/src/main/java/com/ruoyi/ccdi => ruoyi-info-collection/src/main/java/com/ruoyi/info/collection}/service/impl/CcdiStaffEnterpriseRelationImportServiceImpl.java (94%) rename {ruoyi-ccdi/src/main/java/com/ruoyi/ccdi => ruoyi-info-collection/src/main/java/com/ruoyi/info/collection}/service/impl/CcdiStaffEnterpriseRelationServiceImpl.java (91%) rename {ruoyi-ccdi/src/main/java/com/ruoyi/ccdi => ruoyi-info-collection/src/main/java/com/ruoyi/info/collection}/service/impl/CcdiStaffFmyRelationImportServiceImpl.java (94%) rename {ruoyi-ccdi/src/main/java/com/ruoyi/ccdi => ruoyi-info-collection/src/main/java/com/ruoyi/info/collection}/service/impl/CcdiStaffFmyRelationServiceImpl.java (88%) rename {ruoyi-ccdi/src/main/java/com/ruoyi/ccdi => ruoyi-info-collection/src/main/java/com/ruoyi/info/collection}/service/impl/CcdiStaffRecruitmentImportServiceImpl.java (94%) rename {ruoyi-ccdi/src/main/java/com/ruoyi/ccdi => ruoyi-info-collection/src/main/java/com/ruoyi/info/collection}/service/impl/CcdiStaffRecruitmentServiceImpl.java (89%) rename {ruoyi-ccdi/src/main/java/com/ruoyi/ccdi => ruoyi-info-collection/src/main/java/com/ruoyi/info/collection}/service/impl/CcdiStaffTransferImportServiceImpl.java (95%) rename {ruoyi-ccdi/src/main/java/com/ruoyi/ccdi => ruoyi-info-collection/src/main/java/com/ruoyi/info/collection}/service/impl/CcdiStaffTransferServiceImpl.java (89%) rename {ruoyi-ccdi/src/main/java/com/ruoyi/ccdi => ruoyi-info-collection/src/main/java/com/ruoyi/info/collection}/utils/EasyExcelUtil.java (98%) rename {ruoyi-ccdi/src/main/java/com/ruoyi/ccdi => ruoyi-info-collection/src/main/java/com/ruoyi/info/collection}/utils/ImportLogUtils.java (99%) rename {ruoyi-ccdi/src/main/java/com/ruoyi/ccdi => ruoyi-info-collection/src/main/java/com/ruoyi/info/collection}/utils/converter/IntermediaryStatusConverter.java (97%) rename {ruoyi-ccdi/src/main/java/com/ruoyi/ccdi => ruoyi-info-collection/src/main/java/com/ruoyi/info/collection}/utils/converter/IntermediaryTypeConverter.java (97%) rename {ruoyi-ccdi/src/main/java/com/ruoyi/ccdi => ruoyi-info-collection/src/main/java/com/ruoyi/info/collection}/validation/EnumValidator.java (95%) rename {ruoyi-ccdi/src/main/resources/mapper/ccdi => ruoyi-info-collection/src/main/resources/mapper/info/collection}/CcdiBaseStaffMapper.xml (93%) rename {ruoyi-ccdi/src/main/resources/mapper/ccdi => ruoyi-info-collection/src/main/resources/mapper/info/collection}/CcdiBizIntermediaryMapper.xml (98%) rename {ruoyi-ccdi/src/main/resources/mapper/ccdi => ruoyi-info-collection/src/main/resources/mapper/info/collection}/CcdiCustEnterpriseRelationMapper.xml (95%) rename {ruoyi-ccdi/src/main/resources/mapper/ccdi => ruoyi-info-collection/src/main/resources/mapper/info/collection}/CcdiCustFmyRelationMapper.xml (96%) rename {ruoyi-ccdi/src/main/resources/mapper/ccdi => ruoyi-info-collection/src/main/resources/mapper/info/collection}/CcdiEnterpriseBaseInfoMapper.xml (98%) rename {ruoyi-ccdi/src/main/resources/mapper/ccdi => ruoyi-info-collection/src/main/resources/mapper/info/collection}/CcdiIntermediaryMapper.xml (91%) rename {ruoyi-ccdi/src/main/resources/mapper/ccdi => ruoyi-info-collection/src/main/resources/mapper/info/collection}/CcdiPurchaseTransactionMapper.xml (97%) rename {ruoyi-ccdi/src/main/resources/mapper/ccdi => ruoyi-info-collection/src/main/resources/mapper/info/collection}/CcdiStaffEnterpriseRelationMapper.xml (95%) rename {ruoyi-ccdi/src/main/resources/mapper/ccdi => ruoyi-info-collection/src/main/resources/mapper/info/collection}/CcdiStaffFmyRelationMapper.xml (96%) rename {ruoyi-ccdi/src/main/resources/mapper/ccdi => ruoyi-info-collection/src/main/resources/mapper/info/collection}/CcdiStaffRecruitmentMapper.xml (96%) rename {ruoyi-ccdi/src/main/resources/mapper/ccdi => ruoyi-info-collection/src/main/resources/mapper/info/collection}/CcdiStaffTransferMapper.xml (95%) diff --git a/CLAUDE.md b/CLAUDE.md index c53ffc3..ba7b98d 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -78,7 +78,7 @@ ccdi/ ├── ruoyi-common/ # 通用工具 (annotations, utils, constants) ├── ruoyi-quartz/ # 定时任务 ├── ruoyi-generator/ # 代码生成器 -├── ruoyi-ccdi/ # 【核心业务模块】纪检初核业务 +├── ruoyi-info-collection/ # 【核心业务模块】信息采集 ├── ruoyi-ui/ # 前端 Vue 应用 ├── sql/ # 数据库脚本 ├── bin/ # 启动脚本 @@ -94,10 +94,10 @@ ruoyi-admin (启动模块) ├── ruoyi-common (共享工具) ├── ruoyi-quartz (定时任务) ├── ruoyi-generator (代码生成) - └── ruoyi-ccdi (纪检业务模块) + └── ruoyi-info-collection (信息采集模块) ``` -### ruoyi-ccdi 业务模块 (核心) +### ruoyi-info-collection 业务模块 (核心) 自定义业务模块，包含以下核心功能： @@ -115,14 +115,14 @@ ruoyi-admin (启动模块) **分层结构:** -- Controller: `ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/controller/` -- Service: `ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/` -- Mapper: `ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/mapper/` -- Domain: `ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/` +- Controller: `ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/controller/` +- Service: `ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/service/` +- Mapper: `ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/mapper/` +- Domain: `ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/` - dto/: 数据传输对象 - vo/: 视图对象 - excel/: Excel导入导出实体 -- XML映射: `ruoyi-ccdi/src/main/resources/mapper/ccdi/` +- XML映射: `ruoyi-info-collection/src/main/resources/mapper/info/collection/` --- @@ -130,7 +130,7 @@ ruoyi-admin (启动模块) ### 通用规范 -- **新模块命名**: 项目英文名首字母集合 + 主要功能 (如 `ruoyi-ccdi`) +- **新模块命名**: 项目英文名首字母集合 + 主要功能 (如 `ruoyi-info-collection`) - **代码分离**: 新功能代码与若依框架自带代码分离，Controller 放在新模块中 - **审计字段**: 实体类不继承 BaseEntity，单独添加审计字段，通过注释实现自动插入 @@ -301,8 +301,8 @@ POST /login/test?username=admin&password=admin123 |---------------|--------------------------------------------------------------------------------| | 应用入口 | `ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java` | | 安全配置 | `ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java` | -| 业务 Controller | `ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/controller/` | -| 业务 Mapper XML | `ruoyi-ccdi/src/main/resources/mapper/ccdi/` | +| 业务 Controller | `ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/controller/` | +| 业务 Mapper XML | `ruoyi-info-collection/src/main/resources/mapper/info/collection/` | | Vue 路由 | `ruoyi-ui/src/router/index.js` | | Vuex Store | `ruoyi-ui/src/store/` | | 前端 API | `ruoyi-ui/src/api/` | @@ -311,7 +311,7 @@ POST /login/test?username=admin&password=admin123 ## 数据库规范 -- **新建表名**: 需要加上项目英文名首字母集合前缀 (如 `ccdi_base_staff`) +- **新建表名**: 需要加上项目英文名首字母集合前缀 `ccdi_` (如 `ccdi_base_staff`) --- diff --git a/doc/implementation-notes.md b/doc/implementation-notes.md index 659b7b7..b5a74a5 100644 --- a/doc/implementation-notes.md +++ b/doc/implementation-notes.md @@ -72,7 +72,7 @@ SHOW INDEX FROM ccdi_base_staff WHERE Key_name = 'idx_id_card'; 2026-02-11 ### 执行内容 -修改文件: `ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/vo/CcdiStaffEnterpriseRelationVO.java` +修改文件: `ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/domain/vo/CcdiStaffEnterpriseRelationVO.java` 添加字段: ```java @@ -98,7 +98,7 @@ private String personName; 2026-02-11 ### 执行内容 -修改文件: `ruoyi-ccdi/src/main/resources/mapper/ccdi/CcdiStaffEnterpriseRelationMapper.xml` +修改文件: `ruoyi-info-collection/src/main/resources/mapper/ccdi/CcdiStaffEnterpriseRelationMapper.xml` #### 1. 更新ResultMap 添加字段映射: @@ -134,7 +134,7 @@ LEFT JOIN ccdi_base_staff bs ON ser.person_id = bs.id_card 2026-02-11 ### 执行内容 -修改文件: `ruoyi-ccdi/src/main/resources/mapper/ccdi/CcdiStaffEnterpriseRelationMapper.xml` +修改文件: `ruoyi-info-collection/src/main/resources/mapper/ccdi/CcdiStaffEnterpriseRelationMapper.xml` 更新selectRelationById查询: ```xml diff --git a/doc/implementation/implementation-reports/employee-duplicate-detection-feature.md b/doc/implementation/implementation-reports/employee-duplicate-detection-feature.md index 7ab71bc..8261a1a 100644 --- a/doc/implementation/implementation-reports/employee-duplicate-detection-feature.md +++ b/doc/implementation/implementation-reports/employee-duplicate-detection-feature.md @@ -7,7 +7,7 @@ 2026-02-09 ## 实现位置 -- 文件: `D:\ccdi\ccdi\ruoyi-ccdi\src\main\java\com\ruoyi\ccdi\service\impl\CcdiEmployeeImportServiceImpl.java` +- 文件: `D:\ccdi\ccdi\ruoyi-info-collection\src\main\java\com\ruoyi\ccdi\service\impl\CcdiEmployeeImportServiceImpl.java` - 方法: `importEmployeeAsync` (第43-126行) ## 核心功能 diff --git a/doc/implementation/other/中介黑名单导入功能修复说明.md b/doc/implementation/other/中介黑名单导入功能修复说明.md index 1aa6335..03ab741 100644 --- a/doc/implementation/other/中介黑名单导入功能修复说明.md +++ b/doc/implementation/other/中介黑名单导入功能修复说明.md @@ -20,7 +20,7 @@ Error updating database. Cause: java.sql.SQLIntegrityConstraintViolationExceptio ### 1. 代码修改 -**文件**：[CcdiIntermediaryBlacklistServiceImpl.java](d:\discipline-prelim-check\discipline-prelim-check\ruoyi-ccdi\src\main\java\com\ruoyi\dpc\service\impl\CcdiIntermediaryBlacklistServiceImpl.java) +**文件**：[CcdiIntermediaryBlacklistServiceImpl.java](d:\discipline-prelim-check\discipline-prelim-check\ruoyi-info-collection\src\main\java\com\ruoyi\dpc\service\impl\CcdiIntermediaryBlacklistServiceImpl.java) **修改位置**：第 390-394 行 @@ -44,7 +44,7 @@ intermediary.setIntermediaryType("2"); ### 2. 验证逻辑增强 -**文件**：[CcdiIntermediaryBlacklistServiceImpl.java](d:\discipline-prelim-check\discipline-prelim-check\ruoyi-ccdi\src\main\java\com\ruoyi\dpc\service\impl\CcdiIntermediaryBlacklistServiceImpl.java) +**文件**：[CcdiIntermediaryBlacklistServiceImpl.java](d:\discipline-prelim-check\discipline-prelim-check\ruoyi-info-collection\src\main\java\com\ruoyi\dpc\service\impl\CcdiIntermediaryBlacklistServiceImpl.java) **修改位置**：第 484-488 行 @@ -72,7 +72,7 @@ private void validateEntityIntermediaryData(CcdiIntermediaryEntityExcel excel) { ### 3. 批量更新 XML 配置优化 -**文件**：[CcdiIntermediaryBlacklistMapper.xml](d:\discipline-prelim-check\discipline-prelim-check\ruoyi-ccdi\src\main\resources\mapper\dpc\CcdiIntermediaryBlacklistMapper.xml) +**文件**：[CcdiIntermediaryBlacklistMapper.xml](d:\discipline-prelim-check\discipline-prelim-check\ruoyi-info-collection\src\main\resources\mapper\dpc\CcdiIntermediaryBlacklistMapper.xml) **修改位置**：第 125-127 行 @@ -151,8 +151,8 @@ WHERE intermediary_type = '2' AND certificate_no IS NULL AND corp_credit_code IS ## 修改文件列表 -1. [CcdiIntermediaryBlacklistServiceImpl.java](d:\discipline-prelim-check\discipline-prelim-check\ruoyi-ccdi\src\main\java\com\ruoyi\dpc\service\impl\CcdiIntermediaryBlacklistServiceImpl.java) - 服务层实现 -2. [CcdiIntermediaryBlacklistMapper.xml](d:\discipline-prelim-check\discipline-prelim-check\ruoyi-ccdi\src\main\resources\mapper\dpc\CcdiIntermediaryBlacklistMapper.xml) - MyBatis 映射文件 +1. [CcdiIntermediaryBlacklistServiceImpl.java](d:\discipline-prelim-check\discipline-prelim-check\ruoyi-info-collection\src\main\java\com\ruoyi\dpc\service\impl\CcdiIntermediaryBlacklistServiceImpl.java) - 服务层实现 +2. [CcdiIntermediaryBlacklistMapper.xml](d:\discipline-prelim-check\discipline-prelim-check\ruoyi-info-collection\src\main\resources\mapper\dpc\CcdiIntermediaryBlacklistMapper.xml) - MyBatis 映射文件 3. [test_import_fix.py](d:\discipline-prelim-check\discipline-prelim-check\doc\test-data\test_import_fix.py) - 测试脚本 ## 版本历史 diff --git a/doc/implementation/reports/code-review-report-staff-enterprise-relation.md b/doc/implementation/reports/code-review-report-staff-enterprise-relation.md index f96caab..f0f2a4e 100644 --- a/doc/implementation/reports/code-review-report-staff-enterprise-relation.md +++ b/doc/implementation/reports/code-review-report-staff-enterprise-relation.md @@ -5,7 +5,7 @@ ## 审查范围 - 前端：`ruoyi-ui/src/views/ccdiStaffEnterpriseRelation/index.vue` -- 后端：`ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/` 相关文件 +- 后端：`ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/` 相关文件 ## 严重问题（必须立即修复） diff --git a/doc/implementation/reports/staff-enterprise-relation-implementation-summary.md b/doc/implementation/reports/staff-enterprise-relation-implementation-summary.md index b69f77e..c86e347 100644 --- a/doc/implementation/reports/staff-enterprise-relation-implementation-summary.md +++ b/doc/implementation/reports/staff-enterprise-relation-implementation-summary.md @@ -360,20 +360,20 @@ VALUES | 类型 | 文件路径 | |------|---------| -| Controller | `ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/controller/CcdiStaffEnterpriseRelationController.java` | -| Service接口 | `ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/ICcdiStaffEnterpriseRelationService.java` | -| Service实现 | `ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/impl/CcdiStaffEnterpriseRelationServiceImpl.java` | -| ImportService接口 | `ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/ICcdiStaffEnterpriseRelationImportService.java` | -| ImportService实现 | `ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/impl/CcdiStaffEnterpriseRelationImportServiceImpl.java` | -| Mapper接口 | `ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/mapper/CcdiStaffEnterpriseRelationMapper.java` | -| Mapper XML | `ruoyi-ccdi/src/main/resources/mapper/ccdi/CcdiStaffEnterpriseRelationMapper.xml` | -| Entity | `ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/CcdiStaffEnterpriseRelation.java` | -| DTO (Add) | `ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/dto/CcdiStaffEnterpriseRelationAddDTO.java` | -| DTO (Edit) | `ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/dto/CcdiStaffEnterpriseRelationEditDTO.java` | -| DTO (Query) | `ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/dto/CcdiStaffEnterpriseRelationQueryDTO.java` | -| VO | `ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/vo/CcdiStaffEnterpriseRelationVO.java` | -| Excel | `ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/excel/CcdiStaffEnterpriseRelationExcel.java` | -| ImportFailureVO | `ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/vo/StaffEnterpriseRelationImportFailureVO.java` | +| Controller | `ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/controller/CcdiStaffEnterpriseRelationController.java` | +| Service接口 | `ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/service/ICcdiStaffEnterpriseRelationService.java` | +| Service实现 | `ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/service/impl/CcdiStaffEnterpriseRelationServiceImpl.java` | +| ImportService接口 | `ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/service/ICcdiStaffEnterpriseRelationImportService.java` | +| ImportService实现 | `ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/service/impl/CcdiStaffEnterpriseRelationImportServiceImpl.java` | +| Mapper接口 | `ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/mapper/CcdiStaffEnterpriseRelationMapper.java` | +| Mapper XML | `ruoyi-info-collection/src/main/resources/mapper/ccdi/CcdiStaffEnterpriseRelationMapper.xml` | +| Entity | `ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/domain/CcdiStaffEnterpriseRelation.java` | +| DTO (Add) | `ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/domain/dto/CcdiStaffEnterpriseRelationAddDTO.java` | +| DTO (Edit) | `ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/domain/dto/CcdiStaffEnterpriseRelationEditDTO.java` | +| DTO (Query) | `ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/domain/dto/CcdiStaffEnterpriseRelationQueryDTO.java` | +| VO | `ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/domain/vo/CcdiStaffEnterpriseRelationVO.java` | +| Excel | `ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/domain/excel/CcdiStaffEnterpriseRelationExcel.java` | +| ImportFailureVO | `ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/domain/vo/StaffEnterpriseRelationImportFailureVO.java` | --- diff --git a/doc/implementation/reports/staff-enterprise-relation-status-fix-report.md b/doc/implementation/reports/staff-enterprise-relation-status-fix-report.md index 9a82098..b8c73fc 100644 --- a/doc/implementation/reports/staff-enterprise-relation-status-fix-report.md +++ b/doc/implementation/reports/staff-enterprise-relation-status-fix-report.md @@ -67,7 +67,7 @@ ### 修复1：后端强制设置默认状态 -**修改文件：** `ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/impl/CcdiStaffEnterpriseRelationServiceImpl.java` +**修改文件：** `ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/service/impl/CcdiStaffEnterpriseRelationServiceImpl.java` **修改内容：** ```java @@ -144,7 +144,7 @@ dicts: ['ccdi_relation_status', 'ccdi_data_source'], ### 修改文件清单 -1. `ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/impl/CcdiStaffEnterpriseRelationServiceImpl.java` +1. `ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/service/impl/CcdiStaffEnterpriseRelationServiceImpl.java` 2. `ruoyi-ui/src/views/ccdiStaffEnterpriseRelation/index.vue` ### 数据库变更 diff --git a/doc/implementation/优化说明/中介黑名单导入唯一性校验优化说明_20260205.md b/doc/implementation/优化说明/中介黑名单导入唯一性校验优化说明_20260205.md index a14fa23..2a55cd3 100644 --- a/doc/implementation/优化说明/中介黑名单导入唯一性校验优化说明_20260205.md +++ b/doc/implementation/优化说明/中介黑名单导入唯一性校验优化说明_20260205.md @@ -258,7 +258,7 @@ python doc/test-data/intermediary/test_import_performance.py ## 相关文件 ### 后端文件 -- `ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/impl/CcdiIntermediaryServiceImpl.java:245-488` +- `ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/service/impl/CcdiIntermediaryServiceImpl.java:245-488` ### 数据库表 - `ccdi_biz_intermediary` - 个人中介表 diff --git a/doc/implementation/员工导入状态持久化-最终代码审查报告.md b/doc/implementation/员工导入状态持久化-最终代码审查报告.md index 4b93776..b72f7ec 100644 --- a/doc/implementation/员工导入状态持久化-最终代码审查报告.md +++ b/doc/implementation/员工导入状态持久化-最终代码审查报告.md @@ -482,8 +482,8 @@ handleImportComplete(statusResult) { ### 相关文件 - **前端组件:** `ruoyi-ui/src/views/ccdiEmployee/index.vue` - **API定义:** `ruoyi-ui/src/api/ccdiEmployee.js` -- **后端VO:** `ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/vo/ImportStatusVO.java` -- **后端Controller:** `ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/controller/CcdiEmployeeController.java` +- **后端VO:** `ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/domain/vo/ImportStatusVO.java` +- **后端Controller:** `ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/controller/CcdiEmployeeController.java` ### 测试文件 - **浏览器测试:** `doc/员工导入状态持久化功能测试.html` diff --git a/doc/plans/2026-02-24-module-rename-design.md b/doc/plans/2026-02-24-module-rename-design.md new file mode 100644 index 0000000..6a08176 --- /dev/null +++ b/doc/plans/2026-02-24-module-rename-design.md @@ -0,0 +1,93 @@ +# ruoyi-ccdi 模块重命名设计文档 + +## 概述 + +将 `ruoyi-ccdi` 模块重命名为 `ruoyi-info-collection`，以更清晰地表达"信息采集"功能，同时保持与其他功能模块的命名一致性。 + +## 设计决策 + +### 方案选择：混合命名（方案 A） + +| 项目 | 当前命名 | 目标命名 | +|-----|---------|---------| +| Maven 模块 | `ruoyi-ccdi` | `ruoyi-info-collection` | +| Java 包名 | `com.ruoyi.ccdi` | `com.ruoyi.info.collection` | +| 数据库表 | `ccdi_*` | `ccdi_*` (保持不变) | +| API URL | `/ccdi/*` | `/ccdi/*` (保持不变) | +| 权限标识 | `ccdi:*:*` | `ccdi:*:*` (保持不变) | +| 前端文件 | `ccdi*` | `ccdi*` (保持不变) | + +### 选择理由 + +1. **模块名和包名**：更清晰表达"信息采集"功能 +2. **保留 ccdi 前缀**：在 URL、表名、前端避免破坏性变更 +3. **数据库不变**：无需迁移数据，降低风险 +4. **API 不变**：前端调用无需修改 + +## 修改清单 + +### 1. Maven 模块重命名 + +| 文件 | 修改内容 | +|-----|---------| +| `pom.xml` (根目录) | `ruoyi-ccdi` → `ruoyi-info-collection` | +| `pom.xml` (根目录) | `ruoyi-ccdi` → `ruoyi-info-collection` | +| `ruoyi-ccdi/pom.xml` | 目录重命名为 `ruoyi-info-collection/`，`` 同步修改 | +| `ruoyi-admin/pom.xml` | `ruoyi-ccdi` → `ruoyi-info-collection` | + +### 2. Java 包名重命名 + +- **目录结构**：`com/ruoyi/ccdi/` → `com/ruoyi/info/collection/` +- **涉及文件**：约 100+ 个 Java 文件 +- **修改内容**： + - 所有 `package com.ruoyi.ccdi` → `package com.ruoyi.info.collection` + - 所有 `import com.ruoyi.ccdi.*` → `import com.ruoyi.info.collection.*` + +### 3. MyBatis XML 命名空间 + +- **涉及文件**：11 个 Mapper XML 文件 +- **修改内容**：命名空间从 `com.ruoyi.ccdi.mapper.*` 改为 `com.ruoyi.info.collection.mapper.*` + +### 4. 项目文档修改 + +- **涉及文件**：`doc/` 目录下约 135 个文件 +- **修改内容**：将 `ruoyi-ccdi` 模块引用改为 `ruoyi-info-collection` + +## 不修改的内容 + +- 数据库表名 (`ccdi_*`) +- 数据库名 (`ccdi`) +- API URL 路径 (`/ccdi/*`) +- 权限标识 (`ccdi:*:*`) +- 前端 API 文件和视图目录 +- 菜单配置数据 + +## 执行步骤 + +1. 重命名模块目录 `ruoyi-ccdi/` → `ruoyi-info-collection/` +2. 修改 Maven 配置文件 +3. 批量修改 Java 包名 +4. 修改 MyBatis XML 命名空间 +5. 更新项目文档 +6. 验证编译 `mvn clean compile` + +## 风险评估 + +- **风险等级**：中 +- **主要风险**：包名修改涉及大量文件，可能遗漏 +- **缓解措施**： + - 使用 IDE 的重构功能 + - 编译验证确保无遗漏 + - 执行单元测试 + +## 验收标准 + +1. Maven 编译成功 (`mvn clean compile`) +2. 所有 Java 文件包名正确 +3. MyBatis XML 命名空间正确 +4. 文档中模块名称已更新 + +--- + +**设计日期**：2026-02-24 +**设计状态**：已批准 diff --git a/doc/plans/2026-02-24-module-rename-impl.md b/doc/plans/2026-02-24-module-rename-impl.md new file mode 100644 index 0000000..0e25ba3 --- /dev/null +++ b/doc/plans/2026-02-24-module-rename-impl.md @@ -0,0 +1,331 @@ +# ruoyi-ccdi 模块重命名实施计划 + +> **For Claude:** REQUIRED SUB-SKILL: Use superpowers:executing-plans to implement this plan task-by-task. + +**Goal:** 将 ruoyi-ccdi 模块重命名为 ruoyi-info-collection，同时将 Java 包名从 com.ruoyi.ccdi 改为 com.ruoyi.info.collection + +**Architecture:** Maven 模块重命名 + Java 包结构重组 + MyBatis XML 命名空间更新。保留数据库表名、API URL、权限标识和前端文件中的 ccdi 前缀不变。 + +**Tech Stack:** Maven, Java 17, MyBatis Plus, Spring Boot 3 + +--- + +## Task 1: 重命名模块目录 + +**Files:** +- Rename: `ruoyi-ccdi/` → `ruoyi-info-collection/` + +**Step 1: 使用 git mv 重命名目录** + +```bash +git mv ruoyi-ccdi ruoyi-info-collection +``` + +**Step 2: 验证目录已重命名** + +Run: `ls -la | grep ruoyi-info-collection` +Expected: 显示 `ruoyi-info-collection` 目录 + +--- + +## Task 2: 修改根 pom.xml 模块声明 + +**Files:** +- Modify: `pom.xml` + +**Step 1: 修改 module 声明** + +找到 `ruoyi-ccdi` 并修改为： + +```xml +ruoyi-info-collection +``` + +**Step 2: 修改 dependencyManagement 中的 artifactId** + +找到 ruoyi-ccdi 的依赖声明并修改为： + +```xml + + + com.ruoyi + ruoyi-info-collection + ${ruoyi.version} + +``` + +**Step 3: 验证修改** + +Run: `grep -n "ruoyi-info-collection" pom.xml` +Expected: 显示 2 处匹配（module 和 dependency） + +--- + +## Task 3: 修改 ruoyi-info-collection 模块 pom.xml + +**Files:** +- Modify: `ruoyi-info-collection/pom.xml` + +**Step 1: 修改 artifactId 和 description** + +```xml +ruoyi-info-collection +信息采集模块 +``` + +**Step 2: 验证修改** + +Run: `grep -n "artifactId" ruoyi-info-collection/pom.xml | head -1` +Expected: `ruoyi-info-collection` + +--- + +## Task 4: 修改 ruoyi-admin 的依赖声明 + +**Files:** +- Modify: `ruoyi-admin/pom.xml` + +**Step 1: 修改依赖 artifactId** + +找到 ruoyi-ccdi 依赖并修改为： + +```xml + + + com.ruoyi + ruoyi-info-collection + +``` + +**Step 2: 验证修改** + +Run: `grep -n "ruoyi-info-collection" ruoyi-admin/pom.xml` +Expected: 显示 1 处匹配 + +--- + +## Task 5: 创建新的包目录结构 + +**Files:** +- Create: `ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/` +- Create: `ruoyi-info-collection/src/main/resources/mapper/info/collection/` + +**Step 1: 创建 Java 包目录** + +```bash +mkdir -p ruoyi-info-collection/src/main/java/com/ruoyi/info/collection +``` + +**Step 2: 创建 MyBatis mapper 目录** + +```bash +mkdir -p ruoyi-info-collection/src/main/resources/mapper/info/collection +``` + +**Step 3: 验证目录创建** + +Run: `ls -la ruoyi-info-collection/src/main/java/com/ruoyi/info/` +Expected: 显示 `collection` 目录 + +--- + +## Task 6: 移动 Java 源码到新包结构 + +**Files:** +- Move: `ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/*` → `ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/` + +**Step 1: 移动所有子目录** + +```bash +cd ruoyi-info-collection/src/main/java/com/ruoyi +mv ccdi/* info/collection/ +``` + +**Step 2: 删除旧目录** + +```bash +rm -rf ccdi +``` + +**Step 3: 验证新结构** + +Run: `ls ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/` +Expected: 显示 controller, domain, enums, mapper, service, utils 等目录 + +--- + +## Task 7: 批量修改 Java 文件包名声明 + +**Files:** +- Modify: `ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/**/*.java` (约 100+ 文件) + +**Step 1: 批量替换 package 声明** + +```bash +find ruoyi-info-collection/src/main/java -name "*.java" -exec sed -i 's/package com\.ruoyi\.ccdi/package com.ruoyi.info.collection/g' {} + +``` + +**Step 2: 批量替换 import 语句** + +```bash +find ruoyi-info-collection/src/main/java -name "*.java" -exec sed -i 's/import com\.ruoyi\.ccdi/import com.ruoyi.info.collection/g' {} + +``` + +**Step 3: 验证包名修改** + +Run: `grep -r "package com.ruoyi.ccdi" ruoyi-info-collection/src/main/java/` +Expected: 无输出（所有旧的包名已替换） + +--- + +## Task 8: 移动 MyBatis XML 文件 + +**Files:** +- Move: `ruoyi-info-collection/src/main/resources/mapper/ccdi/*` → `ruoyi-info-collection/src/main/resources/mapper/info/collection/` + +**Step 1: 移动 XML 文件** + +```bash +cd ruoyi-info-collection/src/main/resources/mapper +mkdir -p info/collection +mv ccdi/* info/collection/ +rm -rf ccdi +``` + +**Step 2: 验证文件移动** + +Run: `ls ruoyi-info-collection/src/main/resources/mapper/info/collection/` +Expected: 显示 11 个 XML 文件 + +--- + +## Task 9: 修改 MyBatis XML 命名空间 + +**Files:** +- Modify: `ruoyi-info-collection/src/main/resources/mapper/info/collection/*.xml` (11 文件) + +**Step 1: 批量替换命名空间** + +```bash +find ruoyi-info-collection/src/main/resources/mapper -name "*.xml" -exec sed -i 's/com\.ruoyi\.ccdi/com.ruoyi.info.collection/g' {} + +``` + +**Step 2: 验证命名空间修改** + +Run: `grep -r "com.ruoyi.ccdi" ruoyi-info-collection/src/main/resources/mapper/` +Expected: 无输出（所有旧的命名空间已替换） + +--- + +## Task 10: 更新 CLAUDE.md 项目文档 + +**Files:** +- Modify: `CLAUDE.md` + +**Step 1: 更新模块架构描述** + +将所有 `ruoyi-ccdi` 引用改为 `ruoyi-info-collection`，包括： +- 模块架构图 +- 模块依赖关系 +- ruoyi-ccdi 业务模块描述 +- 重要文件路径 + +**Step 2: 验证修改** + +Run: `grep "ruoyi-ccdi" CLAUDE.md` +Expected: 无输出（所有引用已更新） + +--- + +## Task 11: 更新 doc 目录下的文档 + +**Files:** +- Modify: `doc/**/*.md` (约 135 文件) + +**Step 1: 批量替换模块名引用** + +```bash +find doc -name "*.md" -exec sed -i 's/ruoyi-ccdi/ruoyi-info-collection/g' {} + +``` + +**Step 2: 验证修改** + +Run: `grep -r "ruoyi-ccdi" doc/` +Expected: 仅在设计文档中保留历史记录 + +--- + +## Task 12: 验证 Maven 编译 + +**Files:** +- None (验证步骤) + +**Step 1: 清理并编译** + +```bash +mvn clean compile +``` + +Expected: BUILD SUCCESS + +**Step 2: 如果编译失败，检查错误** + +常见的编译错误： +- 遗漏的 import 语句 +- 遗漏的包名声明 +- MyBatis XML 命名空间不匹配 + +--- + +## Task 13: 提交更改 + +**Files:** +- None (Git 操作) + +**Step 1: 查看更改** + +```bash +git status +git diff --stat +``` + +**Step 2: 添加所有更改** + +```bash +git add -A +``` + +**Step 3: 提交** + +```bash +git commit -m "$(cat <<'EOF' +refactor: 重命名 ruoyi-ccdi 模块为 ruoyi-info-collection + +- Maven 模块从 ruoyi-ccdi 重命名为 ruoyi-info-collection +- Java 包名从 com.ruoyi.ccdi 改为 com.ruoyi.info.collection +- MyBatis XML 命名空间同步更新 +- 保留数据库表名、API URL、权限标识中的 ccdi 前缀 +- 更新项目文档中的模块引用 +EOF +)" +``` + +--- + +## 验收清单 + +- [ ] 模块目录已重命名为 `ruoyi-info-collection` +- [ ] 所有 pom.xml 中的 artifactId 已更新 +- [ ] Java 包结构已重组为 `com.ruoyi.info.collection` +- [ ] 所有 Java 文件的 package 声明已更新 +- [ ] 所有 Java 文件的 import 语句已更新 +- [ ] MyBatis XML 文件已移动到新目录 +- [ ] MyBatis XML 命名空间已更新 +- [ ] 项目文档已更新 +- [ ] Maven 编译成功 +- [ ] 更改已提交到 Git + +--- + +**计划日期**: 2026-02-24 +**预计任务数**: 13 diff --git a/doc/requirements/plans/2025-02-05-ccdi_staff_recruitment.md b/doc/requirements/plans/2025-02-05-ccdi_staff_recruitment.md index 87f09e0..d35eb39 100644 --- a/doc/requirements/plans/2025-02-05-ccdi_staff_recruitment.md +++ b/doc/requirements/plans/2025-02-05-ccdi_staff_recruitment.md @@ -80,7 +80,7 @@ CREATE TABLE `ccdi_staff_recruitment` ( ### 3.1 模块结构 ``` -ruoyi-ccdi/ +ruoyi-info-collection/ ├── domain/ │ ├── CcdiStaffRecruitment.java # 实体类 │ ├── dto/ diff --git a/doc/requirements/plans/2025-02-05-employee-import-result-dialog-optimization.md b/doc/requirements/plans/2025-02-05-employee-import-result-dialog-optimization.md index b8e3064..c276f3f 100644 --- a/doc/requirements/plans/2025-02-05-employee-import-result-dialog-optimization.md +++ b/doc/requirements/plans/2025-02-05-employee-import-result-dialog-optimization.md @@ -391,5 +391,5 @@ Element UI 的 MessageBox 组件有较高的CSS优先级，必须使用 `!import ### 8.2 相关文件 - 前端组件: `ruoyi-ui/src/views/ccdiEmployee/index.vue` -- 后端服务: `ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/impl/CcdiEmployeeServiceImpl.java` +- 后端服务: `ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/service/impl/CcdiEmployeeServiceImpl.java` - API文档: `doc/api/ccdiEmployee.md` diff --git a/doc/requirements/plans/2026-02-04-intermediary-blacklist-implementation.md b/doc/requirements/plans/2026-02-04-intermediary-blacklist-implementation.md index 3b2fb5a..237ac71 100644 --- a/doc/requirements/plans/2026-02-04-intermediary-blacklist-implementation.md +++ b/doc/requirements/plans/2026-02-04-intermediary-blacklist-implementation.md @@ -13,7 +13,7 @@ ## Task 1: 创建个人中介Entity实体类 **Files:** -- Create: `ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/CcdiBizIntermediary.java` +- Create: `ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/domain/CcdiBizIntermediary.java` **Step 1: 创建CcdiBizIntermediary实体类** @@ -116,7 +116,7 @@ public class CcdiBizIntermediary implements Serializable { **Step 2: 提交代码** ```bash -git add ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/CcdiBizIntermediary.java +git add ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/domain/CcdiBizIntermediary.java git commit -m "feat: 添加个人中介实体类CcdiBizIntermediary" ``` @@ -125,7 +125,7 @@ git commit -m "feat: 添加个人中介实体类CcdiBizIntermediary" ## Task 2: 创建实体中介Entity实体类 **Files:** -- Create: `ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/CcdiEnterpriseBaseInfo.java` +- Create: `ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/domain/CcdiEnterpriseBaseInfo.java` **Step 1: 创建CcdiEnterpriseBaseInfo实体类** @@ -234,7 +234,7 @@ public class CcdiEnterpriseBaseInfo implements Serializable { **Step 2: 提交代码** ```bash -git add ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/CcdiEnterpriseBaseInfo.java +git add ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/domain/CcdiEnterpriseBaseInfo.java git commit -m "feat: 添加实体中介实体类CcdiEnterpriseBaseInfo" ``` @@ -243,8 +243,8 @@ git commit -m "feat: 添加实体中介实体类CcdiEnterpriseBaseInfo" ## Task 3: 创建个人中介DTO **Files:** -- Create: `ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/dto/CcdiIntermediaryPersonAddDTO.java` -- Create: `ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/dto/CcdiIntermediaryPersonEditDTO.java` +- Create: `ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/domain/dto/CcdiIntermediaryPersonAddDTO.java` +- Create: `ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/domain/dto/CcdiIntermediaryPersonEditDTO.java` **Step 1: 创建个人中介新增DTO** @@ -465,8 +465,8 @@ public class CcdiIntermediaryPersonEditDTO implements Serializable { **Step 3: 提交代码** ```bash -git add ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/dto/CcdiIntermediaryPersonAddDTO.java -git add ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/dto/CcdiIntermediaryPersonEditDTO.java +git add ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/domain/dto/CcdiIntermediaryPersonAddDTO.java +git add ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/domain/dto/CcdiIntermediaryPersonEditDTO.java git commit -m "feat: 添加个人中介DTO类" ``` @@ -475,8 +475,8 @@ git commit -m "feat: 添加个人中介DTO类" ## Task 4: 创建实体中介DTO **Files:** -- Create: `ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/dto/CcdiIntermediaryEntityAddDTO.java` -- Create: `ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/dto/CcdiIntermediaryEntityEditDTO.java` +- Create: `ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/domain/dto/CcdiIntermediaryEntityAddDTO.java` +- Create: `ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/domain/dto/CcdiIntermediaryEntityEditDTO.java` **Step 1: 创建实体中介新增DTO** @@ -709,8 +709,8 @@ public class CcdiIntermediaryEntityEditDTO implements Serializable { **Step 3: 提交代码** ```bash -git add ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/dto/CcdiIntermediaryEntityAddDTO.java -git add ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/dto/CcdiIntermediaryEntityEditDTO.java +git add ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/domain/dto/CcdiIntermediaryEntityAddDTO.java +git add ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/domain/dto/CcdiIntermediaryEntityEditDTO.java git commit -m "feat: 添加实体中介DTO类" ``` @@ -719,10 +719,10 @@ git commit -m "feat: 添加实体中介DTO类" ## Task 5: 创建查询DTO和统一VO **Files:** -- Create: `ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/dto/CcdiIntermediaryQueryDTO.java` -- Create: `ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/vo/CcdiIntermediaryVO.java` -- Create: `ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/vo/CcdiIntermediaryPersonDetailVO.java` -- Create: `ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/vo/CcdiIntermediaryEntityDetailVO.java` +- Create: `ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/domain/dto/CcdiIntermediaryQueryDTO.java` +- Create: `ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/domain/vo/CcdiIntermediaryVO.java` +- Create: `ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/domain/vo/CcdiIntermediaryPersonDetailVO.java` +- Create: `ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/domain/vo/CcdiIntermediaryEntityDetailVO.java` **Step 1: 创建查询DTO** @@ -999,10 +999,10 @@ public class CcdiIntermediaryEntityDetailVO implements Serializable { **Step 5: 提交代码** ```bash -git add ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/dto/CcdiIntermediaryQueryDTO.java -git add ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/vo/CcdiIntermediaryVO.java -git add ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/vo/CcdiIntermediaryPersonDetailVO.java -git add ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/vo/CcdiIntermediaryEntityDetailVO.java +git add ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/domain/dto/CcdiIntermediaryQueryDTO.java +git add ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/domain/vo/CcdiIntermediaryVO.java +git add ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/domain/vo/CcdiIntermediaryPersonDetailVO.java +git add ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/domain/vo/CcdiIntermediaryEntityDetailVO.java git commit -m "feat: 添加中介查询DTO和VO类" ``` @@ -1011,9 +1011,9 @@ git commit -m "feat: 添加中介查询DTO和VO类" ## Task 6: 创建Mapper接口 **Files:** -- Create: `ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/mapper/CcdiBizIntermediaryMapper.java` -- Create: `ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/mapper/CcdiEnterpriseBaseInfoMapper.java` -- Create: `ruoyi-ccdi/src/main/resources/mapper/ccdi/CcdiIntermediaryMapper.xml` +- Create: `ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/mapper/CcdiBizIntermediaryMapper.java` +- Create: `ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/mapper/CcdiEnterpriseBaseInfoMapper.java` +- Create: `ruoyi-info-collection/src/main/resources/mapper/ccdi/CcdiIntermediaryMapper.xml` **Step 1: 创建个人中介Mapper接口** @@ -1121,9 +1121,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" **Step 4: 提交代码** ```bash -git add ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/mapper/CcdiBizIntermediaryMapper.java -git add ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/mapper/CcdiEnterpriseBaseInfoMapper.java -git add ruoyi-ccdi/src/main/resources/mapper/ccdi/CcdiIntermediaryMapper.xml +git add ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/mapper/CcdiBizIntermediaryMapper.java +git add ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/mapper/CcdiEnterpriseBaseInfoMapper.java +git add ruoyi-info-collection/src/main/resources/mapper/ccdi/CcdiIntermediaryMapper.xml git commit -m "feat: 添加中介Mapper接口和XML映射" ``` @@ -1132,8 +1132,8 @@ git commit -m "feat: 添加中介Mapper接口和XML映射" ## Task 7: 创建Service接口和实现类 **Files:** -- Create: `ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/ICcdiIntermediaryService.java` -- Create: `ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/impl/CcdiIntermediaryServiceImpl.java` +- Create: `ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/service/ICcdiIntermediaryService.java` +- Create: `ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/service/impl/CcdiIntermediaryServiceImpl.java` **Step 1: 创建Service接口** @@ -1316,7 +1316,7 @@ public class CcdiIntermediaryServiceImpl implements ICcdiIntermediaryService { **Step 3: 提交Service框架** ```bash -git add ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/ +git add ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/service/ git commit -m "feat: 添加中介Service接口和实现类框架" ``` @@ -1325,8 +1325,8 @@ git commit -m "feat: 添加中介Service接口和实现类框架" ## Task 8: 创建Excel导入导出类 **Files:** -- Create: `ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/excel/CcdiIntermediaryPersonExcel.java` -- Create: `ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/excel/CcdiIntermediaryEntityExcel.java` +- Create: `ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/domain/excel/CcdiIntermediaryPersonExcel.java` +- Create: `ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/domain/excel/CcdiIntermediaryEntityExcel.java` **Step 1: 创建个人中介Excel类** @@ -1518,7 +1518,7 @@ public class CcdiIntermediaryEntityExcel implements Serializable { **Step 3: 提交Excel类** ```bash -git add ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/excel/ +git add ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/domain/excel/ git commit -m "feat: 添加中介Excel导入导出类" ``` @@ -1527,7 +1527,7 @@ git commit -m "feat: 添加中介Excel导入导出类" ## Task 9: 创建Controller控制器 **Files:** -- Create: `ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/controller/CcdiIntermediaryController.java` +- Create: `ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/controller/CcdiIntermediaryController.java` **Step 1: 创建CcdiIntermediaryController** @@ -1723,7 +1723,7 @@ public class CcdiIntermediaryController extends BaseController { **Step 2: 提交Controller** ```bash -git add ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/controller/CcdiIntermediaryController.java +git add ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/controller/CcdiIntermediaryController.java git commit -m "feat: 添加中介黑名单Controller" ``` @@ -1732,7 +1732,7 @@ git commit -m "feat: 添加中介黑名单Controller" ## Task 10: 补充Service实现类的完整代码 **Files:** -- Complete: `ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/impl/CcdiIntermediaryServiceImpl.java` +- Complete: `ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/service/impl/CcdiIntermediaryServiceImpl.java` 完整的Service实现需要包含所有业务逻辑方法，包括： - UNION联合查询的分页实现 @@ -1745,7 +1745,7 @@ git commit -m "feat: 添加中介黑名单Controller" **Step 1: 提交完整的Service实现** ```bash -git add ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/impl/CcdiIntermediaryServiceImpl.java +git add ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/service/impl/CcdiIntermediaryServiceImpl.java git commit -m "feat: 完善中介Service实现类" ``` diff --git a/doc/requirements/plans/2026-02-05-intermediary-blacklist-union-query-implementation.md b/doc/requirements/plans/2026-02-05-intermediary-blacklist-union-query-implementation.md index 000340f..a5bf27f 100644 --- a/doc/requirements/plans/2026-02-05-intermediary-blacklist-union-query-implementation.md +++ b/doc/requirements/plans/2026-02-05-intermediary-blacklist-union-query-implementation.md @@ -13,7 +13,7 @@ ### 2.1 修复实体类字段映射 -**文件：** `ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/CcdiBizIntermediary.java` +**文件：** `ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/domain/CcdiBizIntermediary.java` **修改内容：** 1. 删除了不存在的 `relationTypeField` 字段（第70行） @@ -31,7 +31,7 @@ private String dataSource; ### 2.2 创建联合查询Mapper接口 -**新增文件：** `ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/mapper/CcdiIntermediaryMapper.java` +**新增文件：** `ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/mapper/CcdiIntermediaryMapper.java` **功能：** - 定义联合查询方法 `selectIntermediaryList()` @@ -40,7 +40,7 @@ private String dataSource; ### 2.3 创建MyBatis XML Mapper -**新增文件：** `ruoyi-ccdi/src/main/resources/mapper/ccdi/CcdiIntermediaryMapper.xml` +**新增文件：** `ruoyi-info-collection/src/main/resources/mapper/ccdi/CcdiIntermediaryMapper.xml` **SQL设计策略：** @@ -69,7 +69,7 @@ private String dataSource; ### 2.4 优化Service层实现 -**文件：** `ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/impl/CcdiIntermediaryServiceImpl.java` +**文件：** `ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/service/impl/CcdiIntermediaryServiceImpl.java` **修改内容：** @@ -84,7 +84,7 @@ private String dataSource; ### 2.5 扩展查询DTO -**文件：** `ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/dto/CcdiIntermediaryQueryDTO.java` +**文件：** `ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/domain/dto/CcdiIntermediaryQueryDTO.java` **新增字段：** ```java @@ -144,17 +144,17 @@ OFFSET #{pageNum} * #{pageSize} ## 五、文件清单 ### 修改的文件 -1. `ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/CcdiBizIntermediary.java` - 删除冗余字段，修复字段映射 -2. `ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/impl/CcdiIntermediaryServiceImpl.java` - 重构查询逻辑 -3. `ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/dto/CcdiIntermediaryQueryDTO.java` - 添加分页参数 +1. `ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/domain/CcdiBizIntermediary.java` - 删除冗余字段，修复字段映射 +2. `ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/service/impl/CcdiIntermediaryServiceImpl.java` - 重构查询逻辑 +3. `ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/domain/dto/CcdiIntermediaryQueryDTO.java` - 添加分页参数 ### 新增的文件 -1. `ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/mapper/CcdiIntermediaryMapper.java` - 联合查询Mapper接口 -2. `ruoyi-ccdi/src/main/resources/mapper/ccdi/CcdiIntermediaryMapper.xml` - MyBatis XML Mapper +1. `ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/mapper/CcdiIntermediaryMapper.java` - 联合查询Mapper接口 +2. `ruoyi-info-collection/src/main/resources/mapper/ccdi/CcdiIntermediaryMapper.xml` - MyBatis XML Mapper 3. `doc/test/scripts/test_union_query.sh` - 测试脚本 ### 删除的文件 -1. `ruoyi-ccdi/src/main/resources/mapper/ccdi/CcdiIntermediaryMapper.xml` - 旧的错误配置 +1. `ruoyi-info-collection/src/main/resources/mapper/ccdi/CcdiIntermediaryMapper.xml` - 旧的错误配置 ## 六、优势总结 @@ -204,7 +204,7 @@ chmod +x test_union_query.sh 如果新实现出现问题，可以通过Git回滚到之前的版本： ```bash -git checkout HEAD~1 -- ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/impl/CcdiIntermediaryServiceImpl.java +git checkout HEAD~1 -- ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/service/impl/CcdiIntermediaryServiceImpl.java ``` 删除新增的Mapper文件即可恢复原状。 diff --git a/doc/requirements/plans/2026-02-05-intermediary-blacklist-union-query-mybatis-plus.md b/doc/requirements/plans/2026-02-05-intermediary-blacklist-union-query-mybatis-plus.md index 3362072..f932622 100644 --- a/doc/requirements/plans/2026-02-05-intermediary-blacklist-union-query-mybatis-plus.md +++ b/doc/requirements/plans/2026-02-05-intermediary-blacklist-union-query-mybatis-plus.md @@ -48,7 +48,7 @@ Page selectEmployeePageWithDept(@Param("page") Page selectIntermediaryList( - 删除了单独的count查询方法 #### 2. XML Mapper文件 -**文件：** `ruoyi-ccdi/src/main/resources/mapper/ccdi/CcdiIntermediaryMapper.xml` +**文件：** `ruoyi-info-collection/src/main/resources/mapper/ccdi/CcdiIntermediaryMapper.xml` **修改前（v2.0）：** ```xml @@ -125,7 +125,7 @@ Page selectIntermediaryList( - MyBatis Plus分页插件会自动在ORDER BY后面注入分页SQL #### 3. Service层实现 -**文件：** `ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/impl/CcdiIntermediaryServiceImpl.java` +**文件：** `ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/service/impl/CcdiIntermediaryServiceImpl.java` **修改前（v2.0）：** ```java @@ -162,7 +162,7 @@ public Page selectIntermediaryPage(Page - 无需手动计算分页参数 #### 4. QueryDTO清理 -**文件：** `ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/dto/CcdiIntermediaryQueryDTO.java` +**文件：** `ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/domain/dto/CcdiIntermediaryQueryDTO.java` **删除字段：** ```java @@ -237,11 +237,11 @@ mapper.selectList(page, queryDTO); ## 五、文件清单 ### 修改的文件 -1. `ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/CcdiBizIntermediary.java` - 删除冗余字段，修复字段映射 -2. `ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/dto/CcdiIntermediaryQueryDTO.java` - 删除分页参数 -3. `ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/mapper/CcdiIntermediaryMapper.java` - 修改方法签名 -4. `ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/impl/CcdiIntermediaryServiceImpl.java` - 简化分页逻辑 -5. `ruoyi-ccdi/src/main/resources/mapper/ccdi/CcdiIntermediaryMapper.xml` - 重写SQL结构 +1. `ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/domain/CcdiBizIntermediary.java` - 删除冗余字段，修复字段映射 +2. `ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/domain/dto/CcdiIntermediaryQueryDTO.java` - 删除分页参数 +3. `ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/mapper/CcdiIntermediaryMapper.java` - 修改方法签名 +4. `ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/service/impl/CcdiIntermediaryServiceImpl.java` - 简化分页逻辑 +5. `ruoyi-info-collection/src/main/resources/mapper/ccdi/CcdiIntermediaryMapper.xml` - 重写SQL结构 ### 新增的文件 1. `doc/test/scripts/test_union_query_mybatis_plus.sh` - 测试脚本 diff --git a/doc/requirements/plans/2026-02-05-导入逻辑优化实施计划.md b/doc/requirements/plans/2026-02-05-导入逻辑优化实施计划.md index 3dcf749..39f6d78 100644 --- a/doc/requirements/plans/2026-02-05-导入逻辑优化实施计划.md +++ b/doc/requirements/plans/2026-02-05-导入逻辑优化实施计划.md @@ -17,7 +17,7 @@ ### Task 1.1：添加批量删除方法到 Mapper 接口 **文件：** -- 修改：`ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/mapper/CcdiEmployeeMapper.java` +- 修改：`ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/mapper/CcdiEmployeeMapper.java` **Step 1: 在 Mapper 接口中添加方法声明** @@ -40,7 +40,7 @@ int deleteBatchByIdCard(@Param("list") List idCards); **Step 3: 提交** ```bash -git add ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/mapper/CcdiEmployeeMapper.java +git add ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/mapper/CcdiEmployeeMapper.java git commit -m "feat(employee): 添加批量删除方法声明" ``` @@ -49,7 +49,7 @@ git commit -m "feat(employee): 添加批量删除方法声明" ### Task 1.2：在 Mapper XML 中实现批量删除 SQL **文件：** -- 修改：`ruoyi-ccdi/src/main/resources/mapper/ccdi/CcdiEmployeeMapper.xml` +- 修改：`ruoyi-info-collection/src/main/resources/mapper/ccdi/CcdiEmployeeMapper.xml` **Step 1: 在 XML 文件中添加删除 SQL** @@ -73,7 +73,7 @@ git commit -m "feat(employee): 添加批量删除方法声明" **Step 3: 提交** ```bash -git add ruoyi-ccdi/src/main/resources/mapper/ccdi/CcdiEmployeeMapper.xml +git add ruoyi-info-collection/src/main/resources/mapper/ccdi/CcdiEmployeeMapper.xml git commit -m "feat(employee): 实现批量删除SQL" ``` @@ -84,7 +84,7 @@ git commit -m "feat(employee): 实现批量删除SQL" - [x] **已完成** (commit: ebe4fd7) **文件：** -- 修改：`ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/impl/CcdiEmployeeServiceImpl.java` +- 修改：`ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/service/impl/CcdiEmployeeServiceImpl.java` - 目标方法：`importEmployee` (第 172-311 行) **Step 1: 备份原方法** @@ -183,7 +183,7 @@ public String importEmployee(List excelList, Boolean isUpdate **Step 3: 提交** ```bash -git add ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/impl/CcdiEmployeeServiceImpl.java +git add ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/service/impl/CcdiEmployeeServiceImpl.java git commit -m "refactor(employee): 重构导入方法为先删后插模式" ``` @@ -369,7 +369,7 @@ cd D:\ccdi\ccdi - [x] **已完成** (commit: ba8eedc) **文件：** -- 修改：`ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/mapper/CcdiBizIntermediaryMapper.java` +- 修改：`ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/mapper/CcdiBizIntermediaryMapper.java` **Step 1: 在 Mapper 接口中添加方法声明** @@ -386,7 +386,7 @@ int deleteBatchByPersonId(@Param("list") List personIds); **Step 2: 提交** ```bash -git add ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/mapper/CcdiBizIntermediaryMapper.java +git add ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/mapper/CcdiBizIntermediaryMapper.java git commit -m "feat(intermediary): 添加个人批量删除方法声明" ``` @@ -395,7 +395,7 @@ git commit -m "feat(intermediary): 添加个人批量删除方法声明" ### Task 2.2：在 Mapper XML 中实现批量删除 SQL **文件：** -- 修改：`ruoyi-ccdi/src/main/resources/mapper/ccdi/CcdiBizIntermediaryMapper.xml` +- 修改：`ruoyi-info-collection/src/main/resources/mapper/ccdi/CcdiBizIntermediaryMapper.xml` **Step 1: 在 XML 文件中添加删除 SQL** @@ -413,7 +413,7 @@ git commit -m "feat(intermediary): 添加个人批量删除方法声明" **Step 2: 提交** ```bash -git add ruoyi-ccdi/src/main/resources/mapper/ccdi/CcdiBizIntermediaryMapper.xml +git add ruoyi-info-collection/src/main/resources/mapper/ccdi/CcdiBizIntermediaryMapper.xml git commit -m "feat(intermediary): 实现个人批量删除SQL" ``` @@ -422,7 +422,7 @@ git commit -m "feat(intermediary): 实现个人批量删除SQL" ### Task 2.3：重构中介库个人导入方法 **文件：** -- 修改：`ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/impl/CcdiIntermediaryServiceImpl.java` +- 修改：`ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/service/impl/CcdiIntermediaryServiceImpl.java` - 目标方法：`importIntermediaryPerson` **Step 1: 找到 `importIntermediaryPerson` 方法** @@ -511,7 +511,7 @@ public String importIntermediaryPerson(List excelLi **Step 3: 提交** ```bash -git add ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/impl/CcdiIntermediaryServiceImpl.java +git add ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/service/impl/CcdiIntermediaryServiceImpl.java git commit -m "refactor(intermediary): 重构个人导入方法为先删后插模式" ``` @@ -522,7 +522,7 @@ git commit -m "refactor(intermediary): 重构个人导入方法为先删后插 ### Task 3.1：添加批量删除方法到 Mapper 接口 **文件：** -- 修改：`ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/mapper/CcdiEnterpriseBaseInfoMapper.java` +- 修改：`ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/mapper/CcdiEnterpriseBaseInfoMapper.java` **Step 1: 在 Mapper 接口中添加方法声明** @@ -539,7 +539,7 @@ int deleteBatchBySocialCreditCode(@Param("list") List socialCreditCodes) **Step 2: 提交** ```bash -git add ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/mapper/CcdiEnterpriseBaseInfoMapper.java +git add ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/mapper/CcdiEnterpriseBaseInfoMapper.java git commit -m "feat(intermediary): 添加实体批量删除方法声明" ``` @@ -548,7 +548,7 @@ git commit -m "feat(intermediary): 添加实体批量删除方法声明" ### Task 3.2：在 Mapper XML 中实现批量删除 SQL **文件：** -- 修改：`ruoyi-ccdi/src/main/resources/mapper/ccdi/CcdiEnterpriseBaseInfoMapper.xml` +- 修改：`ruoyi-info-collection/src/main/resources/mapper/ccdi/CcdiEnterpriseBaseInfoMapper.xml` **Step 1: 在 XML 文件中添加删除 SQL** @@ -566,7 +566,7 @@ git commit -m "feat(intermediary): 添加实体批量删除方法声明" **Step 2: 提交** ```bash -git add ruoyi-ccdi/src/main/resources/mapper/ccdi/CcdiEnterpriseBaseInfoMapper.xml +git add ruoyi-info-collection/src/main/resources/mapper/ccdi/CcdiEnterpriseBaseInfoMapper.xml git commit -m "feat(intermediary): 实现实体批量删除SQL" ``` @@ -575,7 +575,7 @@ git commit -m "feat(intermediary): 实现实体批量删除SQL" ### Task 3.3：重构中介库实体导入方法 **文件：** -- 修改：`ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/impl/CcdiIntermediaryServiceImpl.java` +- 修改：`ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/service/impl/CcdiIntermediaryServiceImpl.java` - 目标方法：`importIntermediaryEntity` **Step 1: 找到 `importIntermediaryEntity` 方法** @@ -664,7 +664,7 @@ public String importIntermediaryEntity(List excelLi **Step 3: 提交** ```bash -git add ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/impl/CcdiIntermediaryServiceImpl.java +git add ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/service/impl/CcdiIntermediaryServiceImpl.java git commit -m "refactor(intermediary): 重构实体导入方法为先删后插模式" ``` @@ -675,7 +675,7 @@ git commit -m "refactor(intermediary): 重构实体导入方法为先删后插 ### Task 4.1：添加批量删除方法到 Mapper 接口 **文件：** -- 修改：`ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/mapper/CcdiStaffRecruitmentMapper.java` +- 修改：`ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/mapper/CcdiStaffRecruitmentMapper.java` **Step 1: 在 Mapper 接口中添加方法声明** @@ -692,7 +692,7 @@ int deleteBatchByRecruitId(@Param("list") List recruitIds); **Step 2: 提交** ```bash -git add ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/mapper/CcdiStaffRecruitmentMapper.java +git add ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/mapper/CcdiStaffRecruitmentMapper.java git commit -m "feat(recruitment): 添加批量删除方法声明" ``` @@ -701,7 +701,7 @@ git commit -m "feat(recruitment): 添加批量删除方法声明" ### Task 4.2：在 Mapper XML 中实现批量删除 SQL **文件：** -- 修改：`ruoyi-ccdi/src/main/resources/mapper/ccdi/CcdiStaffRecruitmentMapper.xml` +- 修改：`ruoyi-info-collection/src/main/resources/mapper/ccdi/CcdiStaffRecruitmentMapper.xml` **Step 1: 在 XML 文件中添加删除 SQL** @@ -719,7 +719,7 @@ git commit -m "feat(recruitment): 添加批量删除方法声明" **Step 2: 提交** ```bash -git add ruoyi-ccdi/src/main/resources/mapper/ccdi/CcdiStaffRecruitmentMapper.xml +git add ruoyi-info-collection/src/main/resources/mapper/ccdi/CcdiStaffRecruitmentMapper.xml git commit -m "feat(recruitment): 实现批量删除SQL" ``` @@ -728,7 +728,7 @@ git commit -m "feat(recruitment): 实现批量删除SQL" ### Task 4.3：重构招聘信息导入方法 **文件：** -- 修改：`ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/impl/CcdiStaffRecruitmentServiceImpl.java` +- 修改：`ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/service/impl/CcdiStaffRecruitmentServiceImpl.java` - 目标方法：`importRecruitment` **Step 1: 找到 `importRecruitment` 方法** @@ -817,7 +817,7 @@ public String importRecruitment(List excelList, Boole **Step 3: 提交** ```bash -git add ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/impl/CcdiStaffRecruitmentServiceImpl.java +git add ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/service/impl/CcdiStaffRecruitmentServiceImpl.java git commit -m "refactor(recruitment): 重构导入方法为先删后插模式" ``` diff --git a/doc/requirements/plans/2026-02-05-导入逻辑优化设计.md b/doc/requirements/plans/2026-02-05-导入逻辑优化设计.md index faa5e12..1613edb 100644 --- a/doc/requirements/plans/2026-02-05-导入逻辑优化设计.md +++ b/doc/requirements/plans/2026-02-05-导入逻辑优化设计.md @@ -383,23 +383,23 @@ public String importXxx(List excelList, Boolean isUpdateSupport) { ### 5.1 修改文件清单（11 个文件） #### 员工信息管理模块 -1. `ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/mapper/CcdiEmployeeMapper.java` -2. `ruoyi-ccdi/src/main/resources/mapper/ccdi/CcdiEmployeeMapper.xml` -3. `ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/impl/CcdiEmployeeServiceImpl.java` +1. `ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/mapper/CcdiEmployeeMapper.java` +2. `ruoyi-info-collection/src/main/resources/mapper/ccdi/CcdiEmployeeMapper.xml` +3. `ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/service/impl/CcdiEmployeeServiceImpl.java` #### 中介库管理模块（个人和实体） -4. `ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/mapper/CcdiBizIntermediaryMapper.java` -5. `ruoyi-ccdi/src/main/resources/mapper/ccdi/CcdiBizIntermediaryMapper.xml` -6. `ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/mapper/CcdiEnterpriseBaseInfoMapper.java` -7. `ruoyi-ccdi/src/main/resources/mapper/ccdi/CcdiEnterpriseBaseInfoMapper.xml` -8. `ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/impl/CcdiIntermediaryServiceImpl.java` +4. `ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/mapper/CcdiBizIntermediaryMapper.java` +5. `ruoyi-info-collection/src/main/resources/mapper/ccdi/CcdiBizIntermediaryMapper.xml` +6. `ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/mapper/CcdiEnterpriseBaseInfoMapper.java` +7. `ruoyi-info-collection/src/main/resources/mapper/ccdi/CcdiEnterpriseBaseInfoMapper.xml` +8. `ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/service/impl/CcdiIntermediaryServiceImpl.java` - 修改 `importIntermediaryPerson` 方法 - 修改 `importIntermediaryEntity` 方法 #### 员工招聘信息管理模块 -9. `ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/mapper/CcdiStaffRecruitmentMapper.java` -10. `ruoyi-ccdi/src/main/resources/mapper/ccdi/CcdiStaffRecruitmentMapper.xml` -11. `ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/impl/CcdiStaffRecruitmentServiceImpl.java` +9. `ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/mapper/CcdiStaffRecruitmentMapper.java` +10. `ruoyi-info-collection/src/main/resources/mapper/ccdi/CcdiStaffRecruitmentMapper.xml` +11. `ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/service/impl/CcdiStaffRecruitmentServiceImpl.java` ### 5.2 实施步骤 diff --git a/doc/requirements/plans/2026-02-06-ccdi_purchase_transaction-deployment.md b/doc/requirements/plans/2026-02-06-ccdi_purchase_transaction-deployment.md index 234a160..d011f42 100644 --- a/doc/requirements/plans/2026-02-06-ccdi_purchase_transaction-deployment.md +++ b/doc/requirements/plans/2026-02-06-ccdi_purchase_transaction-deployment.md @@ -34,7 +34,7 @@ #### 1. 实体层 ``` -ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/ +ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/ ├── domain/ │ ├── CcdiPurchaseTransaction.java # 实体类 (36字段) │ ├── dto/ @@ -50,7 +50,7 @@ ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/ #### 2. 持久层 ``` -ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/ +ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/ ├── mapper/ │ ├── CcdiPurchaseTransactionMapper.java # Mapper接口 │ └── resources/mapper/ccdi/ @@ -59,7 +59,7 @@ ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/ #### 3. 服务层 ``` -ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/ +ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/ ├── service/ │ ├── ICcdiPurchaseTransactionService.java # Service接口 │ ├── ICcdiPurchaseTransactionImportService.java # 异步导入Service接口 @@ -70,7 +70,7 @@ ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/ #### 4. 控制层 ``` -ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/ +ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/ └── controller/ └── CcdiPurchaseTransactionController.java # REST Controller (10接口) ``` @@ -159,14 +159,14 @@ WHERE menu_name = '采购交易管理'; #### 方式A: 已有代码跳过 (推荐) ```bash # 代码已存在于项目目录中，无需额外操作 -cd ruoyi-ccdi +cd ruoyi-info-collection mvn clean compile # 验证编译 ``` #### 方式B: 从Git拉取 ```bash git pull origin dev -cd ruoyi-ccdi +cd ruoyi-info-collection mvn clean compile ``` @@ -586,8 +586,8 @@ redis-cli KEYS "import:purchaseTransaction:*" - 查看Redis状态: `redis-cli monitor` **关键文件位置**: -- Controller: `ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/controller/CcdiPurchaseTransactionController.java` -- 异步Service: `ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/impl/CcdiPurchaseTransactionImportServiceImpl.java` +- Controller: `ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/controller/CcdiPurchaseTransactionController.java` +- 异步Service: `ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/service/impl/CcdiPurchaseTransactionImportServiceImpl.java` - 前端页面: `ruoyi-ui/src/views/ccdiPurchaseTransaction/index.vue` --- diff --git a/doc/requirements/plans/2026-02-06-ccdi_purchase_transaction-summary.md b/doc/requirements/plans/2026-02-06-ccdi_purchase_transaction-summary.md index 002c348..134eba8 100644 --- a/doc/requirements/plans/2026-02-06-ccdi_purchase_transaction-summary.md +++ b/doc/requirements/plans/2026-02-06-ccdi_purchase_transaction-summary.md @@ -407,8 +407,8 @@ redisTemplate.expire(statusKey, 7, TimeUnit.DAYS); - 验证清单: `doc/plans/2026-02-06-ccdi_purchase_transaction-verification.md` **关键文件**: -- 后端Controller: `ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/controller/CcdiPurchaseTransactionController.java` -- 异步Service: `ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/impl/CcdiPurchaseTransactionImportServiceImpl.java` +- 后端Controller: `ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/controller/CcdiPurchaseTransactionController.java` +- 异步Service: `ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/service/impl/CcdiPurchaseTransactionImportServiceImpl.java` - 前端页面: `ruoyi-ui/src/views/ccdiPurchaseTransaction/index.vue` **测试账号**: diff --git a/doc/requirements/plans/2026-02-06-ccdi_purchase_transaction.md b/doc/requirements/plans/2026-02-06-ccdi_purchase_transaction.md index ecc40f7..a29131a 100644 --- a/doc/requirements/plans/2026-02-06-ccdi_purchase_transaction.md +++ b/doc/requirements/plans/2026-02-06-ccdi_purchase_transaction.md @@ -16,8 +16,8 @@ ## 前置条件 ### 参考文档 -- 员工招聘信息模块: `ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/**/CcdiStaffRecruitment*` -- 员工异步导入实现: `ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/impl/CcdiEmployeeImportServiceImpl.java` +- 员工招聘信息模块: `ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/**/CcdiStaffRecruitment*` +- 员工异步导入实现: `ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/service/impl/CcdiEmployeeImportServiceImpl.java` - 数据库表定义: `doc/docs/ccdi_purchase_transaction.csv` ### 数据库表结构 @@ -98,7 +98,7 @@ git commit -m "feat: 添加员工采购交易信息表" ## Task 2: 创建实体类 **Files:** -- Create: `ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/CcdiPurchaseTransaction.java` +- Create: `ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/domain/CcdiPurchaseTransaction.java` **Step 1: 创建实体类** @@ -247,7 +247,7 @@ public class CcdiPurchaseTransaction implements Serializable { **Step 2: 验证编译** ```bash -cd ruoyi-ccdi +cd ruoyi-info-collection mvn compile -pl . -am ``` @@ -256,7 +256,7 @@ Expected: 编译成功，无错误 **Step 3: Commit** ```bash -git add ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/CcdiPurchaseTransaction.java +git add ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/domain/CcdiPurchaseTransaction.java git commit -m "feat: 添加采购交易信息实体类" ``` @@ -265,7 +265,7 @@ git commit -m "feat: 添加采购交易信息实体类" ## Task 3: 创建查询DTO **Files:** -- Create: `ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/dto/CcdiPurchaseTransactionQueryDTO.java` +- Create: `ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/domain/dto/CcdiPurchaseTransactionQueryDTO.java` **Step 1: 创建查询DTO** @@ -324,7 +324,7 @@ public class CcdiPurchaseTransactionQueryDTO implements Serializable { **Step 2: Commit** ```bash -git add ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/dto/CcdiPurchaseTransactionQueryDTO.java +git add ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/domain/dto/CcdiPurchaseTransactionQueryDTO.java git commit -m "feat: 添加采购交易查询DTO" ``` @@ -333,7 +333,7 @@ git commit -m "feat: 添加采购交易查询DTO" ## Task 4: 创建新增DTO **Files:** -- Create: `ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/dto/CcdiPurchaseTransactionAddDTO.java` +- Create: `ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/domain/dto/CcdiPurchaseTransactionAddDTO.java` **Step 1: 创建新增DTO（包含验证注解）** @@ -505,7 +505,7 @@ public class CcdiPurchaseTransactionAddDTO implements Serializable { **Step 2: Commit** ```bash -git add ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/dto/CcdiPurchaseTransactionAddDTO.java +git add ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/domain/dto/CcdiPurchaseTransactionAddDTO.java git commit -m "feat: 添加采购交易新增DTO" ``` @@ -514,7 +514,7 @@ git commit -m "feat: 添加采购交易新增DTO" ## Task 5: 创建编辑DTO **Files:** -- Create: `ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/dto/CcdiPurchaseTransactionEditDTO.java` +- Create: `ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/domain/dto/CcdiPurchaseTransactionEditDTO.java` **Step 1: 创建编辑DTO** @@ -523,7 +523,7 @@ git commit -m "feat: 添加采购交易新增DTO" **Step 2: Commit** ```bash -git add ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/dto/CcdiPurchaseTransactionEditDTO.java +git add ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/domain/dto/CcdiPurchaseTransactionEditDTO.java git commit -m "feat: 添加采购交易编辑DTO" ``` @@ -532,7 +532,7 @@ git commit -m "feat: 添加采购交易编辑DTO" ## Task 6: 创建VO类 **Files:** -- Create: `ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/vo/CcdiPurchaseTransactionVO.java` +- Create: `ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/domain/vo/CcdiPurchaseTransactionVO.java` **Step 1: 创建VO类** @@ -686,7 +686,7 @@ public class CcdiPurchaseTransactionVO implements Serializable { **Step 2: Commit** ```bash -git add ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/vo/CcdiPurchaseTransactionVO.java +git add ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/domain/vo/CcdiPurchaseTransactionVO.java git commit -m "feat: 添加采购交易VO类" ``` @@ -695,7 +695,7 @@ git commit -m "feat: 添加采购交易VO类" ## Task 7: 创建Excel导入导出类 **Files:** -- Create: `ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/excel/CcdiPurchaseTransactionExcel.java` +- Create: `ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/domain/excel/CcdiPurchaseTransactionExcel.java` **Step 1: 创建Excel类** @@ -704,7 +704,7 @@ git commit -m "feat: 添加采购交易VO类" **Step 2: Commit** ```bash -git add ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/excel/CcdiPurchaseTransactionExcel.java +git add ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/domain/excel/CcdiPurchaseTransactionExcel.java git commit -m "feat: 添加采购交易Excel类" ``` @@ -713,7 +713,7 @@ git commit -m "feat: 添加采购交易Excel类" ## Task 8: 创建Mapper接口 **Files:** -- Create: `ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/mapper/CcdiPurchaseTransactionMapper.java` +- Create: `ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/mapper/CcdiPurchaseTransactionMapper.java` **Step 1: 创建Mapper接口** @@ -763,7 +763,7 @@ public interface CcdiPurchaseTransactionMapper extends BaseMapper list); **步骤 3: 提交Mapper变更** ```bash -git add ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/mapper/CcdiEmployeeMapper.java -git add ruoyi-ccdi/src/main/resources/mapper/ccdi/CcdiEmployeeMapper.xml +git add ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/mapper/CcdiEmployeeMapper.java +git add ruoyi-info-collection/src/main/resources/mapper/ccdi/CcdiEmployeeMapper.xml git commit -m "feat: 添加批量插入或更新员工信息方法" ``` @@ -331,8 +331,8 @@ git commit -m "feat: 添加批量插入或更新员工信息方法" **目标:** 实现异步导入逻辑,包括数据分类、批量操作、Redis存储 **文件:** -- 修改: `ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/ICcdiEmployeeService.java` -- 修改: `ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/impl/CcdiEmployeeServiceImpl.java` +- 修改: `ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/service/ICcdiEmployeeService.java` +- 修改: `ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/service/impl/CcdiEmployeeServiceImpl.java` **步骤 1: 在Service接口中添加方法声明** @@ -625,7 +625,7 @@ public List getImportFailures(String taskId) { **步骤 6: 提交Service层代码** ```bash -git add ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/ +git add ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/service/ git commit -m "feat: 实现员工信息异步导入服务" ``` @@ -636,7 +636,7 @@ git commit -m "feat: 实现员工信息异步导入服务" **目标:** 修改导入接口为异步,添加状态查询和失败记录查询接口 **文件:** -- 修改: `ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/controller/CcdiEmployeeController.java` +- 修改: `ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/controller/CcdiEmployeeController.java` **步骤 1: 添加Resource注入** @@ -722,7 +722,7 @@ public TableDataInfo getImportFailures( **步骤 5: 提交Controller变更** ```bash -git add ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/controller/CcdiEmployeeController.java +git add ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/controller/CcdiEmployeeController.java git commit -m "feat: 修改导入接口为异步,添加状态和失败记录查询接口" ``` @@ -1411,15 +1411,15 @@ git push origin v1.x.x ### A. 相关文件清单 **后端:** -- `ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/config/AsyncConfig.java` -- `ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/vo/ImportResultVO.java` -- `ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/vo/ImportStatusVO.java` -- `ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/vo/ImportFailureVO.java` -- `ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/ICcdiEmployeeService.java` -- `ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/impl/CcdiEmployeeServiceImpl.java` -- `ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/mapper/CcdiEmployeeMapper.java` -- `ruoyi-ccdi/src/main/resources/mapper/ccdi/CcdiEmployeeMapper.xml` -- `ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/controller/CcdiEmployeeController.java` +- `ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/config/AsyncConfig.java` +- `ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/domain/vo/ImportResultVO.java` +- `ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/domain/vo/ImportStatusVO.java` +- `ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/domain/vo/ImportFailureVO.java` +- `ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/service/ICcdiEmployeeService.java` +- `ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/service/impl/CcdiEmployeeServiceImpl.java` +- `ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/mapper/CcdiEmployeeMapper.java` +- `ruoyi-info-collection/src/main/resources/mapper/ccdi/CcdiEmployeeMapper.xml` +- `ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/controller/CcdiEmployeeController.java` **前端:** - `ruoyi-ui/src/api/ccdiEmployee.js` diff --git a/doc/requirements/plans/2026-02-06-intermediary-async-import-design.md b/doc/requirements/plans/2026-02-06-intermediary-async-import-design.md index 77d0da4..2971a3e 100644 --- a/doc/requirements/plans/2026-02-06-intermediary-async-import-design.md +++ b/doc/requirements/plans/2026-02-06-intermediary-async-import-design.md @@ -869,19 +869,19 @@ private void updateImportStatus(String taskType, String taskId, String status, I | 文件路径 | 说明 | |---------|------| -| `ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/vo/IntermediaryPersonImportFailureVO.java` | 个人中介导入失败记录VO | -| `ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/vo/IntermediaryEntityImportFailureVO.java` | 实体中介导入失败记录VO | -| `ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/ICcdiIntermediaryPersonImportService.java` | 个人中介异步导入Service接口 | -| `ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/ICcdiIntermediaryEntityImportService.java` | 实体中介异步导入Service接口 | -| `ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/impl/CcdiIntermediaryPersonImportServiceImpl.java` | 个人中介异步导入Service实现 | -| `ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/impl/CcdiIntermediaryEntityImportServiceImpl.java` | 实体中介异步导入Service实现 | +| `ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/domain/vo/IntermediaryPersonImportFailureVO.java` | 个人中介导入失败记录VO | +| `ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/domain/vo/IntermediaryEntityImportFailureVO.java` | 实体中介导入失败记录VO | +| `ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/service/ICcdiIntermediaryPersonImportService.java` | 个人中介异步导入Service接口 | +| `ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/service/ICcdiIntermediaryEntityImportService.java` | 实体中介异步导入Service接口 | +| `ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/service/impl/CcdiIntermediaryPersonImportServiceImpl.java` | 个人中介异步导入Service实现 | +| `ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/service/impl/CcdiIntermediaryEntityImportServiceImpl.java` | 实体中介异步导入Service实现 | | `test/test_intermediary_import.py` | 测试脚本 | ### 5.2 修改文件 | 文件路径 | 修改内容 | |---------|---------| -| `ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/controller/CcdiIntermediaryController.java` | 修改导入接口,添加状态查询和失败记录查询接口(个人+实体共6个接口) | +| `ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/controller/CcdiIntermediaryController.java` | 修改导入接口,添加状态查询和失败记录查询接口(个人+实体共6个接口) | | `ruoyi-ui/src/api/ccdiIntermediary.js` | 添加导入状态和失败记录查询API(4个新方法) | | `ruoyi-ui/src/views/ccdiIntermediary/index.vue` | 添加轮询逻辑、失败记录UI(两套独立组件) | | `doc/api/ccdi_intermediary_api.md` | 更新API文档(新增导入相关接口文档) | @@ -904,20 +904,20 @@ private void updateImportStatus(String taskType, String taskId, String status, I #### 步骤1: 创建失败记录VO类 **文件:** -- `ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/vo/IntermediaryPersonImportFailureVO.java` -- `ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/vo/IntermediaryEntityImportFailureVO.java` +- `ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/domain/vo/IntermediaryPersonImportFailureVO.java` +- `ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/domain/vo/IntermediaryEntityImportFailureVO.java` #### 步骤2: 创建Service接口 **文件:** -- `ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/ICcdiIntermediaryPersonImportService.java` -- `ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/ICcdiIntermediaryEntityImportService.java` +- `ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/service/ICcdiIntermediaryPersonImportService.java` +- `ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/service/ICcdiIntermediaryEntityImportService.java` #### 步骤3: 实现Service **文件:** -- `ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/impl/CcdiIntermediaryPersonImportServiceImpl.java` -- `ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/impl/CcdiIntermediaryEntityImportServiceImpl.java` +- `ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/service/impl/CcdiIntermediaryPersonImportServiceImpl.java` +- `ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/service/impl/CcdiIntermediaryEntityImportServiceImpl.java` **操作:** - 实现`ICcdiIntermediaryPersonImportService`接口 @@ -931,7 +931,7 @@ private void updateImportStatus(String taskType, String taskId, String status, I #### 步骤4: 修改Controller **文件:** -- `ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/controller/CcdiIntermediaryController.java` +- `ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/controller/CcdiIntermediaryController.java` **操作:** - 注入两个导入Service diff --git a/doc/requirements/plans/2026-02-06-intermediary-async-import.md b/doc/requirements/plans/2026-02-06-intermediary-async-import.md index cda626a..8e7e2ac 100644 --- a/doc/requirements/plans/2026-02-06-intermediary-async-import.md +++ b/doc/requirements/plans/2026-02-06-intermediary-async-import.md @@ -14,8 +14,8 @@ **参考资料:** - 设计文档: `doc/plans/2026-02-06-intermediary-async-import-design.md` -- 员工导入实现: `ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/impl/CcdiEmployeeImportServiceImpl.java` -- 招聘导入实现: `ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/impl/CcdiStaffRecruitmentImportServiceImpl.java` +- 员工导入实现: `ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/service/impl/CcdiEmployeeImportServiceImpl.java` +- 招聘导入实现: `ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/service/impl/CcdiStaffRecruitmentImportServiceImpl.java` **关键依赖:** - `ImportResultVO` - 导入结果VO(已存在,复用) @@ -32,7 +32,7 @@ ## Task 1: 创建个人中介导入失败记录VO **文件:** -- Create: `ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/vo/IntermediaryPersonImportFailureVO.java` +- Create: `ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/domain/vo/IntermediaryPersonImportFailureVO.java` **Step 1: 创建VO类** @@ -84,13 +84,13 @@ public class IntermediaryPersonImportFailureVO implements Serializable { **Step 2: 编译验证** -Run: `mvn compile -pl ruoyi-ccdi` +Run: `mvn compile -pl ruoyi-info-collection` Expected: BUILD SUCCESS **Step 3: 提交** ```bash -git add ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/vo/IntermediaryPersonImportFailureVO.java +git add ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/domain/vo/IntermediaryPersonImportFailureVO.java git commit -m "feat: 添加个人中介导入失败记录VO" ``` @@ -99,7 +99,7 @@ git commit -m "feat: 添加个人中介导入失败记录VO" ## Task 2: 创建实体中介导入失败记录VO **文件:** -- Create: `ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/vo/IntermediaryEntityImportFailureVO.java` +- Create: `ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/domain/vo/IntermediaryEntityImportFailureVO.java` **Step 1: 创建VO类** @@ -152,13 +152,13 @@ public class IntermediaryEntityImportFailureVO implements Serializable { **Step 2: 编译验证** -Run: `mvn compile -pl ruoyi-ccdi` +Run: `mvn compile -pl ruoyi-info-collection` Expected: BUILD SUCCESS **Step 3: 提交** ```bash -git add ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/vo/IntermediaryEntityImportFailureVO.java +git add ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/domain/vo/IntermediaryEntityImportFailureVO.java git commit -m "feat: 添加实体中介导入失败记录VO" ``` @@ -167,7 +167,7 @@ git commit -m "feat: 添加实体中介导入失败记录VO" ## Task 3: 创建个人中介导入Service接口 **文件:** -- Create: `ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/ICcdiIntermediaryPersonImportService.java` +- Create: `ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/service/ICcdiIntermediaryPersonImportService.java` **Step 1: 创建Service接口** @@ -222,13 +222,13 @@ public interface ICcdiIntermediaryPersonImportService { **Step 2: 编译验证** -Run: `mvn compile -pl ruoyi-ccdi` +Run: `mvn compile -pl ruoyi-info-collection` Expected: BUILD SUCCESS **Step 3: 提交** ```bash -git add ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/ICcdiIntermediaryPersonImportService.java +git add ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/service/ICcdiIntermediaryPersonImportService.java git commit -m "feat: 添加个人中介异步导入Service接口" ``` @@ -237,7 +237,7 @@ git commit -m "feat: 添加个人中介异步导入Service接口" ## Task 4: 创建实体中介导入Service接口 **文件:** -- Create: `ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/ICcdiIntermediaryEntityImportService.java` +- Create: `ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/service/ICcdiIntermediaryEntityImportService.java` **Step 1: 创建Service接口** @@ -292,13 +292,13 @@ public interface ICcdiIntermediaryEntityImportService { **Step 2: 编译验证** -Run: `mvn compile -pl ruoyi-ccdi` +Run: `mvn compile -pl ruoyi-info-collection` Expected: BUILD SUCCESS **Step 3: 提交** ```bash -git add ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/ICcdiIntermediaryEntityImportService.java +git add ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/service/ICcdiIntermediaryEntityImportService.java git commit -m "feat: 添加实体中介异步导入Service接口" ``` @@ -307,7 +307,7 @@ git commit -m "feat: 添加实体中介异步导入Service接口" ## Task 5: 实现个人中介异步导入Service **文件:** -- Create: `ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/impl/CcdiIntermediaryPersonImportServiceImpl.java` +- Create: `ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/service/impl/CcdiIntermediaryPersonImportServiceImpl.java` **Step 1: 创建Service实现类** @@ -515,13 +515,13 @@ public class CcdiIntermediaryPersonImportServiceImpl implements ICcdiIntermediar **Step 2: 编译验证** -Run: `mvn compile -pl ruoyi-ccdi` +Run: `mvn compile -pl ruoyi-info-collection` Expected: BUILD SUCCESS **Step 3: 提交** ```bash -git add ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/impl/CcdiIntermediaryPersonImportServiceImpl.java +git add ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/service/impl/CcdiIntermediaryPersonImportServiceImpl.java git commit -m "feat: 实现个人中介异步导入Service" ``` @@ -530,7 +530,7 @@ git commit -m "feat: 实现个人中介异步导入Service" ## Task 6: 实现实体中介异步导入Service **文件:** -- Create: `ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/impl/CcdiIntermediaryEntityImportServiceImpl.java` +- Create: `ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/service/impl/CcdiIntermediaryEntityImportServiceImpl.java` **Step 1: 创建Service实现类** @@ -737,13 +737,13 @@ public class CcdiIntermediaryEntityImportServiceImpl implements ICcdiIntermediar **Step 2: 编译验证** -Run: `mvn compile -pl ruoyi-ccdi` +Run: `mvn compile -pl ruoyi-info-collection` Expected: BUILD SUCCESS **Step 3: 提交** ```bash -git add ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/impl/CcdiIntermediaryEntityImportServiceImpl.java +git add ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/service/impl/CcdiIntermediaryEntityImportServiceImpl.java git commit -m "feat: 实现实体中介异步导入Service" ``` @@ -752,7 +752,7 @@ git commit -m "feat: 实现实体中介异步导入Service" ## Task 7: 修改Controller - 注入Service和添加辅助方法 **文件:** -- Modify: `ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/controller/CcdiIntermediaryController.java` +- Modify: `ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/controller/CcdiIntermediaryController.java` **Step 1: 添加导入Service注入** @@ -801,13 +801,13 @@ private RedisTemplate redisTemplate; **Step 4: 编译验证** -Run: `mvn compile -pl ruoyi-ccdi` +Run: `mvn compile -pl ruoyi-info-collection` Expected: BUILD SUCCESS **Step 5: 提交** ```bash -git add ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/controller/CcdiIntermediaryController.java +git add ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/controller/CcdiIntermediaryController.java git commit -m "feat: Controller添加导入Service注入和辅助方法" ``` @@ -816,7 +816,7 @@ git commit -m "feat: Controller添加导入Service注入和辅助方法" ## Task 8: 修改Controller - 改造个人中介导入接口为异步 **文件:** -- Modify: `ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/controller/CcdiIntermediaryController.java` +- Modify: `ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/controller/CcdiIntermediaryController.java` **Step 1: 修改importPersonData方法** @@ -865,13 +865,13 @@ public AjaxResult importPersonData(MultipartFile file, **Step 2: 编译验证** -Run: `mvn compile -pl ruoyi-ccdi` +Run: `mvn compile -pl ruoyi-info-collection` Expected: BUILD SUCCESS **Step 3: 提交** ```bash -git add ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/controller/CcdiIntermediaryController.java +git add ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/controller/CcdiIntermediaryController.java git commit -m "feat: 改造个人中介导入接口为异步" ``` @@ -880,7 +880,7 @@ git commit -m "feat: 改造个人中介导入接口为异步" ## Task 9: 修改Controller - 添加个人中介状态查询接口 **文件:** -- Modify: `ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/controller/CcdiIntermediaryController.java` +- Modify: `ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/controller/CcdiIntermediaryController.java` **Step 1: 添加getPersonImportStatus方法** @@ -903,13 +903,13 @@ public AjaxResult getPersonImportStatus(@PathVariable String taskId) { **Step 2: 编译验证** -Run: `mvn compile -pl ruoyi-ccdi` +Run: `mvn compile -pl ruoyi-info-collection` Expected: BUILD SUCCESS **Step 3: 提交** ```bash -git add ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/controller/CcdiIntermediaryController.java +git add ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/controller/CcdiIntermediaryController.java git commit -m "feat: 添加个人中介导入状态查询接口" ``` @@ -918,7 +918,7 @@ git commit -m "feat: 添加个人中介导入状态查询接口" ## Task 10: 修改Controller - 添加个人中介失败记录查询接口 **文件:** -- Modify: `ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/controller/CcdiIntermediaryController.java` +- Modify: `ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/controller/CcdiIntermediaryController.java` **Step 1: 添加getPersonImportFailures方法** @@ -949,13 +949,13 @@ public TableDataInfo getPersonImportFailures( **Step 2: 编译验证** -Run: `mvn compile -pl ruoyi-ccdi` +Run: `mvn compile -pl ruoyi-info-collection` Expected: BUILD SUCCESS **Step 3: 提交** ```bash -git add ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/controller/CcdiIntermediaryController.java +git add ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/controller/CcdiIntermediaryController.java git commit -m "feat: 添加个人中介导入失败记录查询接口" ``` @@ -964,7 +964,7 @@ git commit -m "feat: 添加个人中介导入失败记录查询接口" ## Task 11: 修改Controller - 改造实体中介导入接口为异步 **文件:** -- Modify: `ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/controller/CcdiIntermediaryController.java` +- Modify: `ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/controller/CcdiIntermediaryController.java` **Step 1: 修改importEntityData方法** @@ -1013,13 +1013,13 @@ public AjaxResult importEntityData(MultipartFile file, **Step 2: 编译验证** -Run: `mvn compile -pl ruoyi-ccdi` +Run: `mvn compile -pl ruoyi-info-collection` Expected: BUILD SUCCESS **Step 3: 提交** ```bash -git add ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/controller/CcdiIntermediaryController.java +git add ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/controller/CcdiIntermediaryController.java git commit -m "feat: 改造实体中介导入接口为异步" ``` @@ -1028,7 +1028,7 @@ git commit -m "feat: 改造实体中介导入接口为异步" ## Task 12: 修改Controller - 添加实体中介状态查询接口 **文件:** -- Modify: `ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/controller/CcdiIntermediaryController.java` +- Modify: `ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/controller/CcdiIntermediaryController.java` **Step 1: 添加getEntityImportStatus方法** @@ -1051,13 +1051,13 @@ public AjaxResult getEntityImportStatus(@PathVariable String taskId) { **Step 2: 编译验证** -Run: `mvn compile -pl ruoyi-ccdi` +Run: `mvn compile -pl ruoyi-info-collection` Expected: BUILD SUCCESS **Step 3: 提交** ```bash -git add ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/controller/CcdiIntermediaryController.java +git add ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/controller/CcdiIntermediaryController.java git commit -m "feat: 添加实体中介导入状态查询接口" ``` @@ -1066,7 +1066,7 @@ git commit -m "feat: 添加实体中介导入状态查询接口" ## Task 13: 修改Controller - 添加实体中介失败记录查询接口 **文件:** -- Modify: `ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/controller/CcdiIntermediaryController.java` +- Modify: `ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/controller/CcdiIntermediaryController.java` **Step 1: 添加getEntityImportFailures方法** @@ -1097,13 +1097,13 @@ public TableDataInfo getEntityImportFailures( **Step 2: 编译验证** -Run: `mvn compile -pl ruoyi-ccdi` +Run: `mvn compile -pl ruoyi-info-collection` Expected: BUILD SUCCESS **Step 3: 提交** ```bash -git add ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/controller/CcdiIntermediaryController.java +git add ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/controller/CcdiIntermediaryController.java git commit -m "feat: 添加实体中介导入失败记录查询接口" ``` @@ -1924,7 +1924,7 @@ git commit -m "test: 添加中介导入测试脚本" **Step 1: 编译后端** -Run: `mvn clean compile -pl ruoyi-ccdi` +Run: `mvn clean compile -pl ruoyi-info-collection` Expected: BUILD SUCCESS **Step 2: 检查前端语法** diff --git a/doc/requirements/plans/2026-02-06-recruitment-async-import-design.md b/doc/requirements/plans/2026-02-06-recruitment-async-import-design.md index b2da827..3fa5dbc 100644 --- a/doc/requirements/plans/2026-02-06-recruitment-async-import-design.md +++ b/doc/requirements/plans/2026-02-06-recruitment-async-import-design.md @@ -695,7 +695,7 @@ methods: { #### 步骤1: 创建VO类 **文件:** -- `ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/vo/RecruitmentImportFailureVO.java` +- `ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/domain/vo/RecruitmentImportFailureVO.java` **操作:** - 创建`RecruitmentImportFailureVO`类 @@ -705,7 +705,7 @@ methods: { #### 步骤2: 创建Service接口 **文件:** -- `ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/ICcdiStaffRecruitmentImportService.java` +- `ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/service/ICcdiStaffRecruitmentImportService.java` **操作:** - 创建Service接口 @@ -714,7 +714,7 @@ methods: { #### 步骤3: 实现Service **文件:** -- `ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/impl/CcdiStaffRecruitmentImportServiceImpl.java` +- `ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/service/impl/CcdiStaffRecruitmentImportServiceImpl.java` **操作:** - 实现`ICcdiStaffRecruitmentImportService`接口 @@ -727,7 +727,7 @@ methods: { #### 步骤4: 修改Controller **文件:** -- `ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/controller/CcdiStaffRecruitmentController.java` +- `ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/controller/CcdiStaffRecruitmentController.java` **操作:** - 注入`ICcdiStaffRecruitmentImportService` @@ -807,16 +807,16 @@ git commit -m "feat: 实现招聘信息异步导入功能" | 文件路径 | 说明 | |---------|------| -| `ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/vo/RecruitmentImportFailureVO.java` | 招聘信息导入失败记录VO | -| `ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/ICcdiStaffRecruitmentImportService.java` | 招聘信息异步导入Service接口 | -| `ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/impl/CcdiStaffRecruitmentImportServiceImpl.java` | 招聘信息异步导入Service实现 | +| `ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/domain/vo/RecruitmentImportFailureVO.java` | 招聘信息导入失败记录VO | +| `ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/service/ICcdiStaffRecruitmentImportService.java` | 招聘信息异步导入Service接口 | +| `ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/service/impl/CcdiStaffRecruitmentImportServiceImpl.java` | 招聘信息异步导入Service实现 | | `test/test_recruitment_import.py` | 测试脚本 | ### 7.2 修改文件 | 文件路径 | 修改内容 | |---------|---------| -| `ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/controller/CcdiStaffRecruitmentController.java` | 修改导入接口,添加状态查询和失败记录查询接口 | +| `ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/controller/CcdiStaffRecruitmentController.java` | 修改导入接口,添加状态查询和失败记录查询接口 | | `ruoyi-ui/src/api/ccdiStaffRecruitment.js` | 添加导入状态和失败记录查询API | | `ruoyi-ui/src/views/ccdiStaffRecruitment/index.vue` | 添加轮询逻辑和失败记录UI | | `doc/api/ccdi_staff_recruitment_api.md` | 更新API文档 | diff --git a/doc/requirements/plans/2026-02-08-intermediary-import-upsert-implementation.md b/doc/requirements/plans/2026-02-08-intermediary-import-upsert-implementation.md index ccd334f..6439564 100644 --- a/doc/requirements/plans/2026-02-08-intermediary-import-upsert-implementation.md +++ b/doc/requirements/plans/2026-02-08-intermediary-import-upsert-implementation.md @@ -60,7 +60,7 @@ ALTER TABLE cdi_biz_intermediary ADD UNIQUE KEY uk_person_id (person_id); ### Task 1: 添加个人中介批量导入方法接口 **文件:** -- 修改: `ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/mapper/CcdiBizIntermediaryMapper.java` +- 修改: `ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/mapper/CcdiBizIntermediaryMapper.java` **Step 1: 添加方法签名到接口** @@ -81,7 +81,7 @@ void importPersonBatch(@Param("list") List list); ```bash cd .worktrees/intermediary-import-upsert -mvn compile -pl ruoyi-ccdi -am +mvn compile -pl ruoyi-info-collection -am ``` 预期: 编译成功,无错误 @@ -89,7 +89,7 @@ mvn compile -pl ruoyi-ccdi -am **Step 3: 提交** ```bash -git add ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/mapper/CcdiBizIntermediaryMapper.java +git add ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/mapper/CcdiBizIntermediaryMapper.java git commit -m "feat: 添加个人中介批量导入方法签名 添加importPersonBatch方法到Mapper接口,用于支持ON DUPLICATE KEY UPDATE的批量导入操作。 @@ -102,7 +102,7 @@ Co-Authored-By: Claude Sonnet 4.5 " ### Task 2: 实现个人中介批量导入SQL **文件:** -- 修改: `ruoyi-ccdi/src/main/resources/mapper/ccdi/CcdiBizIntermediaryMapper.xml` +- 修改: `ruoyi-info-collection/src/main/resources/mapper/ccdi/CcdiBizIntermediaryMapper.xml` **Step 1: 在XML文件中添加SQL实现** @@ -137,7 +137,7 @@ Co-Authored-By: Claude Sonnet 4.5 " ```bash # 检查XML格式是否正确 -xmllint --noout ruoyi-ccdi/src/main/resources/mapper/ccdi/CcdiBizIntermediaryMapper.xml +xmllint --noout ruoyi-info-collection/src/main/resources/mapper/ccdi/CcdiBizIntermediaryMapper.xml ``` 预期: 无输出表示格式正确 @@ -145,7 +145,7 @@ xmllint --noout ruoyi-ccdi/src/main/resources/mapper/ccdi/CcdiBizIntermediaryMap **Step 3: 验证编译** ```bash -mvn compile -pl ruoyi-ccdi -am +mvn compile -pl ruoyi-info-collection -am ``` 预期: 编译成功 @@ -153,7 +153,7 @@ mvn compile -pl ruoyi-ccdi -am **Step 4: 提交** ```bash -git add ruoyi-ccdi/src/main/resources/mapper/ccdi/CcdiBizIntermediaryMapper.xml +git add ruoyi-info-collection/src/main/resources/mapper/ccdi/CcdiBizIntermediaryMapper.xml git commit -m "feat: 实现个人中介批量导入ON DUPLICATE KEY UPDATE SQL 使用INSERT ... ON DUPLICATE KEY UPDATE实现单次SQL完成插入或更新操作。 @@ -169,7 +169,7 @@ Co-Authored-By: Claude Sonnet 4.5 " ### Task 3: 添加实体中介批量导入方法接口 **文件:** -- 修改: `ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/mapper/CcdiEnterpriseBaseInfoMapper.java` +- 修改: `ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/mapper/CcdiEnterpriseBaseInfoMapper.java` **Step 1: 添加方法签名到接口** @@ -185,13 +185,13 @@ void importEntityBatch(@Param("list") List list); **Step 2: 验证编译** ```bash -mvn compile -pl ruoyi-ccdi -am +mvn compile -pl ruoyi-info-collection -am ``` **Step 3: 提交** ```bash -git add ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/mapper/CcdiEnterpriseBaseInfoMapper.java +git add ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/mapper/CcdiEnterpriseBaseInfoMapper.java git commit -m "feat: 添加实体中介批量导入方法签名 添加importEntityBatch方法到Mapper接口。 @@ -204,7 +204,7 @@ Co-Authored-By: Claude Sonnet 4.5 " ### Task 4: 实现实体中介批量导入SQL **文件:** -- 修改: `ruoyi-ccdi/src/main/resources/mapper/ccdi/CcdiEnterpriseBaseInfoMapper.xml` +- 修改: `ruoyi-info-collection/src/main/resources/mapper/ccdi/CcdiEnterpriseBaseInfoMapper.xml` **Step 1: 在XML文件中添加SQL实现** @@ -237,19 +237,19 @@ Co-Authored-By: Claude Sonnet 4.5 " **Step 2: 验证XML语法** ```bash -xmllint --noout ruoyi-ccdi/src/main/resources/mapper/ccdi/CcdiEnterpriseBaseInfoMapper.xml +xmllint --noout ruoyi-info-collection/src/main/resources/mapper/ccdi/CcdiEnterpriseBaseInfoMapper.xml ``` **Step 3: 验证编译** ```bash -mvn compile -pl ruoyi-ccdi -am +mvn compile -pl ruoyi-info-collection -am ``` **Step 4: 提交** ```bash -git add ruoyi-ccdi/src/main/resources/mapper/ccdi/CcdiEnterpriseBaseInfoMapper.xml +git add ruoyi-info-collection/src/main/resources/mapper/ccdi/CcdiEnterpriseBaseInfoMapper.xml git commit -m "feat: 实现实体中介批量导入ON DUPLICATE KEY UPDATE SQL 使用INSERT ... ON DUPLICATE KEY UPDATE实现单次SQL完成插入或更新操作。 @@ -266,7 +266,7 @@ Co-Authored-By: Claude Sonnet 4.5 " ### Task 5: 重构个人中介导入Service - 更新模式 **文件:** -- 修改: `ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/impl/CcdiIntermediaryPersonImportServiceImpl.java` +- 修改: `ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/service/impl/CcdiIntermediaryPersonImportServiceImpl.java` **Step 1: 修改 importPersonAsync 方法的核心导入逻辑** @@ -361,13 +361,13 @@ private CcdiIntermediaryPersonExcel convertToExcel(CcdiBizIntermediary entity) { **Step 4: 验证编译** ```bash -mvn compile -pl ruoyi-ccdi -am +mvn compile -pl ruoyi-info-collection -am ``` **Step 5: 提交** ```bash -git add ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/impl/CcdiIntermediaryPersonImportServiceImpl.java +git add ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/service/impl/CcdiIntermediaryPersonImportServiceImpl.java git commit -m "refactor: 重构个人中介导入Service使用ON DUPLICATE KEY UPDATE 主要变更: @@ -384,7 +384,7 @@ Co-Authored-By: Claude Sonnet 4.5 " ### Task 6: 重构实体中介导入Service - 更新模式 **文件:** -- 修改: `ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/impl/CcdiIntermediaryEntityImportServiceImpl.java` +- 修改: `ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/service/impl/CcdiIntermediaryEntityImportServiceImpl.java` **Step 1: 修改 importEntityAsync 方法的核心导入逻辑** @@ -475,13 +475,13 @@ private CcdiIntermediaryEntityExcel convertToExcel(CcdiEnterpriseBaseInfo entity **Step 4: 验证编译** ```bash -mvn compile -pl ruoyi-ccdi -am +mvn compile -pl ruoyi-info-collection -am ``` **Step 5: 提交** ```bash -git add ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/impl/CcdiIntermediaryEntityImportServiceImpl.java +git add ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/service/impl/CcdiIntermediaryEntityImportServiceImpl.java git commit -m "refactor: 重构实体中介导入Service使用ON DUPLICATE KEY UPDATE 与个人中介导入保持一致的实现方式。 @@ -496,7 +496,7 @@ Co-Authored-By: Claude Sonnet 4.5 " ### Task 7: 编写个人中介导入单元测试 **文件:** -- 创建: `ruoyi-ccdi/src/test/java/com/ruoyi/ccdi/mapper/CcdiBizIntermediaryMapperTest.java` +- 创建: `ruoyi-info-collection/src/test/java/com/ruoyi/ccdi/mapper/CcdiBizIntermediaryMapperTest.java` **Step 1: 创建测试类** @@ -643,7 +643,7 @@ class CcdiBizIntermediaryMapperTest { **Step 2: 运行测试** ```bash -mvn test -pl ruoyi-ccdi -Dtest=CcdiBizIntermediaryMapperTest +mvn test -pl ruoyi-info-collection -Dtest=CcdiBizIntermediaryMapperTest ``` 预期: 所有测试通过 (3 tests, 0 failures) @@ -651,7 +651,7 @@ mvn test -pl ruoyi-ccdi -Dtest=CcdiBizIntermediaryMapperTest **Step 3: 提交** ```bash -git add ruoyi-ccdi/src/test/java/com/ruoyi/ccdi/mapper/CcdiBizIntermediaryMapperTest.java +git add ruoyi-info-collection/src/test/java/com/ruoyi/ccdi/mapper/CcdiBizIntermediaryMapperTest.java git commit -m "test: 添加个人中介批量导入单元测试 覆盖场景: @@ -668,7 +668,7 @@ Co-Authored-By: Claude Sonnet 4.5 " ### Task 8: 编写实体中介导入单元测试 **文件:** -- 创建: `ruoyi-ccdi/src/test/java/com/ruoyi/ccdi/mapper/CcdiEnterpriseBaseInfoMapperTest.java` +- 创建: `ruoyi-info-collection/src/test/java/com/ruoyi/ccdi/mapper/CcdiEnterpriseBaseInfoMapperTest.java` **Step 1: 创建测试类** @@ -797,7 +797,7 @@ class CcdiEnterpriseBaseInfoMapperTest { **Step 2: 运行测试** ```bash -mvn test -pl ruoyi-ccdi -Dtest=CcdiEnterpriseBaseInfoMapperTest +mvn test -pl ruoyi-info-collection -Dtest=CcdiEnterpriseBaseInfoMapperTest ``` 预期: 所有测试通过 @@ -805,7 +805,7 @@ mvn test -pl ruoyi-ccdi -Dtest=CcdiEnterpriseBaseInfoMapperTest **Step 3: 提交** ```bash -git add ruoyi-ccdi/src/test/java/com/ruoyi/ccdi/mapper/CcdiEnterpriseBaseInfoMapperTest.java +git add ruoyi-info-collection/src/test/java/com/ruoyi/ccdi/mapper/CcdiEnterpriseBaseInfoMapperTest.java git commit -m "test: 添加实体中介批量导入单元测试 覆盖场景与个人中介测试一致。 @@ -818,7 +818,7 @@ Co-Authored-By: Claude Sonnet 4.5 " ### Task 9: 集成测试 - 使用真实Excel文件 **文件:** -- 创建: `ruoyi-ccdi/src/test/java/com/ruoyi/ccdi/service/CcdiIntermediaryImportIntegrationTest.java` +- 创建: `ruoyi-info-collection/src/test/java/com/ruoyi/ccdi/service/CcdiIntermediaryImportIntegrationTest.java` **Step 1: 创建集成测试** @@ -927,13 +927,13 @@ class CcdiIntermediaryImportIntegrationTest { **Step 2: 运行集成测试** ```bash -mvn test -pl ruoyi-ccdi -Dtest=CcdiIntermediaryImportIntegrationTest +mvn test -pl ruoyi-info-collection -Dtest=CcdiIntermediaryImportIntegrationTest ``` **Step 3: 提交** ```bash -git add ruoyi-ccdi/src/test/java/com/ruoyi/ccdi/service/CcdiIntermediaryImportIntegrationTest.java +git add ruoyi-info-collection/src/test/java/com/ruoyi/ccdi/service/CcdiIntermediaryImportIntegrationTest.java git commit -m "test: 添加中介导入集成测试 测试端到端的导入流程,包括: @@ -1011,7 +1011,7 @@ Co-Authored-By: Claude Sonnet 4.5 " ```bash cd .worktrees/intermediary-import-upsert -mvn test -pl ruoyi-ccdi +mvn test -pl ruoyi-info-collection ``` 预期: 所有测试通过,包括新增的测试和现有的回归测试 @@ -1019,10 +1019,10 @@ mvn test -pl ruoyi-ccdi **Step 2: 检查测试覆盖率(可选)** ```bash -mvn jacoco:report -pl ruoyi-ccdi +mvn jacoco:report -pl ruoyi-info-collection ``` -查看覆盖率报告: `ruoyi-ccdi/target/site/jacoco/index.html` +查看覆盖率报告: `ruoyi-info-collection/target/site/jacoco/index.html` **Step 3: 记录测试结果** @@ -1082,7 +1082,7 @@ Co-Authored-By: Claude Sonnet 4.5 " ```bash # 运行代码检查(如果项目配置了checkstyle或spotbugs) -mvn checkstyle:check -pl ruoyi-ccdi +mvn checkstyle:check -pl ruoyi-info-collection ``` **Step 2: 检查未使用的导入** @@ -1096,7 +1096,7 @@ mvn checkstyle:check -pl ruoyi-ccdi **Step 4: 最终构建验证** ```bash -mvn clean package -pl ruoyi-ccdi -am -DskipTests +mvn clean package -pl ruoyi-info-collection -am -DskipTests ``` 预期: 构建成功,生成jar文件 @@ -1174,10 +1174,10 @@ Co-Authored-By: Claude Sonnet 4.5 " ### 影响范围 **影响的模块:** -- `ruoyi-ccdi/mapper/CcdiBizIntermediaryMapper` -- `ruoyi-ccdi/mapper/CcdiEnterpriseBaseInfoMapper` -- `ruoyi-ccdi/service/impl/CcdiIntermediaryPersonImportServiceImpl` -- `ruoyi-ccdi/service/impl/CcdiIntermediaryEntityImportServiceImpl` +- `ruoyi-info-collection/mapper/CcdiBizIntermediaryMapper` +- `ruoyi-info-collection/mapper/CcdiEnterpriseBaseInfoMapper` +- `ruoyi-info-collection/service/impl/CcdiIntermediaryPersonImportServiceImpl` +- `ruoyi-info-collection/service/impl/CcdiIntermediaryEntityImportServiceImpl` **不影响:** - Controller层 (无变更) @@ -1318,7 +1318,7 @@ git worktree remove .worktrees/intermediary-import-upsert **实施完成后,请在worktree中运行:** ```bash -mvn clean package -pl ruoyi-ccdi -am +mvn clean package -pl ruoyi-info-collection -am ``` 验证构建成功后,即可合并分支或创建Pull Request。 diff --git a/doc/requirements/plans/2026-02-08-purchase-transaction-import-fixes.md b/doc/requirements/plans/2026-02-08-purchase-transaction-import-fixes.md index 5c19bbd..4afbd5f 100644 --- a/doc/requirements/plans/2026-02-08-purchase-transaction-import-fixes.md +++ b/doc/requirements/plans/2026-02-08-purchase-transaction-import-fixes.md @@ -21,7 +21,7 @@ 修改 `CcdiPurchaseTransactionExcel.java`，将数值字段类型从 String 改为 BigDecimal **修改文件**: -- `ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/excel/CcdiPurchaseTransactionExcel.java:52-82` +- `ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/domain/excel/CcdiPurchaseTransactionExcel.java:52-82` **修改内容**: ```java @@ -59,7 +59,7 @@ private BigDecimal bidAmount; 4. 使用 `getDataTable()` 方法返回分页格式 **修改文件**: -- `ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/controller/CcdiPurchaseTransactionController.java:173-196` +- `ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/controller/CcdiPurchaseTransactionController.java:173-196` **修改内容**: ```java @@ -197,11 +197,11 @@ protected TableDataInfo getDataTable(List list, long total) { ## 附录：相关文件 ### 修改的文件 -1. `ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/excel/CcdiPurchaseTransactionExcel.java` -2. `ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/controller/CcdiPurchaseTransactionController.java` +1. `ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/domain/excel/CcdiPurchaseTransactionExcel.java` +2. `ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/controller/CcdiPurchaseTransactionController.java` ### 参考文件 -1. `ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/controller/CcdiEmployeeController.java` (员工信息管理，作为参考) +1. `ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/controller/CcdiEmployeeController.java` (员工信息管理，作为参考) ### 测试文件 1. `doc/test-data/purchase_transaction/generate-test-data.js` (测试数据生成脚本) diff --git a/doc/requirements/plans/2026-02-08-task-5-6-completion-report.md b/doc/requirements/plans/2026-02-08-task-5-6-completion-report.md index 06ff1f2..edb02d6 100644 --- a/doc/requirements/plans/2026-02-08-task-5-6-completion-report.md +++ b/doc/requirements/plans/2026-02-08-task-5-6-completion-report.md @@ -268,7 +268,7 @@ Co-Authored-By: Claude Sonnet 4.5 ```bash cd D:\ccdi\ccdi\.worktrees\intermediary-import-upsert -mvn compile -pl ruoyi-ccdi -am -q +mvn compile -pl ruoyi-info-collection -am -q ``` **结果:** ✅ 编译成功,无错误无警告 diff --git a/doc/requirements/plans/2026-02-08-中介导入异步化改造设计.md b/doc/requirements/plans/2026-02-08-中介导入异步化改造设计.md index a9cb688..a28f4f2 100644 --- a/doc/requirements/plans/2026-02-08-中介导入异步化改造设计.md +++ b/doc/requirements/plans/2026-02-08-中介导入异步化改造设计.md @@ -130,7 +130,7 @@ Controller解析Excel #### 文件1: CcdiIntermediaryServiceImpl.java -**路径**: `ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/impl/CcdiIntermediaryServiceImpl.java` +**路径**: `ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/service/impl/CcdiIntermediaryServiceImpl.java` **需要添加的依赖注入**: ```java @@ -200,7 +200,7 @@ public String importIntermediaryPerson(List list, #### 文件2: CcdiIntermediaryController.java -**路径**: `ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/controller/CcdiIntermediaryController.java` +**路径**: `ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/controller/CcdiIntermediaryController.java` **需要添加的依赖注入**: ```java @@ -614,7 +614,7 @@ ab -n 100 -c 10 -T "multipart/form-data; boundary=----WebKitFormBoundary" \ 2. **编译打包** ```bash # 后端 - cd ruoyi-ccdi + cd ruoyi-info-collection mvn clean package # 前端 diff --git a/doc/requirements/原型图开发设计文档.md b/doc/requirements/原型图开发设计文档.md index 4f71799..31b6bf2 100644 --- a/doc/requirements/原型图开发设计文档.md +++ b/doc/requirements/原型图开发设计文档.md @@ -528,7 +528,7 @@ CREATE TABLE ccdi_transaction_category ( ### 3.1 后端模块划分 ``` -ruoyi-ccdi/ (新建模块) +ruoyi-info-collection/ (新建模块) ├── controller/ │ ├── CcdiProjectController.java # 项目管理 │ ├── CcdiDataUploadController.java # 数据上传 diff --git a/doc/reviews/2026-02-11-final-code-review.md b/doc/reviews/2026-02-11-final-code-review.md index 29ff562..7a49788 100644 --- a/doc/reviews/2026-02-11-final-code-review.md +++ b/doc/reviews/2026-02-11-final-code-review.md @@ -8,7 +8,7 @@ ### CcdiStaffEnterpriseRelationVO.java -文件位置: `ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/vo/CcdiStaffEnterpriseRelationVO.java` +文件位置: `ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/domain/vo/CcdiStaffEnterpriseRelationVO.java` | 检查项 | 状态 | 说明 | |--------|------|------| @@ -29,7 +29,7 @@ private String personName; ### CcdiStaffEnterpriseRelationMapper.xml -文件位置: `ruoyi-ccdi/src/main/resources/mapper/ccdi/CcdiStaffEnterpriseRelationMapper.xml` +文件位置: `ruoyi-info-collection/src/main/resources/mapper/ccdi/CcdiStaffEnterpriseRelationMapper.xml` | 检查项 | 状态 | 说明 | |--------|------|------| @@ -295,8 +295,8 @@ eec2f8c feat(staff-enterprise-relation): Task 6完成后端编译验证 ### 文件变更统计 **后端文件:** -- `ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/vo/CcdiStaffEnterpriseRelationVO.java` (添加personName字段) -- `ruoyi-ccdi/src/main/resources/mapper/ccdi/CcdiStaffEnterpriseRelationMapper.xml` (添加LEFT JOIN和ResultMap映射) +- `ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/domain/vo/CcdiStaffEnterpriseRelationVO.java` (添加personName字段) +- `ruoyi-info-collection/src/main/resources/mapper/ccdi/CcdiStaffEnterpriseRelationMapper.xml` (添加LEFT JOIN和ResultMap映射) **前端文件:** - `ruoyi-ui/src/views/ccdiStaffEnterpriseRelation/index.vue` (添加员工姓名列) diff --git a/doc/reviews/2026-02-11-staff-relation-import-fix-review.md b/doc/reviews/2026-02-11-staff-relation-import-fix-review.md index 301396d..18f054c 100644 --- a/doc/reviews/2026-02-11-staff-relation-import-fix-review.md +++ b/doc/reviews/2026-02-11-staff-relation-import-fix-review.md @@ -3,7 +3,7 @@ **审查日期：** 2026-02-11 **审查人：** Code Review Agent **修复提交：** af7ec6f43dc1c8a80fe23cb5a437eef27ea5002d -**审查文件：** `ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/impl/CcdiStaffEnterpriseRelationImportServiceImpl.java` +**审查文件：** `ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/service/impl/CcdiStaffEnterpriseRelationImportServiceImpl.java` --- diff --git a/doc/reviews/2026-02-11-staff-relation-import-supplement.md b/doc/reviews/2026-02-11-staff-relation-import-supplement.md index 5ccdc4f..b5c515a 100644 --- a/doc/reviews/2026-02-11-staff-relation-import-supplement.md +++ b/doc/reviews/2026-02-11-staff-relation-import-supplement.md @@ -30,7 +30,7 @@ ```bash # 在采购交易导入服务中搜索身份证号存在性检查 grep -n "CcdiBaseStaff\|existingPersonIds\|身份证.*存在" \ - ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/impl/CcdiPurchaseTransactionImportServiceImpl.java + ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/service/impl/CcdiPurchaseTransactionImportServiceImpl.java # 结果：No matches found ``` @@ -251,4 +251,4 @@ if (!addDTO.getPersonId().matches("^[1-9]\\d{5}(18|19|20)\\d{2}(0[1-9]|1[0-2])(0 - [员工实体关系信息维护功能设计文档](../design/staff-enterprise-relation/员工实体关系信息维护功能设计文档.md) - [2026-02-11 员工实体关系导入代码审查报告（修复后复审）](./2026-02-11-staff-relation-import-fix-review.md) -- [采购交易管理功能实现](../../ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/impl/CcdiPurchaseTransactionImportServiceImpl.java) +- [采购交易管理功能实现](../../ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/service/impl/CcdiPurchaseTransactionImportServiceImpl.java) diff --git a/doc/reviews/2026-02-11-task-2-code-review.md b/doc/reviews/2026-02-11-task-2-code-review.md index 17e2b4e..6071ff4 100644 --- a/doc/reviews/2026-02-11-task-2-code-review.md +++ b/doc/reviews/2026-02-11-task-2-code-review.md @@ -374,12 +374,12 @@ ccdi_base_staff.name → 映射为 VO.personName ### 8.1 项目内参考实现 1. **员工亲属关系模块** (正确实现): - - 文件: `ruoyi-ccdi/src/main/resources/mapper/ccdi/CcdiStaffFmyRelationMapper.xml` + - 文件: `ruoyi-info-collection/src/main/resources/mapper/ccdi/CcdiStaffFmyRelationMapper.xml` - 提交: 历史提交记录 - 特点: 完整实现personName字段的查询和映射 2. **员工调动模块** (正确实现): - - 文件: `ruoyi-ccdi/src/main/resources/mapper/ccdi/CcdiStaffTransferMapper.xml` + - 文件: `ruoyi-info-collection/src/main/resources/mapper/ccdi/CcdiStaffTransferMapper.xml` - 特点: 类似的staffName字段实现 ### 8.2 数据库文档 diff --git a/doc/实施文档/员工调动记录唯一性校验实施总结.md b/doc/实施文档/员工调动记录唯一性校验实施总结.md index c098bfc..16b065c 100644 --- a/doc/实施文档/员工调动记录唯一性校验实施总结.md +++ b/doc/实施文档/员工调动记录唯一性校验实施总结.md @@ -129,7 +129,7 @@ doc/数据库文档/员工调动记录/04_add_unique_index.sql ### Java源码 ``` -ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/ +ruoyi-info-collection/src/main/java/com/ruoyi/ccdi/ ├── domain/dto/ │ └── TransferUniqueKey.java [新增] ├── mapper/ diff --git a/doc/实施文档/员工调动记录实施总结.md b/doc/实施文档/员工调动记录实施总结.md index 2797674..2972c22 100644 --- a/doc/实施文档/员工调动记录实施总结.md +++ b/doc/实施文档/员工调动记录实施总结.md @@ -34,7 +34,7 @@ ### 2. 后端代码 ✓ -**文件位置**: `D:\ccdi\ccdi\ruoyi-ccdi\src\main\java\com\ruoyi\ccdi\` +**文件位置**: `D:\ccdi\ccdi\ruoyi-info-collection\src\main\java\com\ruoyi\ccdi\` #### 2.1 实体类 (1个) - `CcdiStaffTransfer.java` - 员工调动记录实体 diff --git a/pom.xml b/pom.xml index 89f1eab..2c66e2e 100644 --- a/pom.xml +++ b/pom.xml @@ -201,10 +201,10 @@ ${ruoyi.version} - + com.ruoyi - ruoyi-ccdi + ruoyi-info-collection ${ruoyi.version} @@ -218,7 +218,7 @@ ruoyi-quartz ruoyi-generator ruoyi-common - ruoyi-ccdi + ruoyi-info-collection pom diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml index cb79bae..47de15d 100644 --- a/ruoyi-admin/pom.xml +++ b/ruoyi-admin/pom.xml @@ -54,10 +54,10 @@ ruoyi-generator - + com.ruoyi - ruoyi-ccdi + ruoyi-info-collection diff --git a/ruoyi-ccdi/pom.xml b/ruoyi-info-collection/pom.xml similarity index 96% rename from ruoyi-ccdi/pom.xml rename to ruoyi-info-collection/pom.xml index 24ea468..e0cfc52 100644 --- a/ruoyi-ccdi/pom.xml +++ b/ruoyi-info-collection/pom.xml @@ -9,10 +9,10 @@ 4.0.0 - ruoyi-ccdi + ruoyi-info-collection - 纪检初核系统模块 + 信息采集模块 diff --git a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/annotation/EnumValid.java b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/annotation/EnumValid.java similarity index 89% rename from ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/annotation/EnumValid.java rename to ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/annotation/EnumValid.java index cb1a6cc..7bb0700 100644 --- a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/annotation/EnumValid.java +++ b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/annotation/EnumValid.java @@ -1,6 +1,6 @@ -package com.ruoyi.ccdi.annotation; +package com.ruoyi.info.collection.annotation; -import com.ruoyi.ccdi.validation.EnumValidator; +import com.ruoyi.info.collection.validation.EnumValidator; import jakarta.validation.Constraint; import jakarta.validation.Payload; diff --git a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/controller/CcdiBaseStaffController.java b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/controller/CcdiBaseStaffController.java similarity index 92% rename from ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/controller/CcdiBaseStaffController.java rename to ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/controller/CcdiBaseStaffController.java index 63d1fd3..249f691 100644 --- a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/controller/CcdiBaseStaffController.java +++ b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/controller/CcdiBaseStaffController.java @@ -1,14 +1,14 @@ -package com.ruoyi.ccdi.controller; +package com.ruoyi.info.collection.controller; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.ruoyi.ccdi.domain.dto.CcdiBaseStaffAddDTO; -import com.ruoyi.ccdi.domain.dto.CcdiBaseStaffEditDTO; -import com.ruoyi.ccdi.domain.dto.CcdiBaseStaffQueryDTO; -import com.ruoyi.ccdi.domain.excel.CcdiBaseStaffExcel; -import com.ruoyi.ccdi.domain.vo.*; -import com.ruoyi.ccdi.service.ICcdiBaseStaffImportService; -import com.ruoyi.ccdi.service.ICcdiBaseStaffService; -import com.ruoyi.ccdi.utils.EasyExcelUtil; +import com.ruoyi.info.collection.domain.dto.CcdiBaseStaffAddDTO; +import com.ruoyi.info.collection.domain.dto.CcdiBaseStaffEditDTO; +import com.ruoyi.info.collection.domain.dto.CcdiBaseStaffQueryDTO; +import com.ruoyi.info.collection.domain.excel.CcdiBaseStaffExcel; +import com.ruoyi.info.collection.domain.vo.*; +import com.ruoyi.info.collection.service.ICcdiBaseStaffImportService; +import com.ruoyi.info.collection.service.ICcdiBaseStaffService; +import com.ruoyi.info.collection.utils.EasyExcelUtil; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; diff --git a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/controller/CcdiCustEnterpriseRelationController.java b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/controller/CcdiCustEnterpriseRelationController.java similarity index 90% rename from ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/controller/CcdiCustEnterpriseRelationController.java rename to ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/controller/CcdiCustEnterpriseRelationController.java index 8c630d9..625edf1 100644 --- a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/controller/CcdiCustEnterpriseRelationController.java +++ b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/controller/CcdiCustEnterpriseRelationController.java @@ -1,17 +1,17 @@ -package com.ruoyi.ccdi.controller; +package com.ruoyi.info.collection.controller; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.ruoyi.ccdi.domain.dto.CcdiCustEnterpriseRelationAddDTO; -import com.ruoyi.ccdi.domain.dto.CcdiCustEnterpriseRelationEditDTO; -import com.ruoyi.ccdi.domain.dto.CcdiCustEnterpriseRelationQueryDTO; -import com.ruoyi.ccdi.domain.excel.CcdiCustEnterpriseRelationExcel; -import com.ruoyi.ccdi.domain.vo.CcdiCustEnterpriseRelationVO; -import com.ruoyi.ccdi.domain.vo.CustEnterpriseRelationImportFailureVO; -import com.ruoyi.ccdi.domain.vo.ImportResultVO; -import com.ruoyi.ccdi.domain.vo.ImportStatusVO; -import com.ruoyi.ccdi.service.ICcdiCustEnterpriseRelationImportService; -import com.ruoyi.ccdi.service.ICcdiCustEnterpriseRelationService; -import com.ruoyi.ccdi.utils.EasyExcelUtil; +import com.ruoyi.info.collection.domain.dto.CcdiCustEnterpriseRelationAddDTO; +import com.ruoyi.info.collection.domain.dto.CcdiCustEnterpriseRelationEditDTO; +import com.ruoyi.info.collection.domain.dto.CcdiCustEnterpriseRelationQueryDTO; +import com.ruoyi.info.collection.domain.excel.CcdiCustEnterpriseRelationExcel; +import com.ruoyi.info.collection.domain.vo.CcdiCustEnterpriseRelationVO; +import com.ruoyi.info.collection.domain.vo.CustEnterpriseRelationImportFailureVO; +import com.ruoyi.info.collection.domain.vo.ImportResultVO; +import com.ruoyi.info.collection.domain.vo.ImportStatusVO; +import com.ruoyi.info.collection.service.ICcdiCustEnterpriseRelationImportService; +import com.ruoyi.info.collection.service.ICcdiCustEnterpriseRelationService; +import com.ruoyi.info.collection.utils.EasyExcelUtil; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; diff --git a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/controller/CcdiCustFmyRelationController.java b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/controller/CcdiCustFmyRelationController.java similarity index 89% rename from ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/controller/CcdiCustFmyRelationController.java rename to ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/controller/CcdiCustFmyRelationController.java index 064e4b8..09a5a5e 100644 --- a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/controller/CcdiCustFmyRelationController.java +++ b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/controller/CcdiCustFmyRelationController.java @@ -1,17 +1,17 @@ -package com.ruoyi.ccdi.controller; +package com.ruoyi.info.collection.controller; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.ruoyi.ccdi.domain.dto.CcdiCustFmyRelationAddDTO; -import com.ruoyi.ccdi.domain.dto.CcdiCustFmyRelationEditDTO; -import com.ruoyi.ccdi.domain.dto.CcdiCustFmyRelationQueryDTO; -import com.ruoyi.ccdi.domain.excel.CcdiCustFmyRelationExcel; -import com.ruoyi.ccdi.domain.vo.CcdiCustFmyRelationVO; -import com.ruoyi.ccdi.domain.vo.CustFmyRelationImportFailureVO; -import com.ruoyi.ccdi.domain.vo.ImportResultVO; -import com.ruoyi.ccdi.domain.vo.ImportStatusVO; -import com.ruoyi.ccdi.service.ICcdiCustFmyRelationImportService; -import com.ruoyi.ccdi.service.ICcdiCustFmyRelationService; -import com.ruoyi.ccdi.utils.EasyExcelUtil; +import com.ruoyi.info.collection.domain.dto.CcdiCustFmyRelationAddDTO; +import com.ruoyi.info.collection.domain.dto.CcdiCustFmyRelationEditDTO; +import com.ruoyi.info.collection.domain.dto.CcdiCustFmyRelationQueryDTO; +import com.ruoyi.info.collection.domain.excel.CcdiCustFmyRelationExcel; +import com.ruoyi.info.collection.domain.vo.CcdiCustFmyRelationVO; +import com.ruoyi.info.collection.domain.vo.CustFmyRelationImportFailureVO; +import com.ruoyi.info.collection.domain.vo.ImportResultVO; +import com.ruoyi.info.collection.domain.vo.ImportStatusVO; +import com.ruoyi.info.collection.service.ICcdiCustFmyRelationImportService; +import com.ruoyi.info.collection.service.ICcdiCustFmyRelationService; +import com.ruoyi.info.collection.utils.EasyExcelUtil; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; diff --git a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/controller/CcdiEnumController.java b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/controller/CcdiEnumController.java similarity index 96% rename from ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/controller/CcdiEnumController.java rename to ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/controller/CcdiEnumController.java index 20b723a..8acffc0 100644 --- a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/controller/CcdiEnumController.java +++ b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/controller/CcdiEnumController.java @@ -1,7 +1,7 @@ -package com.ruoyi.ccdi.controller; +package com.ruoyi.info.collection.controller; -import com.ruoyi.ccdi.domain.vo.EnumOptionVO; -import com.ruoyi.ccdi.enums.*; +import com.ruoyi.info.collection.domain.vo.EnumOptionVO; +import com.ruoyi.info.collection.enums.*; import com.ruoyi.common.core.domain.AjaxResult; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; diff --git a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/controller/CcdiIntermediaryController.java b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/controller/CcdiIntermediaryController.java similarity index 95% rename from ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/controller/CcdiIntermediaryController.java rename to ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/controller/CcdiIntermediaryController.java index 0db7e71..070ff06 100644 --- a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/controller/CcdiIntermediaryController.java +++ b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/controller/CcdiIntermediaryController.java @@ -1,14 +1,14 @@ -package com.ruoyi.ccdi.controller; +package com.ruoyi.info.collection.controller; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.ruoyi.ccdi.domain.dto.*; -import com.ruoyi.ccdi.domain.excel.CcdiIntermediaryEntityExcel; -import com.ruoyi.ccdi.domain.excel.CcdiIntermediaryPersonExcel; -import com.ruoyi.ccdi.domain.vo.*; -import com.ruoyi.ccdi.service.ICcdiIntermediaryEntityImportService; -import com.ruoyi.ccdi.service.ICcdiIntermediaryPersonImportService; -import com.ruoyi.ccdi.service.ICcdiIntermediaryService; -import com.ruoyi.ccdi.utils.EasyExcelUtil; +import com.ruoyi.info.collection.domain.dto.*; +import com.ruoyi.info.collection.domain.excel.CcdiIntermediaryEntityExcel; +import com.ruoyi.info.collection.domain.excel.CcdiIntermediaryPersonExcel; +import com.ruoyi.info.collection.domain.vo.*; +import com.ruoyi.info.collection.service.ICcdiIntermediaryEntityImportService; +import com.ruoyi.info.collection.service.ICcdiIntermediaryPersonImportService; +import com.ruoyi.info.collection.service.ICcdiIntermediaryService; +import com.ruoyi.info.collection.utils.EasyExcelUtil; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; diff --git a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/controller/CcdiPurchaseTransactionController.java b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/controller/CcdiPurchaseTransactionController.java similarity index 90% rename from ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/controller/CcdiPurchaseTransactionController.java rename to ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/controller/CcdiPurchaseTransactionController.java index f4bb78c..4abc08e 100644 --- a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/controller/CcdiPurchaseTransactionController.java +++ b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/controller/CcdiPurchaseTransactionController.java @@ -1,17 +1,17 @@ -package com.ruoyi.ccdi.controller; +package com.ruoyi.info.collection.controller; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.ruoyi.ccdi.domain.dto.CcdiPurchaseTransactionAddDTO; -import com.ruoyi.ccdi.domain.dto.CcdiPurchaseTransactionEditDTO; -import com.ruoyi.ccdi.domain.dto.CcdiPurchaseTransactionQueryDTO; -import com.ruoyi.ccdi.domain.excel.CcdiPurchaseTransactionExcel; -import com.ruoyi.ccdi.domain.vo.CcdiPurchaseTransactionVO; -import com.ruoyi.ccdi.domain.vo.ImportResultVO; -import com.ruoyi.ccdi.domain.vo.ImportStatusVO; -import com.ruoyi.ccdi.domain.vo.PurchaseTransactionImportFailureVO; -import com.ruoyi.ccdi.service.ICcdiPurchaseTransactionImportService; -import com.ruoyi.ccdi.service.ICcdiPurchaseTransactionService; -import com.ruoyi.ccdi.utils.EasyExcelUtil; +import com.ruoyi.info.collection.domain.dto.CcdiPurchaseTransactionAddDTO; +import com.ruoyi.info.collection.domain.dto.CcdiPurchaseTransactionEditDTO; +import com.ruoyi.info.collection.domain.dto.CcdiPurchaseTransactionQueryDTO; +import com.ruoyi.info.collection.domain.excel.CcdiPurchaseTransactionExcel; +import com.ruoyi.info.collection.domain.vo.CcdiPurchaseTransactionVO; +import com.ruoyi.info.collection.domain.vo.ImportResultVO; +import com.ruoyi.info.collection.domain.vo.ImportStatusVO; +import com.ruoyi.info.collection.domain.vo.PurchaseTransactionImportFailureVO; +import com.ruoyi.info.collection.service.ICcdiPurchaseTransactionImportService; +import com.ruoyi.info.collection.service.ICcdiPurchaseTransactionService; +import com.ruoyi.info.collection.utils.EasyExcelUtil; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; diff --git a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/controller/CcdiStaffEnterpriseRelationController.java b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/controller/CcdiStaffEnterpriseRelationController.java similarity index 90% rename from ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/controller/CcdiStaffEnterpriseRelationController.java rename to ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/controller/CcdiStaffEnterpriseRelationController.java index 10ee001..d5e3aef 100644 --- a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/controller/CcdiStaffEnterpriseRelationController.java +++ b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/controller/CcdiStaffEnterpriseRelationController.java @@ -1,17 +1,17 @@ -package com.ruoyi.ccdi.controller; +package com.ruoyi.info.collection.controller; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.ruoyi.ccdi.domain.dto.CcdiStaffEnterpriseRelationAddDTO; -import com.ruoyi.ccdi.domain.dto.CcdiStaffEnterpriseRelationEditDTO; -import com.ruoyi.ccdi.domain.dto.CcdiStaffEnterpriseRelationQueryDTO; -import com.ruoyi.ccdi.domain.excel.CcdiStaffEnterpriseRelationExcel; -import com.ruoyi.ccdi.domain.vo.CcdiStaffEnterpriseRelationVO; -import com.ruoyi.ccdi.domain.vo.ImportResultVO; -import com.ruoyi.ccdi.domain.vo.ImportStatusVO; -import com.ruoyi.ccdi.domain.vo.StaffEnterpriseRelationImportFailureVO; -import com.ruoyi.ccdi.service.ICcdiStaffEnterpriseRelationImportService; -import com.ruoyi.ccdi.service.ICcdiStaffEnterpriseRelationService; -import com.ruoyi.ccdi.utils.EasyExcelUtil; +import com.ruoyi.info.collection.domain.dto.CcdiStaffEnterpriseRelationAddDTO; +import com.ruoyi.info.collection.domain.dto.CcdiStaffEnterpriseRelationEditDTO; +import com.ruoyi.info.collection.domain.dto.CcdiStaffEnterpriseRelationQueryDTO; +import com.ruoyi.info.collection.domain.excel.CcdiStaffEnterpriseRelationExcel; +import com.ruoyi.info.collection.domain.vo.CcdiStaffEnterpriseRelationVO; +import com.ruoyi.info.collection.domain.vo.ImportResultVO; +import com.ruoyi.info.collection.domain.vo.ImportStatusVO; +import com.ruoyi.info.collection.domain.vo.StaffEnterpriseRelationImportFailureVO; +import com.ruoyi.info.collection.service.ICcdiStaffEnterpriseRelationImportService; +import com.ruoyi.info.collection.service.ICcdiStaffEnterpriseRelationService; +import com.ruoyi.info.collection.utils.EasyExcelUtil; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; diff --git a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/controller/CcdiStaffFmyRelationController.java b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/controller/CcdiStaffFmyRelationController.java similarity index 90% rename from ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/controller/CcdiStaffFmyRelationController.java rename to ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/controller/CcdiStaffFmyRelationController.java index 2312c3d..3daad9f 100644 --- a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/controller/CcdiStaffFmyRelationController.java +++ b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/controller/CcdiStaffFmyRelationController.java @@ -1,17 +1,17 @@ -package com.ruoyi.ccdi.controller; +package com.ruoyi.info.collection.controller; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.ruoyi.ccdi.domain.dto.CcdiStaffFmyRelationAddDTO; -import com.ruoyi.ccdi.domain.dto.CcdiStaffFmyRelationEditDTO; -import com.ruoyi.ccdi.domain.dto.CcdiStaffFmyRelationQueryDTO; -import com.ruoyi.ccdi.domain.excel.CcdiStaffFmyRelationExcel; -import com.ruoyi.ccdi.domain.vo.CcdiStaffFmyRelationVO; -import com.ruoyi.ccdi.domain.vo.ImportResultVO; -import com.ruoyi.ccdi.domain.vo.ImportStatusVO; -import com.ruoyi.ccdi.domain.vo.StaffFmyRelationImportFailureVO; -import com.ruoyi.ccdi.service.ICcdiStaffFmyRelationImportService; -import com.ruoyi.ccdi.service.ICcdiStaffFmyRelationService; -import com.ruoyi.ccdi.utils.EasyExcelUtil; +import com.ruoyi.info.collection.domain.dto.CcdiStaffFmyRelationAddDTO; +import com.ruoyi.info.collection.domain.dto.CcdiStaffFmyRelationEditDTO; +import com.ruoyi.info.collection.domain.dto.CcdiStaffFmyRelationQueryDTO; +import com.ruoyi.info.collection.domain.excel.CcdiStaffFmyRelationExcel; +import com.ruoyi.info.collection.domain.vo.CcdiStaffFmyRelationVO; +import com.ruoyi.info.collection.domain.vo.ImportResultVO; +import com.ruoyi.info.collection.domain.vo.ImportStatusVO; +import com.ruoyi.info.collection.domain.vo.StaffFmyRelationImportFailureVO; +import com.ruoyi.info.collection.service.ICcdiStaffFmyRelationImportService; +import com.ruoyi.info.collection.service.ICcdiStaffFmyRelationService; +import com.ruoyi.info.collection.utils.EasyExcelUtil; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; diff --git a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/controller/CcdiStaffRecruitmentController.java b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/controller/CcdiStaffRecruitmentController.java similarity index 90% rename from ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/controller/CcdiStaffRecruitmentController.java rename to ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/controller/CcdiStaffRecruitmentController.java index 0cd18bb..3a4b735 100644 --- a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/controller/CcdiStaffRecruitmentController.java +++ b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/controller/CcdiStaffRecruitmentController.java @@ -1,17 +1,17 @@ -package com.ruoyi.ccdi.controller; +package com.ruoyi.info.collection.controller; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.ruoyi.ccdi.domain.dto.CcdiStaffRecruitmentAddDTO; -import com.ruoyi.ccdi.domain.dto.CcdiStaffRecruitmentEditDTO; -import com.ruoyi.ccdi.domain.dto.CcdiStaffRecruitmentQueryDTO; -import com.ruoyi.ccdi.domain.excel.CcdiStaffRecruitmentExcel; -import com.ruoyi.ccdi.domain.vo.CcdiStaffRecruitmentVO; -import com.ruoyi.ccdi.domain.vo.ImportResultVO; -import com.ruoyi.ccdi.domain.vo.ImportStatusVO; -import com.ruoyi.ccdi.domain.vo.RecruitmentImportFailureVO; -import com.ruoyi.ccdi.service.ICcdiStaffRecruitmentImportService; -import com.ruoyi.ccdi.service.ICcdiStaffRecruitmentService; -import com.ruoyi.ccdi.utils.EasyExcelUtil; +import com.ruoyi.info.collection.domain.dto.CcdiStaffRecruitmentAddDTO; +import com.ruoyi.info.collection.domain.dto.CcdiStaffRecruitmentEditDTO; +import com.ruoyi.info.collection.domain.dto.CcdiStaffRecruitmentQueryDTO; +import com.ruoyi.info.collection.domain.excel.CcdiStaffRecruitmentExcel; +import com.ruoyi.info.collection.domain.vo.CcdiStaffRecruitmentVO; +import com.ruoyi.info.collection.domain.vo.ImportResultVO; +import com.ruoyi.info.collection.domain.vo.ImportStatusVO; +import com.ruoyi.info.collection.domain.vo.RecruitmentImportFailureVO; +import com.ruoyi.info.collection.service.ICcdiStaffRecruitmentImportService; +import com.ruoyi.info.collection.service.ICcdiStaffRecruitmentService; +import com.ruoyi.info.collection.utils.EasyExcelUtil; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; diff --git a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/controller/CcdiStaffTransferController.java b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/controller/CcdiStaffTransferController.java similarity index 90% rename from ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/controller/CcdiStaffTransferController.java rename to ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/controller/CcdiStaffTransferController.java index 4430702..62d9afe 100644 --- a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/controller/CcdiStaffTransferController.java +++ b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/controller/CcdiStaffTransferController.java @@ -1,17 +1,17 @@ -package com.ruoyi.ccdi.controller; +package com.ruoyi.info.collection.controller; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.ruoyi.ccdi.domain.dto.CcdiStaffTransferAddDTO; -import com.ruoyi.ccdi.domain.dto.CcdiStaffTransferEditDTO; -import com.ruoyi.ccdi.domain.dto.CcdiStaffTransferQueryDTO; -import com.ruoyi.ccdi.domain.excel.CcdiStaffTransferExcel; -import com.ruoyi.ccdi.domain.vo.CcdiStaffTransferVO; -import com.ruoyi.ccdi.domain.vo.ImportResultVO; -import com.ruoyi.ccdi.domain.vo.ImportStatusVO; -import com.ruoyi.ccdi.domain.vo.StaffTransferImportFailureVO; -import com.ruoyi.ccdi.service.ICcdiStaffTransferImportService; -import com.ruoyi.ccdi.service.ICcdiStaffTransferService; -import com.ruoyi.ccdi.utils.EasyExcelUtil; +import com.ruoyi.info.collection.domain.dto.CcdiStaffTransferAddDTO; +import com.ruoyi.info.collection.domain.dto.CcdiStaffTransferEditDTO; +import com.ruoyi.info.collection.domain.dto.CcdiStaffTransferQueryDTO; +import com.ruoyi.info.collection.domain.excel.CcdiStaffTransferExcel; +import com.ruoyi.info.collection.domain.vo.CcdiStaffTransferVO; +import com.ruoyi.info.collection.domain.vo.ImportResultVO; +import com.ruoyi.info.collection.domain.vo.ImportStatusVO; +import com.ruoyi.info.collection.domain.vo.StaffTransferImportFailureVO; +import com.ruoyi.info.collection.service.ICcdiStaffTransferImportService; +import com.ruoyi.info.collection.service.ICcdiStaffTransferService; +import com.ruoyi.info.collection.utils.EasyExcelUtil; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; diff --git a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/CcdiBaseStaff.java b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/CcdiBaseStaff.java similarity index 96% rename from ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/CcdiBaseStaff.java rename to ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/CcdiBaseStaff.java index d75a0bb..0f364b6 100644 --- a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/CcdiBaseStaff.java +++ b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/CcdiBaseStaff.java @@ -1,4 +1,4 @@ -package com.ruoyi.ccdi.domain; +package com.ruoyi.info.collection.domain; import com.baomidou.mybatisplus.annotation.*; import lombok.Data; diff --git a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/CcdiBizIntermediary.java b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/CcdiBizIntermediary.java similarity index 97% rename from ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/CcdiBizIntermediary.java rename to ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/CcdiBizIntermediary.java index 003b915..2317ae0 100644 --- a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/CcdiBizIntermediary.java +++ b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/CcdiBizIntermediary.java @@ -1,4 +1,4 @@ -package com.ruoyi.ccdi.domain; +package com.ruoyi.info.collection.domain; import com.baomidou.mybatisplus.annotation.*; import lombok.Data; diff --git a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/CcdiCustEnterpriseRelation.java b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/CcdiCustEnterpriseRelation.java similarity index 98% rename from ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/CcdiCustEnterpriseRelation.java rename to ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/CcdiCustEnterpriseRelation.java index 9dd5d71..57a0061 100644 --- a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/CcdiCustEnterpriseRelation.java +++ b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/CcdiCustEnterpriseRelation.java @@ -1,4 +1,4 @@ -package com.ruoyi.ccdi.domain; +package com.ruoyi.info.collection.domain; import com.baomidou.mybatisplus.annotation.*; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/CcdiCustFmyRelation.java b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/CcdiCustFmyRelation.java similarity index 98% rename from ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/CcdiCustFmyRelation.java rename to ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/CcdiCustFmyRelation.java index 5ef8037..403468a 100644 --- a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/CcdiCustFmyRelation.java +++ b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/CcdiCustFmyRelation.java @@ -1,4 +1,4 @@ -package com.ruoyi.ccdi.domain; +package com.ruoyi.info.collection.domain; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.IdType; diff --git a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/CcdiEnterpriseBaseInfo.java b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/CcdiEnterpriseBaseInfo.java similarity index 98% rename from ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/CcdiEnterpriseBaseInfo.java rename to ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/CcdiEnterpriseBaseInfo.java index b4bb0f4..f27f12c 100644 --- a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/CcdiEnterpriseBaseInfo.java +++ b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/CcdiEnterpriseBaseInfo.java @@ -1,4 +1,4 @@ -package com.ruoyi.ccdi.domain; +package com.ruoyi.info.collection.domain; import com.baomidou.mybatisplus.annotation.*; import lombok.Data; diff --git a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/CcdiPurchaseTransaction.java b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/CcdiPurchaseTransaction.java similarity index 98% rename from ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/CcdiPurchaseTransaction.java rename to ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/CcdiPurchaseTransaction.java index 3d4a27a..d032b19 100644 --- a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/CcdiPurchaseTransaction.java +++ b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/CcdiPurchaseTransaction.java @@ -1,4 +1,4 @@ -package com.ruoyi.ccdi.domain; +package com.ruoyi.info.collection.domain; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.IdType; diff --git a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/CcdiStaffEnterpriseRelation.java b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/CcdiStaffEnterpriseRelation.java similarity index 98% rename from ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/CcdiStaffEnterpriseRelation.java rename to ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/CcdiStaffEnterpriseRelation.java index 1d8a07d..be0321b 100644 --- a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/CcdiStaffEnterpriseRelation.java +++ b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/CcdiStaffEnterpriseRelation.java @@ -1,4 +1,4 @@ -package com.ruoyi.ccdi.domain; +package com.ruoyi.info.collection.domain; import com.baomidou.mybatisplus.annotation.*; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/CcdiStaffFmyRelation.java b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/CcdiStaffFmyRelation.java similarity index 98% rename from ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/CcdiStaffFmyRelation.java rename to ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/CcdiStaffFmyRelation.java index 8577525..aeb6ec6 100644 --- a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/CcdiStaffFmyRelation.java +++ b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/CcdiStaffFmyRelation.java @@ -1,4 +1,4 @@ -package com.ruoyi.ccdi.domain; +package com.ruoyi.info.collection.domain; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.IdType; diff --git a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/CcdiStaffRecruitment.java b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/CcdiStaffRecruitment.java similarity index 97% rename from ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/CcdiStaffRecruitment.java rename to ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/CcdiStaffRecruitment.java index 1cc8fdf..4fc163a 100644 --- a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/CcdiStaffRecruitment.java +++ b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/CcdiStaffRecruitment.java @@ -1,4 +1,4 @@ -package com.ruoyi.ccdi.domain; +package com.ruoyi.info.collection.domain; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.IdType; diff --git a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/CcdiStaffTransfer.java b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/CcdiStaffTransfer.java similarity index 97% rename from ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/CcdiStaffTransfer.java rename to ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/CcdiStaffTransfer.java index 34e7a47..9e43f6e 100644 --- a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/CcdiStaffTransfer.java +++ b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/CcdiStaffTransfer.java @@ -1,4 +1,4 @@ -package com.ruoyi.ccdi.domain; +package com.ruoyi.info.collection.domain; import com.baomidou.mybatisplus.annotation.*; import lombok.Data; diff --git a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/dto/CcdiBaseStaffAddDTO.java b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/dto/CcdiBaseStaffAddDTO.java similarity index 96% rename from ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/dto/CcdiBaseStaffAddDTO.java rename to ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/dto/CcdiBaseStaffAddDTO.java index cb3f621..73517c6 100644 --- a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/dto/CcdiBaseStaffAddDTO.java +++ b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/dto/CcdiBaseStaffAddDTO.java @@ -1,4 +1,4 @@ -package com.ruoyi.ccdi.domain.dto; +package com.ruoyi.info.collection.domain.dto; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; diff --git a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/dto/CcdiBaseStaffEditDTO.java b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/dto/CcdiBaseStaffEditDTO.java similarity index 96% rename from ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/dto/CcdiBaseStaffEditDTO.java rename to ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/dto/CcdiBaseStaffEditDTO.java index 0809e01..688eadc 100644 --- a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/dto/CcdiBaseStaffEditDTO.java +++ b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/dto/CcdiBaseStaffEditDTO.java @@ -1,4 +1,4 @@ -package com.ruoyi.ccdi.domain.dto; +package com.ruoyi.info.collection.domain.dto; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; diff --git a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/dto/CcdiBaseStaffQueryDTO.java b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/dto/CcdiBaseStaffQueryDTO.java similarity index 92% rename from ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/dto/CcdiBaseStaffQueryDTO.java rename to ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/dto/CcdiBaseStaffQueryDTO.java index 2f01ae0..ba5ba9b 100644 --- a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/dto/CcdiBaseStaffQueryDTO.java +++ b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/dto/CcdiBaseStaffQueryDTO.java @@ -1,4 +1,4 @@ -package com.ruoyi.ccdi.domain.dto; +package com.ruoyi.info.collection.domain.dto; import lombok.Data; diff --git a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/dto/CcdiCustEnterpriseRelationAddDTO.java b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/dto/CcdiCustEnterpriseRelationAddDTO.java similarity index 97% rename from ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/dto/CcdiCustEnterpriseRelationAddDTO.java rename to ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/dto/CcdiCustEnterpriseRelationAddDTO.java index 89c0a67..5d31e65 100644 --- a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/dto/CcdiCustEnterpriseRelationAddDTO.java +++ b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/dto/CcdiCustEnterpriseRelationAddDTO.java @@ -1,4 +1,4 @@ -package com.ruoyi.ccdi.domain.dto; +package com.ruoyi.info.collection.domain.dto; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; diff --git a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/dto/CcdiCustEnterpriseRelationEditDTO.java b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/dto/CcdiCustEnterpriseRelationEditDTO.java similarity index 97% rename from ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/dto/CcdiCustEnterpriseRelationEditDTO.java rename to ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/dto/CcdiCustEnterpriseRelationEditDTO.java index f2add41..1dc3989 100644 --- a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/dto/CcdiCustEnterpriseRelationEditDTO.java +++ b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/dto/CcdiCustEnterpriseRelationEditDTO.java @@ -1,4 +1,4 @@ -package com.ruoyi.ccdi.domain.dto; +package com.ruoyi.info.collection.domain.dto; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; diff --git a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/dto/CcdiCustEnterpriseRelationQueryDTO.java b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/dto/CcdiCustEnterpriseRelationQueryDTO.java similarity index 95% rename from ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/dto/CcdiCustEnterpriseRelationQueryDTO.java rename to ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/dto/CcdiCustEnterpriseRelationQueryDTO.java index c8b46cd..ffa2450 100644 --- a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/dto/CcdiCustEnterpriseRelationQueryDTO.java +++ b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/dto/CcdiCustEnterpriseRelationQueryDTO.java @@ -1,4 +1,4 @@ -package com.ruoyi.ccdi.domain.dto; +package com.ruoyi.info.collection.domain.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/dto/CcdiCustFmyRelationAddDTO.java b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/dto/CcdiCustFmyRelationAddDTO.java similarity index 98% rename from ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/dto/CcdiCustFmyRelationAddDTO.java rename to ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/dto/CcdiCustFmyRelationAddDTO.java index 89e00bf..fdd7672 100644 --- a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/dto/CcdiCustFmyRelationAddDTO.java +++ b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/dto/CcdiCustFmyRelationAddDTO.java @@ -1,4 +1,4 @@ -package com.ruoyi.ccdi.domain.dto; +package com.ruoyi.info.collection.domain.dto; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/dto/CcdiCustFmyRelationEditDTO.java b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/dto/CcdiCustFmyRelationEditDTO.java similarity index 98% rename from ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/dto/CcdiCustFmyRelationEditDTO.java rename to ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/dto/CcdiCustFmyRelationEditDTO.java index 557501d..c1a93ac 100644 --- a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/dto/CcdiCustFmyRelationEditDTO.java +++ b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/dto/CcdiCustFmyRelationEditDTO.java @@ -1,4 +1,4 @@ -package com.ruoyi.ccdi.domain.dto; +package com.ruoyi.info.collection.domain.dto; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/dto/CcdiCustFmyRelationQueryDTO.java b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/dto/CcdiCustFmyRelationQueryDTO.java similarity index 96% rename from ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/dto/CcdiCustFmyRelationQueryDTO.java rename to ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/dto/CcdiCustFmyRelationQueryDTO.java index 5b224aa..965e4fd 100644 --- a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/dto/CcdiCustFmyRelationQueryDTO.java +++ b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/dto/CcdiCustFmyRelationQueryDTO.java @@ -1,4 +1,4 @@ -package com.ruoyi.ccdi.domain.dto; +package com.ruoyi.info.collection.domain.dto; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/dto/CcdiIntermediaryEntityAddDTO.java b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/dto/CcdiIntermediaryEntityAddDTO.java similarity index 98% rename from ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/dto/CcdiIntermediaryEntityAddDTO.java rename to ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/dto/CcdiIntermediaryEntityAddDTO.java index a63a20d..52c39c4 100644 --- a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/dto/CcdiIntermediaryEntityAddDTO.java +++ b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/dto/CcdiIntermediaryEntityAddDTO.java @@ -1,4 +1,4 @@ -package com.ruoyi.ccdi.domain.dto; +package com.ruoyi.info.collection.domain.dto; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; diff --git a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/dto/CcdiIntermediaryEntityEditDTO.java b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/dto/CcdiIntermediaryEntityEditDTO.java similarity index 98% rename from ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/dto/CcdiIntermediaryEntityEditDTO.java rename to ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/dto/CcdiIntermediaryEntityEditDTO.java index 0b7fee0..73fb4af 100644 --- a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/dto/CcdiIntermediaryEntityEditDTO.java +++ b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/dto/CcdiIntermediaryEntityEditDTO.java @@ -1,4 +1,4 @@ -package com.ruoyi.ccdi.domain.dto; +package com.ruoyi.info.collection.domain.dto; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; diff --git a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/dto/CcdiIntermediaryPersonAddDTO.java b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/dto/CcdiIntermediaryPersonAddDTO.java similarity index 98% rename from ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/dto/CcdiIntermediaryPersonAddDTO.java rename to ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/dto/CcdiIntermediaryPersonAddDTO.java index da70e0d..fb54d56 100644 --- a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/dto/CcdiIntermediaryPersonAddDTO.java +++ b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/dto/CcdiIntermediaryPersonAddDTO.java @@ -1,4 +1,4 @@ -package com.ruoyi.ccdi.domain.dto; +package com.ruoyi.info.collection.domain.dto; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; diff --git a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/dto/CcdiIntermediaryPersonEditDTO.java b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/dto/CcdiIntermediaryPersonEditDTO.java similarity index 98% rename from ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/dto/CcdiIntermediaryPersonEditDTO.java rename to ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/dto/CcdiIntermediaryPersonEditDTO.java index 9785f2a..9a7ae6c 100644 --- a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/dto/CcdiIntermediaryPersonEditDTO.java +++ b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/dto/CcdiIntermediaryPersonEditDTO.java @@ -1,4 +1,4 @@ -package com.ruoyi.ccdi.domain.dto; +package com.ruoyi.info.collection.domain.dto; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; diff --git a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/dto/CcdiIntermediaryQueryDTO.java b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/dto/CcdiIntermediaryQueryDTO.java similarity index 93% rename from ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/dto/CcdiIntermediaryQueryDTO.java rename to ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/dto/CcdiIntermediaryQueryDTO.java index f36c5a9..abf2640 100644 --- a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/dto/CcdiIntermediaryQueryDTO.java +++ b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/dto/CcdiIntermediaryQueryDTO.java @@ -1,4 +1,4 @@ -package com.ruoyi.ccdi.domain.dto; +package com.ruoyi.info.collection.domain.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/dto/CcdiPurchaseTransactionAddDTO.java b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/dto/CcdiPurchaseTransactionAddDTO.java similarity index 99% rename from ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/dto/CcdiPurchaseTransactionAddDTO.java rename to ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/dto/CcdiPurchaseTransactionAddDTO.java index 167e16c..f697791 100644 --- a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/dto/CcdiPurchaseTransactionAddDTO.java +++ b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/dto/CcdiPurchaseTransactionAddDTO.java @@ -1,4 +1,4 @@ -package com.ruoyi.ccdi.domain.dto; +package com.ruoyi.info.collection.domain.dto; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/dto/CcdiPurchaseTransactionEditDTO.java b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/dto/CcdiPurchaseTransactionEditDTO.java similarity index 99% rename from ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/dto/CcdiPurchaseTransactionEditDTO.java rename to ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/dto/CcdiPurchaseTransactionEditDTO.java index 583e6f1..ac97d4c 100644 --- a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/dto/CcdiPurchaseTransactionEditDTO.java +++ b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/dto/CcdiPurchaseTransactionEditDTO.java @@ -1,4 +1,4 @@ -package com.ruoyi.ccdi.domain.dto; +package com.ruoyi.info.collection.domain.dto; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/dto/CcdiPurchaseTransactionQueryDTO.java b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/dto/CcdiPurchaseTransactionQueryDTO.java similarity index 96% rename from ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/dto/CcdiPurchaseTransactionQueryDTO.java rename to ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/dto/CcdiPurchaseTransactionQueryDTO.java index a842262..68f8c48 100644 --- a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/dto/CcdiPurchaseTransactionQueryDTO.java +++ b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/dto/CcdiPurchaseTransactionQueryDTO.java @@ -1,4 +1,4 @@ -package com.ruoyi.ccdi.domain.dto; +package com.ruoyi.info.collection.domain.dto; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/dto/CcdiStaffEnterpriseRelationAddDTO.java b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/dto/CcdiStaffEnterpriseRelationAddDTO.java similarity index 98% rename from ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/dto/CcdiStaffEnterpriseRelationAddDTO.java rename to ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/dto/CcdiStaffEnterpriseRelationAddDTO.java index 8cd2ece..4e758ed 100644 --- a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/dto/CcdiStaffEnterpriseRelationAddDTO.java +++ b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/dto/CcdiStaffEnterpriseRelationAddDTO.java @@ -1,4 +1,4 @@ -package com.ruoyi.ccdi.domain.dto; +package com.ruoyi.info.collection.domain.dto; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; diff --git a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/dto/CcdiStaffEnterpriseRelationEditDTO.java b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/dto/CcdiStaffEnterpriseRelationEditDTO.java similarity index 98% rename from ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/dto/CcdiStaffEnterpriseRelationEditDTO.java rename to ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/dto/CcdiStaffEnterpriseRelationEditDTO.java index 67654df..150e286 100644 --- a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/dto/CcdiStaffEnterpriseRelationEditDTO.java +++ b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/dto/CcdiStaffEnterpriseRelationEditDTO.java @@ -1,4 +1,4 @@ -package com.ruoyi.ccdi.domain.dto; +package com.ruoyi.info.collection.domain.dto; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; diff --git a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/dto/CcdiStaffEnterpriseRelationQueryDTO.java b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/dto/CcdiStaffEnterpriseRelationQueryDTO.java similarity index 95% rename from ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/dto/CcdiStaffEnterpriseRelationQueryDTO.java rename to ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/dto/CcdiStaffEnterpriseRelationQueryDTO.java index ae9ee6e..b22195b 100644 --- a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/dto/CcdiStaffEnterpriseRelationQueryDTO.java +++ b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/dto/CcdiStaffEnterpriseRelationQueryDTO.java @@ -1,4 +1,4 @@ -package com.ruoyi.ccdi.domain.dto; +package com.ruoyi.info.collection.domain.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/dto/CcdiStaffFmyRelationAddDTO.java b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/dto/CcdiStaffFmyRelationAddDTO.java similarity index 98% rename from ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/dto/CcdiStaffFmyRelationAddDTO.java rename to ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/dto/CcdiStaffFmyRelationAddDTO.java index 51fd3fa..8ca8ee7 100644 --- a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/dto/CcdiStaffFmyRelationAddDTO.java +++ b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/dto/CcdiStaffFmyRelationAddDTO.java @@ -1,4 +1,4 @@ -package com.ruoyi.ccdi.domain.dto; +package com.ruoyi.info.collection.domain.dto; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/dto/CcdiStaffFmyRelationEditDTO.java b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/dto/CcdiStaffFmyRelationEditDTO.java similarity index 98% rename from ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/dto/CcdiStaffFmyRelationEditDTO.java rename to ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/dto/CcdiStaffFmyRelationEditDTO.java index defaed3..d9373b8 100644 --- a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/dto/CcdiStaffFmyRelationEditDTO.java +++ b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/dto/CcdiStaffFmyRelationEditDTO.java @@ -1,4 +1,4 @@ -package com.ruoyi.ccdi.domain.dto; +package com.ruoyi.info.collection.domain.dto; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/dto/CcdiStaffFmyRelationQueryDTO.java b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/dto/CcdiStaffFmyRelationQueryDTO.java similarity index 96% rename from ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/dto/CcdiStaffFmyRelationQueryDTO.java rename to ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/dto/CcdiStaffFmyRelationQueryDTO.java index 4a502b8..4d752eb 100644 --- a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/dto/CcdiStaffFmyRelationQueryDTO.java +++ b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/dto/CcdiStaffFmyRelationQueryDTO.java @@ -1,4 +1,4 @@ -package com.ruoyi.ccdi.domain.dto; +package com.ruoyi.info.collection.domain.dto; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/dto/CcdiStaffRecruitmentAddDTO.java b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/dto/CcdiStaffRecruitmentAddDTO.java similarity index 95% rename from ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/dto/CcdiStaffRecruitmentAddDTO.java rename to ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/dto/CcdiStaffRecruitmentAddDTO.java index 8149db9..7eed1ce 100644 --- a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/dto/CcdiStaffRecruitmentAddDTO.java +++ b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/dto/CcdiStaffRecruitmentAddDTO.java @@ -1,7 +1,7 @@ -package com.ruoyi.ccdi.domain.dto; +package com.ruoyi.info.collection.domain.dto; -import com.ruoyi.ccdi.annotation.EnumValid; -import com.ruoyi.ccdi.enums.AdmitStatus; +import com.ruoyi.info.collection.annotation.EnumValid; +import com.ruoyi.info.collection.enums.AdmitStatus; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.Pattern; import jakarta.validation.constraints.Size; diff --git a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/dto/CcdiStaffRecruitmentEditDTO.java b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/dto/CcdiStaffRecruitmentEditDTO.java similarity index 94% rename from ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/dto/CcdiStaffRecruitmentEditDTO.java rename to ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/dto/CcdiStaffRecruitmentEditDTO.java index da43834..8c050f9 100644 --- a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/dto/CcdiStaffRecruitmentEditDTO.java +++ b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/dto/CcdiStaffRecruitmentEditDTO.java @@ -1,7 +1,7 @@ -package com.ruoyi.ccdi.domain.dto; +package com.ruoyi.info.collection.domain.dto; -import com.ruoyi.ccdi.annotation.EnumValid; -import com.ruoyi.ccdi.enums.AdmitStatus; +import com.ruoyi.info.collection.annotation.EnumValid; +import com.ruoyi.info.collection.enums.AdmitStatus; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Pattern; diff --git a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/dto/CcdiStaffRecruitmentQueryDTO.java b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/dto/CcdiStaffRecruitmentQueryDTO.java similarity index 95% rename from ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/dto/CcdiStaffRecruitmentQueryDTO.java rename to ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/dto/CcdiStaffRecruitmentQueryDTO.java index 76da3ca..dac83e2 100644 --- a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/dto/CcdiStaffRecruitmentQueryDTO.java +++ b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/dto/CcdiStaffRecruitmentQueryDTO.java @@ -1,4 +1,4 @@ -package com.ruoyi.ccdi.domain.dto; +package com.ruoyi.info.collection.domain.dto; import lombok.Data; diff --git a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/dto/CcdiStaffTransferAddDTO.java b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/dto/CcdiStaffTransferAddDTO.java similarity index 98% rename from ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/dto/CcdiStaffTransferAddDTO.java rename to ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/dto/CcdiStaffTransferAddDTO.java index acd8de2..06f22ec 100644 --- a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/dto/CcdiStaffTransferAddDTO.java +++ b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/dto/CcdiStaffTransferAddDTO.java @@ -1,4 +1,4 @@ -package com.ruoyi.ccdi.domain.dto; +package com.ruoyi.info.collection.domain.dto; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/dto/CcdiStaffTransferEditDTO.java b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/dto/CcdiStaffTransferEditDTO.java similarity index 98% rename from ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/dto/CcdiStaffTransferEditDTO.java rename to ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/dto/CcdiStaffTransferEditDTO.java index 5dde198..f52c432 100644 --- a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/dto/CcdiStaffTransferEditDTO.java +++ b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/dto/CcdiStaffTransferEditDTO.java @@ -1,4 +1,4 @@ -package com.ruoyi.ccdi.domain.dto; +package com.ruoyi.info.collection.domain.dto; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/dto/CcdiStaffTransferQueryDTO.java b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/dto/CcdiStaffTransferQueryDTO.java similarity index 96% rename from ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/dto/CcdiStaffTransferQueryDTO.java rename to ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/dto/CcdiStaffTransferQueryDTO.java index e94392c..6059f7e 100644 --- a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/dto/CcdiStaffTransferQueryDTO.java +++ b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/dto/CcdiStaffTransferQueryDTO.java @@ -1,4 +1,4 @@ -package com.ruoyi.ccdi.domain.dto; +package com.ruoyi.info.collection.domain.dto; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/dto/TransferUniqueKey.java b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/dto/TransferUniqueKey.java similarity index 98% rename from ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/dto/TransferUniqueKey.java rename to ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/dto/TransferUniqueKey.java index b2cfe9f..dcf9276 100644 --- a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/dto/TransferUniqueKey.java +++ b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/dto/TransferUniqueKey.java @@ -1,4 +1,4 @@ -package com.ruoyi.ccdi.domain.dto; +package com.ruoyi.info.collection.domain.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/excel/CcdiBaseStaffExcel.java b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/excel/CcdiBaseStaffExcel.java similarity index 96% rename from ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/excel/CcdiBaseStaffExcel.java rename to ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/excel/CcdiBaseStaffExcel.java index b75b39e..2a09c97 100644 --- a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/excel/CcdiBaseStaffExcel.java +++ b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/excel/CcdiBaseStaffExcel.java @@ -1,4 +1,4 @@ -package com.ruoyi.ccdi.domain.excel; +package com.ruoyi.info.collection.domain.excel; import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.write.style.ColumnWidth; diff --git a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/excel/CcdiCustEnterpriseRelationExcel.java b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/excel/CcdiCustEnterpriseRelationExcel.java similarity index 97% rename from ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/excel/CcdiCustEnterpriseRelationExcel.java rename to ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/excel/CcdiCustEnterpriseRelationExcel.java index d70cfea..dcce65b 100644 --- a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/excel/CcdiCustEnterpriseRelationExcel.java +++ b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/excel/CcdiCustEnterpriseRelationExcel.java @@ -1,4 +1,4 @@ -package com.ruoyi.ccdi.domain.excel; +package com.ruoyi.info.collection.domain.excel; import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.write.style.ColumnWidth; diff --git a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/excel/CcdiCustFmyRelationExcel.java b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/excel/CcdiCustFmyRelationExcel.java similarity index 98% rename from ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/excel/CcdiCustFmyRelationExcel.java rename to ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/excel/CcdiCustFmyRelationExcel.java index edc3d4f..cd55378 100644 --- a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/excel/CcdiCustFmyRelationExcel.java +++ b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/excel/CcdiCustFmyRelationExcel.java @@ -1,4 +1,4 @@ -package com.ruoyi.ccdi.domain.excel; +package com.ruoyi.info.collection.domain.excel; import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.write.style.ColumnWidth; diff --git a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/excel/CcdiIntermediaryEntityExcel.java b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/excel/CcdiIntermediaryEntityExcel.java similarity index 98% rename from ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/excel/CcdiIntermediaryEntityExcel.java rename to ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/excel/CcdiIntermediaryEntityExcel.java index 5cda793..14ef3cf 100644 --- a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/excel/CcdiIntermediaryEntityExcel.java +++ b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/excel/CcdiIntermediaryEntityExcel.java @@ -1,4 +1,4 @@ -package com.ruoyi.ccdi.domain.excel; +package com.ruoyi.info.collection.domain.excel; import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.write.style.ColumnWidth; diff --git a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/excel/CcdiIntermediaryPersonExcel.java b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/excel/CcdiIntermediaryPersonExcel.java similarity index 98% rename from ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/excel/CcdiIntermediaryPersonExcel.java rename to ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/excel/CcdiIntermediaryPersonExcel.java index 4360121..a9a8c84 100644 --- a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/excel/CcdiIntermediaryPersonExcel.java +++ b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/excel/CcdiIntermediaryPersonExcel.java @@ -1,4 +1,4 @@ -package com.ruoyi.ccdi.domain.excel; +package com.ruoyi.info.collection.domain.excel; import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.write.style.ColumnWidth; diff --git a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/excel/CcdiPurchaseTransactionExcel.java b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/excel/CcdiPurchaseTransactionExcel.java similarity index 99% rename from ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/excel/CcdiPurchaseTransactionExcel.java rename to ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/excel/CcdiPurchaseTransactionExcel.java index 754668a..7c996cf 100644 --- a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/excel/CcdiPurchaseTransactionExcel.java +++ b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/excel/CcdiPurchaseTransactionExcel.java @@ -1,4 +1,4 @@ -package com.ruoyi.ccdi.domain.excel; +package com.ruoyi.info.collection.domain.excel; import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.write.style.ColumnWidth; diff --git a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/excel/CcdiStaffEnterpriseRelationExcel.java b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/excel/CcdiStaffEnterpriseRelationExcel.java similarity index 97% rename from ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/excel/CcdiStaffEnterpriseRelationExcel.java rename to ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/excel/CcdiStaffEnterpriseRelationExcel.java index b5da69e..0038167 100644 --- a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/excel/CcdiStaffEnterpriseRelationExcel.java +++ b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/excel/CcdiStaffEnterpriseRelationExcel.java @@ -1,4 +1,4 @@ -package com.ruoyi.ccdi.domain.excel; +package com.ruoyi.info.collection.domain.excel; import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.write.style.ColumnWidth; diff --git a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/excel/CcdiStaffFmyRelationExcel.java b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/excel/CcdiStaffFmyRelationExcel.java similarity index 98% rename from ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/excel/CcdiStaffFmyRelationExcel.java rename to ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/excel/CcdiStaffFmyRelationExcel.java index 930c789..ac147fa 100644 --- a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/excel/CcdiStaffFmyRelationExcel.java +++ b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/excel/CcdiStaffFmyRelationExcel.java @@ -1,4 +1,4 @@ -package com.ruoyi.ccdi.domain.excel; +package com.ruoyi.info.collection.domain.excel; import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.write.style.ColumnWidth; diff --git a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/excel/CcdiStaffRecruitmentExcel.java b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/excel/CcdiStaffRecruitmentExcel.java similarity index 98% rename from ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/excel/CcdiStaffRecruitmentExcel.java rename to ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/excel/CcdiStaffRecruitmentExcel.java index c8d7b62..9d2d008 100644 --- a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/excel/CcdiStaffRecruitmentExcel.java +++ b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/excel/CcdiStaffRecruitmentExcel.java @@ -1,4 +1,4 @@ -package com.ruoyi.ccdi.domain.excel; +package com.ruoyi.info.collection.domain.excel; import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.write.style.ColumnWidth; diff --git a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/excel/CcdiStaffTransferExcel.java b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/excel/CcdiStaffTransferExcel.java similarity index 97% rename from ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/excel/CcdiStaffTransferExcel.java rename to ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/excel/CcdiStaffTransferExcel.java index dd4e526..21b8366 100644 --- a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/excel/CcdiStaffTransferExcel.java +++ b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/excel/CcdiStaffTransferExcel.java @@ -1,4 +1,4 @@ -package com.ruoyi.ccdi.domain.excel; +package com.ruoyi.info.collection.domain.excel; import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.write.style.ColumnWidth; diff --git a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/vo/CcdiBaseStaffOptionVO.java b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/vo/CcdiBaseStaffOptionVO.java similarity index 90% rename from ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/vo/CcdiBaseStaffOptionVO.java rename to ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/vo/CcdiBaseStaffOptionVO.java index 5151b31..6c0d612 100644 --- a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/vo/CcdiBaseStaffOptionVO.java +++ b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/vo/CcdiBaseStaffOptionVO.java @@ -1,4 +1,4 @@ -package com.ruoyi.ccdi.domain.vo; +package com.ruoyi.info.collection.domain.vo; import lombok.Data; diff --git a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/vo/CcdiBaseStaffVO.java b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/vo/CcdiBaseStaffVO.java similarity index 95% rename from ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/vo/CcdiBaseStaffVO.java rename to ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/vo/CcdiBaseStaffVO.java index a9d08da..18a9ad2 100644 --- a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/vo/CcdiBaseStaffVO.java +++ b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/vo/CcdiBaseStaffVO.java @@ -1,4 +1,4 @@ -package com.ruoyi.ccdi.domain.vo; +package com.ruoyi.info.collection.domain.vo; import lombok.Data; diff --git a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/vo/CcdiCustEnterpriseRelationVO.java b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/vo/CcdiCustEnterpriseRelationVO.java similarity index 98% rename from ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/vo/CcdiCustEnterpriseRelationVO.java rename to ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/vo/CcdiCustEnterpriseRelationVO.java index 5f468a7..3cd8452 100644 --- a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/vo/CcdiCustEnterpriseRelationVO.java +++ b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/vo/CcdiCustEnterpriseRelationVO.java @@ -1,4 +1,4 @@ -package com.ruoyi.ccdi.domain.vo; +package com.ruoyi.info.collection.domain.vo; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/vo/CcdiCustFmyRelationVO.java b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/vo/CcdiCustFmyRelationVO.java similarity index 98% rename from ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/vo/CcdiCustFmyRelationVO.java rename to ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/vo/CcdiCustFmyRelationVO.java index 9efc108..30b56b5 100644 --- a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/vo/CcdiCustFmyRelationVO.java +++ b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/vo/CcdiCustFmyRelationVO.java @@ -1,4 +1,4 @@ -package com.ruoyi.ccdi.domain.vo; +package com.ruoyi.info.collection.domain.vo; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/vo/CcdiIntermediaryEntityDetailVO.java b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/vo/CcdiIntermediaryEntityDetailVO.java similarity index 98% rename from ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/vo/CcdiIntermediaryEntityDetailVO.java rename to ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/vo/CcdiIntermediaryEntityDetailVO.java index 1d1ac2d..e2e87a6 100644 --- a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/vo/CcdiIntermediaryEntityDetailVO.java +++ b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/vo/CcdiIntermediaryEntityDetailVO.java @@ -1,4 +1,4 @@ -package com.ruoyi.ccdi.domain.vo; +package com.ruoyi.info.collection.domain.vo; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/vo/CcdiIntermediaryPersonDetailVO.java b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/vo/CcdiIntermediaryPersonDetailVO.java similarity index 97% rename from ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/vo/CcdiIntermediaryPersonDetailVO.java rename to ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/vo/CcdiIntermediaryPersonDetailVO.java index 3e4a850..b0de70b 100644 --- a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/vo/CcdiIntermediaryPersonDetailVO.java +++ b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/vo/CcdiIntermediaryPersonDetailVO.java @@ -1,4 +1,4 @@ -package com.ruoyi.ccdi.domain.vo; +package com.ruoyi.info.collection.domain.vo; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/vo/CcdiIntermediaryVO.java b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/vo/CcdiIntermediaryVO.java similarity index 96% rename from ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/vo/CcdiIntermediaryVO.java rename to ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/vo/CcdiIntermediaryVO.java index abbfd00..a875cde 100644 --- a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/vo/CcdiIntermediaryVO.java +++ b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/vo/CcdiIntermediaryVO.java @@ -1,4 +1,4 @@ -package com.ruoyi.ccdi.domain.vo; +package com.ruoyi.info.collection.domain.vo; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/vo/CcdiPurchaseTransactionVO.java b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/vo/CcdiPurchaseTransactionVO.java similarity index 99% rename from ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/vo/CcdiPurchaseTransactionVO.java rename to ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/vo/CcdiPurchaseTransactionVO.java index c986c0a..698ea3e 100644 --- a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/vo/CcdiPurchaseTransactionVO.java +++ b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/vo/CcdiPurchaseTransactionVO.java @@ -1,4 +1,4 @@ -package com.ruoyi.ccdi.domain.vo; +package com.ruoyi.info.collection.domain.vo; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/vo/CcdiStaffEnterpriseRelationVO.java b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/vo/CcdiStaffEnterpriseRelationVO.java similarity index 98% rename from ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/vo/CcdiStaffEnterpriseRelationVO.java rename to ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/vo/CcdiStaffEnterpriseRelationVO.java index 7513a2e..53fd8af 100644 --- a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/vo/CcdiStaffEnterpriseRelationVO.java +++ b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/vo/CcdiStaffEnterpriseRelationVO.java @@ -1,4 +1,4 @@ -package com.ruoyi.ccdi.domain.vo; +package com.ruoyi.info.collection.domain.vo; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/vo/CcdiStaffFmyRelationVO.java b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/vo/CcdiStaffFmyRelationVO.java similarity index 98% rename from ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/vo/CcdiStaffFmyRelationVO.java rename to ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/vo/CcdiStaffFmyRelationVO.java index 5bd044d..4042056 100644 --- a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/vo/CcdiStaffFmyRelationVO.java +++ b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/vo/CcdiStaffFmyRelationVO.java @@ -1,4 +1,4 @@ -package com.ruoyi.ccdi.domain.vo; +package com.ruoyi.info.collection.domain.vo; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/vo/CcdiStaffRecruitmentVO.java b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/vo/CcdiStaffRecruitmentVO.java similarity index 97% rename from ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/vo/CcdiStaffRecruitmentVO.java rename to ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/vo/CcdiStaffRecruitmentVO.java index 96e92b8..78bee51 100644 --- a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/vo/CcdiStaffRecruitmentVO.java +++ b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/vo/CcdiStaffRecruitmentVO.java @@ -1,4 +1,4 @@ -package com.ruoyi.ccdi.domain.vo; +package com.ruoyi.info.collection.domain.vo; import lombok.Data; diff --git a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/vo/CcdiStaffTransferVO.java b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/vo/CcdiStaffTransferVO.java similarity index 98% rename from ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/vo/CcdiStaffTransferVO.java rename to ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/vo/CcdiStaffTransferVO.java index 373eb01..ce5b823 100644 --- a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/vo/CcdiStaffTransferVO.java +++ b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/vo/CcdiStaffTransferVO.java @@ -1,4 +1,4 @@ -package com.ruoyi.ccdi.domain.vo; +package com.ruoyi.info.collection.domain.vo; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/vo/CustEnterpriseRelationImportFailureVO.java b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/vo/CustEnterpriseRelationImportFailureVO.java similarity index 95% rename from ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/vo/CustEnterpriseRelationImportFailureVO.java rename to ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/vo/CustEnterpriseRelationImportFailureVO.java index 98357d3..11f06a9 100644 --- a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/vo/CustEnterpriseRelationImportFailureVO.java +++ b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/vo/CustEnterpriseRelationImportFailureVO.java @@ -1,4 +1,4 @@ -package com.ruoyi.ccdi.domain.vo; +package com.ruoyi.info.collection.domain.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/vo/CustFmyRelationImportFailureVO.java b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/vo/CustFmyRelationImportFailureVO.java similarity index 95% rename from ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/vo/CustFmyRelationImportFailureVO.java rename to ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/vo/CustFmyRelationImportFailureVO.java index e6cc3e8..2233187 100644 --- a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/vo/CustFmyRelationImportFailureVO.java +++ b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/vo/CustFmyRelationImportFailureVO.java @@ -1,4 +1,4 @@ -package com.ruoyi.ccdi.domain.vo; +package com.ruoyi.info.collection.domain.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/vo/EnumOptionVO.java b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/vo/EnumOptionVO.java similarity index 90% rename from ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/vo/EnumOptionVO.java rename to ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/vo/EnumOptionVO.java index 7081ad5..96034bd 100644 --- a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/vo/EnumOptionVO.java +++ b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/vo/EnumOptionVO.java @@ -1,4 +1,4 @@ -package com.ruoyi.ccdi.domain.vo; +package com.ruoyi.info.collection.domain.vo; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/vo/ImportFailureVO.java b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/vo/ImportFailureVO.java similarity index 94% rename from ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/vo/ImportFailureVO.java rename to ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/vo/ImportFailureVO.java index ee398bd..8ba894d 100644 --- a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/vo/ImportFailureVO.java +++ b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/vo/ImportFailureVO.java @@ -1,4 +1,4 @@ -package com.ruoyi.ccdi.domain.vo; +package com.ruoyi.info.collection.domain.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/vo/ImportResult.java b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/vo/ImportResult.java similarity index 82% rename from ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/vo/ImportResult.java rename to ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/vo/ImportResult.java index 36b6171..4023ac1 100644 --- a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/vo/ImportResult.java +++ b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/vo/ImportResult.java @@ -1,4 +1,4 @@ -package com.ruoyi.ccdi.domain.vo; +package com.ruoyi.info.collection.domain.vo; import lombok.Data; diff --git a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/vo/ImportResultVO.java b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/vo/ImportResultVO.java similarity index 91% rename from ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/vo/ImportResultVO.java rename to ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/vo/ImportResultVO.java index f96f296..9cbf31c 100644 --- a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/vo/ImportResultVO.java +++ b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/vo/ImportResultVO.java @@ -1,4 +1,4 @@ -package com.ruoyi.ccdi.domain.vo; +package com.ruoyi.info.collection.domain.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/vo/ImportStatusVO.java b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/vo/ImportStatusVO.java similarity index 94% rename from ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/vo/ImportStatusVO.java rename to ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/vo/ImportStatusVO.java index 914bd3b..bd240e8 100644 --- a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/vo/ImportStatusVO.java +++ b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/vo/ImportStatusVO.java @@ -1,4 +1,4 @@ -package com.ruoyi.ccdi.domain.vo; +package com.ruoyi.info.collection.domain.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/vo/IntermediaryEntityImportFailureVO.java b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/vo/IntermediaryEntityImportFailureVO.java similarity index 95% rename from ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/vo/IntermediaryEntityImportFailureVO.java rename to ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/vo/IntermediaryEntityImportFailureVO.java index 9aa865c..0f248c7 100644 --- a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/vo/IntermediaryEntityImportFailureVO.java +++ b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/vo/IntermediaryEntityImportFailureVO.java @@ -1,4 +1,4 @@ -package com.ruoyi.ccdi.domain.vo; +package com.ruoyi.info.collection.domain.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/vo/IntermediaryPersonImportFailureVO.java b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/vo/IntermediaryPersonImportFailureVO.java similarity index 95% rename from ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/vo/IntermediaryPersonImportFailureVO.java rename to ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/vo/IntermediaryPersonImportFailureVO.java index df1c71a..86cd909 100644 --- a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/vo/IntermediaryPersonImportFailureVO.java +++ b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/vo/IntermediaryPersonImportFailureVO.java @@ -1,4 +1,4 @@ -package com.ruoyi.ccdi.domain.vo; +package com.ruoyi.info.collection.domain.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/vo/PurchaseTransactionImportFailureVO.java b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/vo/PurchaseTransactionImportFailureVO.java similarity index 96% rename from ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/vo/PurchaseTransactionImportFailureVO.java rename to ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/vo/PurchaseTransactionImportFailureVO.java index e39203b..3f8fddd 100644 --- a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/vo/PurchaseTransactionImportFailureVO.java +++ b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/vo/PurchaseTransactionImportFailureVO.java @@ -1,4 +1,4 @@ -package com.ruoyi.ccdi.domain.vo; +package com.ruoyi.info.collection.domain.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/vo/RecruitmentImportFailureVO.java b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/vo/RecruitmentImportFailureVO.java similarity index 94% rename from ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/vo/RecruitmentImportFailureVO.java rename to ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/vo/RecruitmentImportFailureVO.java index a1cb6a6..4f48e27 100644 --- a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/vo/RecruitmentImportFailureVO.java +++ b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/vo/RecruitmentImportFailureVO.java @@ -1,4 +1,4 @@ -package com.ruoyi.ccdi.domain.vo; +package com.ruoyi.info.collection.domain.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/vo/StaffEnterpriseRelationImportFailureVO.java b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/vo/StaffEnterpriseRelationImportFailureVO.java similarity index 95% rename from ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/vo/StaffEnterpriseRelationImportFailureVO.java rename to ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/vo/StaffEnterpriseRelationImportFailureVO.java index c105e36..8da5342 100644 --- a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/vo/StaffEnterpriseRelationImportFailureVO.java +++ b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/vo/StaffEnterpriseRelationImportFailureVO.java @@ -1,4 +1,4 @@ -package com.ruoyi.ccdi.domain.vo; +package com.ruoyi.info.collection.domain.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/vo/StaffFmyRelationImportFailureVO.java b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/vo/StaffFmyRelationImportFailureVO.java similarity index 96% rename from ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/vo/StaffFmyRelationImportFailureVO.java rename to ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/vo/StaffFmyRelationImportFailureVO.java index 74e6566..a124904 100644 --- a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/vo/StaffFmyRelationImportFailureVO.java +++ b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/vo/StaffFmyRelationImportFailureVO.java @@ -1,4 +1,4 @@ -package com.ruoyi.ccdi.domain.vo; +package com.ruoyi.info.collection.domain.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/vo/StaffTransferImportFailureVO.java b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/vo/StaffTransferImportFailureVO.java similarity index 98% rename from ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/vo/StaffTransferImportFailureVO.java rename to ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/vo/StaffTransferImportFailureVO.java index af8fd35..9cb9c07 100644 --- a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/domain/vo/StaffTransferImportFailureVO.java +++ b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/domain/vo/StaffTransferImportFailureVO.java @@ -1,4 +1,4 @@ -package com.ruoyi.ccdi.domain.vo; +package com.ruoyi.info.collection.domain.vo; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/enums/AdmitStatus.java b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/enums/AdmitStatus.java similarity index 95% rename from ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/enums/AdmitStatus.java rename to ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/enums/AdmitStatus.java index 6ad4036..40f3460 100644 --- a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/enums/AdmitStatus.java +++ b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/enums/AdmitStatus.java @@ -1,4 +1,4 @@ -package com.ruoyi.ccdi.enums; +package com.ruoyi.info.collection.enums; /** diff --git a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/enums/CertType.java b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/enums/CertType.java similarity index 95% rename from ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/enums/CertType.java rename to ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/enums/CertType.java index 9bffade..7459fd8 100644 --- a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/enums/CertType.java +++ b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/enums/CertType.java @@ -1,4 +1,4 @@ -package com.ruoyi.ccdi.enums; +package com.ruoyi.info.collection.enums; /** diff --git a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/enums/CorpNature.java b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/enums/CorpNature.java similarity index 96% rename from ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/enums/CorpNature.java rename to ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/enums/CorpNature.java index 25d27e0..899e564 100644 --- a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/enums/CorpNature.java +++ b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/enums/CorpNature.java @@ -1,4 +1,4 @@ -package com.ruoyi.ccdi.enums; +package com.ruoyi.info.collection.enums; /** diff --git a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/enums/CorpType.java b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/enums/CorpType.java similarity index 97% rename from ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/enums/CorpType.java rename to ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/enums/CorpType.java index ea6ffd9..601515b 100644 --- a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/enums/CorpType.java +++ b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/enums/CorpType.java @@ -1,4 +1,4 @@ -package com.ruoyi.ccdi.enums; +package com.ruoyi.info.collection.enums; /** diff --git a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/enums/DataSource.java b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/enums/DataSource.java similarity index 95% rename from ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/enums/DataSource.java rename to ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/enums/DataSource.java index 24db564..b3e2f72 100644 --- a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/enums/DataSource.java +++ b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/enums/DataSource.java @@ -1,4 +1,4 @@ -package com.ruoyi.ccdi.enums; +package com.ruoyi.info.collection.enums; /** * 数据来源枚举 diff --git a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/enums/EmployeeStatus.java b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/enums/EmployeeStatus.java similarity index 94% rename from ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/enums/EmployeeStatus.java rename to ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/enums/EmployeeStatus.java index 368056a..fcdf340 100644 --- a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/enums/EmployeeStatus.java +++ b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/enums/EmployeeStatus.java @@ -1,4 +1,4 @@ -package com.ruoyi.ccdi.enums; +package com.ruoyi.info.collection.enums; /** diff --git a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/enums/Gender.java b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/enums/Gender.java similarity index 94% rename from ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/enums/Gender.java rename to ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/enums/Gender.java index e3accbe..37dc157 100644 --- a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/enums/Gender.java +++ b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/enums/Gender.java @@ -1,4 +1,4 @@ -package com.ruoyi.ccdi.enums; +package com.ruoyi.info.collection.enums; /** diff --git a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/enums/GenderEnum.java b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/enums/GenderEnum.java similarity index 98% rename from ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/enums/GenderEnum.java rename to ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/enums/GenderEnum.java index 3d2cb3c..1f4e43e 100644 --- a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/enums/GenderEnum.java +++ b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/enums/GenderEnum.java @@ -1,4 +1,4 @@ -package com.ruoyi.ccdi.enums; +package com.ruoyi.info.collection.enums; import org.apache.commons.lang3.StringUtils; diff --git a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/enums/IndivType.java b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/enums/IndivType.java similarity index 96% rename from ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/enums/IndivType.java rename to ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/enums/IndivType.java index 5b680ab..133dc73 100644 --- a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/enums/IndivType.java +++ b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/enums/IndivType.java @@ -1,4 +1,4 @@ -package com.ruoyi.ccdi.enums; +package com.ruoyi.info.collection.enums; /** diff --git a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/enums/IntermediaryStatus.java b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/enums/IntermediaryStatus.java similarity index 94% rename from ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/enums/IntermediaryStatus.java rename to ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/enums/IntermediaryStatus.java index 927f256..5ede2e8 100644 --- a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/enums/IntermediaryStatus.java +++ b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/enums/IntermediaryStatus.java @@ -1,4 +1,4 @@ -package com.ruoyi.ccdi.enums; +package com.ruoyi.info.collection.enums; /** diff --git a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/enums/IntermediaryType.java b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/enums/IntermediaryType.java similarity index 94% rename from ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/enums/IntermediaryType.java rename to ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/enums/IntermediaryType.java index 8be28eb..a6d7b3f 100644 --- a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/enums/IntermediaryType.java +++ b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/enums/IntermediaryType.java @@ -1,4 +1,4 @@ -package com.ruoyi.ccdi.enums; +package com.ruoyi.info.collection.enums; /** diff --git a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/enums/RelationType.java b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/enums/RelationType.java similarity index 96% rename from ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/enums/RelationType.java rename to ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/enums/RelationType.java index f1098ae..3f86273 100644 --- a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/enums/RelationType.java +++ b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/enums/RelationType.java @@ -1,4 +1,4 @@ -package com.ruoyi.ccdi.enums; +package com.ruoyi.info.collection.enums; /** diff --git a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/handler/DictDropdownWriteHandler.java b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/handler/DictDropdownWriteHandler.java similarity index 99% rename from ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/handler/DictDropdownWriteHandler.java rename to ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/handler/DictDropdownWriteHandler.java index 8834a79..02ddfa6 100644 --- a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/handler/DictDropdownWriteHandler.java +++ b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/handler/DictDropdownWriteHandler.java @@ -1,4 +1,4 @@ -package com.ruoyi.ccdi.handler; +package com.ruoyi.info.collection.handler; import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.write.handler.SheetWriteHandler; diff --git a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/handler/RequiredFieldWriteHandler.java b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/handler/RequiredFieldWriteHandler.java similarity index 99% rename from ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/handler/RequiredFieldWriteHandler.java rename to ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/handler/RequiredFieldWriteHandler.java index 8757cde..6affba6 100644 --- a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/handler/RequiredFieldWriteHandler.java +++ b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/handler/RequiredFieldWriteHandler.java @@ -1,4 +1,4 @@ -package com.ruoyi.ccdi.handler; +package com.ruoyi.info.collection.handler; import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.write.handler.SheetWriteHandler; diff --git a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/mapper/CcdiBaseStaffMapper.java b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/mapper/CcdiBaseStaffMapper.java similarity index 82% rename from ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/mapper/CcdiBaseStaffMapper.java rename to ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/mapper/CcdiBaseStaffMapper.java index d4cf762..aa89a09 100644 --- a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/mapper/CcdiBaseStaffMapper.java +++ b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/mapper/CcdiBaseStaffMapper.java @@ -1,11 +1,11 @@ -package com.ruoyi.ccdi.mapper; +package com.ruoyi.info.collection.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.ruoyi.ccdi.domain.CcdiBaseStaff; -import com.ruoyi.ccdi.domain.dto.CcdiBaseStaffQueryDTO; -import com.ruoyi.ccdi.domain.vo.CcdiBaseStaffOptionVO; -import com.ruoyi.ccdi.domain.vo.CcdiBaseStaffVO; +import com.ruoyi.info.collection.domain.CcdiBaseStaff; +import com.ruoyi.info.collection.domain.dto.CcdiBaseStaffQueryDTO; +import com.ruoyi.info.collection.domain.vo.CcdiBaseStaffOptionVO; +import com.ruoyi.info.collection.domain.vo.CcdiBaseStaffVO; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/mapper/CcdiBizIntermediaryMapper.java b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/mapper/CcdiBizIntermediaryMapper.java similarity index 89% rename from ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/mapper/CcdiBizIntermediaryMapper.java rename to ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/mapper/CcdiBizIntermediaryMapper.java index 50dd779..26604af 100644 --- a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/mapper/CcdiBizIntermediaryMapper.java +++ b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/mapper/CcdiBizIntermediaryMapper.java @@ -1,7 +1,7 @@ -package com.ruoyi.ccdi.mapper; +package com.ruoyi.info.collection.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.ruoyi.ccdi.domain.CcdiBizIntermediary; +import com.ruoyi.info.collection.domain.CcdiBizIntermediary; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/mapper/CcdiCustEnterpriseRelationMapper.java b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/mapper/CcdiCustEnterpriseRelationMapper.java similarity index 89% rename from ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/mapper/CcdiCustEnterpriseRelationMapper.java rename to ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/mapper/CcdiCustEnterpriseRelationMapper.java index 42954f4..385ac9a 100644 --- a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/mapper/CcdiCustEnterpriseRelationMapper.java +++ b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/mapper/CcdiCustEnterpriseRelationMapper.java @@ -1,10 +1,10 @@ -package com.ruoyi.ccdi.mapper; +package com.ruoyi.info.collection.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.ruoyi.ccdi.domain.CcdiCustEnterpriseRelation; -import com.ruoyi.ccdi.domain.dto.CcdiCustEnterpriseRelationQueryDTO; -import com.ruoyi.ccdi.domain.vo.CcdiCustEnterpriseRelationVO; +import com.ruoyi.info.collection.domain.CcdiCustEnterpriseRelation; +import com.ruoyi.info.collection.domain.dto.CcdiCustEnterpriseRelationQueryDTO; +import com.ruoyi.info.collection.domain.vo.CcdiCustEnterpriseRelationVO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/mapper/CcdiCustFmyRelationMapper.java b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/mapper/CcdiCustFmyRelationMapper.java similarity index 90% rename from ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/mapper/CcdiCustFmyRelationMapper.java rename to ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/mapper/CcdiCustFmyRelationMapper.java index bfae641..e950a00 100644 --- a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/mapper/CcdiCustFmyRelationMapper.java +++ b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/mapper/CcdiCustFmyRelationMapper.java @@ -1,10 +1,10 @@ -package com.ruoyi.ccdi.mapper; +package com.ruoyi.info.collection.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.ruoyi.ccdi.domain.CcdiCustFmyRelation; -import com.ruoyi.ccdi.domain.dto.CcdiCustFmyRelationQueryDTO; -import com.ruoyi.ccdi.domain.vo.CcdiCustFmyRelationVO; +import com.ruoyi.info.collection.domain.CcdiCustFmyRelation; +import com.ruoyi.info.collection.domain.dto.CcdiCustFmyRelationQueryDTO; +import com.ruoyi.info.collection.domain.vo.CcdiCustFmyRelationVO; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/mapper/CcdiEnterpriseBaseInfoMapper.java b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/mapper/CcdiEnterpriseBaseInfoMapper.java similarity index 89% rename from ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/mapper/CcdiEnterpriseBaseInfoMapper.java rename to ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/mapper/CcdiEnterpriseBaseInfoMapper.java index 2c0fd45..0fe7552 100644 --- a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/mapper/CcdiEnterpriseBaseInfoMapper.java +++ b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/mapper/CcdiEnterpriseBaseInfoMapper.java @@ -1,7 +1,7 @@ -package com.ruoyi.ccdi.mapper; +package com.ruoyi.info.collection.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.ruoyi.ccdi.domain.CcdiEnterpriseBaseInfo; +import com.ruoyi.info.collection.domain.CcdiEnterpriseBaseInfo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/mapper/CcdiIntermediaryMapper.java b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/mapper/CcdiIntermediaryMapper.java similarity index 81% rename from ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/mapper/CcdiIntermediaryMapper.java rename to ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/mapper/CcdiIntermediaryMapper.java index e53cbef..370b14a 100644 --- a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/mapper/CcdiIntermediaryMapper.java +++ b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/mapper/CcdiIntermediaryMapper.java @@ -1,8 +1,8 @@ -package com.ruoyi.ccdi.mapper; +package com.ruoyi.info.collection.mapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.ruoyi.ccdi.domain.dto.CcdiIntermediaryQueryDTO; -import com.ruoyi.ccdi.domain.vo.CcdiIntermediaryVO; +import com.ruoyi.info.collection.domain.dto.CcdiIntermediaryQueryDTO; +import com.ruoyi.info.collection.domain.vo.CcdiIntermediaryVO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/mapper/CcdiPurchaseTransactionMapper.java b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/mapper/CcdiPurchaseTransactionMapper.java similarity index 84% rename from ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/mapper/CcdiPurchaseTransactionMapper.java rename to ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/mapper/CcdiPurchaseTransactionMapper.java index deb2b48..bc83d91 100644 --- a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/mapper/CcdiPurchaseTransactionMapper.java +++ b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/mapper/CcdiPurchaseTransactionMapper.java @@ -1,10 +1,10 @@ -package com.ruoyi.ccdi.mapper; +package com.ruoyi.info.collection.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.ruoyi.ccdi.domain.CcdiPurchaseTransaction; -import com.ruoyi.ccdi.domain.dto.CcdiPurchaseTransactionQueryDTO; -import com.ruoyi.ccdi.domain.vo.CcdiPurchaseTransactionVO; +import com.ruoyi.info.collection.domain.CcdiPurchaseTransaction; +import com.ruoyi.info.collection.domain.dto.CcdiPurchaseTransactionQueryDTO; +import com.ruoyi.info.collection.domain.vo.CcdiPurchaseTransactionVO; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/mapper/CcdiStaffEnterpriseRelationMapper.java b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/mapper/CcdiStaffEnterpriseRelationMapper.java similarity index 88% rename from ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/mapper/CcdiStaffEnterpriseRelationMapper.java rename to ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/mapper/CcdiStaffEnterpriseRelationMapper.java index 44698ba..8aeaaa9 100644 --- a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/mapper/CcdiStaffEnterpriseRelationMapper.java +++ b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/mapper/CcdiStaffEnterpriseRelationMapper.java @@ -1,10 +1,10 @@ -package com.ruoyi.ccdi.mapper; +package com.ruoyi.info.collection.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.ruoyi.ccdi.domain.CcdiStaffEnterpriseRelation; -import com.ruoyi.ccdi.domain.dto.CcdiStaffEnterpriseRelationQueryDTO; -import com.ruoyi.ccdi.domain.vo.CcdiStaffEnterpriseRelationVO; +import com.ruoyi.info.collection.domain.CcdiStaffEnterpriseRelation; +import com.ruoyi.info.collection.domain.dto.CcdiStaffEnterpriseRelationQueryDTO; +import com.ruoyi.info.collection.domain.vo.CcdiStaffEnterpriseRelationVO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/mapper/CcdiStaffFmyRelationMapper.java b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/mapper/CcdiStaffFmyRelationMapper.java similarity index 88% rename from ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/mapper/CcdiStaffFmyRelationMapper.java rename to ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/mapper/CcdiStaffFmyRelationMapper.java index 137ba5f..0afc924 100644 --- a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/mapper/CcdiStaffFmyRelationMapper.java +++ b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/mapper/CcdiStaffFmyRelationMapper.java @@ -1,10 +1,10 @@ -package com.ruoyi.ccdi.mapper; +package com.ruoyi.info.collection.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.ruoyi.ccdi.domain.CcdiStaffFmyRelation; -import com.ruoyi.ccdi.domain.dto.CcdiStaffFmyRelationQueryDTO; -import com.ruoyi.ccdi.domain.vo.CcdiStaffFmyRelationVO; +import com.ruoyi.info.collection.domain.CcdiStaffFmyRelation; +import com.ruoyi.info.collection.domain.dto.CcdiStaffFmyRelationQueryDTO; +import com.ruoyi.info.collection.domain.vo.CcdiStaffFmyRelationVO; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/mapper/CcdiStaffRecruitmentMapper.java b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/mapper/CcdiStaffRecruitmentMapper.java similarity index 84% rename from ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/mapper/CcdiStaffRecruitmentMapper.java rename to ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/mapper/CcdiStaffRecruitmentMapper.java index d9a5b58..7d81283 100644 --- a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/mapper/CcdiStaffRecruitmentMapper.java +++ b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/mapper/CcdiStaffRecruitmentMapper.java @@ -1,10 +1,10 @@ -package com.ruoyi.ccdi.mapper; +package com.ruoyi.info.collection.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.ruoyi.ccdi.domain.CcdiStaffRecruitment; -import com.ruoyi.ccdi.domain.dto.CcdiStaffRecruitmentQueryDTO; -import com.ruoyi.ccdi.domain.vo.CcdiStaffRecruitmentVO; +import com.ruoyi.info.collection.domain.CcdiStaffRecruitment; +import com.ruoyi.info.collection.domain.dto.CcdiStaffRecruitmentQueryDTO; +import com.ruoyi.info.collection.domain.vo.CcdiStaffRecruitmentVO; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/mapper/CcdiStaffTransferMapper.java b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/mapper/CcdiStaffTransferMapper.java similarity index 87% rename from ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/mapper/CcdiStaffTransferMapper.java rename to ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/mapper/CcdiStaffTransferMapper.java index 06d29e3..db7f2f1 100644 --- a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/mapper/CcdiStaffTransferMapper.java +++ b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/mapper/CcdiStaffTransferMapper.java @@ -1,11 +1,11 @@ -package com.ruoyi.ccdi.mapper; +package com.ruoyi.info.collection.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.ruoyi.ccdi.domain.CcdiStaffTransfer; -import com.ruoyi.ccdi.domain.dto.CcdiStaffTransferQueryDTO; -import com.ruoyi.ccdi.domain.dto.TransferUniqueKey; -import com.ruoyi.ccdi.domain.vo.CcdiStaffTransferVO; +import com.ruoyi.info.collection.domain.CcdiStaffTransfer; +import com.ruoyi.info.collection.domain.dto.CcdiStaffTransferQueryDTO; +import com.ruoyi.info.collection.domain.dto.TransferUniqueKey; +import com.ruoyi.info.collection.domain.vo.CcdiStaffTransferVO; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/ICcdiBaseStaffImportService.java b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/service/ICcdiBaseStaffImportService.java similarity index 76% rename from ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/ICcdiBaseStaffImportService.java rename to ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/service/ICcdiBaseStaffImportService.java index b330510..8763db2 100644 --- a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/ICcdiBaseStaffImportService.java +++ b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/service/ICcdiBaseStaffImportService.java @@ -1,8 +1,8 @@ -package com.ruoyi.ccdi.service; +package com.ruoyi.info.collection.service; -import com.ruoyi.ccdi.domain.excel.CcdiBaseStaffExcel; -import com.ruoyi.ccdi.domain.vo.ImportFailureVO; -import com.ruoyi.ccdi.domain.vo.ImportStatusVO; +import com.ruoyi.info.collection.domain.excel.CcdiBaseStaffExcel; +import com.ruoyi.info.collection.domain.vo.ImportFailureVO; +import com.ruoyi.info.collection.domain.vo.ImportStatusVO; import java.util.List; diff --git a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/ICcdiBaseStaffService.java b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/service/ICcdiBaseStaffService.java similarity index 82% rename from ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/ICcdiBaseStaffService.java rename to ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/service/ICcdiBaseStaffService.java index d6a2bf3..938cf74 100644 --- a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/ICcdiBaseStaffService.java +++ b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/service/ICcdiBaseStaffService.java @@ -1,12 +1,12 @@ -package com.ruoyi.ccdi.service; +package com.ruoyi.info.collection.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.ruoyi.ccdi.domain.dto.CcdiBaseStaffAddDTO; -import com.ruoyi.ccdi.domain.dto.CcdiBaseStaffEditDTO; -import com.ruoyi.ccdi.domain.dto.CcdiBaseStaffQueryDTO; -import com.ruoyi.ccdi.domain.excel.CcdiBaseStaffExcel; -import com.ruoyi.ccdi.domain.vo.CcdiBaseStaffOptionVO; -import com.ruoyi.ccdi.domain.vo.CcdiBaseStaffVO; +import com.ruoyi.info.collection.domain.dto.CcdiBaseStaffAddDTO; +import com.ruoyi.info.collection.domain.dto.CcdiBaseStaffEditDTO; +import com.ruoyi.info.collection.domain.dto.CcdiBaseStaffQueryDTO; +import com.ruoyi.info.collection.domain.excel.CcdiBaseStaffExcel; +import com.ruoyi.info.collection.domain.vo.CcdiBaseStaffOptionVO; +import com.ruoyi.info.collection.domain.vo.CcdiBaseStaffVO; import java.util.List; diff --git a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/ICcdiCustEnterpriseRelationImportService.java b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/service/ICcdiCustEnterpriseRelationImportService.java similarity index 76% rename from ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/ICcdiCustEnterpriseRelationImportService.java rename to ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/service/ICcdiCustEnterpriseRelationImportService.java index 5aba198..fe6a637 100644 --- a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/ICcdiCustEnterpriseRelationImportService.java +++ b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/service/ICcdiCustEnterpriseRelationImportService.java @@ -1,8 +1,8 @@ -package com.ruoyi.ccdi.service; +package com.ruoyi.info.collection.service; -import com.ruoyi.ccdi.domain.excel.CcdiCustEnterpriseRelationExcel; -import com.ruoyi.ccdi.domain.vo.CustEnterpriseRelationImportFailureVO; -import com.ruoyi.ccdi.domain.vo.ImportStatusVO; +import com.ruoyi.info.collection.domain.excel.CcdiCustEnterpriseRelationExcel; +import com.ruoyi.info.collection.domain.vo.CustEnterpriseRelationImportFailureVO; +import com.ruoyi.info.collection.domain.vo.ImportStatusVO; import java.util.List; diff --git a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/ICcdiCustEnterpriseRelationService.java b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/service/ICcdiCustEnterpriseRelationService.java similarity index 82% rename from ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/ICcdiCustEnterpriseRelationService.java rename to ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/service/ICcdiCustEnterpriseRelationService.java index 0a7b7b2..70fb982 100644 --- a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/ICcdiCustEnterpriseRelationService.java +++ b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/service/ICcdiCustEnterpriseRelationService.java @@ -1,11 +1,11 @@ -package com.ruoyi.ccdi.service; +package com.ruoyi.info.collection.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.ruoyi.ccdi.domain.dto.CcdiCustEnterpriseRelationAddDTO; -import com.ruoyi.ccdi.domain.dto.CcdiCustEnterpriseRelationEditDTO; -import com.ruoyi.ccdi.domain.dto.CcdiCustEnterpriseRelationQueryDTO; -import com.ruoyi.ccdi.domain.excel.CcdiCustEnterpriseRelationExcel; -import com.ruoyi.ccdi.domain.vo.CcdiCustEnterpriseRelationVO; +import com.ruoyi.info.collection.domain.dto.CcdiCustEnterpriseRelationAddDTO; +import com.ruoyi.info.collection.domain.dto.CcdiCustEnterpriseRelationEditDTO; +import com.ruoyi.info.collection.domain.dto.CcdiCustEnterpriseRelationQueryDTO; +import com.ruoyi.info.collection.domain.excel.CcdiCustEnterpriseRelationExcel; +import com.ruoyi.info.collection.domain.vo.CcdiCustEnterpriseRelationVO; import java.util.List; diff --git a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/ICcdiCustFmyRelationImportService.java b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/service/ICcdiCustFmyRelationImportService.java similarity index 80% rename from ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/ICcdiCustFmyRelationImportService.java rename to ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/service/ICcdiCustFmyRelationImportService.java index 62fa2ea..83149e4 100644 --- a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/ICcdiCustFmyRelationImportService.java +++ b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/service/ICcdiCustFmyRelationImportService.java @@ -1,8 +1,8 @@ -package com.ruoyi.ccdi.service; +package com.ruoyi.info.collection.service; -import com.ruoyi.ccdi.domain.excel.CcdiCustFmyRelationExcel; -import com.ruoyi.ccdi.domain.vo.CustFmyRelationImportFailureVO; -import com.ruoyi.ccdi.domain.vo.ImportStatusVO; +import com.ruoyi.info.collection.domain.excel.CcdiCustFmyRelationExcel; +import com.ruoyi.info.collection.domain.vo.CustFmyRelationImportFailureVO; +import com.ruoyi.info.collection.domain.vo.ImportStatusVO; import java.util.List; diff --git a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/ICcdiCustFmyRelationService.java b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/service/ICcdiCustFmyRelationService.java similarity index 84% rename from ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/ICcdiCustFmyRelationService.java rename to ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/service/ICcdiCustFmyRelationService.java index b29d752..0e611fb 100644 --- a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/ICcdiCustFmyRelationService.java +++ b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/service/ICcdiCustFmyRelationService.java @@ -1,11 +1,11 @@ -package com.ruoyi.ccdi.service; +package com.ruoyi.info.collection.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.ruoyi.ccdi.domain.dto.CcdiCustFmyRelationAddDTO; -import com.ruoyi.ccdi.domain.dto.CcdiCustFmyRelationEditDTO; -import com.ruoyi.ccdi.domain.dto.CcdiCustFmyRelationQueryDTO; -import com.ruoyi.ccdi.domain.excel.CcdiCustFmyRelationExcel; -import com.ruoyi.ccdi.domain.vo.CcdiCustFmyRelationVO; +import com.ruoyi.info.collection.domain.dto.CcdiCustFmyRelationAddDTO; +import com.ruoyi.info.collection.domain.dto.CcdiCustFmyRelationEditDTO; +import com.ruoyi.info.collection.domain.dto.CcdiCustFmyRelationQueryDTO; +import com.ruoyi.info.collection.domain.excel.CcdiCustFmyRelationExcel; +import com.ruoyi.info.collection.domain.vo.CcdiCustFmyRelationVO; import jakarta.servlet.http.HttpServletResponse; import java.util.List; diff --git a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/ICcdiIntermediaryEntityImportService.java b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/service/ICcdiIntermediaryEntityImportService.java similarity index 77% rename from ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/ICcdiIntermediaryEntityImportService.java rename to ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/service/ICcdiIntermediaryEntityImportService.java index 99996e3..e2952d7 100644 --- a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/ICcdiIntermediaryEntityImportService.java +++ b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/service/ICcdiIntermediaryEntityImportService.java @@ -1,8 +1,8 @@ -package com.ruoyi.ccdi.service; +package com.ruoyi.info.collection.service; -import com.ruoyi.ccdi.domain.excel.CcdiIntermediaryEntityExcel; -import com.ruoyi.ccdi.domain.vo.ImportStatusVO; -import com.ruoyi.ccdi.domain.vo.IntermediaryEntityImportFailureVO; +import com.ruoyi.info.collection.domain.excel.CcdiIntermediaryEntityExcel; +import com.ruoyi.info.collection.domain.vo.ImportStatusVO; +import com.ruoyi.info.collection.domain.vo.IntermediaryEntityImportFailureVO; import java.util.List; diff --git a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/ICcdiIntermediaryPersonImportService.java b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/service/ICcdiIntermediaryPersonImportService.java similarity index 77% rename from ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/ICcdiIntermediaryPersonImportService.java rename to ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/service/ICcdiIntermediaryPersonImportService.java index a844c3c..af2981e 100644 --- a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/ICcdiIntermediaryPersonImportService.java +++ b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/service/ICcdiIntermediaryPersonImportService.java @@ -1,8 +1,8 @@ -package com.ruoyi.ccdi.service; +package com.ruoyi.info.collection.service; -import com.ruoyi.ccdi.domain.excel.CcdiIntermediaryPersonExcel; -import com.ruoyi.ccdi.domain.vo.ImportStatusVO; -import com.ruoyi.ccdi.domain.vo.IntermediaryPersonImportFailureVO; +import com.ruoyi.info.collection.domain.excel.CcdiIntermediaryPersonExcel; +import com.ruoyi.info.collection.domain.vo.ImportStatusVO; +import com.ruoyi.info.collection.domain.vo.IntermediaryPersonImportFailureVO; import java.util.List; diff --git a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/ICcdiIntermediaryService.java b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/service/ICcdiIntermediaryService.java similarity index 90% rename from ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/ICcdiIntermediaryService.java rename to ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/service/ICcdiIntermediaryService.java index 6cd2cab..80c6bd2 100644 --- a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/ICcdiIntermediaryService.java +++ b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/service/ICcdiIntermediaryService.java @@ -1,10 +1,10 @@ -package com.ruoyi.ccdi.service; +package com.ruoyi.info.collection.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.ruoyi.ccdi.domain.dto.*; -import com.ruoyi.ccdi.domain.vo.CcdiIntermediaryEntityDetailVO; -import com.ruoyi.ccdi.domain.vo.CcdiIntermediaryPersonDetailVO; -import com.ruoyi.ccdi.domain.vo.CcdiIntermediaryVO; +import com.ruoyi.info.collection.domain.dto.*; +import com.ruoyi.info.collection.domain.vo.CcdiIntermediaryEntityDetailVO; +import com.ruoyi.info.collection.domain.vo.CcdiIntermediaryPersonDetailVO; +import com.ruoyi.info.collection.domain.vo.CcdiIntermediaryVO; /** * 中介Service接口 diff --git a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/ICcdiPurchaseTransactionImportService.java b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/service/ICcdiPurchaseTransactionImportService.java similarity index 76% rename from ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/ICcdiPurchaseTransactionImportService.java rename to ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/service/ICcdiPurchaseTransactionImportService.java index 99b9e94..4bcbec5 100644 --- a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/ICcdiPurchaseTransactionImportService.java +++ b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/service/ICcdiPurchaseTransactionImportService.java @@ -1,8 +1,8 @@ -package com.ruoyi.ccdi.service; +package com.ruoyi.info.collection.service; -import com.ruoyi.ccdi.domain.excel.CcdiPurchaseTransactionExcel; -import com.ruoyi.ccdi.domain.vo.PurchaseTransactionImportFailureVO; -import com.ruoyi.ccdi.domain.vo.ImportStatusVO; +import com.ruoyi.info.collection.domain.excel.CcdiPurchaseTransactionExcel; +import com.ruoyi.info.collection.domain.vo.PurchaseTransactionImportFailureVO; +import com.ruoyi.info.collection.domain.vo.ImportStatusVO; import java.util.List; diff --git a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/ICcdiPurchaseTransactionService.java b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/service/ICcdiPurchaseTransactionService.java similarity index 82% rename from ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/ICcdiPurchaseTransactionService.java rename to ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/service/ICcdiPurchaseTransactionService.java index deab47f..ec8f1c5 100644 --- a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/ICcdiPurchaseTransactionService.java +++ b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/service/ICcdiPurchaseTransactionService.java @@ -1,11 +1,11 @@ -package com.ruoyi.ccdi.service; +package com.ruoyi.info.collection.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.ruoyi.ccdi.domain.dto.CcdiPurchaseTransactionAddDTO; -import com.ruoyi.ccdi.domain.dto.CcdiPurchaseTransactionEditDTO; -import com.ruoyi.ccdi.domain.dto.CcdiPurchaseTransactionQueryDTO; -import com.ruoyi.ccdi.domain.excel.CcdiPurchaseTransactionExcel; -import com.ruoyi.ccdi.domain.vo.CcdiPurchaseTransactionVO; +import com.ruoyi.info.collection.domain.dto.CcdiPurchaseTransactionAddDTO; +import com.ruoyi.info.collection.domain.dto.CcdiPurchaseTransactionEditDTO; +import com.ruoyi.info.collection.domain.dto.CcdiPurchaseTransactionQueryDTO; +import com.ruoyi.info.collection.domain.excel.CcdiPurchaseTransactionExcel; +import com.ruoyi.info.collection.domain.vo.CcdiPurchaseTransactionVO; import java.util.List; diff --git a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/ICcdiStaffEnterpriseRelationImportService.java b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/service/ICcdiStaffEnterpriseRelationImportService.java similarity index 76% rename from ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/ICcdiStaffEnterpriseRelationImportService.java rename to ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/service/ICcdiStaffEnterpriseRelationImportService.java index b67b5e2..ab75d2c 100644 --- a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/ICcdiStaffEnterpriseRelationImportService.java +++ b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/service/ICcdiStaffEnterpriseRelationImportService.java @@ -1,8 +1,8 @@ -package com.ruoyi.ccdi.service; +package com.ruoyi.info.collection.service; -import com.ruoyi.ccdi.domain.excel.CcdiStaffEnterpriseRelationExcel; -import com.ruoyi.ccdi.domain.vo.ImportStatusVO; -import com.ruoyi.ccdi.domain.vo.StaffEnterpriseRelationImportFailureVO; +import com.ruoyi.info.collection.domain.excel.CcdiStaffEnterpriseRelationExcel; +import com.ruoyi.info.collection.domain.vo.ImportStatusVO; +import com.ruoyi.info.collection.domain.vo.StaffEnterpriseRelationImportFailureVO; import java.util.List; diff --git a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/ICcdiStaffEnterpriseRelationService.java b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/service/ICcdiStaffEnterpriseRelationService.java similarity index 82% rename from ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/ICcdiStaffEnterpriseRelationService.java rename to ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/service/ICcdiStaffEnterpriseRelationService.java index 5463014..87f5766 100644 --- a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/ICcdiStaffEnterpriseRelationService.java +++ b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/service/ICcdiStaffEnterpriseRelationService.java @@ -1,11 +1,11 @@ -package com.ruoyi.ccdi.service; +package com.ruoyi.info.collection.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.ruoyi.ccdi.domain.dto.CcdiStaffEnterpriseRelationAddDTO; -import com.ruoyi.ccdi.domain.dto.CcdiStaffEnterpriseRelationEditDTO; -import com.ruoyi.ccdi.domain.dto.CcdiStaffEnterpriseRelationQueryDTO; -import com.ruoyi.ccdi.domain.excel.CcdiStaffEnterpriseRelationExcel; -import com.ruoyi.ccdi.domain.vo.CcdiStaffEnterpriseRelationVO; +import com.ruoyi.info.collection.domain.dto.CcdiStaffEnterpriseRelationAddDTO; +import com.ruoyi.info.collection.domain.dto.CcdiStaffEnterpriseRelationEditDTO; +import com.ruoyi.info.collection.domain.dto.CcdiStaffEnterpriseRelationQueryDTO; +import com.ruoyi.info.collection.domain.excel.CcdiStaffEnterpriseRelationExcel; +import com.ruoyi.info.collection.domain.vo.CcdiStaffEnterpriseRelationVO; import java.util.List; diff --git a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/ICcdiStaffFmyRelationImportService.java b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/service/ICcdiStaffFmyRelationImportService.java similarity index 76% rename from ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/ICcdiStaffFmyRelationImportService.java rename to ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/service/ICcdiStaffFmyRelationImportService.java index 48064e4..f07ff88 100644 --- a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/ICcdiStaffFmyRelationImportService.java +++ b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/service/ICcdiStaffFmyRelationImportService.java @@ -1,8 +1,8 @@ -package com.ruoyi.ccdi.service; +package com.ruoyi.info.collection.service; -import com.ruoyi.ccdi.domain.excel.CcdiStaffFmyRelationExcel; -import com.ruoyi.ccdi.domain.vo.ImportStatusVO; -import com.ruoyi.ccdi.domain.vo.StaffFmyRelationImportFailureVO; +import com.ruoyi.info.collection.domain.excel.CcdiStaffFmyRelationExcel; +import com.ruoyi.info.collection.domain.vo.ImportStatusVO; +import com.ruoyi.info.collection.domain.vo.StaffFmyRelationImportFailureVO; import java.util.List; diff --git a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/ICcdiStaffFmyRelationService.java b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/service/ICcdiStaffFmyRelationService.java similarity index 82% rename from ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/ICcdiStaffFmyRelationService.java rename to ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/service/ICcdiStaffFmyRelationService.java index 5b92b6e..b11d1e8 100644 --- a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/ICcdiStaffFmyRelationService.java +++ b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/service/ICcdiStaffFmyRelationService.java @@ -1,11 +1,11 @@ -package com.ruoyi.ccdi.service; +package com.ruoyi.info.collection.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.ruoyi.ccdi.domain.dto.CcdiStaffFmyRelationAddDTO; -import com.ruoyi.ccdi.domain.dto.CcdiStaffFmyRelationEditDTO; -import com.ruoyi.ccdi.domain.dto.CcdiStaffFmyRelationQueryDTO; -import com.ruoyi.ccdi.domain.excel.CcdiStaffFmyRelationExcel; -import com.ruoyi.ccdi.domain.vo.CcdiStaffFmyRelationVO; +import com.ruoyi.info.collection.domain.dto.CcdiStaffFmyRelationAddDTO; +import com.ruoyi.info.collection.domain.dto.CcdiStaffFmyRelationEditDTO; +import com.ruoyi.info.collection.domain.dto.CcdiStaffFmyRelationQueryDTO; +import com.ruoyi.info.collection.domain.excel.CcdiStaffFmyRelationExcel; +import com.ruoyi.info.collection.domain.vo.CcdiStaffFmyRelationVO; import java.util.List; diff --git a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/ICcdiStaffRecruitmentImportService.java b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/service/ICcdiStaffRecruitmentImportService.java similarity index 77% rename from ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/ICcdiStaffRecruitmentImportService.java rename to ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/service/ICcdiStaffRecruitmentImportService.java index fa99c8a..cc25051 100644 --- a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/ICcdiStaffRecruitmentImportService.java +++ b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/service/ICcdiStaffRecruitmentImportService.java @@ -1,8 +1,8 @@ -package com.ruoyi.ccdi.service; +package com.ruoyi.info.collection.service; -import com.ruoyi.ccdi.domain.excel.CcdiStaffRecruitmentExcel; -import com.ruoyi.ccdi.domain.vo.ImportStatusVO; -import com.ruoyi.ccdi.domain.vo.RecruitmentImportFailureVO; +import com.ruoyi.info.collection.domain.excel.CcdiStaffRecruitmentExcel; +import com.ruoyi.info.collection.domain.vo.ImportStatusVO; +import com.ruoyi.info.collection.domain.vo.RecruitmentImportFailureVO; import java.util.List; diff --git a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/ICcdiStaffRecruitmentService.java b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/service/ICcdiStaffRecruitmentService.java similarity index 82% rename from ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/ICcdiStaffRecruitmentService.java rename to ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/service/ICcdiStaffRecruitmentService.java index 9bad26c..bbf8a69 100644 --- a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/ICcdiStaffRecruitmentService.java +++ b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/service/ICcdiStaffRecruitmentService.java @@ -1,11 +1,11 @@ -package com.ruoyi.ccdi.service; +package com.ruoyi.info.collection.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.ruoyi.ccdi.domain.dto.CcdiStaffRecruitmentAddDTO; -import com.ruoyi.ccdi.domain.dto.CcdiStaffRecruitmentEditDTO; -import com.ruoyi.ccdi.domain.dto.CcdiStaffRecruitmentQueryDTO; -import com.ruoyi.ccdi.domain.excel.CcdiStaffRecruitmentExcel; -import com.ruoyi.ccdi.domain.vo.CcdiStaffRecruitmentVO; +import com.ruoyi.info.collection.domain.dto.CcdiStaffRecruitmentAddDTO; +import com.ruoyi.info.collection.domain.dto.CcdiStaffRecruitmentEditDTO; +import com.ruoyi.info.collection.domain.dto.CcdiStaffRecruitmentQueryDTO; +import com.ruoyi.info.collection.domain.excel.CcdiStaffRecruitmentExcel; +import com.ruoyi.info.collection.domain.vo.CcdiStaffRecruitmentVO; import java.util.List; diff --git a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/ICcdiStaffTransferImportService.java b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/service/ICcdiStaffTransferImportService.java similarity index 76% rename from ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/ICcdiStaffTransferImportService.java rename to ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/service/ICcdiStaffTransferImportService.java index 93113f7..f9054b7 100644 --- a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/ICcdiStaffTransferImportService.java +++ b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/service/ICcdiStaffTransferImportService.java @@ -1,8 +1,8 @@ -package com.ruoyi.ccdi.service; +package com.ruoyi.info.collection.service; -import com.ruoyi.ccdi.domain.excel.CcdiStaffTransferExcel; -import com.ruoyi.ccdi.domain.vo.ImportStatusVO; -import com.ruoyi.ccdi.domain.vo.StaffTransferImportFailureVO; +import com.ruoyi.info.collection.domain.excel.CcdiStaffTransferExcel; +import com.ruoyi.info.collection.domain.vo.ImportStatusVO; +import com.ruoyi.info.collection.domain.vo.StaffTransferImportFailureVO; import java.util.List; diff --git a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/ICcdiStaffTransferService.java b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/service/ICcdiStaffTransferService.java similarity index 85% rename from ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/ICcdiStaffTransferService.java rename to ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/service/ICcdiStaffTransferService.java index 45b61e0..96422e2 100644 --- a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/ICcdiStaffTransferService.java +++ b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/service/ICcdiStaffTransferService.java @@ -1,11 +1,11 @@ -package com.ruoyi.ccdi.service; +package com.ruoyi.info.collection.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.ruoyi.ccdi.domain.dto.CcdiStaffTransferAddDTO; -import com.ruoyi.ccdi.domain.dto.CcdiStaffTransferEditDTO; -import com.ruoyi.ccdi.domain.dto.CcdiStaffTransferQueryDTO; -import com.ruoyi.ccdi.domain.excel.CcdiStaffTransferExcel; -import com.ruoyi.ccdi.domain.vo.CcdiStaffTransferVO; +import com.ruoyi.info.collection.domain.dto.CcdiStaffTransferAddDTO; +import com.ruoyi.info.collection.domain.dto.CcdiStaffTransferEditDTO; +import com.ruoyi.info.collection.domain.dto.CcdiStaffTransferQueryDTO; +import com.ruoyi.info.collection.domain.excel.CcdiStaffTransferExcel; +import com.ruoyi.info.collection.domain.vo.CcdiStaffTransferVO; import com.ruoyi.common.exception.ServiceException; import java.util.List; diff --git a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/impl/CcdiBaseStaffImportServiceImpl.java b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/service/impl/CcdiBaseStaffImportServiceImpl.java similarity index 95% rename from ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/impl/CcdiBaseStaffImportServiceImpl.java rename to ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/service/impl/CcdiBaseStaffImportServiceImpl.java index 2a8f968..ea45705 100644 --- a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/impl/CcdiBaseStaffImportServiceImpl.java +++ b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/service/impl/CcdiBaseStaffImportServiceImpl.java @@ -1,16 +1,16 @@ -package com.ruoyi.ccdi.service.impl; +package com.ruoyi.info.collection.service.impl; import com.alibaba.fastjson2.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.ruoyi.ccdi.domain.CcdiBaseStaff; -import com.ruoyi.ccdi.domain.dto.CcdiBaseStaffAddDTO; -import com.ruoyi.ccdi.domain.excel.CcdiBaseStaffExcel; -import com.ruoyi.ccdi.domain.vo.ImportFailureVO; -import com.ruoyi.ccdi.domain.vo.ImportResult; -import com.ruoyi.ccdi.domain.vo.ImportStatusVO; -import com.ruoyi.ccdi.mapper.CcdiBaseStaffMapper; -import com.ruoyi.ccdi.service.ICcdiBaseStaffImportService; -import com.ruoyi.ccdi.utils.ImportLogUtils; +import com.ruoyi.info.collection.domain.CcdiBaseStaff; +import com.ruoyi.info.collection.domain.dto.CcdiBaseStaffAddDTO; +import com.ruoyi.info.collection.domain.excel.CcdiBaseStaffExcel; +import com.ruoyi.info.collection.domain.vo.ImportFailureVO; +import com.ruoyi.info.collection.domain.vo.ImportResult; +import com.ruoyi.info.collection.domain.vo.ImportStatusVO; +import com.ruoyi.info.collection.mapper.CcdiBaseStaffMapper; +import com.ruoyi.info.collection.service.ICcdiBaseStaffImportService; +import com.ruoyi.info.collection.utils.ImportLogUtils; import com.ruoyi.common.utils.IdCardUtil; import com.ruoyi.common.utils.StringUtils; import jakarta.annotation.Resource; diff --git a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/impl/CcdiBaseStaffServiceImpl.java b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/service/impl/CcdiBaseStaffServiceImpl.java similarity index 91% rename from ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/impl/CcdiBaseStaffServiceImpl.java rename to ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/service/impl/CcdiBaseStaffServiceImpl.java index a93c9f5..302a99e 100644 --- a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/impl/CcdiBaseStaffServiceImpl.java +++ b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/service/impl/CcdiBaseStaffServiceImpl.java @@ -1,18 +1,18 @@ -package com.ruoyi.ccdi.service.impl; +package com.ruoyi.info.collection.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.ruoyi.ccdi.domain.CcdiBaseStaff; -import com.ruoyi.ccdi.domain.dto.CcdiBaseStaffAddDTO; -import com.ruoyi.ccdi.domain.dto.CcdiBaseStaffEditDTO; -import com.ruoyi.ccdi.domain.dto.CcdiBaseStaffQueryDTO; -import com.ruoyi.ccdi.domain.excel.CcdiBaseStaffExcel; -import com.ruoyi.ccdi.domain.vo.CcdiBaseStaffOptionVO; -import com.ruoyi.ccdi.domain.vo.CcdiBaseStaffVO; -import com.ruoyi.ccdi.enums.EmployeeStatus; -import com.ruoyi.ccdi.mapper.CcdiBaseStaffMapper; -import com.ruoyi.ccdi.service.ICcdiBaseStaffImportService; -import com.ruoyi.ccdi.service.ICcdiBaseStaffService; +import com.ruoyi.info.collection.domain.CcdiBaseStaff; +import com.ruoyi.info.collection.domain.dto.CcdiBaseStaffAddDTO; +import com.ruoyi.info.collection.domain.dto.CcdiBaseStaffEditDTO; +import com.ruoyi.info.collection.domain.dto.CcdiBaseStaffQueryDTO; +import com.ruoyi.info.collection.domain.excel.CcdiBaseStaffExcel; +import com.ruoyi.info.collection.domain.vo.CcdiBaseStaffOptionVO; +import com.ruoyi.info.collection.domain.vo.CcdiBaseStaffVO; +import com.ruoyi.info.collection.enums.EmployeeStatus; +import com.ruoyi.info.collection.mapper.CcdiBaseStaffMapper; +import com.ruoyi.info.collection.service.ICcdiBaseStaffImportService; +import com.ruoyi.info.collection.service.ICcdiBaseStaffService; import com.ruoyi.common.utils.StringUtils; import jakarta.annotation.Resource; import org.springframework.beans.BeanUtils; diff --git a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/impl/CcdiCustEnterpriseRelationImportServiceImpl.java b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/service/impl/CcdiCustEnterpriseRelationImportServiceImpl.java similarity index 94% rename from ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/impl/CcdiCustEnterpriseRelationImportServiceImpl.java rename to ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/service/impl/CcdiCustEnterpriseRelationImportServiceImpl.java index e03cfdd..16a4db3 100644 --- a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/impl/CcdiCustEnterpriseRelationImportServiceImpl.java +++ b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/service/impl/CcdiCustEnterpriseRelationImportServiceImpl.java @@ -1,15 +1,15 @@ -package com.ruoyi.ccdi.service.impl; +package com.ruoyi.info.collection.service.impl; import com.alibaba.fastjson2.JSON; -import com.ruoyi.ccdi.domain.CcdiCustEnterpriseRelation; -import com.ruoyi.ccdi.domain.dto.CcdiCustEnterpriseRelationAddDTO; -import com.ruoyi.ccdi.domain.excel.CcdiCustEnterpriseRelationExcel; -import com.ruoyi.ccdi.domain.vo.CustEnterpriseRelationImportFailureVO; -import com.ruoyi.ccdi.domain.vo.ImportResult; -import com.ruoyi.ccdi.domain.vo.ImportStatusVO; -import com.ruoyi.ccdi.mapper.CcdiCustEnterpriseRelationMapper; -import com.ruoyi.ccdi.service.ICcdiCustEnterpriseRelationImportService; -import com.ruoyi.ccdi.utils.ImportLogUtils; +import com.ruoyi.info.collection.domain.CcdiCustEnterpriseRelation; +import com.ruoyi.info.collection.domain.dto.CcdiCustEnterpriseRelationAddDTO; +import com.ruoyi.info.collection.domain.excel.CcdiCustEnterpriseRelationExcel; +import com.ruoyi.info.collection.domain.vo.CustEnterpriseRelationImportFailureVO; +import com.ruoyi.info.collection.domain.vo.ImportResult; +import com.ruoyi.info.collection.domain.vo.ImportStatusVO; +import com.ruoyi.info.collection.mapper.CcdiCustEnterpriseRelationMapper; +import com.ruoyi.info.collection.service.ICcdiCustEnterpriseRelationImportService; +import com.ruoyi.info.collection.utils.ImportLogUtils; import com.ruoyi.common.utils.StringUtils; import jakarta.annotation.Resource; import org.slf4j.Logger; diff --git a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/impl/CcdiCustEnterpriseRelationServiceImpl.java b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/service/impl/CcdiCustEnterpriseRelationServiceImpl.java similarity index 91% rename from ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/impl/CcdiCustEnterpriseRelationServiceImpl.java rename to ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/service/impl/CcdiCustEnterpriseRelationServiceImpl.java index 41f2203..980efca 100644 --- a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/impl/CcdiCustEnterpriseRelationServiceImpl.java +++ b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/service/impl/CcdiCustEnterpriseRelationServiceImpl.java @@ -1,16 +1,16 @@ -package com.ruoyi.ccdi.service.impl; +package com.ruoyi.info.collection.service.impl; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.ruoyi.ccdi.domain.CcdiCustEnterpriseRelation; -import com.ruoyi.ccdi.domain.dto.CcdiCustEnterpriseRelationAddDTO; -import com.ruoyi.ccdi.domain.dto.CcdiCustEnterpriseRelationEditDTO; -import com.ruoyi.ccdi.domain.dto.CcdiCustEnterpriseRelationQueryDTO; -import com.ruoyi.ccdi.domain.excel.CcdiCustEnterpriseRelationExcel; -import com.ruoyi.ccdi.domain.vo.CcdiCustEnterpriseRelationVO; -import com.ruoyi.ccdi.mapper.CcdiCustEnterpriseRelationMapper; -import com.ruoyi.ccdi.service.ICcdiCustEnterpriseRelationImportService; -import com.ruoyi.ccdi.service.ICcdiCustEnterpriseRelationService; +import com.ruoyi.info.collection.domain.CcdiCustEnterpriseRelation; +import com.ruoyi.info.collection.domain.dto.CcdiCustEnterpriseRelationAddDTO; +import com.ruoyi.info.collection.domain.dto.CcdiCustEnterpriseRelationEditDTO; +import com.ruoyi.info.collection.domain.dto.CcdiCustEnterpriseRelationQueryDTO; +import com.ruoyi.info.collection.domain.excel.CcdiCustEnterpriseRelationExcel; +import com.ruoyi.info.collection.domain.vo.CcdiCustEnterpriseRelationVO; +import com.ruoyi.info.collection.mapper.CcdiCustEnterpriseRelationMapper; +import com.ruoyi.info.collection.service.ICcdiCustEnterpriseRelationImportService; +import com.ruoyi.info.collection.service.ICcdiCustEnterpriseRelationService; import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.StringUtils; import jakarta.annotation.Resource; diff --git a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/impl/CcdiCustFmyRelationImportServiceImpl.java b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/service/impl/CcdiCustFmyRelationImportServiceImpl.java similarity index 95% rename from ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/impl/CcdiCustFmyRelationImportServiceImpl.java rename to ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/service/impl/CcdiCustFmyRelationImportServiceImpl.java index 7e07c45..4dcc717 100644 --- a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/impl/CcdiCustFmyRelationImportServiceImpl.java +++ b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/service/impl/CcdiCustFmyRelationImportServiceImpl.java @@ -1,14 +1,14 @@ -package com.ruoyi.ccdi.service.impl; +package com.ruoyi.info.collection.service.impl; import com.alibaba.fastjson2.JSON; -import com.ruoyi.ccdi.domain.CcdiCustFmyRelation; -import com.ruoyi.ccdi.domain.excel.CcdiCustFmyRelationExcel; -import com.ruoyi.ccdi.domain.vo.CustFmyRelationImportFailureVO; -import com.ruoyi.ccdi.domain.vo.ImportResult; -import com.ruoyi.ccdi.domain.vo.ImportStatusVO; -import com.ruoyi.ccdi.mapper.CcdiCustFmyRelationMapper; -import com.ruoyi.ccdi.service.ICcdiCustFmyRelationImportService; -import com.ruoyi.ccdi.utils.ImportLogUtils; +import com.ruoyi.info.collection.domain.CcdiCustFmyRelation; +import com.ruoyi.info.collection.domain.excel.CcdiCustFmyRelationExcel; +import com.ruoyi.info.collection.domain.vo.CustFmyRelationImportFailureVO; +import com.ruoyi.info.collection.domain.vo.ImportResult; +import com.ruoyi.info.collection.domain.vo.ImportStatusVO; +import com.ruoyi.info.collection.mapper.CcdiCustFmyRelationMapper; +import com.ruoyi.info.collection.service.ICcdiCustFmyRelationImportService; +import com.ruoyi.info.collection.utils.ImportLogUtils; import com.ruoyi.common.utils.StringUtils; import jakarta.annotation.Resource; import org.slf4j.Logger; diff --git a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/impl/CcdiCustFmyRelationServiceImpl.java b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/service/impl/CcdiCustFmyRelationServiceImpl.java similarity index 87% rename from ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/impl/CcdiCustFmyRelationServiceImpl.java rename to ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/service/impl/CcdiCustFmyRelationServiceImpl.java index f0efa18..1679406 100644 --- a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/impl/CcdiCustFmyRelationServiceImpl.java +++ b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/service/impl/CcdiCustFmyRelationServiceImpl.java @@ -1,16 +1,16 @@ -package com.ruoyi.ccdi.service.impl; +package com.ruoyi.info.collection.service.impl; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.ruoyi.ccdi.domain.CcdiCustFmyRelation; -import com.ruoyi.ccdi.domain.dto.CcdiCustFmyRelationAddDTO; -import com.ruoyi.ccdi.domain.dto.CcdiCustFmyRelationEditDTO; -import com.ruoyi.ccdi.domain.dto.CcdiCustFmyRelationQueryDTO; -import com.ruoyi.ccdi.domain.excel.CcdiCustFmyRelationExcel; -import com.ruoyi.ccdi.domain.vo.CcdiCustFmyRelationVO; -import com.ruoyi.ccdi.mapper.CcdiCustFmyRelationMapper; -import com.ruoyi.ccdi.service.ICcdiCustFmyRelationImportService; -import com.ruoyi.ccdi.service.ICcdiCustFmyRelationService; -import com.ruoyi.ccdi.utils.EasyExcelUtil; +import com.ruoyi.info.collection.domain.CcdiCustFmyRelation; +import com.ruoyi.info.collection.domain.dto.CcdiCustFmyRelationAddDTO; +import com.ruoyi.info.collection.domain.dto.CcdiCustFmyRelationEditDTO; +import com.ruoyi.info.collection.domain.dto.CcdiCustFmyRelationQueryDTO; +import com.ruoyi.info.collection.domain.excel.CcdiCustFmyRelationExcel; +import com.ruoyi.info.collection.domain.vo.CcdiCustFmyRelationVO; +import com.ruoyi.info.collection.mapper.CcdiCustFmyRelationMapper; +import com.ruoyi.info.collection.service.ICcdiCustFmyRelationImportService; +import com.ruoyi.info.collection.service.ICcdiCustFmyRelationService; +import com.ruoyi.info.collection.utils.EasyExcelUtil; import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.StringUtils; import jakarta.annotation.Resource; diff --git a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/impl/CcdiIntermediaryEntityImportServiceImpl.java b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/service/impl/CcdiIntermediaryEntityImportServiceImpl.java similarity index 95% rename from ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/impl/CcdiIntermediaryEntityImportServiceImpl.java rename to ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/service/impl/CcdiIntermediaryEntityImportServiceImpl.java index 9289c95..cd13ef5 100644 --- a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/impl/CcdiIntermediaryEntityImportServiceImpl.java +++ b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/service/impl/CcdiIntermediaryEntityImportServiceImpl.java @@ -1,15 +1,15 @@ -package com.ruoyi.ccdi.service.impl; +package com.ruoyi.info.collection.service.impl; import com.alibaba.fastjson2.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.ruoyi.ccdi.domain.CcdiEnterpriseBaseInfo; -import com.ruoyi.ccdi.domain.excel.CcdiIntermediaryEntityExcel; -import com.ruoyi.ccdi.domain.vo.ImportResult; -import com.ruoyi.ccdi.domain.vo.ImportStatusVO; -import com.ruoyi.ccdi.domain.vo.IntermediaryEntityImportFailureVO; -import com.ruoyi.ccdi.mapper.CcdiEnterpriseBaseInfoMapper; -import com.ruoyi.ccdi.service.ICcdiIntermediaryEntityImportService; -import com.ruoyi.ccdi.utils.ImportLogUtils; +import com.ruoyi.info.collection.domain.CcdiEnterpriseBaseInfo; +import com.ruoyi.info.collection.domain.excel.CcdiIntermediaryEntityExcel; +import com.ruoyi.info.collection.domain.vo.ImportResult; +import com.ruoyi.info.collection.domain.vo.ImportStatusVO; +import com.ruoyi.info.collection.domain.vo.IntermediaryEntityImportFailureVO; +import com.ruoyi.info.collection.mapper.CcdiEnterpriseBaseInfoMapper; +import com.ruoyi.info.collection.service.ICcdiIntermediaryEntityImportService; +import com.ruoyi.info.collection.utils.ImportLogUtils; import com.ruoyi.common.utils.StringUtils; import jakarta.annotation.Resource; import org.slf4j.Logger; diff --git a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/impl/CcdiIntermediaryPersonImportServiceImpl.java b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/service/impl/CcdiIntermediaryPersonImportServiceImpl.java similarity index 95% rename from ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/impl/CcdiIntermediaryPersonImportServiceImpl.java rename to ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/service/impl/CcdiIntermediaryPersonImportServiceImpl.java index d403fc1..d0614be 100644 --- a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/impl/CcdiIntermediaryPersonImportServiceImpl.java +++ b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/service/impl/CcdiIntermediaryPersonImportServiceImpl.java @@ -1,15 +1,15 @@ -package com.ruoyi.ccdi.service.impl; +package com.ruoyi.info.collection.service.impl; import com.alibaba.fastjson2.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.ruoyi.ccdi.domain.CcdiBizIntermediary; -import com.ruoyi.ccdi.domain.excel.CcdiIntermediaryPersonExcel; -import com.ruoyi.ccdi.domain.vo.ImportResult; -import com.ruoyi.ccdi.domain.vo.ImportStatusVO; -import com.ruoyi.ccdi.domain.vo.IntermediaryPersonImportFailureVO; -import com.ruoyi.ccdi.mapper.CcdiBizIntermediaryMapper; -import com.ruoyi.ccdi.service.ICcdiIntermediaryPersonImportService; -import com.ruoyi.ccdi.utils.ImportLogUtils; +import com.ruoyi.info.collection.domain.CcdiBizIntermediary; +import com.ruoyi.info.collection.domain.excel.CcdiIntermediaryPersonExcel; +import com.ruoyi.info.collection.domain.vo.ImportResult; +import com.ruoyi.info.collection.domain.vo.ImportStatusVO; +import com.ruoyi.info.collection.domain.vo.IntermediaryPersonImportFailureVO; +import com.ruoyi.info.collection.mapper.CcdiBizIntermediaryMapper; +import com.ruoyi.info.collection.service.ICcdiIntermediaryPersonImportService; +import com.ruoyi.info.collection.utils.ImportLogUtils; import com.ruoyi.common.utils.IdCardUtil; import com.ruoyi.common.utils.StringUtils; import jakarta.annotation.Resource; diff --git a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/impl/CcdiIntermediaryServiceImpl.java b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/service/impl/CcdiIntermediaryServiceImpl.java similarity index 90% rename from ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/impl/CcdiIntermediaryServiceImpl.java rename to ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/service/impl/CcdiIntermediaryServiceImpl.java index e2b4d38..8ae5dcf 100644 --- a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/impl/CcdiIntermediaryServiceImpl.java +++ b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/service/impl/CcdiIntermediaryServiceImpl.java @@ -1,21 +1,21 @@ -package com.ruoyi.ccdi.service.impl; +package com.ruoyi.info.collection.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.ruoyi.ccdi.domain.CcdiBizIntermediary; -import com.ruoyi.ccdi.domain.CcdiEnterpriseBaseInfo; -import com.ruoyi.ccdi.domain.dto.*; -import com.ruoyi.ccdi.domain.excel.CcdiIntermediaryEntityExcel; -import com.ruoyi.ccdi.domain.excel.CcdiIntermediaryPersonExcel; -import com.ruoyi.ccdi.domain.vo.CcdiIntermediaryEntityDetailVO; -import com.ruoyi.ccdi.domain.vo.CcdiIntermediaryPersonDetailVO; -import com.ruoyi.ccdi.domain.vo.CcdiIntermediaryVO; -import com.ruoyi.ccdi.mapper.CcdiBizIntermediaryMapper; -import com.ruoyi.ccdi.mapper.CcdiEnterpriseBaseInfoMapper; -import com.ruoyi.ccdi.mapper.CcdiIntermediaryMapper; -import com.ruoyi.ccdi.service.ICcdiIntermediaryEntityImportService; -import com.ruoyi.ccdi.service.ICcdiIntermediaryPersonImportService; -import com.ruoyi.ccdi.service.ICcdiIntermediaryService; +import com.ruoyi.info.collection.domain.CcdiBizIntermediary; +import com.ruoyi.info.collection.domain.CcdiEnterpriseBaseInfo; +import com.ruoyi.info.collection.domain.dto.*; +import com.ruoyi.info.collection.domain.excel.CcdiIntermediaryEntityExcel; +import com.ruoyi.info.collection.domain.excel.CcdiIntermediaryPersonExcel; +import com.ruoyi.info.collection.domain.vo.CcdiIntermediaryEntityDetailVO; +import com.ruoyi.info.collection.domain.vo.CcdiIntermediaryPersonDetailVO; +import com.ruoyi.info.collection.domain.vo.CcdiIntermediaryVO; +import com.ruoyi.info.collection.mapper.CcdiBizIntermediaryMapper; +import com.ruoyi.info.collection.mapper.CcdiEnterpriseBaseInfoMapper; +import com.ruoyi.info.collection.mapper.CcdiIntermediaryMapper; +import com.ruoyi.info.collection.service.ICcdiIntermediaryEntityImportService; +import com.ruoyi.info.collection.service.ICcdiIntermediaryPersonImportService; +import com.ruoyi.info.collection.service.ICcdiIntermediaryService; import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.StringUtils; import jakarta.annotation.Resource; diff --git a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/impl/CcdiPurchaseTransactionImportServiceImpl.java b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/service/impl/CcdiPurchaseTransactionImportServiceImpl.java similarity index 95% rename from ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/impl/CcdiPurchaseTransactionImportServiceImpl.java rename to ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/service/impl/CcdiPurchaseTransactionImportServiceImpl.java index 756568b..5aa5848 100644 --- a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/impl/CcdiPurchaseTransactionImportServiceImpl.java +++ b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/service/impl/CcdiPurchaseTransactionImportServiceImpl.java @@ -1,15 +1,15 @@ -package com.ruoyi.ccdi.service.impl; +package com.ruoyi.info.collection.service.impl; import com.alibaba.fastjson2.JSON; -import com.ruoyi.ccdi.domain.CcdiPurchaseTransaction; -import com.ruoyi.ccdi.domain.dto.CcdiPurchaseTransactionAddDTO; -import com.ruoyi.ccdi.domain.excel.CcdiPurchaseTransactionExcel; -import com.ruoyi.ccdi.domain.vo.ImportResult; -import com.ruoyi.ccdi.domain.vo.ImportStatusVO; -import com.ruoyi.ccdi.domain.vo.PurchaseTransactionImportFailureVO; -import com.ruoyi.ccdi.mapper.CcdiPurchaseTransactionMapper; -import com.ruoyi.ccdi.service.ICcdiPurchaseTransactionImportService; -import com.ruoyi.ccdi.utils.ImportLogUtils; +import com.ruoyi.info.collection.domain.CcdiPurchaseTransaction; +import com.ruoyi.info.collection.domain.dto.CcdiPurchaseTransactionAddDTO; +import com.ruoyi.info.collection.domain.excel.CcdiPurchaseTransactionExcel; +import com.ruoyi.info.collection.domain.vo.ImportResult; +import com.ruoyi.info.collection.domain.vo.ImportStatusVO; +import com.ruoyi.info.collection.domain.vo.PurchaseTransactionImportFailureVO; +import com.ruoyi.info.collection.mapper.CcdiPurchaseTransactionMapper; +import com.ruoyi.info.collection.service.ICcdiPurchaseTransactionImportService; +import com.ruoyi.info.collection.utils.ImportLogUtils; import com.ruoyi.common.utils.StringUtils; import jakarta.annotation.Resource; import org.slf4j.Logger; diff --git a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/impl/CcdiPurchaseTransactionServiceImpl.java b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/service/impl/CcdiPurchaseTransactionServiceImpl.java similarity index 89% rename from ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/impl/CcdiPurchaseTransactionServiceImpl.java rename to ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/service/impl/CcdiPurchaseTransactionServiceImpl.java index 3bb8b54..bbe61d7 100644 --- a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/impl/CcdiPurchaseTransactionServiceImpl.java +++ b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/service/impl/CcdiPurchaseTransactionServiceImpl.java @@ -1,15 +1,15 @@ -package com.ruoyi.ccdi.service.impl; +package com.ruoyi.info.collection.service.impl; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.ruoyi.ccdi.domain.CcdiPurchaseTransaction; -import com.ruoyi.ccdi.domain.dto.CcdiPurchaseTransactionAddDTO; -import com.ruoyi.ccdi.domain.dto.CcdiPurchaseTransactionEditDTO; -import com.ruoyi.ccdi.domain.dto.CcdiPurchaseTransactionQueryDTO; -import com.ruoyi.ccdi.domain.excel.CcdiPurchaseTransactionExcel; -import com.ruoyi.ccdi.domain.vo.CcdiPurchaseTransactionVO; -import com.ruoyi.ccdi.mapper.CcdiPurchaseTransactionMapper; -import com.ruoyi.ccdi.service.ICcdiPurchaseTransactionImportService; -import com.ruoyi.ccdi.service.ICcdiPurchaseTransactionService; +import com.ruoyi.info.collection.domain.CcdiPurchaseTransaction; +import com.ruoyi.info.collection.domain.dto.CcdiPurchaseTransactionAddDTO; +import com.ruoyi.info.collection.domain.dto.CcdiPurchaseTransactionEditDTO; +import com.ruoyi.info.collection.domain.dto.CcdiPurchaseTransactionQueryDTO; +import com.ruoyi.info.collection.domain.excel.CcdiPurchaseTransactionExcel; +import com.ruoyi.info.collection.domain.vo.CcdiPurchaseTransactionVO; +import com.ruoyi.info.collection.mapper.CcdiPurchaseTransactionMapper; +import com.ruoyi.info.collection.service.ICcdiPurchaseTransactionImportService; +import com.ruoyi.info.collection.service.ICcdiPurchaseTransactionService; import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.StringUtils; import jakarta.annotation.Resource; diff --git a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/impl/CcdiStaffEnterpriseRelationImportServiceImpl.java b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/service/impl/CcdiStaffEnterpriseRelationImportServiceImpl.java similarity index 94% rename from ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/impl/CcdiStaffEnterpriseRelationImportServiceImpl.java rename to ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/service/impl/CcdiStaffEnterpriseRelationImportServiceImpl.java index 070e204..dfd55d3 100644 --- a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/impl/CcdiStaffEnterpriseRelationImportServiceImpl.java +++ b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/service/impl/CcdiStaffEnterpriseRelationImportServiceImpl.java @@ -1,18 +1,18 @@ -package com.ruoyi.ccdi.service.impl; +package com.ruoyi.info.collection.service.impl; import com.alibaba.fastjson2.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.ruoyi.ccdi.domain.CcdiBaseStaff; -import com.ruoyi.ccdi.domain.CcdiStaffEnterpriseRelation; -import com.ruoyi.ccdi.domain.dto.CcdiStaffEnterpriseRelationAddDTO; -import com.ruoyi.ccdi.domain.excel.CcdiStaffEnterpriseRelationExcel; -import com.ruoyi.ccdi.domain.vo.ImportResult; -import com.ruoyi.ccdi.domain.vo.ImportStatusVO; -import com.ruoyi.ccdi.domain.vo.StaffEnterpriseRelationImportFailureVO; -import com.ruoyi.ccdi.mapper.CcdiBaseStaffMapper; -import com.ruoyi.ccdi.mapper.CcdiStaffEnterpriseRelationMapper; -import com.ruoyi.ccdi.service.ICcdiStaffEnterpriseRelationImportService; -import com.ruoyi.ccdi.utils.ImportLogUtils; +import com.ruoyi.info.collection.domain.CcdiBaseStaff; +import com.ruoyi.info.collection.domain.CcdiStaffEnterpriseRelation; +import com.ruoyi.info.collection.domain.dto.CcdiStaffEnterpriseRelationAddDTO; +import com.ruoyi.info.collection.domain.excel.CcdiStaffEnterpriseRelationExcel; +import com.ruoyi.info.collection.domain.vo.ImportResult; +import com.ruoyi.info.collection.domain.vo.ImportStatusVO; +import com.ruoyi.info.collection.domain.vo.StaffEnterpriseRelationImportFailureVO; +import com.ruoyi.info.collection.mapper.CcdiBaseStaffMapper; +import com.ruoyi.info.collection.mapper.CcdiStaffEnterpriseRelationMapper; +import com.ruoyi.info.collection.service.ICcdiStaffEnterpriseRelationImportService; +import com.ruoyi.info.collection.utils.ImportLogUtils; import com.ruoyi.common.utils.StringUtils; import jakarta.annotation.Resource; import org.slf4j.Logger; diff --git a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/impl/CcdiStaffEnterpriseRelationServiceImpl.java b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/service/impl/CcdiStaffEnterpriseRelationServiceImpl.java similarity index 91% rename from ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/impl/CcdiStaffEnterpriseRelationServiceImpl.java rename to ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/service/impl/CcdiStaffEnterpriseRelationServiceImpl.java index c0e7395..6c6fa0f 100644 --- a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/impl/CcdiStaffEnterpriseRelationServiceImpl.java +++ b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/service/impl/CcdiStaffEnterpriseRelationServiceImpl.java @@ -1,16 +1,16 @@ -package com.ruoyi.ccdi.service.impl; +package com.ruoyi.info.collection.service.impl; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.ruoyi.ccdi.domain.CcdiStaffEnterpriseRelation; -import com.ruoyi.ccdi.domain.dto.CcdiStaffEnterpriseRelationAddDTO; -import com.ruoyi.ccdi.domain.dto.CcdiStaffEnterpriseRelationEditDTO; -import com.ruoyi.ccdi.domain.dto.CcdiStaffEnterpriseRelationQueryDTO; -import com.ruoyi.ccdi.domain.excel.CcdiStaffEnterpriseRelationExcel; -import com.ruoyi.ccdi.domain.vo.CcdiStaffEnterpriseRelationVO; -import com.ruoyi.ccdi.mapper.CcdiStaffEnterpriseRelationMapper; -import com.ruoyi.ccdi.service.ICcdiStaffEnterpriseRelationImportService; -import com.ruoyi.ccdi.service.ICcdiStaffEnterpriseRelationService; +import com.ruoyi.info.collection.domain.CcdiStaffEnterpriseRelation; +import com.ruoyi.info.collection.domain.dto.CcdiStaffEnterpriseRelationAddDTO; +import com.ruoyi.info.collection.domain.dto.CcdiStaffEnterpriseRelationEditDTO; +import com.ruoyi.info.collection.domain.dto.CcdiStaffEnterpriseRelationQueryDTO; +import com.ruoyi.info.collection.domain.excel.CcdiStaffEnterpriseRelationExcel; +import com.ruoyi.info.collection.domain.vo.CcdiStaffEnterpriseRelationVO; +import com.ruoyi.info.collection.mapper.CcdiStaffEnterpriseRelationMapper; +import com.ruoyi.info.collection.service.ICcdiStaffEnterpriseRelationImportService; +import com.ruoyi.info.collection.service.ICcdiStaffEnterpriseRelationService; import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.StringUtils; import jakarta.annotation.Resource; diff --git a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/impl/CcdiStaffFmyRelationImportServiceImpl.java b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/service/impl/CcdiStaffFmyRelationImportServiceImpl.java similarity index 94% rename from ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/impl/CcdiStaffFmyRelationImportServiceImpl.java rename to ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/service/impl/CcdiStaffFmyRelationImportServiceImpl.java index aff8d2a..8dc6cb8 100644 --- a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/impl/CcdiStaffFmyRelationImportServiceImpl.java +++ b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/service/impl/CcdiStaffFmyRelationImportServiceImpl.java @@ -1,19 +1,19 @@ -package com.ruoyi.ccdi.service.impl; +package com.ruoyi.info.collection.service.impl; import com.alibaba.fastjson2.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.ruoyi.ccdi.domain.CcdiBaseStaff; -import com.ruoyi.ccdi.domain.CcdiStaffFmyRelation; -import com.ruoyi.ccdi.domain.dto.CcdiStaffFmyRelationAddDTO; -import com.ruoyi.ccdi.domain.excel.CcdiStaffFmyRelationExcel; -import com.ruoyi.ccdi.domain.vo.ImportResult; -import com.ruoyi.ccdi.domain.vo.ImportStatusVO; -import com.ruoyi.ccdi.domain.vo.StaffFmyRelationImportFailureVO; -import com.ruoyi.ccdi.enums.GenderEnum; -import com.ruoyi.ccdi.mapper.CcdiBaseStaffMapper; -import com.ruoyi.ccdi.mapper.CcdiStaffFmyRelationMapper; -import com.ruoyi.ccdi.service.ICcdiStaffFmyRelationImportService; -import com.ruoyi.ccdi.utils.ImportLogUtils; +import com.ruoyi.info.collection.domain.CcdiBaseStaff; +import com.ruoyi.info.collection.domain.CcdiStaffFmyRelation; +import com.ruoyi.info.collection.domain.dto.CcdiStaffFmyRelationAddDTO; +import com.ruoyi.info.collection.domain.excel.CcdiStaffFmyRelationExcel; +import com.ruoyi.info.collection.domain.vo.ImportResult; +import com.ruoyi.info.collection.domain.vo.ImportStatusVO; +import com.ruoyi.info.collection.domain.vo.StaffFmyRelationImportFailureVO; +import com.ruoyi.info.collection.enums.GenderEnum; +import com.ruoyi.info.collection.mapper.CcdiBaseStaffMapper; +import com.ruoyi.info.collection.mapper.CcdiStaffFmyRelationMapper; +import com.ruoyi.info.collection.service.ICcdiStaffFmyRelationImportService; +import com.ruoyi.info.collection.utils.ImportLogUtils; import com.ruoyi.common.utils.StringUtils; import jakarta.annotation.Resource; import org.slf4j.Logger; diff --git a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/impl/CcdiStaffFmyRelationServiceImpl.java b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/service/impl/CcdiStaffFmyRelationServiceImpl.java similarity index 88% rename from ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/impl/CcdiStaffFmyRelationServiceImpl.java rename to ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/service/impl/CcdiStaffFmyRelationServiceImpl.java index 43f8ffa..4af2af9 100644 --- a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/impl/CcdiStaffFmyRelationServiceImpl.java +++ b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/service/impl/CcdiStaffFmyRelationServiceImpl.java @@ -1,15 +1,15 @@ -package com.ruoyi.ccdi.service.impl; +package com.ruoyi.info.collection.service.impl; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.ruoyi.ccdi.domain.CcdiStaffFmyRelation; -import com.ruoyi.ccdi.domain.dto.CcdiStaffFmyRelationAddDTO; -import com.ruoyi.ccdi.domain.dto.CcdiStaffFmyRelationEditDTO; -import com.ruoyi.ccdi.domain.dto.CcdiStaffFmyRelationQueryDTO; -import com.ruoyi.ccdi.domain.excel.CcdiStaffFmyRelationExcel; -import com.ruoyi.ccdi.domain.vo.CcdiStaffFmyRelationVO; -import com.ruoyi.ccdi.mapper.CcdiStaffFmyRelationMapper; -import com.ruoyi.ccdi.service.ICcdiStaffFmyRelationImportService; -import com.ruoyi.ccdi.service.ICcdiStaffFmyRelationService; +import com.ruoyi.info.collection.domain.CcdiStaffFmyRelation; +import com.ruoyi.info.collection.domain.dto.CcdiStaffFmyRelationAddDTO; +import com.ruoyi.info.collection.domain.dto.CcdiStaffFmyRelationEditDTO; +import com.ruoyi.info.collection.domain.dto.CcdiStaffFmyRelationQueryDTO; +import com.ruoyi.info.collection.domain.excel.CcdiStaffFmyRelationExcel; +import com.ruoyi.info.collection.domain.vo.CcdiStaffFmyRelationVO; +import com.ruoyi.info.collection.mapper.CcdiStaffFmyRelationMapper; +import com.ruoyi.info.collection.service.ICcdiStaffFmyRelationImportService; +import com.ruoyi.info.collection.service.ICcdiStaffFmyRelationService; import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.StringUtils; import jakarta.annotation.Resource; diff --git a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/impl/CcdiStaffRecruitmentImportServiceImpl.java b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/service/impl/CcdiStaffRecruitmentImportServiceImpl.java similarity index 94% rename from ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/impl/CcdiStaffRecruitmentImportServiceImpl.java rename to ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/service/impl/CcdiStaffRecruitmentImportServiceImpl.java index cc3b307..c43c237 100644 --- a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/impl/CcdiStaffRecruitmentImportServiceImpl.java +++ b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/service/impl/CcdiStaffRecruitmentImportServiceImpl.java @@ -1,17 +1,17 @@ -package com.ruoyi.ccdi.service.impl; +package com.ruoyi.info.collection.service.impl; import com.alibaba.fastjson2.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.ruoyi.ccdi.domain.CcdiStaffRecruitment; -import com.ruoyi.ccdi.domain.dto.CcdiStaffRecruitmentAddDTO; -import com.ruoyi.ccdi.domain.excel.CcdiStaffRecruitmentExcel; -import com.ruoyi.ccdi.domain.vo.ImportResult; -import com.ruoyi.ccdi.domain.vo.ImportStatusVO; -import com.ruoyi.ccdi.domain.vo.RecruitmentImportFailureVO; -import com.ruoyi.ccdi.enums.AdmitStatus; -import com.ruoyi.ccdi.mapper.CcdiStaffRecruitmentMapper; -import com.ruoyi.ccdi.service.ICcdiStaffRecruitmentImportService; -import com.ruoyi.ccdi.utils.ImportLogUtils; +import com.ruoyi.info.collection.domain.CcdiStaffRecruitment; +import com.ruoyi.info.collection.domain.dto.CcdiStaffRecruitmentAddDTO; +import com.ruoyi.info.collection.domain.excel.CcdiStaffRecruitmentExcel; +import com.ruoyi.info.collection.domain.vo.ImportResult; +import com.ruoyi.info.collection.domain.vo.ImportStatusVO; +import com.ruoyi.info.collection.domain.vo.RecruitmentImportFailureVO; +import com.ruoyi.info.collection.enums.AdmitStatus; +import com.ruoyi.info.collection.mapper.CcdiStaffRecruitmentMapper; +import com.ruoyi.info.collection.service.ICcdiStaffRecruitmentImportService; +import com.ruoyi.info.collection.utils.ImportLogUtils; import com.ruoyi.common.utils.IdCardUtil; import com.ruoyi.common.utils.StringUtils; import jakarta.annotation.Resource; diff --git a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/impl/CcdiStaffRecruitmentServiceImpl.java b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/service/impl/CcdiStaffRecruitmentServiceImpl.java similarity index 89% rename from ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/impl/CcdiStaffRecruitmentServiceImpl.java rename to ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/service/impl/CcdiStaffRecruitmentServiceImpl.java index be7c655..a8c18b8 100644 --- a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/impl/CcdiStaffRecruitmentServiceImpl.java +++ b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/service/impl/CcdiStaffRecruitmentServiceImpl.java @@ -1,16 +1,16 @@ -package com.ruoyi.ccdi.service.impl; +package com.ruoyi.info.collection.service.impl; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.ruoyi.ccdi.domain.CcdiStaffRecruitment; -import com.ruoyi.ccdi.domain.dto.CcdiStaffRecruitmentAddDTO; -import com.ruoyi.ccdi.domain.dto.CcdiStaffRecruitmentEditDTO; -import com.ruoyi.ccdi.domain.dto.CcdiStaffRecruitmentQueryDTO; -import com.ruoyi.ccdi.domain.excel.CcdiStaffRecruitmentExcel; -import com.ruoyi.ccdi.domain.vo.CcdiStaffRecruitmentVO; -import com.ruoyi.ccdi.enums.AdmitStatus; -import com.ruoyi.ccdi.mapper.CcdiStaffRecruitmentMapper; -import com.ruoyi.ccdi.service.ICcdiStaffRecruitmentImportService; -import com.ruoyi.ccdi.service.ICcdiStaffRecruitmentService; +import com.ruoyi.info.collection.domain.CcdiStaffRecruitment; +import com.ruoyi.info.collection.domain.dto.CcdiStaffRecruitmentAddDTO; +import com.ruoyi.info.collection.domain.dto.CcdiStaffRecruitmentEditDTO; +import com.ruoyi.info.collection.domain.dto.CcdiStaffRecruitmentQueryDTO; +import com.ruoyi.info.collection.domain.excel.CcdiStaffRecruitmentExcel; +import com.ruoyi.info.collection.domain.vo.CcdiStaffRecruitmentVO; +import com.ruoyi.info.collection.enums.AdmitStatus; +import com.ruoyi.info.collection.mapper.CcdiStaffRecruitmentMapper; +import com.ruoyi.info.collection.service.ICcdiStaffRecruitmentImportService; +import com.ruoyi.info.collection.service.ICcdiStaffRecruitmentService; import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.StringUtils; import jakarta.annotation.Resource; diff --git a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/impl/CcdiStaffTransferImportServiceImpl.java b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/service/impl/CcdiStaffTransferImportServiceImpl.java similarity index 95% rename from ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/impl/CcdiStaffTransferImportServiceImpl.java rename to ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/service/impl/CcdiStaffTransferImportServiceImpl.java index f91885b..9a65f2d 100644 --- a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/impl/CcdiStaffTransferImportServiceImpl.java +++ b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/service/impl/CcdiStaffTransferImportServiceImpl.java @@ -1,18 +1,18 @@ -package com.ruoyi.ccdi.service.impl; +package com.ruoyi.info.collection.service.impl; import com.alibaba.fastjson2.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.ruoyi.ccdi.domain.CcdiBaseStaff; -import com.ruoyi.ccdi.domain.CcdiStaffTransfer; -import com.ruoyi.ccdi.domain.dto.CcdiStaffTransferAddDTO; -import com.ruoyi.ccdi.domain.excel.CcdiStaffTransferExcel; -import com.ruoyi.ccdi.domain.vo.ImportResult; -import com.ruoyi.ccdi.domain.vo.ImportStatusVO; -import com.ruoyi.ccdi.domain.vo.StaffTransferImportFailureVO; -import com.ruoyi.ccdi.mapper.CcdiBaseStaffMapper; -import com.ruoyi.ccdi.mapper.CcdiStaffTransferMapper; -import com.ruoyi.ccdi.service.ICcdiStaffTransferImportService; -import com.ruoyi.ccdi.utils.ImportLogUtils; +import com.ruoyi.info.collection.domain.CcdiBaseStaff; +import com.ruoyi.info.collection.domain.CcdiStaffTransfer; +import com.ruoyi.info.collection.domain.dto.CcdiStaffTransferAddDTO; +import com.ruoyi.info.collection.domain.excel.CcdiStaffTransferExcel; +import com.ruoyi.info.collection.domain.vo.ImportResult; +import com.ruoyi.info.collection.domain.vo.ImportStatusVO; +import com.ruoyi.info.collection.domain.vo.StaffTransferImportFailureVO; +import com.ruoyi.info.collection.mapper.CcdiBaseStaffMapper; +import com.ruoyi.info.collection.mapper.CcdiStaffTransferMapper; +import com.ruoyi.info.collection.service.ICcdiStaffTransferImportService; +import com.ruoyi.info.collection.utils.ImportLogUtils; import com.ruoyi.common.core.domain.entity.SysDept; import com.ruoyi.common.utils.DictUtils; import com.ruoyi.common.utils.StringUtils; diff --git a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/impl/CcdiStaffTransferServiceImpl.java b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/service/impl/CcdiStaffTransferServiceImpl.java similarity index 89% rename from ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/impl/CcdiStaffTransferServiceImpl.java rename to ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/service/impl/CcdiStaffTransferServiceImpl.java index fa5137e..03f9c50 100644 --- a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/service/impl/CcdiStaffTransferServiceImpl.java +++ b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/service/impl/CcdiStaffTransferServiceImpl.java @@ -1,17 +1,17 @@ -package com.ruoyi.ccdi.service.impl; +package com.ruoyi.info.collection.service.impl; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.ruoyi.ccdi.domain.CcdiStaffTransfer; -import com.ruoyi.ccdi.domain.dto.CcdiStaffTransferAddDTO; -import com.ruoyi.ccdi.domain.dto.CcdiStaffTransferEditDTO; -import com.ruoyi.ccdi.domain.dto.CcdiStaffTransferQueryDTO; -import com.ruoyi.ccdi.domain.dto.TransferUniqueKey; -import com.ruoyi.ccdi.domain.excel.CcdiStaffTransferExcel; -import com.ruoyi.ccdi.domain.vo.CcdiStaffTransferVO; -import com.ruoyi.ccdi.mapper.CcdiBaseStaffMapper; -import com.ruoyi.ccdi.mapper.CcdiStaffTransferMapper; -import com.ruoyi.ccdi.service.ICcdiStaffTransferImportService; -import com.ruoyi.ccdi.service.ICcdiStaffTransferService; +import com.ruoyi.info.collection.domain.CcdiStaffTransfer; +import com.ruoyi.info.collection.domain.dto.CcdiStaffTransferAddDTO; +import com.ruoyi.info.collection.domain.dto.CcdiStaffTransferEditDTO; +import com.ruoyi.info.collection.domain.dto.CcdiStaffTransferQueryDTO; +import com.ruoyi.info.collection.domain.dto.TransferUniqueKey; +import com.ruoyi.info.collection.domain.excel.CcdiStaffTransferExcel; +import com.ruoyi.info.collection.domain.vo.CcdiStaffTransferVO; +import com.ruoyi.info.collection.mapper.CcdiBaseStaffMapper; +import com.ruoyi.info.collection.mapper.CcdiStaffTransferMapper; +import com.ruoyi.info.collection.service.ICcdiStaffTransferImportService; +import com.ruoyi.info.collection.service.ICcdiStaffTransferService; import com.ruoyi.common.exception.ServiceException; import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.StringUtils; diff --git a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/utils/EasyExcelUtil.java b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/utils/EasyExcelUtil.java similarity index 98% rename from ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/utils/EasyExcelUtil.java rename to ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/utils/EasyExcelUtil.java index ce8a7e7..f277d92 100644 --- a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/utils/EasyExcelUtil.java +++ b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/utils/EasyExcelUtil.java @@ -1,10 +1,10 @@ -package com.ruoyi.ccdi.utils; +package com.ruoyi.info.collection.utils; import com.alibaba.excel.EasyExcel; import com.alibaba.excel.write.handler.WriteHandler; import com.alibaba.excel.write.style.column.LongestMatchColumnWidthStyleStrategy; -import com.ruoyi.ccdi.handler.DictDropdownWriteHandler; -import com.ruoyi.ccdi.handler.RequiredFieldWriteHandler; +import com.ruoyi.info.collection.handler.DictDropdownWriteHandler; +import com.ruoyi.info.collection.handler.RequiredFieldWriteHandler; import jakarta.servlet.http.HttpServletResponse; import lombok.AccessLevel; import lombok.NoArgsConstructor; diff --git a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/utils/ImportLogUtils.java b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/utils/ImportLogUtils.java similarity index 99% rename from ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/utils/ImportLogUtils.java rename to ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/utils/ImportLogUtils.java index 2c725b5..fe55f42 100644 --- a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/utils/ImportLogUtils.java +++ b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/utils/ImportLogUtils.java @@ -1,4 +1,4 @@ -package com.ruoyi.ccdi.utils; +package com.ruoyi.info.collection.utils; import org.slf4j.Logger; diff --git a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/utils/converter/IntermediaryStatusConverter.java b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/utils/converter/IntermediaryStatusConverter.java similarity index 97% rename from ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/utils/converter/IntermediaryStatusConverter.java rename to ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/utils/converter/IntermediaryStatusConverter.java index 155e5fa..55afad3 100644 --- a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/utils/converter/IntermediaryStatusConverter.java +++ b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/utils/converter/IntermediaryStatusConverter.java @@ -1,4 +1,4 @@ -package com.ruoyi.ccdi.utils.converter; +package com.ruoyi.info.collection.utils.converter; import com.alibaba.excel.converters.Converter; import com.alibaba.excel.enums.CellDataTypeEnum; diff --git a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/utils/converter/IntermediaryTypeConverter.java b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/utils/converter/IntermediaryTypeConverter.java similarity index 97% rename from ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/utils/converter/IntermediaryTypeConverter.java rename to ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/utils/converter/IntermediaryTypeConverter.java index ba34ff8..c580f7b 100644 --- a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/utils/converter/IntermediaryTypeConverter.java +++ b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/utils/converter/IntermediaryTypeConverter.java @@ -1,4 +1,4 @@ -package com.ruoyi.ccdi.utils.converter; +package com.ruoyi.info.collection.utils.converter; import com.alibaba.excel.converters.Converter; import com.alibaba.excel.enums.CellDataTypeEnum; diff --git a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/validation/EnumValidator.java b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/validation/EnumValidator.java similarity index 95% rename from ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/validation/EnumValidator.java rename to ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/validation/EnumValidator.java index 59d9ad7..bcafd00 100644 --- a/ruoyi-ccdi/src/main/java/com/ruoyi/ccdi/validation/EnumValidator.java +++ b/ruoyi-info-collection/src/main/java/com/ruoyi/info/collection/validation/EnumValidator.java @@ -1,6 +1,6 @@ -package com.ruoyi.ccdi.validation; +package com.ruoyi.info.collection.validation; -import com.ruoyi.ccdi.annotation.EnumValid; +import com.ruoyi.info.collection.annotation.EnumValid; import jakarta.validation.ConstraintValidator; import jakarta.validation.ConstraintValidatorContext; diff --git a/ruoyi-ccdi/src/main/resources/mapper/ccdi/CcdiBaseStaffMapper.xml b/ruoyi-info-collection/src/main/resources/mapper/info/collection/CcdiBaseStaffMapper.xml similarity index 93% rename from ruoyi-ccdi/src/main/resources/mapper/ccdi/CcdiBaseStaffMapper.xml rename to ruoyi-info-collection/src/main/resources/mapper/info/collection/CcdiBaseStaffMapper.xml index b845be9..1857d9d 100644 --- a/ruoyi-ccdi/src/main/resources/mapper/ccdi/CcdiBaseStaffMapper.xml +++ b/ruoyi-info-collection/src/main/resources/mapper/info/collection/CcdiBaseStaffMapper.xml @@ -2,10 +2,10 @@ - + - + @@ -79,7 +79,7 @@ - SELECT e.staff_id, e.name, diff --git a/ruoyi-ccdi/src/main/resources/mapper/ccdi/CcdiBizIntermediaryMapper.xml b/ruoyi-info-collection/src/main/resources/mapper/info/collection/CcdiBizIntermediaryMapper.xml similarity index 98% rename from ruoyi-ccdi/src/main/resources/mapper/ccdi/CcdiBizIntermediaryMapper.xml rename to ruoyi-info-collection/src/main/resources/mapper/info/collection/CcdiBizIntermediaryMapper.xml index 0ce9fac..376b446 100644 --- a/ruoyi-ccdi/src/main/resources/mapper/ccdi/CcdiBizIntermediaryMapper.xml +++ b/ruoyi-info-collection/src/main/resources/mapper/info/collection/CcdiBizIntermediaryMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-ccdi/src/main/resources/mapper/ccdi/CcdiCustEnterpriseRelationMapper.xml b/ruoyi-info-collection/src/main/resources/mapper/info/collection/CcdiCustEnterpriseRelationMapper.xml similarity index 95% rename from ruoyi-ccdi/src/main/resources/mapper/ccdi/CcdiCustEnterpriseRelationMapper.xml rename to ruoyi-info-collection/src/main/resources/mapper/info/collection/CcdiCustEnterpriseRelationMapper.xml index ac5d42c..ef53322 100644 --- a/ruoyi-ccdi/src/main/resources/mapper/ccdi/CcdiCustEnterpriseRelationMapper.xml +++ b/ruoyi-info-collection/src/main/resources/mapper/info/collection/CcdiCustEnterpriseRelationMapper.xml @@ -2,10 +2,10 @@ - + - + diff --git a/ruoyi-ccdi/src/main/resources/mapper/ccdi/CcdiCustFmyRelationMapper.xml b/ruoyi-info-collection/src/main/resources/mapper/info/collection/CcdiCustFmyRelationMapper.xml similarity index 96% rename from ruoyi-ccdi/src/main/resources/mapper/ccdi/CcdiCustFmyRelationMapper.xml rename to ruoyi-info-collection/src/main/resources/mapper/info/collection/CcdiCustFmyRelationMapper.xml index bb0529b..850c8b2 100644 --- a/ruoyi-ccdi/src/main/resources/mapper/ccdi/CcdiCustFmyRelationMapper.xml +++ b/ruoyi-info-collection/src/main/resources/mapper/info/collection/CcdiCustFmyRelationMapper.xml @@ -2,9 +2,9 @@ - + - + @@ -70,7 +70,7 @@ - SELECT * FROM ccdi_cust_fmy_relation WHERE is_cust_family = 1 diff --git a/ruoyi-ccdi/src/main/resources/mapper/ccdi/CcdiEnterpriseBaseInfoMapper.xml b/ruoyi-info-collection/src/main/resources/mapper/info/collection/CcdiEnterpriseBaseInfoMapper.xml similarity index 98% rename from ruoyi-ccdi/src/main/resources/mapper/ccdi/CcdiEnterpriseBaseInfoMapper.xml rename to ruoyi-info-collection/src/main/resources/mapper/info/collection/CcdiEnterpriseBaseInfoMapper.xml index 0786c7f..22b32db 100644 --- a/ruoyi-ccdi/src/main/resources/mapper/ccdi/CcdiEnterpriseBaseInfoMapper.xml +++ b/ruoyi-info-collection/src/main/resources/mapper/info/collection/CcdiEnterpriseBaseInfoMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-ccdi/src/main/resources/mapper/ccdi/CcdiIntermediaryMapper.xml b/ruoyi-info-collection/src/main/resources/mapper/info/collection/CcdiIntermediaryMapper.xml similarity index 91% rename from ruoyi-ccdi/src/main/resources/mapper/ccdi/CcdiIntermediaryMapper.xml rename to ruoyi-info-collection/src/main/resources/mapper/info/collection/CcdiIntermediaryMapper.xml index 942a154..3601d0b 100644 --- a/ruoyi-ccdi/src/main/resources/mapper/ccdi/CcdiIntermediaryMapper.xml +++ b/ruoyi-info-collection/src/main/resources/mapper/info/collection/CcdiIntermediaryMapper.xml @@ -2,14 +2,14 @@ - + - SELECT * FROM ( SELECT diff --git a/ruoyi-ccdi/src/main/resources/mapper/ccdi/CcdiPurchaseTransactionMapper.xml b/ruoyi-info-collection/src/main/resources/mapper/info/collection/CcdiPurchaseTransactionMapper.xml similarity index 97% rename from ruoyi-ccdi/src/main/resources/mapper/ccdi/CcdiPurchaseTransactionMapper.xml rename to ruoyi-info-collection/src/main/resources/mapper/info/collection/CcdiPurchaseTransactionMapper.xml index 0a87d2c..0d1a80d 100644 --- a/ruoyi-ccdi/src/main/resources/mapper/ccdi/CcdiPurchaseTransactionMapper.xml +++ b/ruoyi-info-collection/src/main/resources/mapper/info/collection/CcdiPurchaseTransactionMapper.xml @@ -2,10 +2,10 @@ - + - + diff --git a/ruoyi-ccdi/src/main/resources/mapper/ccdi/CcdiStaffEnterpriseRelationMapper.xml b/ruoyi-info-collection/src/main/resources/mapper/info/collection/CcdiStaffEnterpriseRelationMapper.xml similarity index 95% rename from ruoyi-ccdi/src/main/resources/mapper/ccdi/CcdiStaffEnterpriseRelationMapper.xml rename to ruoyi-info-collection/src/main/resources/mapper/info/collection/CcdiStaffEnterpriseRelationMapper.xml index 6d8524b..54e000a 100644 --- a/ruoyi-ccdi/src/main/resources/mapper/ccdi/CcdiStaffEnterpriseRelationMapper.xml +++ b/ruoyi-info-collection/src/main/resources/mapper/info/collection/CcdiStaffEnterpriseRelationMapper.xml @@ -2,10 +2,10 @@ - + - + diff --git a/ruoyi-ccdi/src/main/resources/mapper/ccdi/CcdiStaffFmyRelationMapper.xml b/ruoyi-info-collection/src/main/resources/mapper/info/collection/CcdiStaffFmyRelationMapper.xml similarity index 96% rename from ruoyi-ccdi/src/main/resources/mapper/ccdi/CcdiStaffFmyRelationMapper.xml rename to ruoyi-info-collection/src/main/resources/mapper/info/collection/CcdiStaffFmyRelationMapper.xml index 5667960..119907a 100644 --- a/ruoyi-ccdi/src/main/resources/mapper/ccdi/CcdiStaffFmyRelationMapper.xml +++ b/ruoyi-info-collection/src/main/resources/mapper/info/collection/CcdiStaffFmyRelationMapper.xml @@ -2,10 +2,10 @@ - + - + @@ -149,7 +149,7 @@ - SELECT id, person_id, relation_type, relation_name, gender, birth_date, relation_cert_type, relation_cert_no diff --git a/ruoyi-ccdi/src/main/resources/mapper/ccdi/CcdiStaffRecruitmentMapper.xml b/ruoyi-info-collection/src/main/resources/mapper/info/collection/CcdiStaffRecruitmentMapper.xml similarity index 96% rename from ruoyi-ccdi/src/main/resources/mapper/ccdi/CcdiStaffRecruitmentMapper.xml rename to ruoyi-info-collection/src/main/resources/mapper/info/collection/CcdiStaffRecruitmentMapper.xml index b07391c..d548283 100644 --- a/ruoyi-ccdi/src/main/resources/mapper/ccdi/CcdiStaffRecruitmentMapper.xml +++ b/ruoyi-info-collection/src/main/resources/mapper/info/collection/CcdiStaffRecruitmentMapper.xml @@ -2,10 +2,10 @@ - + - + diff --git a/ruoyi-ccdi/src/main/resources/mapper/ccdi/CcdiStaffTransferMapper.xml b/ruoyi-info-collection/src/main/resources/mapper/info/collection/CcdiStaffTransferMapper.xml similarity index 95% rename from ruoyi-ccdi/src/main/resources/mapper/ccdi/CcdiStaffTransferMapper.xml rename to ruoyi-info-collection/src/main/resources/mapper/info/collection/CcdiStaffTransferMapper.xml index 6651235..f254207 100644 --- a/ruoyi-ccdi/src/main/resources/mapper/ccdi/CcdiStaffTransferMapper.xml +++ b/ruoyi-info-collection/src/main/resources/mapper/info/collection/CcdiStaffTransferMapper.xml @@ -2,10 +2,10 @@ - + - + @@ -132,7 +132,7 @@ - SELECT id, staff_id, dept_id_before, dept_id_after, transfer_date FROM ccdi_staff_transfer @@ -144,7 +144,7 @@ - SELECT id, staff_id, dept_id_before, dept_id_after, transfer_date FROM ccdi_staff_transfer