From c397f712347ff7aa54cc42dda5f94a9b589b8152 Mon Sep 17 00:00:00 2001 From: weizhiqiang <598748873@qq.com> Date: Mon, 2 Sep 2024 18:12:02 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20skyeye-ehr=EF=BC=8Cskyeye-jobdiary?= =?UTF-8?q?=E5=90=88=E5=85=A5skyeye-adm?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 - .../adm-ehr}/pom.xml | 6 +- .../controller/ArchivesController.java | 0 .../com/skyeye/archives/dao/ArchivesDao.java | 0 .../com/skyeye/archives/entity/Archives.java | 0 .../archives/service/ArchivesService.java | 0 .../service/impl/ArchivesServiceImpl.java | 0 .../controller/CertificateController.java | 0 .../certificate/dao/CertificateDao.java | 0 .../certificate/entity/Certificate.java | 0 .../service/CertificateService.java | 0 .../service/impl/CertificateServiceImpl.java | 0 .../controller/ContractController.java | 0 .../com/skyeye/contract/dao/ContractDao.java | 0 .../com/skyeye/contract/entity/Contract.java | 0 .../contract/service/ContractService.java | 0 .../service/impl/ContractServiceImpl.java | 0 .../controller/EducationController.java | 0 .../skyeye/education/dao/EducationDao.java | 0 .../skyeye/education/entity/Education.java | 0 .../education/service/EducationService.java | 0 .../service/impl/EducationServiceImpl.java | 0 .../family/controller/FamilyController.java | 0 .../java/com/skyeye/family/dao/FamilyDao.java | 0 .../java/com/skyeye/family/entity/Family.java | 0 .../skyeye/family/service/FamilyService.java | 0 .../service/impl/FamilyServiceImpl.java | 0 .../job/controller/JobResumeController.java | 0 .../java/com/skyeye/job/dao/JobResumeDao.java | 0 .../java/com/skyeye/job/entity/JobResume.java | 0 .../skyeye/job/service/JobResumeService.java | 0 .../service/impl/JobResumeServiceImpl.java | 0 .../controller/LanguageController.java | 0 .../com/skyeye/language/dao/LanguageDao.java | 0 .../com/skyeye/language/entity/Language.java | 0 .../language/service/LanguageService.java | 0 .../service/impl/LanguageServiceImpl.java | 0 .../controller/RewardPunishController.java | 0 .../skyeye/reward/dao/RewardPunishDao.java | 0 .../skyeye/reward/entity/RewardPunish.java | 0 .../reward/service/RewardPunishService.java | 0 .../service/impl/RewardPunishServiceImpl.java | 0 .../mapper/archives/ArchivesMapper.xml | 0 .../mapper/certificate/CertificateMapper.xml | 0 .../mapper/contract/ContractMapper.xml | 0 .../mapper/education/EducationMapper.xml | 0 .../resources/mapper/family/FamilyMapper.xml | 0 .../resources/mapper/job/JobResumeMapper.xml | 0 .../mapper/language/LanguageMapper.xml | 0 .../mapper/reward/RewardPunishMapper.xml | 0 skyeye-adm/adm-pro/pom.xml | 6 + .../jobdiary}/classenum/JobDiaryState.java | 2 +- .../eve/jobdiary}/classenum/JobDiaryType.java | 2 +- .../eve/jobdiary}/classenum/ReadState.java | 2 +- .../controller/JobDiaryController.java | 6 +- .../skyeye/eve/jobdiary}/dao/JobDiaryDao.java | 5 +- .../jobdiary}/dao/JobDiaryReceivedDao.java | 5 +- .../skyeye/eve/jobdiary}/entity/JobDiary.java | 2 +- .../jobdiary}/entity/JobDiaryReceived.java | 2 +- .../service/JobDiaryReceivedService.java | 4 +- .../jobdiary}/service/JobDiaryService.java | 4 +- .../impl/JobDiaryReceivedServiceImpl.java | 10 +- .../service/impl/JobDiaryServiceImpl.java | 16 +- .../mapper/jobdiary/JobDiaryMapper.xml | 2 +- .../db/config/BaseDataSourceConfig.java | 3 +- skyeye-adm/pom.xml | 1 + skyeye-ehr/.gitignore | 18 -- skyeye-ehr/ehr-common/.gitignore | 18 -- skyeye-ehr/ehr-common/pom.xml | 25 --- skyeye-ehr/ehr-entity/.gitignore | 18 -- skyeye-ehr/ehr-entity/pom.xml | 24 --- .../entity/ehr/common/PointStaffQueryDo.java | 29 ---- skyeye-ehr/ehr-pro/.gitignore | 18 -- skyeye-ehr/ehr-pro/pom.xml | 24 --- skyeye-ehr/ehr-web/.gitignore | 18 -- skyeye-ehr/ehr-web/pom.xml | 105 ----------- .../src/main/java/com/SkyEhrApplication.java | 30 ---- .../db/config/BaseDataSourceConfig.java | 164 ------------------ .../ehr-web/src/main/resources/banner.txt | 36 ---- .../ehr-web/src/main/resources/bootstrap.yml | 38 ---- .../src/main/resources/log4j.properties | 70 -------- skyeye-ehr/pom.xml | 25 --- skyeye-jobdiary/.gitignore | 18 -- skyeye-jobdiary/jobdiary-common/.gitignore | 18 -- skyeye-jobdiary/jobdiary-common/pom.xml | 25 --- skyeye-jobdiary/jobdiary-entity/.gitignore | 18 -- skyeye-jobdiary/jobdiary-entity/pom.xml | 24 --- skyeye-jobdiary/jobdiary-pro/.gitignore | 18 -- skyeye-jobdiary/jobdiary-web/.gitignore | 18 -- skyeye-jobdiary/jobdiary-web/pom.xml | 106 ----------- .../main/java/com/SkyJobdiaryApplication.java | 30 ---- .../db/config/BaseDataSourceConfig.java | 163 ----------------- .../src/main/resources/banner.txt | 36 ---- .../src/main/resources/bootstrap.yml | 38 ---- .../src/main/resources/log4j.properties | 70 -------- skyeye-jobdiary/pom.xml | 25 --- 96 files changed, 44 insertions(+), 1303 deletions(-) rename {skyeye-jobdiary/jobdiary-pro => skyeye-adm/adm-ehr}/pom.xml (80%) rename {skyeye-ehr/ehr-pro => skyeye-adm/adm-ehr}/src/main/java/com/skyeye/archives/controller/ArchivesController.java (100%) rename {skyeye-ehr/ehr-pro => skyeye-adm/adm-ehr}/src/main/java/com/skyeye/archives/dao/ArchivesDao.java (100%) rename {skyeye-ehr/ehr-pro => skyeye-adm/adm-ehr}/src/main/java/com/skyeye/archives/entity/Archives.java (100%) rename {skyeye-ehr/ehr-pro => skyeye-adm/adm-ehr}/src/main/java/com/skyeye/archives/service/ArchivesService.java (100%) rename {skyeye-ehr/ehr-pro => skyeye-adm/adm-ehr}/src/main/java/com/skyeye/archives/service/impl/ArchivesServiceImpl.java (100%) rename {skyeye-ehr/ehr-pro => skyeye-adm/adm-ehr}/src/main/java/com/skyeye/certificate/controller/CertificateController.java (100%) rename {skyeye-ehr/ehr-pro => skyeye-adm/adm-ehr}/src/main/java/com/skyeye/certificate/dao/CertificateDao.java (100%) rename {skyeye-ehr/ehr-pro => skyeye-adm/adm-ehr}/src/main/java/com/skyeye/certificate/entity/Certificate.java (100%) rename {skyeye-ehr/ehr-pro => skyeye-adm/adm-ehr}/src/main/java/com/skyeye/certificate/service/CertificateService.java (100%) rename {skyeye-ehr/ehr-pro => skyeye-adm/adm-ehr}/src/main/java/com/skyeye/certificate/service/impl/CertificateServiceImpl.java (100%) rename {skyeye-ehr/ehr-pro => skyeye-adm/adm-ehr}/src/main/java/com/skyeye/contract/controller/ContractController.java (100%) rename {skyeye-ehr/ehr-pro => skyeye-adm/adm-ehr}/src/main/java/com/skyeye/contract/dao/ContractDao.java (100%) rename {skyeye-ehr/ehr-pro => skyeye-adm/adm-ehr}/src/main/java/com/skyeye/contract/entity/Contract.java (100%) rename {skyeye-ehr/ehr-pro => skyeye-adm/adm-ehr}/src/main/java/com/skyeye/contract/service/ContractService.java (100%) rename {skyeye-ehr/ehr-pro => skyeye-adm/adm-ehr}/src/main/java/com/skyeye/contract/service/impl/ContractServiceImpl.java (100%) rename {skyeye-ehr/ehr-pro => skyeye-adm/adm-ehr}/src/main/java/com/skyeye/education/controller/EducationController.java (100%) rename {skyeye-ehr/ehr-pro => skyeye-adm/adm-ehr}/src/main/java/com/skyeye/education/dao/EducationDao.java (100%) rename {skyeye-ehr/ehr-pro => skyeye-adm/adm-ehr}/src/main/java/com/skyeye/education/entity/Education.java (100%) rename {skyeye-ehr/ehr-pro => skyeye-adm/adm-ehr}/src/main/java/com/skyeye/education/service/EducationService.java (100%) rename {skyeye-ehr/ehr-pro => skyeye-adm/adm-ehr}/src/main/java/com/skyeye/education/service/impl/EducationServiceImpl.java (100%) rename {skyeye-ehr/ehr-pro => skyeye-adm/adm-ehr}/src/main/java/com/skyeye/family/controller/FamilyController.java (100%) rename {skyeye-ehr/ehr-pro => skyeye-adm/adm-ehr}/src/main/java/com/skyeye/family/dao/FamilyDao.java (100%) rename {skyeye-ehr/ehr-pro => skyeye-adm/adm-ehr}/src/main/java/com/skyeye/family/entity/Family.java (100%) rename {skyeye-ehr/ehr-pro => skyeye-adm/adm-ehr}/src/main/java/com/skyeye/family/service/FamilyService.java (100%) rename {skyeye-ehr/ehr-pro => skyeye-adm/adm-ehr}/src/main/java/com/skyeye/family/service/impl/FamilyServiceImpl.java (100%) rename {skyeye-ehr/ehr-pro => skyeye-adm/adm-ehr}/src/main/java/com/skyeye/job/controller/JobResumeController.java (100%) rename {skyeye-ehr/ehr-pro => skyeye-adm/adm-ehr}/src/main/java/com/skyeye/job/dao/JobResumeDao.java (100%) rename {skyeye-ehr/ehr-pro => skyeye-adm/adm-ehr}/src/main/java/com/skyeye/job/entity/JobResume.java (100%) rename {skyeye-ehr/ehr-pro => skyeye-adm/adm-ehr}/src/main/java/com/skyeye/job/service/JobResumeService.java (100%) rename {skyeye-ehr/ehr-pro => skyeye-adm/adm-ehr}/src/main/java/com/skyeye/job/service/impl/JobResumeServiceImpl.java (100%) rename {skyeye-ehr/ehr-pro => skyeye-adm/adm-ehr}/src/main/java/com/skyeye/language/controller/LanguageController.java (100%) rename {skyeye-ehr/ehr-pro => skyeye-adm/adm-ehr}/src/main/java/com/skyeye/language/dao/LanguageDao.java (100%) rename {skyeye-ehr/ehr-pro => skyeye-adm/adm-ehr}/src/main/java/com/skyeye/language/entity/Language.java (100%) rename {skyeye-ehr/ehr-pro => skyeye-adm/adm-ehr}/src/main/java/com/skyeye/language/service/LanguageService.java (100%) rename {skyeye-ehr/ehr-pro => skyeye-adm/adm-ehr}/src/main/java/com/skyeye/language/service/impl/LanguageServiceImpl.java (100%) rename {skyeye-ehr/ehr-pro => skyeye-adm/adm-ehr}/src/main/java/com/skyeye/reward/controller/RewardPunishController.java (100%) rename {skyeye-ehr/ehr-pro => skyeye-adm/adm-ehr}/src/main/java/com/skyeye/reward/dao/RewardPunishDao.java (100%) rename {skyeye-ehr/ehr-pro => skyeye-adm/adm-ehr}/src/main/java/com/skyeye/reward/entity/RewardPunish.java (100%) rename {skyeye-ehr/ehr-pro => skyeye-adm/adm-ehr}/src/main/java/com/skyeye/reward/service/RewardPunishService.java (100%) rename {skyeye-ehr/ehr-pro => skyeye-adm/adm-ehr}/src/main/java/com/skyeye/reward/service/impl/RewardPunishServiceImpl.java (100%) rename {skyeye-ehr/ehr-pro => skyeye-adm/adm-ehr}/src/main/resources/mapper/archives/ArchivesMapper.xml (100%) rename {skyeye-ehr/ehr-pro => skyeye-adm/adm-ehr}/src/main/resources/mapper/certificate/CertificateMapper.xml (100%) rename {skyeye-ehr/ehr-pro => skyeye-adm/adm-ehr}/src/main/resources/mapper/contract/ContractMapper.xml (100%) rename {skyeye-ehr/ehr-pro => skyeye-adm/adm-ehr}/src/main/resources/mapper/education/EducationMapper.xml (100%) rename {skyeye-ehr/ehr-pro => skyeye-adm/adm-ehr}/src/main/resources/mapper/family/FamilyMapper.xml (100%) rename {skyeye-ehr/ehr-pro => skyeye-adm/adm-ehr}/src/main/resources/mapper/job/JobResumeMapper.xml (100%) rename {skyeye-ehr/ehr-pro => skyeye-adm/adm-ehr}/src/main/resources/mapper/language/LanguageMapper.xml (100%) rename {skyeye-ehr/ehr-pro => skyeye-adm/adm-ehr}/src/main/resources/mapper/reward/RewardPunishMapper.xml (100%) rename {skyeye-jobdiary/jobdiary-pro/src/main/java/com/skyeye/eve => skyeye-adm/adm-pro/src/main/java/com/skyeye/eve/jobdiary}/classenum/JobDiaryState.java (96%) rename {skyeye-jobdiary/jobdiary-pro/src/main/java/com/skyeye/eve => skyeye-adm/adm-pro/src/main/java/com/skyeye/eve/jobdiary}/classenum/JobDiaryType.java (97%) rename {skyeye-jobdiary/jobdiary-pro/src/main/java/com/skyeye/eve => skyeye-adm/adm-pro/src/main/java/com/skyeye/eve/jobdiary}/classenum/ReadState.java (96%) rename {skyeye-jobdiary/jobdiary-pro/src/main/java/com/skyeye/eve => skyeye-adm/adm-pro/src/main/java/com/skyeye/eve/jobdiary}/controller/JobDiaryController.java (96%) rename {skyeye-jobdiary/jobdiary-pro/src/main/java/com/skyeye/eve => skyeye-adm/adm-pro/src/main/java/com/skyeye/eve/jobdiary}/dao/JobDiaryDao.java (88%) rename {skyeye-jobdiary/jobdiary-pro/src/main/java/com/skyeye/eve => skyeye-adm/adm-pro/src/main/java/com/skyeye/eve/jobdiary}/dao/JobDiaryReceivedDao.java (83%) rename {skyeye-jobdiary/jobdiary-pro/src/main/java/com/skyeye/eve => skyeye-adm/adm-pro/src/main/java/com/skyeye/eve/jobdiary}/entity/JobDiary.java (98%) rename {skyeye-jobdiary/jobdiary-pro/src/main/java/com/skyeye/eve => skyeye-adm/adm-pro/src/main/java/com/skyeye/eve/jobdiary}/entity/JobDiaryReceived.java (97%) rename {skyeye-jobdiary/jobdiary-pro/src/main/java/com/skyeye/eve => skyeye-adm/adm-pro/src/main/java/com/skyeye/eve/jobdiary}/service/JobDiaryReceivedService.java (90%) rename {skyeye-jobdiary/jobdiary-pro/src/main/java/com/skyeye/eve => skyeye-adm/adm-pro/src/main/java/com/skyeye/eve/jobdiary}/service/JobDiaryService.java (91%) rename {skyeye-jobdiary/jobdiary-pro/src/main/java/com/skyeye/eve => skyeye-adm/adm-pro/src/main/java/com/skyeye/eve/jobdiary}/service/impl/JobDiaryReceivedServiceImpl.java (91%) rename {skyeye-jobdiary/jobdiary-pro/src/main/java/com/skyeye/eve => skyeye-adm/adm-pro/src/main/java/com/skyeye/eve/jobdiary}/service/impl/JobDiaryServiceImpl.java (93%) rename {skyeye-jobdiary/jobdiary-pro => skyeye-adm/adm-pro}/src/main/resources/mapper/jobdiary/JobDiaryMapper.xml (96%) delete mode 100644 skyeye-ehr/.gitignore delete mode 100644 skyeye-ehr/ehr-common/.gitignore delete mode 100644 skyeye-ehr/ehr-common/pom.xml delete mode 100644 skyeye-ehr/ehr-entity/.gitignore delete mode 100644 skyeye-ehr/ehr-entity/pom.xml delete mode 100644 skyeye-ehr/ehr-entity/src/main/java/com/skyeye/eve/entity/ehr/common/PointStaffQueryDo.java delete mode 100644 skyeye-ehr/ehr-pro/.gitignore delete mode 100644 skyeye-ehr/ehr-pro/pom.xml delete mode 100644 skyeye-ehr/ehr-web/.gitignore delete mode 100644 skyeye-ehr/ehr-web/pom.xml delete mode 100644 skyeye-ehr/ehr-web/src/main/java/com/SkyEhrApplication.java delete mode 100644 skyeye-ehr/ehr-web/src/main/java/com/skyeye/db/config/BaseDataSourceConfig.java delete mode 100644 skyeye-ehr/ehr-web/src/main/resources/banner.txt delete mode 100644 skyeye-ehr/ehr-web/src/main/resources/bootstrap.yml delete mode 100644 skyeye-ehr/ehr-web/src/main/resources/log4j.properties delete mode 100644 skyeye-ehr/pom.xml delete mode 100644 skyeye-jobdiary/.gitignore delete mode 100644 skyeye-jobdiary/jobdiary-common/.gitignore delete mode 100644 skyeye-jobdiary/jobdiary-common/pom.xml delete mode 100644 skyeye-jobdiary/jobdiary-entity/.gitignore delete mode 100644 skyeye-jobdiary/jobdiary-entity/pom.xml delete mode 100644 skyeye-jobdiary/jobdiary-pro/.gitignore delete mode 100644 skyeye-jobdiary/jobdiary-web/.gitignore delete mode 100644 skyeye-jobdiary/jobdiary-web/pom.xml delete mode 100644 skyeye-jobdiary/jobdiary-web/src/main/java/com/SkyJobdiaryApplication.java delete mode 100644 skyeye-jobdiary/jobdiary-web/src/main/java/com/skyeye/db/config/BaseDataSourceConfig.java delete mode 100644 skyeye-jobdiary/jobdiary-web/src/main/resources/banner.txt delete mode 100644 skyeye-jobdiary/jobdiary-web/src/main/resources/bootstrap.yml delete mode 100644 skyeye-jobdiary/jobdiary-web/src/main/resources/log4j.properties delete mode 100644 skyeye-jobdiary/pom.xml diff --git a/README.md b/README.md index 58b99146..6381253e 100644 --- a/README.md +++ b/README.md @@ -57,8 +57,6 @@ |skyeye-rmprogram |8089 |小程序设计器模块 |rmprogram-web.jar | |skyeye-notice |8096 |公告模块 |notice-web.jar | |skyeye-forum |8097 |论坛模块 |forum-web.jar | -|skyeye-jobdiary |8098 |工作日报模块 |jobdiary-web.jar | -|skyeye-ehr |8100 |EHR模块 |ehr-web.jar | |skyeye-wages |8101 |薪资模块 |wages-web.jar | |skyeye-deploy |8010 |部署模块 |deploy-web.war | |skyeye-schedule |8095 |日程模块 |schedule-web.jar | diff --git a/skyeye-jobdiary/jobdiary-pro/pom.xml b/skyeye-adm/adm-ehr/pom.xml similarity index 80% rename from skyeye-jobdiary/jobdiary-pro/pom.xml rename to skyeye-adm/adm-ehr/pom.xml index 46dab174..12e0c9fd 100644 --- a/skyeye-jobdiary/jobdiary-pro/pom.xml +++ b/skyeye-adm/adm-ehr/pom.xml @@ -3,19 +3,19 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - skyeye-jobdiary + skyeye-adm com.skyeye 1.0-SNAPSHOT 4.0.0 - jobdiary-pro + adm-ehr com.skyeye - jobdiary-entity + adm-common 1.0-SNAPSHOT diff --git a/skyeye-ehr/ehr-pro/src/main/java/com/skyeye/archives/controller/ArchivesController.java b/skyeye-adm/adm-ehr/src/main/java/com/skyeye/archives/controller/ArchivesController.java similarity index 100% rename from skyeye-ehr/ehr-pro/src/main/java/com/skyeye/archives/controller/ArchivesController.java rename to skyeye-adm/adm-ehr/src/main/java/com/skyeye/archives/controller/ArchivesController.java diff --git a/skyeye-ehr/ehr-pro/src/main/java/com/skyeye/archives/dao/ArchivesDao.java b/skyeye-adm/adm-ehr/src/main/java/com/skyeye/archives/dao/ArchivesDao.java similarity index 100% rename from skyeye-ehr/ehr-pro/src/main/java/com/skyeye/archives/dao/ArchivesDao.java rename to skyeye-adm/adm-ehr/src/main/java/com/skyeye/archives/dao/ArchivesDao.java diff --git a/skyeye-ehr/ehr-pro/src/main/java/com/skyeye/archives/entity/Archives.java b/skyeye-adm/adm-ehr/src/main/java/com/skyeye/archives/entity/Archives.java similarity index 100% rename from skyeye-ehr/ehr-pro/src/main/java/com/skyeye/archives/entity/Archives.java rename to skyeye-adm/adm-ehr/src/main/java/com/skyeye/archives/entity/Archives.java diff --git a/skyeye-ehr/ehr-pro/src/main/java/com/skyeye/archives/service/ArchivesService.java b/skyeye-adm/adm-ehr/src/main/java/com/skyeye/archives/service/ArchivesService.java similarity index 100% rename from skyeye-ehr/ehr-pro/src/main/java/com/skyeye/archives/service/ArchivesService.java rename to skyeye-adm/adm-ehr/src/main/java/com/skyeye/archives/service/ArchivesService.java diff --git a/skyeye-ehr/ehr-pro/src/main/java/com/skyeye/archives/service/impl/ArchivesServiceImpl.java b/skyeye-adm/adm-ehr/src/main/java/com/skyeye/archives/service/impl/ArchivesServiceImpl.java similarity index 100% rename from skyeye-ehr/ehr-pro/src/main/java/com/skyeye/archives/service/impl/ArchivesServiceImpl.java rename to skyeye-adm/adm-ehr/src/main/java/com/skyeye/archives/service/impl/ArchivesServiceImpl.java diff --git a/skyeye-ehr/ehr-pro/src/main/java/com/skyeye/certificate/controller/CertificateController.java b/skyeye-adm/adm-ehr/src/main/java/com/skyeye/certificate/controller/CertificateController.java similarity index 100% rename from skyeye-ehr/ehr-pro/src/main/java/com/skyeye/certificate/controller/CertificateController.java rename to skyeye-adm/adm-ehr/src/main/java/com/skyeye/certificate/controller/CertificateController.java diff --git a/skyeye-ehr/ehr-pro/src/main/java/com/skyeye/certificate/dao/CertificateDao.java b/skyeye-adm/adm-ehr/src/main/java/com/skyeye/certificate/dao/CertificateDao.java similarity index 100% rename from skyeye-ehr/ehr-pro/src/main/java/com/skyeye/certificate/dao/CertificateDao.java rename to skyeye-adm/adm-ehr/src/main/java/com/skyeye/certificate/dao/CertificateDao.java diff --git a/skyeye-ehr/ehr-pro/src/main/java/com/skyeye/certificate/entity/Certificate.java b/skyeye-adm/adm-ehr/src/main/java/com/skyeye/certificate/entity/Certificate.java similarity index 100% rename from skyeye-ehr/ehr-pro/src/main/java/com/skyeye/certificate/entity/Certificate.java rename to skyeye-adm/adm-ehr/src/main/java/com/skyeye/certificate/entity/Certificate.java diff --git a/skyeye-ehr/ehr-pro/src/main/java/com/skyeye/certificate/service/CertificateService.java b/skyeye-adm/adm-ehr/src/main/java/com/skyeye/certificate/service/CertificateService.java similarity index 100% rename from skyeye-ehr/ehr-pro/src/main/java/com/skyeye/certificate/service/CertificateService.java rename to skyeye-adm/adm-ehr/src/main/java/com/skyeye/certificate/service/CertificateService.java diff --git a/skyeye-ehr/ehr-pro/src/main/java/com/skyeye/certificate/service/impl/CertificateServiceImpl.java b/skyeye-adm/adm-ehr/src/main/java/com/skyeye/certificate/service/impl/CertificateServiceImpl.java similarity index 100% rename from skyeye-ehr/ehr-pro/src/main/java/com/skyeye/certificate/service/impl/CertificateServiceImpl.java rename to skyeye-adm/adm-ehr/src/main/java/com/skyeye/certificate/service/impl/CertificateServiceImpl.java diff --git a/skyeye-ehr/ehr-pro/src/main/java/com/skyeye/contract/controller/ContractController.java b/skyeye-adm/adm-ehr/src/main/java/com/skyeye/contract/controller/ContractController.java similarity index 100% rename from skyeye-ehr/ehr-pro/src/main/java/com/skyeye/contract/controller/ContractController.java rename to skyeye-adm/adm-ehr/src/main/java/com/skyeye/contract/controller/ContractController.java diff --git a/skyeye-ehr/ehr-pro/src/main/java/com/skyeye/contract/dao/ContractDao.java b/skyeye-adm/adm-ehr/src/main/java/com/skyeye/contract/dao/ContractDao.java similarity index 100% rename from skyeye-ehr/ehr-pro/src/main/java/com/skyeye/contract/dao/ContractDao.java rename to skyeye-adm/adm-ehr/src/main/java/com/skyeye/contract/dao/ContractDao.java diff --git a/skyeye-ehr/ehr-pro/src/main/java/com/skyeye/contract/entity/Contract.java b/skyeye-adm/adm-ehr/src/main/java/com/skyeye/contract/entity/Contract.java similarity index 100% rename from skyeye-ehr/ehr-pro/src/main/java/com/skyeye/contract/entity/Contract.java rename to skyeye-adm/adm-ehr/src/main/java/com/skyeye/contract/entity/Contract.java diff --git a/skyeye-ehr/ehr-pro/src/main/java/com/skyeye/contract/service/ContractService.java b/skyeye-adm/adm-ehr/src/main/java/com/skyeye/contract/service/ContractService.java similarity index 100% rename from skyeye-ehr/ehr-pro/src/main/java/com/skyeye/contract/service/ContractService.java rename to skyeye-adm/adm-ehr/src/main/java/com/skyeye/contract/service/ContractService.java diff --git a/skyeye-ehr/ehr-pro/src/main/java/com/skyeye/contract/service/impl/ContractServiceImpl.java b/skyeye-adm/adm-ehr/src/main/java/com/skyeye/contract/service/impl/ContractServiceImpl.java similarity index 100% rename from skyeye-ehr/ehr-pro/src/main/java/com/skyeye/contract/service/impl/ContractServiceImpl.java rename to skyeye-adm/adm-ehr/src/main/java/com/skyeye/contract/service/impl/ContractServiceImpl.java diff --git a/skyeye-ehr/ehr-pro/src/main/java/com/skyeye/education/controller/EducationController.java b/skyeye-adm/adm-ehr/src/main/java/com/skyeye/education/controller/EducationController.java similarity index 100% rename from skyeye-ehr/ehr-pro/src/main/java/com/skyeye/education/controller/EducationController.java rename to skyeye-adm/adm-ehr/src/main/java/com/skyeye/education/controller/EducationController.java diff --git a/skyeye-ehr/ehr-pro/src/main/java/com/skyeye/education/dao/EducationDao.java b/skyeye-adm/adm-ehr/src/main/java/com/skyeye/education/dao/EducationDao.java similarity index 100% rename from skyeye-ehr/ehr-pro/src/main/java/com/skyeye/education/dao/EducationDao.java rename to skyeye-adm/adm-ehr/src/main/java/com/skyeye/education/dao/EducationDao.java diff --git a/skyeye-ehr/ehr-pro/src/main/java/com/skyeye/education/entity/Education.java b/skyeye-adm/adm-ehr/src/main/java/com/skyeye/education/entity/Education.java similarity index 100% rename from skyeye-ehr/ehr-pro/src/main/java/com/skyeye/education/entity/Education.java rename to skyeye-adm/adm-ehr/src/main/java/com/skyeye/education/entity/Education.java diff --git a/skyeye-ehr/ehr-pro/src/main/java/com/skyeye/education/service/EducationService.java b/skyeye-adm/adm-ehr/src/main/java/com/skyeye/education/service/EducationService.java similarity index 100% rename from skyeye-ehr/ehr-pro/src/main/java/com/skyeye/education/service/EducationService.java rename to skyeye-adm/adm-ehr/src/main/java/com/skyeye/education/service/EducationService.java diff --git a/skyeye-ehr/ehr-pro/src/main/java/com/skyeye/education/service/impl/EducationServiceImpl.java b/skyeye-adm/adm-ehr/src/main/java/com/skyeye/education/service/impl/EducationServiceImpl.java similarity index 100% rename from skyeye-ehr/ehr-pro/src/main/java/com/skyeye/education/service/impl/EducationServiceImpl.java rename to skyeye-adm/adm-ehr/src/main/java/com/skyeye/education/service/impl/EducationServiceImpl.java diff --git a/skyeye-ehr/ehr-pro/src/main/java/com/skyeye/family/controller/FamilyController.java b/skyeye-adm/adm-ehr/src/main/java/com/skyeye/family/controller/FamilyController.java similarity index 100% rename from skyeye-ehr/ehr-pro/src/main/java/com/skyeye/family/controller/FamilyController.java rename to skyeye-adm/adm-ehr/src/main/java/com/skyeye/family/controller/FamilyController.java diff --git a/skyeye-ehr/ehr-pro/src/main/java/com/skyeye/family/dao/FamilyDao.java b/skyeye-adm/adm-ehr/src/main/java/com/skyeye/family/dao/FamilyDao.java similarity index 100% rename from skyeye-ehr/ehr-pro/src/main/java/com/skyeye/family/dao/FamilyDao.java rename to skyeye-adm/adm-ehr/src/main/java/com/skyeye/family/dao/FamilyDao.java diff --git a/skyeye-ehr/ehr-pro/src/main/java/com/skyeye/family/entity/Family.java b/skyeye-adm/adm-ehr/src/main/java/com/skyeye/family/entity/Family.java similarity index 100% rename from skyeye-ehr/ehr-pro/src/main/java/com/skyeye/family/entity/Family.java rename to skyeye-adm/adm-ehr/src/main/java/com/skyeye/family/entity/Family.java diff --git a/skyeye-ehr/ehr-pro/src/main/java/com/skyeye/family/service/FamilyService.java b/skyeye-adm/adm-ehr/src/main/java/com/skyeye/family/service/FamilyService.java similarity index 100% rename from skyeye-ehr/ehr-pro/src/main/java/com/skyeye/family/service/FamilyService.java rename to skyeye-adm/adm-ehr/src/main/java/com/skyeye/family/service/FamilyService.java diff --git a/skyeye-ehr/ehr-pro/src/main/java/com/skyeye/family/service/impl/FamilyServiceImpl.java b/skyeye-adm/adm-ehr/src/main/java/com/skyeye/family/service/impl/FamilyServiceImpl.java similarity index 100% rename from skyeye-ehr/ehr-pro/src/main/java/com/skyeye/family/service/impl/FamilyServiceImpl.java rename to skyeye-adm/adm-ehr/src/main/java/com/skyeye/family/service/impl/FamilyServiceImpl.java diff --git a/skyeye-ehr/ehr-pro/src/main/java/com/skyeye/job/controller/JobResumeController.java b/skyeye-adm/adm-ehr/src/main/java/com/skyeye/job/controller/JobResumeController.java similarity index 100% rename from skyeye-ehr/ehr-pro/src/main/java/com/skyeye/job/controller/JobResumeController.java rename to skyeye-adm/adm-ehr/src/main/java/com/skyeye/job/controller/JobResumeController.java diff --git a/skyeye-ehr/ehr-pro/src/main/java/com/skyeye/job/dao/JobResumeDao.java b/skyeye-adm/adm-ehr/src/main/java/com/skyeye/job/dao/JobResumeDao.java similarity index 100% rename from skyeye-ehr/ehr-pro/src/main/java/com/skyeye/job/dao/JobResumeDao.java rename to skyeye-adm/adm-ehr/src/main/java/com/skyeye/job/dao/JobResumeDao.java diff --git a/skyeye-ehr/ehr-pro/src/main/java/com/skyeye/job/entity/JobResume.java b/skyeye-adm/adm-ehr/src/main/java/com/skyeye/job/entity/JobResume.java similarity index 100% rename from skyeye-ehr/ehr-pro/src/main/java/com/skyeye/job/entity/JobResume.java rename to skyeye-adm/adm-ehr/src/main/java/com/skyeye/job/entity/JobResume.java diff --git a/skyeye-ehr/ehr-pro/src/main/java/com/skyeye/job/service/JobResumeService.java b/skyeye-adm/adm-ehr/src/main/java/com/skyeye/job/service/JobResumeService.java similarity index 100% rename from skyeye-ehr/ehr-pro/src/main/java/com/skyeye/job/service/JobResumeService.java rename to skyeye-adm/adm-ehr/src/main/java/com/skyeye/job/service/JobResumeService.java diff --git a/skyeye-ehr/ehr-pro/src/main/java/com/skyeye/job/service/impl/JobResumeServiceImpl.java b/skyeye-adm/adm-ehr/src/main/java/com/skyeye/job/service/impl/JobResumeServiceImpl.java similarity index 100% rename from skyeye-ehr/ehr-pro/src/main/java/com/skyeye/job/service/impl/JobResumeServiceImpl.java rename to skyeye-adm/adm-ehr/src/main/java/com/skyeye/job/service/impl/JobResumeServiceImpl.java diff --git a/skyeye-ehr/ehr-pro/src/main/java/com/skyeye/language/controller/LanguageController.java b/skyeye-adm/adm-ehr/src/main/java/com/skyeye/language/controller/LanguageController.java similarity index 100% rename from skyeye-ehr/ehr-pro/src/main/java/com/skyeye/language/controller/LanguageController.java rename to skyeye-adm/adm-ehr/src/main/java/com/skyeye/language/controller/LanguageController.java diff --git a/skyeye-ehr/ehr-pro/src/main/java/com/skyeye/language/dao/LanguageDao.java b/skyeye-adm/adm-ehr/src/main/java/com/skyeye/language/dao/LanguageDao.java similarity index 100% rename from skyeye-ehr/ehr-pro/src/main/java/com/skyeye/language/dao/LanguageDao.java rename to skyeye-adm/adm-ehr/src/main/java/com/skyeye/language/dao/LanguageDao.java diff --git a/skyeye-ehr/ehr-pro/src/main/java/com/skyeye/language/entity/Language.java b/skyeye-adm/adm-ehr/src/main/java/com/skyeye/language/entity/Language.java similarity index 100% rename from skyeye-ehr/ehr-pro/src/main/java/com/skyeye/language/entity/Language.java rename to skyeye-adm/adm-ehr/src/main/java/com/skyeye/language/entity/Language.java diff --git a/skyeye-ehr/ehr-pro/src/main/java/com/skyeye/language/service/LanguageService.java b/skyeye-adm/adm-ehr/src/main/java/com/skyeye/language/service/LanguageService.java similarity index 100% rename from skyeye-ehr/ehr-pro/src/main/java/com/skyeye/language/service/LanguageService.java rename to skyeye-adm/adm-ehr/src/main/java/com/skyeye/language/service/LanguageService.java diff --git a/skyeye-ehr/ehr-pro/src/main/java/com/skyeye/language/service/impl/LanguageServiceImpl.java b/skyeye-adm/adm-ehr/src/main/java/com/skyeye/language/service/impl/LanguageServiceImpl.java similarity index 100% rename from skyeye-ehr/ehr-pro/src/main/java/com/skyeye/language/service/impl/LanguageServiceImpl.java rename to skyeye-adm/adm-ehr/src/main/java/com/skyeye/language/service/impl/LanguageServiceImpl.java diff --git a/skyeye-ehr/ehr-pro/src/main/java/com/skyeye/reward/controller/RewardPunishController.java b/skyeye-adm/adm-ehr/src/main/java/com/skyeye/reward/controller/RewardPunishController.java similarity index 100% rename from skyeye-ehr/ehr-pro/src/main/java/com/skyeye/reward/controller/RewardPunishController.java rename to skyeye-adm/adm-ehr/src/main/java/com/skyeye/reward/controller/RewardPunishController.java diff --git a/skyeye-ehr/ehr-pro/src/main/java/com/skyeye/reward/dao/RewardPunishDao.java b/skyeye-adm/adm-ehr/src/main/java/com/skyeye/reward/dao/RewardPunishDao.java similarity index 100% rename from skyeye-ehr/ehr-pro/src/main/java/com/skyeye/reward/dao/RewardPunishDao.java rename to skyeye-adm/adm-ehr/src/main/java/com/skyeye/reward/dao/RewardPunishDao.java diff --git a/skyeye-ehr/ehr-pro/src/main/java/com/skyeye/reward/entity/RewardPunish.java b/skyeye-adm/adm-ehr/src/main/java/com/skyeye/reward/entity/RewardPunish.java similarity index 100% rename from skyeye-ehr/ehr-pro/src/main/java/com/skyeye/reward/entity/RewardPunish.java rename to skyeye-adm/adm-ehr/src/main/java/com/skyeye/reward/entity/RewardPunish.java diff --git a/skyeye-ehr/ehr-pro/src/main/java/com/skyeye/reward/service/RewardPunishService.java b/skyeye-adm/adm-ehr/src/main/java/com/skyeye/reward/service/RewardPunishService.java similarity index 100% rename from skyeye-ehr/ehr-pro/src/main/java/com/skyeye/reward/service/RewardPunishService.java rename to skyeye-adm/adm-ehr/src/main/java/com/skyeye/reward/service/RewardPunishService.java diff --git a/skyeye-ehr/ehr-pro/src/main/java/com/skyeye/reward/service/impl/RewardPunishServiceImpl.java b/skyeye-adm/adm-ehr/src/main/java/com/skyeye/reward/service/impl/RewardPunishServiceImpl.java similarity index 100% rename from skyeye-ehr/ehr-pro/src/main/java/com/skyeye/reward/service/impl/RewardPunishServiceImpl.java rename to skyeye-adm/adm-ehr/src/main/java/com/skyeye/reward/service/impl/RewardPunishServiceImpl.java diff --git a/skyeye-ehr/ehr-pro/src/main/resources/mapper/archives/ArchivesMapper.xml b/skyeye-adm/adm-ehr/src/main/resources/mapper/archives/ArchivesMapper.xml similarity index 100% rename from skyeye-ehr/ehr-pro/src/main/resources/mapper/archives/ArchivesMapper.xml rename to skyeye-adm/adm-ehr/src/main/resources/mapper/archives/ArchivesMapper.xml diff --git a/skyeye-ehr/ehr-pro/src/main/resources/mapper/certificate/CertificateMapper.xml b/skyeye-adm/adm-ehr/src/main/resources/mapper/certificate/CertificateMapper.xml similarity index 100% rename from skyeye-ehr/ehr-pro/src/main/resources/mapper/certificate/CertificateMapper.xml rename to skyeye-adm/adm-ehr/src/main/resources/mapper/certificate/CertificateMapper.xml diff --git a/skyeye-ehr/ehr-pro/src/main/resources/mapper/contract/ContractMapper.xml b/skyeye-adm/adm-ehr/src/main/resources/mapper/contract/ContractMapper.xml similarity index 100% rename from skyeye-ehr/ehr-pro/src/main/resources/mapper/contract/ContractMapper.xml rename to skyeye-adm/adm-ehr/src/main/resources/mapper/contract/ContractMapper.xml diff --git a/skyeye-ehr/ehr-pro/src/main/resources/mapper/education/EducationMapper.xml b/skyeye-adm/adm-ehr/src/main/resources/mapper/education/EducationMapper.xml similarity index 100% rename from skyeye-ehr/ehr-pro/src/main/resources/mapper/education/EducationMapper.xml rename to skyeye-adm/adm-ehr/src/main/resources/mapper/education/EducationMapper.xml diff --git a/skyeye-ehr/ehr-pro/src/main/resources/mapper/family/FamilyMapper.xml b/skyeye-adm/adm-ehr/src/main/resources/mapper/family/FamilyMapper.xml similarity index 100% rename from skyeye-ehr/ehr-pro/src/main/resources/mapper/family/FamilyMapper.xml rename to skyeye-adm/adm-ehr/src/main/resources/mapper/family/FamilyMapper.xml diff --git a/skyeye-ehr/ehr-pro/src/main/resources/mapper/job/JobResumeMapper.xml b/skyeye-adm/adm-ehr/src/main/resources/mapper/job/JobResumeMapper.xml similarity index 100% rename from skyeye-ehr/ehr-pro/src/main/resources/mapper/job/JobResumeMapper.xml rename to skyeye-adm/adm-ehr/src/main/resources/mapper/job/JobResumeMapper.xml diff --git a/skyeye-ehr/ehr-pro/src/main/resources/mapper/language/LanguageMapper.xml b/skyeye-adm/adm-ehr/src/main/resources/mapper/language/LanguageMapper.xml similarity index 100% rename from skyeye-ehr/ehr-pro/src/main/resources/mapper/language/LanguageMapper.xml rename to skyeye-adm/adm-ehr/src/main/resources/mapper/language/LanguageMapper.xml diff --git a/skyeye-ehr/ehr-pro/src/main/resources/mapper/reward/RewardPunishMapper.xml b/skyeye-adm/adm-ehr/src/main/resources/mapper/reward/RewardPunishMapper.xml similarity index 100% rename from skyeye-ehr/ehr-pro/src/main/resources/mapper/reward/RewardPunishMapper.xml rename to skyeye-adm/adm-ehr/src/main/resources/mapper/reward/RewardPunishMapper.xml diff --git a/skyeye-adm/adm-pro/pom.xml b/skyeye-adm/adm-pro/pom.xml index 145d5cf9..3fcf018a 100644 --- a/skyeye-adm/adm-pro/pom.xml +++ b/skyeye-adm/adm-pro/pom.xml @@ -19,6 +19,12 @@ 1.0-SNAPSHOT + + com.skyeye + adm-ehr + 1.0-SNAPSHOT + + com.deepoove poi-tl diff --git a/skyeye-jobdiary/jobdiary-pro/src/main/java/com/skyeye/eve/classenum/JobDiaryState.java b/skyeye-adm/adm-pro/src/main/java/com/skyeye/eve/jobdiary/classenum/JobDiaryState.java similarity index 96% rename from skyeye-jobdiary/jobdiary-pro/src/main/java/com/skyeye/eve/classenum/JobDiaryState.java rename to skyeye-adm/adm-pro/src/main/java/com/skyeye/eve/jobdiary/classenum/JobDiaryState.java index 44d42302..65614a1a 100644 --- a/skyeye-jobdiary/jobdiary-pro/src/main/java/com/skyeye/eve/classenum/JobDiaryState.java +++ b/skyeye-adm/adm-pro/src/main/java/com/skyeye/eve/jobdiary/classenum/JobDiaryState.java @@ -2,7 +2,7 @@ * Copyright 卫志强 QQ：598748873@qq.com Inc. All rights reserved. 开源地址：https://gitee.com/doc_wei01/skyeye ******************************************************************************/ -package com.skyeye.eve.classenum; +package com.skyeye.eve.jobdiary.classenum; import com.skyeye.common.base.classenum.SkyeyeEnumClass; import lombok.AllArgsConstructor; diff --git a/skyeye-jobdiary/jobdiary-pro/src/main/java/com/skyeye/eve/classenum/JobDiaryType.java b/skyeye-adm/adm-pro/src/main/java/com/skyeye/eve/jobdiary/classenum/JobDiaryType.java similarity index 97% rename from skyeye-jobdiary/jobdiary-pro/src/main/java/com/skyeye/eve/classenum/JobDiaryType.java rename to skyeye-adm/adm-pro/src/main/java/com/skyeye/eve/jobdiary/classenum/JobDiaryType.java index c08f9956..b6ac2b9a 100644 --- a/skyeye-jobdiary/jobdiary-pro/src/main/java/com/skyeye/eve/classenum/JobDiaryType.java +++ b/skyeye-adm/adm-pro/src/main/java/com/skyeye/eve/jobdiary/classenum/JobDiaryType.java @@ -2,7 +2,7 @@ * Copyright 卫志强 QQ：598748873@qq.com Inc. All rights reserved. 开源地址：https://gitee.com/doc_wei01/skyeye ******************************************************************************/ -package com.skyeye.eve.classenum; +package com.skyeye.eve.jobdiary.classenum; import com.skyeye.common.base.classenum.SkyeyeEnumClass; import com.skyeye.common.util.DateUtil; diff --git a/skyeye-jobdiary/jobdiary-pro/src/main/java/com/skyeye/eve/classenum/ReadState.java b/skyeye-adm/adm-pro/src/main/java/com/skyeye/eve/jobdiary/classenum/ReadState.java similarity index 96% rename from skyeye-jobdiary/jobdiary-pro/src/main/java/com/skyeye/eve/classenum/ReadState.java rename to skyeye-adm/adm-pro/src/main/java/com/skyeye/eve/jobdiary/classenum/ReadState.java index 28508083..2d4eba25 100644 --- a/skyeye-jobdiary/jobdiary-pro/src/main/java/com/skyeye/eve/classenum/ReadState.java +++ b/skyeye-adm/adm-pro/src/main/java/com/skyeye/eve/jobdiary/classenum/ReadState.java @@ -2,7 +2,7 @@ * Copyright 卫志强 QQ：598748873@qq.com Inc. All rights reserved. 开源地址：https://gitee.com/doc_wei01/skyeye ******************************************************************************/ -package com.skyeye.eve.classenum; +package com.skyeye.eve.jobdiary.classenum; import com.skyeye.common.base.classenum.SkyeyeEnumClass; import lombok.AllArgsConstructor; diff --git a/skyeye-jobdiary/jobdiary-pro/src/main/java/com/skyeye/eve/controller/JobDiaryController.java b/skyeye-adm/adm-pro/src/main/java/com/skyeye/eve/jobdiary/controller/JobDiaryController.java similarity index 96% rename from skyeye-jobdiary/jobdiary-pro/src/main/java/com/skyeye/eve/controller/JobDiaryController.java rename to skyeye-adm/adm-pro/src/main/java/com/skyeye/eve/jobdiary/controller/JobDiaryController.java index 2f78d462..2acd2cd6 100644 --- a/skyeye-jobdiary/jobdiary-pro/src/main/java/com/skyeye/eve/controller/JobDiaryController.java +++ b/skyeye-adm/adm-pro/src/main/java/com/skyeye/eve/jobdiary/controller/JobDiaryController.java @@ -2,7 +2,7 @@ * Copyright 卫志强 QQ：598748873@qq.com Inc. All rights reserved. 开源地址：https://gitee.com/doc_wei01/skyeye ******************************************************************************/ -package com.skyeye.eve.controller; +package com.skyeye.eve.jobdiary.controller; import com.skyeye.annotation.api.Api; import com.skyeye.annotation.api.ApiImplicitParam; @@ -11,8 +11,8 @@ import com.skyeye.annotation.api.ApiOperation; import com.skyeye.common.entity.search.CommonPageInfo; import com.skyeye.common.object.InputObject; import com.skyeye.common.object.OutputObject; -import com.skyeye.eve.entity.JobDiary; -import com.skyeye.eve.service.JobDiaryService; +import com.skyeye.eve.jobdiary.entity.JobDiary; +import com.skyeye.eve.jobdiary.service.JobDiaryService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; diff --git a/skyeye-jobdiary/jobdiary-pro/src/main/java/com/skyeye/eve/dao/JobDiaryDao.java b/skyeye-adm/adm-pro/src/main/java/com/skyeye/eve/jobdiary/dao/JobDiaryDao.java similarity index 88% rename from skyeye-jobdiary/jobdiary-pro/src/main/java/com/skyeye/eve/dao/JobDiaryDao.java rename to skyeye-adm/adm-pro/src/main/java/com/skyeye/eve/jobdiary/dao/JobDiaryDao.java index 633fb1ec..60570fa5 100644 --- a/skyeye-jobdiary/jobdiary-pro/src/main/java/com/skyeye/eve/dao/JobDiaryDao.java +++ b/skyeye-adm/adm-pro/src/main/java/com/skyeye/eve/jobdiary/dao/JobDiaryDao.java @@ -2,10 +2,11 @@ * Copyright 卫志强 QQ：598748873@qq.com Inc. All rights reserved. 开源地址：https://gitee.com/doc_wei01/skyeye ******************************************************************************/ -package com.skyeye.eve.dao; +package com.skyeye.eve.jobdiary.dao; import com.skyeye.common.entity.search.CommonPageInfo; -import com.skyeye.eve.entity.JobDiary; +import com.skyeye.eve.dao.SkyeyeBaseMapper; +import com.skyeye.eve.jobdiary.entity.JobDiary; import java.util.List; import java.util.Map; diff --git a/skyeye-jobdiary/jobdiary-pro/src/main/java/com/skyeye/eve/dao/JobDiaryReceivedDao.java b/skyeye-adm/adm-pro/src/main/java/com/skyeye/eve/jobdiary/dao/JobDiaryReceivedDao.java similarity index 83% rename from skyeye-jobdiary/jobdiary-pro/src/main/java/com/skyeye/eve/dao/JobDiaryReceivedDao.java rename to skyeye-adm/adm-pro/src/main/java/com/skyeye/eve/jobdiary/dao/JobDiaryReceivedDao.java index 2ec3372d..f6937628 100644 --- a/skyeye-jobdiary/jobdiary-pro/src/main/java/com/skyeye/eve/dao/JobDiaryReceivedDao.java +++ b/skyeye-adm/adm-pro/src/main/java/com/skyeye/eve/jobdiary/dao/JobDiaryReceivedDao.java @@ -2,9 +2,10 @@ * Copyright 卫志强 QQ：598748873@qq.com Inc. All rights reserved. 开源地址：https://gitee.com/doc_wei01/skyeye ******************************************************************************/ -package com.skyeye.eve.dao; +package com.skyeye.eve.jobdiary.dao; -import com.skyeye.eve.entity.JobDiaryReceived; +import com.skyeye.eve.dao.SkyeyeBaseMapper; +import com.skyeye.eve.jobdiary.entity.JobDiaryReceived; /** * @ClassName: JobDiaryReceivedDao diff --git a/skyeye-jobdiary/jobdiary-pro/src/main/java/com/skyeye/eve/entity/JobDiary.java b/skyeye-adm/adm-pro/src/main/java/com/skyeye/eve/jobdiary/entity/JobDiary.java similarity index 98% rename from skyeye-jobdiary/jobdiary-pro/src/main/java/com/skyeye/eve/entity/JobDiary.java rename to skyeye-adm/adm-pro/src/main/java/com/skyeye/eve/jobdiary/entity/JobDiary.java index 471106a3..89a84358 100644 --- a/skyeye-jobdiary/jobdiary-pro/src/main/java/com/skyeye/eve/entity/JobDiary.java +++ b/skyeye-adm/adm-pro/src/main/java/com/skyeye/eve/jobdiary/entity/JobDiary.java @@ -2,7 +2,7 @@ * Copyright 卫志强 QQ：598748873@qq.com Inc. All rights reserved. 开源地址：https://gitee.com/doc_wei01/skyeye ******************************************************************************/ -package com.skyeye.eve.entity; +package com.skyeye.eve.jobdiary.entity; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/skyeye-jobdiary/jobdiary-pro/src/main/java/com/skyeye/eve/entity/JobDiaryReceived.java b/skyeye-adm/adm-pro/src/main/java/com/skyeye/eve/jobdiary/entity/JobDiaryReceived.java similarity index 97% rename from skyeye-jobdiary/jobdiary-pro/src/main/java/com/skyeye/eve/entity/JobDiaryReceived.java rename to skyeye-adm/adm-pro/src/main/java/com/skyeye/eve/jobdiary/entity/JobDiaryReceived.java index f5b58afd..b093f38e 100644 --- a/skyeye-jobdiary/jobdiary-pro/src/main/java/com/skyeye/eve/entity/JobDiaryReceived.java +++ b/skyeye-adm/adm-pro/src/main/java/com/skyeye/eve/jobdiary/entity/JobDiaryReceived.java @@ -2,7 +2,7 @@ * Copyright 卫志强 QQ：598748873@qq.com Inc. All rights reserved. 开源地址：https://gitee.com/doc_wei01/skyeye ******************************************************************************/ -package com.skyeye.eve.entity; +package com.skyeye.eve.jobdiary.entity; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/skyeye-jobdiary/jobdiary-pro/src/main/java/com/skyeye/eve/service/JobDiaryReceivedService.java b/skyeye-adm/adm-pro/src/main/java/com/skyeye/eve/jobdiary/service/JobDiaryReceivedService.java similarity index 90% rename from skyeye-jobdiary/jobdiary-pro/src/main/java/com/skyeye/eve/service/JobDiaryReceivedService.java rename to skyeye-adm/adm-pro/src/main/java/com/skyeye/eve/jobdiary/service/JobDiaryReceivedService.java index add49898..bffdfb16 100644 --- a/skyeye-jobdiary/jobdiary-pro/src/main/java/com/skyeye/eve/service/JobDiaryReceivedService.java +++ b/skyeye-adm/adm-pro/src/main/java/com/skyeye/eve/jobdiary/service/JobDiaryReceivedService.java @@ -2,10 +2,10 @@ * Copyright 卫志强 QQ：598748873@qq.com Inc. All rights reserved. 开源地址：https://gitee.com/doc_wei01/skyeye ******************************************************************************/ -package com.skyeye.eve.service; +package com.skyeye.eve.jobdiary.service; import com.skyeye.base.business.service.SkyeyeBusinessService; -import com.skyeye.eve.entity.JobDiaryReceived; +import com.skyeye.eve.jobdiary.entity.JobDiaryReceived; import java.util.List; diff --git a/skyeye-jobdiary/jobdiary-pro/src/main/java/com/skyeye/eve/service/JobDiaryService.java b/skyeye-adm/adm-pro/src/main/java/com/skyeye/eve/jobdiary/service/JobDiaryService.java similarity index 91% rename from skyeye-jobdiary/jobdiary-pro/src/main/java/com/skyeye/eve/service/JobDiaryService.java rename to skyeye-adm/adm-pro/src/main/java/com/skyeye/eve/jobdiary/service/JobDiaryService.java index c0f23885..b739981e 100644 --- a/skyeye-jobdiary/jobdiary-pro/src/main/java/com/skyeye/eve/service/JobDiaryService.java +++ b/skyeye-adm/adm-pro/src/main/java/com/skyeye/eve/jobdiary/service/JobDiaryService.java @@ -2,12 +2,12 @@ * Copyright 卫志强 QQ：598748873@qq.com Inc. All rights reserved. 开源地址：https://gitee.com/doc_wei01/skyeye ******************************************************************************/ -package com.skyeye.eve.service; +package com.skyeye.eve.jobdiary.service; import com.skyeye.base.business.service.SkyeyeBusinessService; import com.skyeye.common.object.InputObject; import com.skyeye.common.object.OutputObject; -import com.skyeye.eve.entity.JobDiary; +import com.skyeye.eve.jobdiary.entity.JobDiary; /** * @ClassName: JobDiaryService diff --git a/skyeye-jobdiary/jobdiary-pro/src/main/java/com/skyeye/eve/service/impl/JobDiaryReceivedServiceImpl.java b/skyeye-adm/adm-pro/src/main/java/com/skyeye/eve/jobdiary/service/impl/JobDiaryReceivedServiceImpl.java similarity index 91% rename from skyeye-jobdiary/jobdiary-pro/src/main/java/com/skyeye/eve/service/impl/JobDiaryReceivedServiceImpl.java rename to skyeye-adm/adm-pro/src/main/java/com/skyeye/eve/jobdiary/service/impl/JobDiaryReceivedServiceImpl.java index 31eac835..299ccf3e 100644 --- a/skyeye-jobdiary/jobdiary-pro/src/main/java/com/skyeye/eve/service/impl/JobDiaryReceivedServiceImpl.java +++ b/skyeye-adm/adm-pro/src/main/java/com/skyeye/eve/jobdiary/service/impl/JobDiaryReceivedServiceImpl.java @@ -2,7 +2,7 @@ * Copyright 卫志强 QQ：598748873@qq.com Inc. All rights reserved. 开源地址：https://gitee.com/doc_wei01/skyeye ******************************************************************************/ -package com.skyeye.eve.service.impl; +package com.skyeye.eve.jobdiary.service.impl; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.StrUtil; @@ -10,10 +10,10 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.skyeye.annotation.service.SkyeyeService; import com.skyeye.base.business.service.impl.SkyeyeBusinessServiceImpl; import com.skyeye.common.util.mybatisplus.MybatisPlusUtil; -import com.skyeye.eve.classenum.ReadState; -import com.skyeye.eve.dao.JobDiaryReceivedDao; -import com.skyeye.eve.entity.JobDiaryReceived; -import com.skyeye.eve.service.JobDiaryReceivedService; +import com.skyeye.eve.jobdiary.classenum.ReadState; +import com.skyeye.eve.jobdiary.dao.JobDiaryReceivedDao; +import com.skyeye.eve.jobdiary.entity.JobDiaryReceived; +import com.skyeye.eve.jobdiary.service.JobDiaryReceivedService; import org.springframework.stereotype.Service; import java.util.ArrayList; diff --git a/skyeye-jobdiary/jobdiary-pro/src/main/java/com/skyeye/eve/service/impl/JobDiaryServiceImpl.java b/skyeye-adm/adm-pro/src/main/java/com/skyeye/eve/jobdiary/service/impl/JobDiaryServiceImpl.java similarity index 93% rename from skyeye-jobdiary/jobdiary-pro/src/main/java/com/skyeye/eve/service/impl/JobDiaryServiceImpl.java rename to skyeye-adm/adm-pro/src/main/java/com/skyeye/eve/jobdiary/service/impl/JobDiaryServiceImpl.java index 579b4c2c..263c7175 100644 --- a/skyeye-jobdiary/jobdiary-pro/src/main/java/com/skyeye/eve/service/impl/JobDiaryServiceImpl.java +++ b/skyeye-adm/adm-pro/src/main/java/com/skyeye/eve/jobdiary/service/impl/JobDiaryServiceImpl.java @@ -2,7 +2,7 @@ * Copyright 卫志强 QQ：598748873@qq.com Inc. All rights reserved. 开源地址：https://gitee.com/doc_wei01/skyeye ******************************************************************************/ -package com.skyeye.eve.service.impl; +package com.skyeye.eve.jobdiary.service.impl; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.github.pagehelper.Page; @@ -18,13 +18,13 @@ import com.skyeye.common.object.InputObject; import com.skyeye.common.object.OutputObject; import com.skyeye.common.util.DateUtil; import com.skyeye.common.util.mybatisplus.MybatisPlusUtil; -import com.skyeye.eve.classenum.JobDiaryState; -import com.skyeye.eve.classenum.JobDiaryType; -import com.skyeye.eve.classenum.ReadState; -import com.skyeye.eve.dao.JobDiaryDao; -import com.skyeye.eve.entity.JobDiary; -import com.skyeye.eve.service.JobDiaryReceivedService; -import com.skyeye.eve.service.JobDiaryService; +import com.skyeye.eve.jobdiary.classenum.JobDiaryState; +import com.skyeye.eve.jobdiary.classenum.JobDiaryType; +import com.skyeye.eve.jobdiary.classenum.ReadState; +import com.skyeye.eve.jobdiary.dao.JobDiaryDao; +import com.skyeye.eve.jobdiary.entity.JobDiary; +import com.skyeye.eve.jobdiary.service.JobDiaryReceivedService; +import com.skyeye.eve.jobdiary.service.JobDiaryService; import com.skyeye.exception.CustomException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/skyeye-jobdiary/jobdiary-pro/src/main/resources/mapper/jobdiary/JobDiaryMapper.xml b/skyeye-adm/adm-pro/src/main/resources/mapper/jobdiary/JobDiaryMapper.xml similarity index 96% rename from skyeye-jobdiary/jobdiary-pro/src/main/resources/mapper/jobdiary/JobDiaryMapper.xml rename to skyeye-adm/adm-pro/src/main/resources/mapper/jobdiary/JobDiaryMapper.xml index 2c6265e5..fa599e2a 100644 --- a/skyeye-jobdiary/jobdiary-pro/src/main/resources/mapper/jobdiary/JobDiaryMapper.xml +++ b/skyeye-adm/adm-pro/src/main/resources/mapper/jobdiary/JobDiaryMapper.xml @@ -1,6 +1,6 @@ - +