From de2faf071f7bda3a2f454fb7c48584df71a7bdd7 Mon Sep 17 00:00:00 2001 From: fengshuonan Date: Thu, 8 Jun 2023 21:29:26 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=907.6.0=E3=80=91=E3=80=90position?= =?UTF-8?q?=E3=80=91=E6=95=B4=E7=90=86=E5=8C=85=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/HrPositionController.java | 6 +++--- .../{organization => position}/entity/HrPosition.java | 2 +- .../mapper/HrPositionMapper.java | 4 ++-- .../mapper/mapping/HrPositionMapper.xml | 2 +- .../service/HrPositionService.java | 4 ++-- .../service/impl/HrPositionServiceImpl.java | 8 ++++---- 6 files changed, 13 insertions(+), 13 deletions(-) rename kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/{organization => position}/controller/HrPositionController.java (96%) rename kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/{organization => position}/entity/HrPosition.java (97%) rename kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/{organization => position}/mapper/HrPositionMapper.java (90%) rename kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/{organization => position}/mapper/mapping/HrPositionMapper.xml (58%) rename kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/{organization => position}/service/HrPositionService.java (95%) rename kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/{organization => position}/service/impl/HrPositionServiceImpl.java (96%) diff --git a/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/controller/HrPositionController.java b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/position/controller/HrPositionController.java similarity index 96% rename from kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/controller/HrPositionController.java rename to kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/position/controller/HrPositionController.java index 687b1c44b..a5f5d0a60 100644 --- a/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/controller/HrPositionController.java +++ b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/position/controller/HrPositionController.java @@ -22,7 +22,7 @@ * 5.在修改包名，模块名称，项目代码等时，请注明软件出处 https://gitee.com/stylefeng/guns * 6.若您的项目无法满足以上几点，可申请商业授权 */ -package cn.stylefeng.roses.kernel.system.modular.organization.controller; +package cn.stylefeng.roses.kernel.system.modular.position.controller; import cn.stylefeng.roses.kernel.db.api.pojo.page.PageResult; import cn.stylefeng.roses.kernel.rule.annotation.BusinessLog; @@ -35,8 +35,8 @@ import cn.stylefeng.roses.kernel.scanner.api.annotation.GetResource; import cn.stylefeng.roses.kernel.scanner.api.annotation.PostResource; import cn.stylefeng.roses.kernel.system.api.pojo.organization.HrPositionDTO; import cn.stylefeng.roses.kernel.system.api.pojo.organization.HrPositionRequest; -import cn.stylefeng.roses.kernel.system.modular.organization.entity.HrPosition; -import cn.stylefeng.roses.kernel.system.modular.organization.service.HrPositionService; +import cn.stylefeng.roses.kernel.system.modular.position.entity.HrPosition; +import cn.stylefeng.roses.kernel.system.modular.position.service.HrPositionService; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; diff --git a/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/entity/HrPosition.java b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/position/entity/HrPosition.java similarity index 97% rename from kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/entity/HrPosition.java rename to kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/position/entity/HrPosition.java index 5f40379c2..d3b49baa7 100644 --- a/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/entity/HrPosition.java +++ b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/position/entity/HrPosition.java @@ -22,7 +22,7 @@ * 5.在修改包名，模块名称，项目代码等时，请注明软件出处 https://gitee.com/stylefeng/guns * 6.若您的项目无法满足以上几点，可申请商业授权 */ -package cn.stylefeng.roses.kernel.system.modular.organization.entity; +package cn.stylefeng.roses.kernel.system.modular.position.entity; import cn.stylefeng.roses.kernel.db.api.pojo.entity.BaseExpandFieldEntity; import cn.stylefeng.roses.kernel.rule.annotation.ChineseDescription; diff --git a/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/mapper/HrPositionMapper.java b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/position/mapper/HrPositionMapper.java similarity index 90% rename from kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/mapper/HrPositionMapper.java rename to kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/position/mapper/HrPositionMapper.java index 10c9e750b..cfeccf543 100644 --- a/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/mapper/HrPositionMapper.java +++ b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/position/mapper/HrPositionMapper.java @@ -22,9 +22,9 @@ * 5.在修改包名，模块名称，项目代码等时，请注明软件出处 https://gitee.com/stylefeng/guns * 6.若您的项目无法满足以上几点，可申请商业授权 */ -package cn.stylefeng.roses.kernel.system.modular.organization.mapper; +package cn.stylefeng.roses.kernel.system.modular.position.mapper; -import cn.stylefeng.roses.kernel.system.modular.organization.entity.HrPosition; +import cn.stylefeng.roses.kernel.system.modular.position.entity.HrPosition; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/mapper/mapping/HrPositionMapper.xml b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/position/mapper/mapping/HrPositionMapper.xml similarity index 58% rename from kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/mapper/mapping/HrPositionMapper.xml rename to kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/position/mapper/mapping/HrPositionMapper.xml index 13fe38705..74bdd623f 100644 --- a/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/mapper/mapping/HrPositionMapper.xml +++ b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/position/mapper/mapping/HrPositionMapper.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/service/HrPositionService.java b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/position/service/HrPositionService.java similarity index 95% rename from kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/service/HrPositionService.java rename to kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/position/service/HrPositionService.java index c3a9b9af3..52e187fec 100644 --- a/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/service/HrPositionService.java +++ b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/position/service/HrPositionService.java @@ -22,12 +22,12 @@ * 5.在修改包名，模块名称，项目代码等时，请注明软件出处 https://gitee.com/stylefeng/guns * 6.若您的项目无法满足以上几点，可申请商业授权 */ -package cn.stylefeng.roses.kernel.system.modular.organization.service; +package cn.stylefeng.roses.kernel.system.modular.position.service; import cn.stylefeng.roses.kernel.db.api.pojo.page.PageResult; import cn.stylefeng.roses.kernel.system.api.PositionServiceApi; import cn.stylefeng.roses.kernel.system.api.pojo.organization.HrPositionRequest; -import cn.stylefeng.roses.kernel.system.modular.organization.entity.HrPosition; +import cn.stylefeng.roses.kernel.system.modular.position.entity.HrPosition; import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; diff --git a/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/service/impl/HrPositionServiceImpl.java b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/position/service/impl/HrPositionServiceImpl.java similarity index 96% rename from kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/service/impl/HrPositionServiceImpl.java rename to kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/position/service/impl/HrPositionServiceImpl.java index 3c03142b5..679327c68 100644 --- a/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/service/impl/HrPositionServiceImpl.java +++ b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/position/service/impl/HrPositionServiceImpl.java @@ -22,7 +22,7 @@ * 5.在修改包名，模块名称，项目代码等时，请注明软件出处 https://gitee.com/stylefeng/guns * 6.若您的项目无法满足以上几点，可申请商业授权 */ -package cn.stylefeng.roses.kernel.system.modular.organization.service.impl; +package cn.stylefeng.roses.kernel.system.modular.position.service.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; @@ -39,9 +39,9 @@ import cn.stylefeng.roses.kernel.system.api.exception.SystemModularException; import cn.stylefeng.roses.kernel.system.api.exception.enums.organization.PositionExceptionEnum; import cn.stylefeng.roses.kernel.system.api.pojo.organization.HrPositionDTO; import cn.stylefeng.roses.kernel.system.api.pojo.organization.HrPositionRequest; -import cn.stylefeng.roses.kernel.system.modular.organization.entity.HrPosition; -import cn.stylefeng.roses.kernel.system.modular.organization.mapper.HrPositionMapper; -import cn.stylefeng.roses.kernel.system.modular.organization.service.HrPositionService; +import cn.stylefeng.roses.kernel.system.modular.position.entity.HrPosition; +import cn.stylefeng.roses.kernel.system.modular.position.mapper.HrPositionMapper; +import cn.stylefeng.roses.kernel.system.modular.position.service.HrPositionService; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;