From e359057e0d8972fff0cb5090c14b9861571e01d2 Mon Sep 17 00:00:00 2001 From: fengshuonan Date: Sun, 11 Jun 2023 17:27:32 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=907.6.0=E3=80=91=E3=80=90sys=E3=80=91?= =?UTF-8?q?=E3=80=90position=E3=80=91=E6=9B=B4=E6=96=B0=E6=89=B9=E9=87=8F?= =?UTF-8?q?=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/HrPositionController.java | 33 +++++++++++++------ .../pojo/request/HrPositionRequest.java | 29 ++++------------ .../position/service/HrPositionService.java | 24 +++++++++----- .../service/impl/HrPositionServiceImpl.java | 8 +++++ 4 files changed, 54 insertions(+), 40 deletions(-) diff --git a/kernel-s-sys/sys-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/position/controller/HrPositionController.java b/kernel-s-sys/sys-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/position/controller/HrPositionController.java index 9422a215e..bcd96cf87 100644 --- a/kernel-s-sys/sys-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/position/controller/HrPositionController.java +++ b/kernel-s-sys/sys-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/position/controller/HrPositionController.java @@ -1,6 +1,7 @@ package cn.stylefeng.roses.kernel.sys.modular.position.controller; import cn.stylefeng.roses.kernel.db.api.pojo.page.PageResult; +import cn.stylefeng.roses.kernel.rule.pojo.request.BaseRequest; import cn.stylefeng.roses.kernel.rule.pojo.response.ResponseData; import cn.stylefeng.roses.kernel.rule.pojo.response.SuccessResponseData; import cn.stylefeng.roses.kernel.scanner.api.annotation.ApiResource; @@ -29,59 +30,71 @@ public class HrPositionController { private HrPositionService hrPositionService; /** - * 添加 + * 添加职位 * * @author fengshuonan * @date 2023/06/10 21:25 */ - @PostResource(name = "添加", path = "/hrPosition/add") + @PostResource(name = "添加职位", path = "/hrPosition/add") public ResponseData add(@RequestBody @Validated(HrPositionRequest.add.class) HrPositionRequest hrPositionRequest) { hrPositionService.add(hrPositionRequest); return new SuccessResponseData<>(); } /** - * 删除 + * 删除职位 * * @author fengshuonan * @date 2023/06/10 21:25 */ - @PostResource(name = "删除", path = "/hrPosition/delete") + @PostResource(name = "删除职位", path = "/hrPosition/delete") public ResponseData delete(@RequestBody @Validated(HrPositionRequest.delete.class) HrPositionRequest hrPositionRequest) { hrPositionService.del(hrPositionRequest); return new SuccessResponseData<>(); } /** - * 编辑 + * 批量删除职位 * * @author fengshuonan * @date 2023/06/10 21:25 */ - @PostResource(name = "编辑", path = "/hrPosition/edit") + @PostResource(name = "批量删除职位", path = "/hrPosition/batchDelete") + public ResponseData batchDelete(@RequestBody @Validated(BaseRequest.batchDelete.class) HrPositionRequest hrPositionRequest) { + hrPositionService.batchDelete(hrPositionRequest); + return new SuccessResponseData<>(); + } + + /** + * 编辑职位 + * + * @author fengshuonan + * @date 2023/06/10 21:25 + */ + @PostResource(name = "编辑职位", path = "/hrPosition/edit") public ResponseData edit(@RequestBody @Validated(HrPositionRequest.edit.class) HrPositionRequest hrPositionRequest) { hrPositionService.edit(hrPositionRequest); return new SuccessResponseData<>(); } /** - * 查看详情 + * 查看职位详情 * * @author fengshuonan * @date 2023/06/10 21:25 */ - @GetResource(name = "查看详情", path = "/hrPosition/detail") + @GetResource(name = "查看职位详情", path = "/hrPosition/detail") public ResponseData detail(@Validated(HrPositionRequest.detail.class) HrPositionRequest hrPositionRequest) { return new SuccessResponseData<>(hrPositionService.detail(hrPositionRequest)); } /** - * 获取列表（带分页） + * 获取列表-职位信息（带分页） * * @author fengshuonan * @date 2023/06/10 21:25 */ - @GetResource(name = "分页查询", path = "/hrPosition/page") + @GetResource(name = "分页查询-职位信息", path = "/hrPosition/page") public ResponseData> page(HrPositionRequest hrPositionRequest) { return new SuccessResponseData<>(hrPositionService.findPage(hrPositionRequest)); } diff --git a/kernel-s-sys/sys-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/position/pojo/request/HrPositionRequest.java b/kernel-s-sys/sys-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/position/pojo/request/HrPositionRequest.java index 7e8eb71b5..48fa886ee 100644 --- a/kernel-s-sys/sys-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/position/pojo/request/HrPositionRequest.java +++ b/kernel-s-sys/sys-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/position/pojo/request/HrPositionRequest.java @@ -8,6 +8,7 @@ import lombok.EqualsAndHashCode; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; import java.math.BigDecimal; +import java.util.List; /** * 职位信息封装类 @@ -61,28 +62,12 @@ public class HrPositionRequest extends BaseRequest { private String remark; /** - * 拓展字段 + * 职位id集合 + *

+ * 用在批量删除 */ - @ChineseDescription("拓展字段") - private String expandField; - - /** - * 乐观锁 - */ - @ChineseDescription("乐观锁") - private Long versionFlag; - - /** - * 删除标记：Y-已删除，N-未删除 - */ - @NotBlank(message = "删除标记：Y-已删除，N-未删除不能为空", groups = {add.class, edit.class}) - @ChineseDescription("删除标记：Y-已删除，N-未删除") - private String delFlag; - - /** - * 租户号 - */ - @ChineseDescription("租户号") - private Long tenantId; + @NotNull(message = "职位id集合不能为空", groups = {batchDelete.class}) + @ChineseDescription("职位id集合") + private List positionIdList; } diff --git a/kernel-s-sys/sys-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/position/service/HrPositionService.java b/kernel-s-sys/sys-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/position/service/HrPositionService.java index 47f2900ad..946f61694 100644 --- a/kernel-s-sys/sys-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/position/service/HrPositionService.java +++ b/kernel-s-sys/sys-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/position/service/HrPositionService.java @@ -15,7 +15,7 @@ import java.util.List; */ public interface HrPositionService extends IService { - /** + /** * 新增 * * @param hrPositionRequest 请求参数 @@ -24,7 +24,7 @@ public interface HrPositionService extends IService { */ void add(HrPositionRequest hrPositionRequest); - /** + /** * 删除 * * @param hrPositionRequest 请求参数 @@ -33,7 +33,15 @@ public interface HrPositionService extends IService { */ void del(HrPositionRequest hrPositionRequest); - /** + /** + * 批量删除职位 + * + * @author fengshuonan + * @since 2023/6/11 17:14 + */ + void batchDelete(HrPositionRequest hrPositionRequest); + + /** * 编辑 * * @param hrPositionRequest 请求参数 @@ -42,7 +50,7 @@ public interface HrPositionService extends IService { */ void edit(HrPositionRequest hrPositionRequest); - /** + /** * 查询详情 * * @param hrPositionRequest 请求参数 @@ -51,20 +59,20 @@ public interface HrPositionService extends IService { */ HrPosition detail(HrPositionRequest hrPositionRequest); - /** + /** * 获取列表 * - * @param hrPositionRequest 请求参数 + * @param hrPositionRequest 请求参数 * @return List 返回结果 * @author fengshuonan * @date 2023/06/10 21:25 */ List findList(HrPositionRequest hrPositionRequest); - /** + /** * 获取列表（带分页） * - * @param hrPositionRequest 请求参数 + * @param hrPositionRequest 请求参数 * @return PageResult 返回结果 * @author fengshuonan * @date 2023/06/10 21:25 diff --git a/kernel-s-sys/sys-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/position/service/impl/HrPositionServiceImpl.java b/kernel-s-sys/sys-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/position/service/impl/HrPositionServiceImpl.java index a82275661..937541d89 100644 --- a/kernel-s-sys/sys-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/position/service/impl/HrPositionServiceImpl.java +++ b/kernel-s-sys/sys-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/position/service/impl/HrPositionServiceImpl.java @@ -16,6 +16,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import java.util.List; @@ -41,6 +42,13 @@ public class HrPositionServiceImpl extends ServiceImpl positionIdList = hrPositionRequest.getPositionIdList(); + this.removeBatchByIds(positionIdList); + } + @Override public void edit(HrPositionRequest hrPositionRequest) { HrPosition hrPosition = this.queryHrPosition(hrPositionRequest);