【7.6.0】【sys】【position】更新批量删除

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<HrPosition> 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<HrPosition> 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<PageResult<HrPosition>> page(HrPositionRequest hrPositionRequest) {
         return new SuccessResponseData<>(hrPositionService.findPage(hrPositionRequest));
     }

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集合
+     * <p>
+     * 用在批量删除
      */
-    @ChineseDescription("拓展字段")
+    @NotNull(message = "职位id集合不能为空", groups = {batchDelete.class})
-    private String expandField;
+    @ChineseDescription("职位id集合")
-
+    private List<Long> positionIdList;
-    /**
-     * 乐观锁
-     */
-    @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;
 
 }

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<HrPosition> {
 
-	/**
+    /**
      * 新增
      *
      * @param hrPositionRequest 请求参数
@@ -24,7 +24,7 @@ public interface HrPositionService extends IService<HrPosition> {
      */
     void add(HrPositionRequest hrPositionRequest);
 
-	/**
+    /**
      * 删除
      *
      * @param hrPositionRequest 请求参数
@@ -33,7 +33,15 @@ public interface HrPositionService extends IService<HrPosition> {
      */
     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<HrPosition> {
      */
     void edit(HrPositionRequest hrPositionRequest);
 
-	/**
+    /**
      * 查询详情
      *
      * @param hrPositionRequest 请求参数
@@ -51,20 +59,20 @@ public interface HrPositionService extends IService<HrPosition> {
      */
     HrPosition detail(HrPositionRequest hrPositionRequest);
 
-	/**
+    /**
      * 获取列表
      *
-     * @param hrPositionRequest        请求参数
+     * @param hrPositionRequest 请求参数
      * @return List<HrPosition>   返回结果
      * @author fengshuonan
      * @date 2023/06/10 21:25
      */
     List<HrPosition> findList(HrPositionRequest hrPositionRequest);
 
-	/**
+    /**
      * 获取列表（带分页）
      *
-     * @param hrPositionRequest              请求参数
+     * @param hrPositionRequest 请求参数
      * @return PageResult<HrPosition>   返回结果
      * @author fengshuonan
      * @date 2023/06/10 21:25

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<HrPositionMapper, HrPosit
         this.removeById(hrPosition.getPositionId());
     }
 
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void batchDelete(HrPositionRequest hrPositionRequest) {
+        List<Long> positionIdList = hrPositionRequest.getPositionIdList();
+        this.removeBatchByIds(positionIdList);
+    }
+
     @Override
     public void edit(HrPositionRequest hrPositionRequest) {
         HrPosition hrPosition = this.queryHrPosition(hrPositionRequest);