离职模块改名字

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/dimission/OaDimissionController.java

@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.module.bpm.controller.admin.oa.dimission;
+package cn.iocoder.yudao.module.bpm.controller.admin.oa.turnover;
 
 import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
@@ -6,12 +6,12 @@ import cn.iocoder.yudao.framework.common.pojo.PageParam;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
 import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
-import cn.iocoder.yudao.module.bpm.controller.admin.oa.dimission.vo.OaDimissionPageReqVO;
-import cn.iocoder.yudao.module.bpm.controller.admin.oa.dimission.vo.OaDimissionRespVO;
-import cn.iocoder.yudao.module.bpm.controller.admin.oa.dimission.vo.OaDimissionSaveReqVO;
+import cn.iocoder.yudao.module.bpm.controller.admin.oa.turnover.vo.OaTurnoverPageReqVO;
+import cn.iocoder.yudao.module.bpm.controller.admin.oa.turnover.vo.OaTurnoverRespVO;
+import cn.iocoder.yudao.module.bpm.controller.admin.oa.turnover.vo.OaTurnoverSaveReqVO;
 import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.task.BpmTaskApproveReqVO;
-import cn.iocoder.yudao.module.bpm.dal.dataobject.oa.dimission.OaDimissionDO;
-import cn.iocoder.yudao.module.bpm.service.oa.dimission.OaDimissionService;
+import cn.iocoder.yudao.module.bpm.dal.dataobject.oa.turnover.OaTurnoverDO;
+import cn.iocoder.yudao.module.bpm.service.oa.turnover.OaTurnoverService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -33,53 +33,53 @@ import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUti
 @RestController
 @RequestMapping("/bpm/oa-dimission")
 @Validated
-public class OaDimissionController {
+public class OaTurnoverController {
 
     @Resource
-    private OaDimissionService oaDimissionService;
+    private OaTurnoverService oaTurnoverService;
 
 
     @PostMapping("/start")
     @Operation(summary = "提交或暂存离职流程信息")
-    @PreAuthorize("@ss.hasPermission('bpm:oa-Dimission:start')")
-    public CommonResult<Long> startOaDimission(@Valid @RequestBody OaDimissionSaveReqVO createReqVO) {
-        return success(oaDimissionService.startOaDimission(getLoginUserId(), createReqVO));
+    @PreAuthorize("@ss.hasPermission('bpm:oa-Turnover:start')")
+    public CommonResult<Long> startOaTurnover(@Valid @RequestBody OaTurnoverSaveReqVO createReqVO) {
+        return success(oaTurnoverService.startOaTurnover(getLoginUserId(), createReqVO));
     }
 
     @PostMapping("/completeTure")
     @Operation(summary = "审批同意离职流程信息")
     @PreAuthorize("@ss.hasPermission('bpm:oa-entry:complete-true')")
-    public CommonResult<Long> completeTrueOaDimission(@Valid @RequestBody BpmTaskApproveReqVO reqVO) {
-        return success(oaDimissionService.completeTrueOaDimission(getLoginUserId(), reqVO));
+    public CommonResult<Long> completeTrueOaTurnover(@Valid @RequestBody BpmTaskApproveReqVO reqVO) {
+        return success(oaTurnoverService.completeTrueOaTurnover(getLoginUserId(), reqVO));
     }
 
     @PostMapping("/completeFalse")
     @Operation(summary = "驳回或撤回离职流程信息")
     @PreAuthorize("@ss.hasPermission('bpm:oa-entry:complete-false')")
-    public CommonResult<Long> completeFalseOaDimission(@Valid @RequestBody BpmTaskApproveReqVO reqVO) {
-        return success(oaDimissionService.completeFalseOaDimission(getLoginUserId(), reqVO));
+    public CommonResult<Long> completeFalseOaTurnover(@Valid @RequestBody BpmTaskApproveReqVO reqVO) {
+        return success(oaTurnoverService.completeFalseOaTurnover(getLoginUserId(), reqVO));
     }
 
     @PostMapping("/updateComplete")
     @Operation(summary = "驳回和撤回后再次提交或关闭离职流程信息")
     @PreAuthorize("@ss.hasPermission('bpm:oa-entry:update-complete')")
-    public CommonResult<Long> updateCompleteOaDimission(@Valid @RequestBody OaDimissionSaveReqVO createReqVO) {
-        return success(oaDimissionService.updateCompleteOaDimission(getLoginUserId(), createReqVO, createReqVO.getBpmTaskApproveReqVO()));
+    public CommonResult<Long> updateCompleteOaTurnover(@Valid @RequestBody OaTurnoverSaveReqVO createReqVO) {
+        return success(oaTurnoverService.updateCompleteOaTurnover(getLoginUserId(), createReqVO, createReqVO.getBpmTaskApproveReqVO()));
     }
 
 
     @PostMapping("/create")
     @Operation(summary = "创建离职流程信息")
     @PreAuthorize("@ss.hasPermission('bpm:oa-dimission:create')")
-    public CommonResult<Long> createOaDimission(@Valid @RequestBody OaDimissionSaveReqVO createReqVO) {
-        return success(oaDimissionService.createOaDimission(createReqVO));
+    public CommonResult<Long> createOaTurnover(@Valid @RequestBody OaTurnoverSaveReqVO createReqVO) {
+        return success(oaTurnoverService.createOaTurnover(createReqVO));
     }
 
     @PutMapping("/update")
     @Operation(summary = "更新离职流程信息")
     @PreAuthorize("@ss.hasPermission('bpm:oa-dimission:update')")
-    public CommonResult<Boolean> updateOaDimission(@Valid @RequestBody OaDimissionSaveReqVO updateReqVO) {
-        oaDimissionService.updateOaDimission(updateReqVO);
+    public CommonResult<Boolean> updateOaTurnover(@Valid @RequestBody OaTurnoverSaveReqVO updateReqVO) {
+        oaTurnoverService.updateOaTurnover(updateReqVO);
         return success(true);
     }
 
@@ -87,8 +87,8 @@ public class OaDimissionController {
     @Operation(summary = "删除离职流程信息")
     @Parameter(name = "id", description = "编号", required = true)
     @PreAuthorize("@ss.hasPermission('bpm:oa-dimission:delete')")
-    public CommonResult<Boolean> deleteOaDimission(@RequestParam("id") Long id) {
-        oaDimissionService.deleteOaDimission(id);
+    public CommonResult<Boolean> deleteOaTurnover(@RequestParam("id") Long id) {
+        oaTurnoverService.deleteOaTurnover(id);
         return success(true);
     }
 
@@ -96,30 +96,30 @@ public class OaDimissionController {
     @Operation(summary = "获得离职流程信息")
     @Parameter(name = "id", description = "编号", required = true, example = "1024")
     @PreAuthorize("@ss.hasPermission('bpm:oa-dimission:query')")
-    public CommonResult<OaDimissionRespVO> getOaDimission(@RequestParam("id") Long id) {
-        OaDimissionDO oaDimission = oaDimissionService.getOaDimission(id);
-        return success(BeanUtils.toBean(oaDimission, OaDimissionRespVO.class));
+    public CommonResult<OaTurnoverRespVO> getOaTurnover(@RequestParam("id") Long id) {
+        OaTurnoverDO oaTurnover = oaTurnoverService.getOaTurnover(id);
+        return success(BeanUtils.toBean(oaTurnover, OaTurnoverRespVO.class));
     }
 
     @GetMapping("/page")
     @Operation(summary = "获得离职流程信息分页")
     @PreAuthorize("@ss.hasPermission('bpm:oa-dimission:query')")
-    public CommonResult<PageResult<OaDimissionRespVO>> getOaDimissionPage(@Valid OaDimissionPageReqVO pageReqVO) {
-        PageResult<OaDimissionDO> pageResult = oaDimissionService.getOaDimissionPage(pageReqVO);
-        return success(BeanUtils.toBean(pageResult, OaDimissionRespVO.class));
+    public CommonResult<PageResult<OaTurnoverRespVO>> getOaTurnoverPage(@Valid OaTurnoverPageReqVO pageReqVO) {
+        PageResult<OaTurnoverDO> pageResult = oaTurnoverService.getOaTurnoverPage(pageReqVO);
+        return success(BeanUtils.toBean(pageResult, OaTurnoverRespVO.class));
     }
 
     @GetMapping("/export-excel")
     @Operation(summary = "导出离职流程信息 Excel")
     @PreAuthorize("@ss.hasPermission('bpm:oa-dimission:export')")
     @ApiAccessLog(operateType = EXPORT)
-    public void exportOaDimissionExcel(@Valid OaDimissionPageReqVO pageReqVO,
+    public void exportOaTurnoverExcel(@Valid OaTurnoverPageReqVO pageReqVO,
               HttpServletResponse response) throws IOException {
         pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
-        List<OaDimissionDO> list = oaDimissionService.getOaDimissionPage(pageReqVO).getList();
+        List<OaTurnoverDO> list = oaTurnoverService.getOaTurnoverPage(pageReqVO).getList();
         // 导出 Excel
-        ExcelUtils.write(response, "离职流程信息.xls", "数据", OaDimissionRespVO.class,
-                        BeanUtils.toBean(list, OaDimissionRespVO.class));
+        ExcelUtils.write(response, "离职流程信息.xls", "数据", OaTurnoverRespVO.class,
+                        BeanUtils.toBean(list, OaTurnoverRespVO.class));
     }
 
 }

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/dimission/vo/OaDimissionPageReqVO.java

@@ -1,7 +1,6 @@
-package cn.iocoder.yudao.module.bpm.controller.admin.oa.dimission.vo;
+package cn.iocoder.yudao.module.bpm.controller.admin.oa.turnover.vo;
 
 import lombok.*;
-import java.util.*;
 import io.swagger.v3.oas.annotations.media.Schema;
 import cn.iocoder.yudao.framework.common.pojo.PageParam;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -13,10 +12,10 @@ import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_
 @Data
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)
-public class OaDimissionPageReqVO extends PageParam {
+public class OaTurnoverPageReqVO extends PageParam {
 
     @Schema(description = "uuid", example = "18425")
-    private String dimissionId;
+    private String turnoverId;
 
     @Schema(description = "转正人id", example = "18376")
     private Long employeeId;
@@ -48,10 +47,10 @@ public class OaDimissionPageReqVO extends PageParam {
 
     @Schema(description = "离职日期")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
-    private String[] dimissionDate;
+    private String[] turnoverDate;
 
     @Schema(description = "离职原因", example = "不喜欢")
-    private String dimissionReason;
+    private String turnoverReason;
 
     @Schema(description = "备注")
     private String remarks;

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/dimission/vo/OaDimissionRespVO.java

@@ -1,17 +1,15 @@
-package cn.iocoder.yudao.module.bpm.controller.admin.oa.dimission.vo;
+package cn.iocoder.yudao.module.bpm.controller.admin.oa.turnover.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
-import java.util.*;
-import java.util.*;
-import org.springframework.format.annotation.DateTimeFormat;
+
 import java.time.LocalDateTime;
 import com.alibaba.excel.annotation.*;
 
 @Schema(description = "管理后台 - 离职流程信息 Response VO")
 @Data
 @ExcelIgnoreUnannotated
-public class OaDimissionRespVO {
+public class OaTurnoverRespVO {
 
     @Schema(description = "离职表单主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "15606")
     @ExcelProperty("离职表单主键")
@@ -19,7 +17,7 @@ public class OaDimissionRespVO {
 
     @Schema(description = "uuid", example = "18425")
     @ExcelProperty("uuid")
-    private String dimissionId;
+    private String turnoverId;
 
     @Schema(description = "转正人id", example = "18376")
     @ExcelProperty("转正人id")
@@ -59,11 +57,11 @@ public class OaDimissionRespVO {
 
     @Schema(description = "离职日期")
     @ExcelProperty("离职日期")
-    private String dimissionDate;
+    private String turnoverDate;
 
     @Schema(description = "离职原因", example = "不喜欢")
     @ExcelProperty("离职原因")
-    private String dimissionReason;
+    private String turnoverReason;
 
     @Schema(description = "备注")
     @ExcelProperty("备注")

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/dimission/vo/OaDimissionSaveReqVO.java

@@ -1,22 +1,20 @@
-package cn.iocoder.yudao.module.bpm.controller.admin.oa.dimission.vo;
+package cn.iocoder.yudao.module.bpm.controller.admin.oa.turnover.vo;
 
 import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.task.BpmTaskApproveReqVO;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
 import java.util.*;
-import javax.validation.constraints.*;
-import org.springframework.format.annotation.DateTimeFormat;
 import java.time.LocalDateTime;
 
 @Schema(description = "管理后台 - 离职流程信息新增/修改 Request VO")
 @Data
-public class OaDimissionSaveReqVO {
+public class OaTurnoverSaveReqVO {
 
     @Schema(description = "离职表单主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "15606")
     private Long id;
 
     @Schema(description = "uuid", example = "18425")
-    private String dimissionId;
+    private String turnoverId;
 
     @Schema(description = "转正人id", example = "18376")
     private Long employeeId;
@@ -46,10 +44,10 @@ public class OaDimissionSaveReqVO {
     private String startDate;
 
     @Schema(description = "离职日期")
-    private String dimissionDate;
+    private String turnoverDate;
 
     @Schema(description = "离职原因", example = "不喜欢")
-    private String dimissionReason;
+    private String turnoverReason;
 
     @Schema(description = "备注")
     private String remarks;

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/oa/dimission/OaDimissionDO.java

@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.module.bpm.dal.dataobject.oa.dimission;
+package cn.iocoder.yudao.module.bpm.dal.dataobject.oa.turnover;
 
 import lombok.*;
 import java.util.*;
@@ -13,15 +13,15 @@ import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
  *
  * @author dp
  */
-@TableName("bpm_oa_dimission")
-@KeySequence("bpm_oa_dimission_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
+@TableName("bpm_oa_turnover")
+@KeySequence("bpm_oa_turnover_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
 @Data
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
-public class OaDimissionDO extends BaseDO {
+public class OaTurnoverDO extends BaseDO {
 
     /**
      * 离职表单主键
@@ -31,7 +31,7 @@ public class OaDimissionDO extends BaseDO {
     /**
      * uuid
      */
-    private String dimissionId;
+    private String turnoverId;
     /**
      * 转正人id
      */
@@ -71,11 +71,11 @@ public class OaDimissionDO extends BaseDO {
     /**
      * 离职日期
      */
-    private String dimissionDate;
+    private String turnoverDate;
     /**
      * 离职原因
      */
-    private String dimissionReason;
+    private String turnoverReason;
     /**
      * 备注
      */

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/mysql/oa/dimission/OaDimissionMapper.java

@@ -1,45 +0,0 @@
-package cn.iocoder.yudao.module.bpm.dal.mysql.oa.dimission;
-
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
-import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
-import cn.iocoder.yudao.module.bpm.controller.admin.oa.dimission.vo.OaDimissionPageReqVO;
-import cn.iocoder.yudao.module.bpm.dal.dataobject.oa.dimission.OaDimissionDO;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * 离职流程信息 Mapper
- *
- * @author dp
- */
-@Mapper
-public interface OaDimissionMapper extends BaseMapperX<OaDimissionDO> {
-
-    default PageResult<OaDimissionDO> selectPage(OaDimissionPageReqVO reqVO) {
-        return selectPage(reqVO, new LambdaQueryWrapperX<OaDimissionDO>()
-                .eqIfPresent(OaDimissionDO::getDimissionId, reqVO.getDimissionId())
-                .eqIfPresent(OaDimissionDO::getEmployeeId, reqVO.getEmployeeId())
-                .eqIfPresent(OaDimissionDO::getEmployeeUuid, reqVO.getEmployeeUuid())
-                .likeIfPresent(OaDimissionDO::getEmployeeName, reqVO.getEmployeeName())
-                .eqIfPresent(OaDimissionDO::getUserId, reqVO.getUserId())
-                .eqIfPresent(OaDimissionDO::getUserUuid, reqVO.getUserUuid())
-                .eqIfPresent(OaDimissionDO::getDeptId, reqVO.getDeptId())
-                .eqIfPresent(OaDimissionDO::getDeptUuid, reqVO.getDeptUuid())
-                .eqIfPresent(OaDimissionDO::getPosition, reqVO.getPosition())
-                .betweenIfPresent(OaDimissionDO::getStartDate, reqVO.getStartDate())
-                .betweenIfPresent(OaDimissionDO::getDimissionDate, reqVO.getDimissionDate())
-                .eqIfPresent(OaDimissionDO::getDimissionReason, reqVO.getDimissionReason())
-                .eqIfPresent(OaDimissionDO::getRemarks, reqVO.getRemarks())
-                .eqIfPresent(OaDimissionDO::getProcInstId, reqVO.getProcInstId())
-                .eqIfPresent(OaDimissionDO::getAuditStatus, reqVO.getAuditStatus())
-                .eqIfPresent(OaDimissionDO::getCurrentAuditUserId, reqVO.getCurrentAuditUserId())
-                .eqIfPresent(OaDimissionDO::getCurrentAuditUserUuid, reqVO.getCurrentAuditUserUuid())
-                .eqIfPresent(OaDimissionDO::getCurrentAuditEmployeeId, reqVO.getCurrentAuditEmployeeId())
-                .eqIfPresent(OaDimissionDO::getCurrentAuditEmployeeUuid, reqVO.getCurrentAuditEmployeeUuid())
-                .betweenIfPresent(OaDimissionDO::getFinalAuditDate, reqVO.getFinalAuditDate())
-                .eqIfPresent(OaDimissionDO::getInfoSource, reqVO.getInfoSource())
-                .betweenIfPresent(OaDimissionDO::getCreateTime, reqVO.getCreateTime())
-                .orderByDesc(OaDimissionDO::getId));
-    }
-
-}

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/mysql/oa/turnover/OaTurnOverMapper.java

@@ -0,0 +1,45 @@
+package cn.iocoder.yudao.module.bpm.dal.mysql.oa.turnover;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
+import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import cn.iocoder.yudao.module.bpm.controller.admin.oa.turnover.vo.OaTurnoverPageReqVO;
+import cn.iocoder.yudao.module.bpm.dal.dataobject.oa.turnover.OaTurnoverDO;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 离职流程信息 Mapper
+ *
+ * @author dp
+ */
+@Mapper
+public interface OaTurnOverMapper extends BaseMapperX<OaTurnoverDO> {
+
+    default PageResult<OaTurnoverDO> selectPage(OaTurnoverPageReqVO reqVO) {
+        return selectPage(reqVO, new LambdaQueryWrapperX<OaTurnoverDO>()
+                .eqIfPresent(OaTurnoverDO::getTurnoverId, reqVO.getTurnoverId())
+                .eqIfPresent(OaTurnoverDO::getEmployeeId, reqVO.getEmployeeId())
+                .eqIfPresent(OaTurnoverDO::getEmployeeUuid, reqVO.getEmployeeUuid())
+                .likeIfPresent(OaTurnoverDO::getEmployeeName, reqVO.getEmployeeName())
+                .eqIfPresent(OaTurnoverDO::getUserId, reqVO.getUserId())
+                .eqIfPresent(OaTurnoverDO::getUserUuid, reqVO.getUserUuid())
+                .eqIfPresent(OaTurnoverDO::getDeptId, reqVO.getDeptId())
+                .eqIfPresent(OaTurnoverDO::getDeptUuid, reqVO.getDeptUuid())
+                .eqIfPresent(OaTurnoverDO::getPosition, reqVO.getPosition())
+                .betweenIfPresent(OaTurnoverDO::getStartDate, reqVO.getStartDate())
+                .betweenIfPresent(OaTurnoverDO::getTurnoverDate, reqVO.getTurnoverDate())
+                .eqIfPresent(OaTurnoverDO::getTurnoverReason, reqVO.getTurnoverReason())
+                .eqIfPresent(OaTurnoverDO::getRemarks, reqVO.getRemarks())
+                .eqIfPresent(OaTurnoverDO::getProcInstId, reqVO.getProcInstId())
+                .eqIfPresent(OaTurnoverDO::getAuditStatus, reqVO.getAuditStatus())
+                .eqIfPresent(OaTurnoverDO::getCurrentAuditUserId, reqVO.getCurrentAuditUserId())
+                .eqIfPresent(OaTurnoverDO::getCurrentAuditUserUuid, reqVO.getCurrentAuditUserUuid())
+                .eqIfPresent(OaTurnoverDO::getCurrentAuditEmployeeId, reqVO.getCurrentAuditEmployeeId())
+                .eqIfPresent(OaTurnoverDO::getCurrentAuditEmployeeUuid, reqVO.getCurrentAuditEmployeeUuid())
+                .betweenIfPresent(OaTurnoverDO::getFinalAuditDate, reqVO.getFinalAuditDate())
+                .eqIfPresent(OaTurnoverDO::getInfoSource, reqVO.getInfoSource())
+                .betweenIfPresent(OaTurnoverDO::getCreateTime, reqVO.getCreateTime())
+                .orderByDesc(OaTurnoverDO::getId));
+    }
+
+}

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/dimission/OaDimissionService.java

@@ -1,66 +0,0 @@
-package cn.iocoder.yudao.module.bpm.service.oa.dimission;
-
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.module.bpm.controller.admin.oa.dimission.vo.OaDimissionPageReqVO;
-import cn.iocoder.yudao.module.bpm.controller.admin.oa.dimission.vo.OaDimissionSaveReqVO;
-import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.task.BpmTaskApproveReqVO;
-import cn.iocoder.yudao.module.bpm.dal.dataobject.oa.dimission.OaDimissionDO;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-import javax.validation.Valid;
-
-/**
- * 离职流程信息 Service 接口
- *
- * @author dp
- */
-public interface OaDimissionService extends IService<OaDimissionDO> {
-
-    Long startOaDimission(Long userId, @Valid OaDimissionSaveReqVO createReqVO);
-
-    Long completeTrueOaDimission(Long userId, BpmTaskApproveReqVO reqVO);
-
-    Long completeFalseOaDimission(Long userId, BpmTaskApproveReqVO reqVO);
-
-    Long updateCompleteOaDimission(Long userId, @Valid OaDimissionSaveReqVO createReqVO, @Valid BpmTaskApproveReqVO reqVO);
-    
-
-    /**
-     * 创建离职流程信息
-     *
-     * @param createReqVO 创建信息
-     * @return 编号
-     */
-    Long createOaDimission(@Valid OaDimissionSaveReqVO createReqVO);
-
-    /**
-     * 更新离职流程信息
-     *
-     * @param updateReqVO 更新信息
-     */
-    void updateOaDimission(@Valid OaDimissionSaveReqVO updateReqVO);
-
-    /**
-     * 删除离职流程信息
-     *
-     * @param id 编号
-     */
-    void deleteOaDimission(Long id);
-
-    /**
-     * 获得离职流程信息
-     *
-     * @param id 编号
-     * @return 离职流程信息
-     */
-    OaDimissionDO getOaDimission(Long id);
-
-    /**
-     * 获得离职流程信息分页
-     *
-     * @param pageReqVO 分页查询
-     * @return 离职流程信息分页
-     */
-    PageResult<OaDimissionDO> getOaDimissionPage(OaDimissionPageReqVO pageReqVO);
-
-}

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/turnover/OaTurnoverService.java

@@ -0,0 +1,66 @@
+package cn.iocoder.yudao.module.bpm.service.oa.turnover;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.module.bpm.controller.admin.oa.turnover.vo.OaTurnoverPageReqVO;
+import cn.iocoder.yudao.module.bpm.controller.admin.oa.turnover.vo.OaTurnoverSaveReqVO;
+import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.task.BpmTaskApproveReqVO;
+import cn.iocoder.yudao.module.bpm.dal.dataobject.oa.turnover.OaTurnoverDO;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import javax.validation.Valid;
+
+/**
+ * 离职流程信息 Service 接口
+ *
+ * @author dp
+ */
+public interface OaTurnoverService extends IService<OaTurnoverDO> {
+
+    Long startOaTurnover(Long userId, @Valid OaTurnoverSaveReqVO createReqVO);
+
+    Long completeTrueOaTurnover(Long userId, BpmTaskApproveReqVO reqVO);
+
+    Long completeFalseOaTurnover(Long userId, BpmTaskApproveReqVO reqVO);
+
+    Long updateCompleteOaTurnover(Long userId, @Valid OaTurnoverSaveReqVO createReqVO, @Valid BpmTaskApproveReqVO reqVO);
+    
+
+    /**
+     * 创建离职流程信息
+     *
+     * @param createReqVO 创建信息
+     * @return 编号
+     */
+    Long createOaTurnover(@Valid OaTurnoverSaveReqVO createReqVO);
+
+    /**
+     * 更新离职流程信息
+     *
+     * @param updateReqVO 更新信息
+     */
+    void updateOaTurnover(@Valid OaTurnoverSaveReqVO updateReqVO);
+
+    /**
+     * 删除离职流程信息
+     *
+     * @param id 编号
+     */
+    void deleteOaTurnover(Long id);
+
+    /**
+     * 获得离职流程信息
+     *
+     * @param id 编号
+     * @return 离职流程信息
+     */
+    OaTurnoverDO getOaTurnover(Long id);
+
+    /**
+     * 获得离职流程信息分页
+     *
+     * @param pageReqVO 分页查询
+     * @return 离职流程信息分页
+     */
+    PageResult<OaTurnoverDO> getOaTurnoverPage(OaTurnoverPageReqVO pageReqVO);
+
+}

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/dimission/OaDimissionServiceImpl.java

@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.module.bpm.service.oa.dimission;
+package cn.iocoder.yudao.module.bpm.service.oa.turnover;
 
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.IdUtil;
@@ -6,12 +6,12 @@ import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
 import cn.iocoder.yudao.module.bpm.api.task.BpmProcessInstanceApi;
 import cn.iocoder.yudao.module.bpm.api.task.dto.BpmProcessInstanceCreateReqDTO;
-import cn.iocoder.yudao.module.bpm.controller.admin.oa.dimission.vo.OaDimissionPageReqVO;
-import cn.iocoder.yudao.module.bpm.controller.admin.oa.dimission.vo.OaDimissionSaveReqVO;
+import cn.iocoder.yudao.module.bpm.controller.admin.oa.turnover.vo.OaTurnoverPageReqVO;
+import cn.iocoder.yudao.module.bpm.controller.admin.oa.turnover.vo.OaTurnoverSaveReqVO;
 import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.task.BpmTaskApproveReqVO;
 import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.task.BpmTaskReturnReqVO;
-import cn.iocoder.yudao.module.bpm.dal.dataobject.oa.dimission.OaDimissionDO;
-import cn.iocoder.yudao.module.bpm.dal.mysql.oa.dimission.OaDimissionMapper;
+import cn.iocoder.yudao.module.bpm.dal.dataobject.oa.turnover.OaTurnoverDO;
+import cn.iocoder.yudao.module.bpm.dal.mysql.oa.turnover.OaTurnOverMapper;
 import cn.iocoder.yudao.module.bpm.service.task.BpmTaskService;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -39,17 +39,17 @@ import static cn.iocoder.yudao.module.bpm.enums.ErrorCodeConstants.OA_DIMISSION_
  */
 @Service
 @Validated
-public class OaDimissionServiceImpl extends ServiceImpl<OaDimissionMapper, OaDimissionDO> implements OaDimissionService {
+public class OaTurnoverServiceImpl extends ServiceImpl<OaTurnOverMapper, OaTurnoverDO> implements OaTurnoverService {
 
 
     /**
      * OA 离职对应的流程定义 KEY
      */
-    public static final String PROCESS_KEY = "oa_dimission";
+    public static final String PROCESS_KEY = "oa_turnover";
 
 
     @Resource
-    private OaDimissionMapper oaDimissionMapper;
+    private OaTurnOverMapper oaTurnOverMapper;
 
     @Resource
     private BpmProcessInstanceApi processInstanceApi;
@@ -62,17 +62,17 @@ public class OaDimissionServiceImpl extends ServiceImpl<OaDimissionMapper, OaDim
 
     @Override
     @Transactional
-    public Long startOaDimission(Long userId, OaDimissionSaveReqVO createReqVO) {
+    public Long startOaTurnover(Long userId, OaTurnoverSaveReqVO createReqVO) {
         //判断是否已经发起流程
         Boolean auditPass = createReqVO.getAuditPass();
         // 创建单据uuid
         String uuid = IdUtil.fastSimpleUUID();
-        OaDimissionDO oaDimission = BeanUtils.toBean(createReqVO, OaDimissionDO.class);
-        if (StringUtils.isBlank(oaDimission.getDimissionId())) {
-            oaDimission.setDimissionId(uuid);
+        OaTurnoverDO oaTurnover = BeanUtils.toBean(createReqVO, OaTurnoverDO.class);
+        if (StringUtils.isBlank(oaTurnover.getTurnoverId())) {
+            oaTurnover.setTurnoverId(uuid);
         }
         // 保存或更新表单信息
-        this.saveOrUpdate(oaDimission);
+        this.saveOrUpdate(oaTurnover);
 
         // 提交
         if (auditPass) {
@@ -87,18 +87,18 @@ public class OaDimissionServiceImpl extends ServiceImpl<OaDimissionMapper, OaDim
                             new BpmProcessInstanceCreateReqDTO()
                                     .setProcessDefinitionKey(PROCESS_KEY)
                                     .setVariables(processInstanceVariables)
-                                    .setBusinessKey(String.valueOf(oaDimission.getId()))
+                                    .setBusinessKey(String.valueOf(oaTurnover.getId()))
                                     .setStartUserSelectAssignees(startUserSelectAssignees));
 
             //获取下一个审批人
             Task task = taskService.createTaskQuery().processInstanceId(processInstanceId).singleResult();
 
             // 将工作流的编号，单据状态 最后一次审批时间 当前审批人  更新到 OA 转正中
-            oaDimissionMapper.updateById(new OaDimissionDO()
-                    .setId(oaDimission.getId())
+            oaTurnOverMapper.updateById(new OaTurnoverDO()
+                    .setId(oaTurnover.getId())
                     .setProcInstId(processInstanceId)
                     .setAuditStatus("1")
-                    .setDimissionId(uuid)
+                    .setTurnoverId(uuid)
                     .setFinalAuditDate(LocalDateTime.now())
                     .setCurrentAuditEmployeeId(Long.valueOf(task.getAssignee())));
 
@@ -107,8 +107,8 @@ public class OaDimissionServiceImpl extends ServiceImpl<OaDimissionMapper, OaDim
         }else {
             // 暂存，不发起流程
             // 将单据状态 更新到 OA转正中
-            oaDimissionMapper.updateById(new OaDimissionDO()
-                    .setId(oaDimission.getId())
+            oaTurnOverMapper.updateById(new OaTurnoverDO()
+                    .setId(oaTurnover.getId())
                     .setAuditStatus("0"));
         }
 
@@ -117,29 +117,29 @@ public class OaDimissionServiceImpl extends ServiceImpl<OaDimissionMapper, OaDim
         }
 
         // 返回
-        return oaDimission.getId();
+        return oaTurnover.getId();
     }
     @Override
-    public Long completeTrueOaDimission(Long userId, BpmTaskApproveReqVO reqVO) {
+    public Long completeTrueOaTurnover(Long userId, BpmTaskApproveReqVO reqVO) {
         Task currentTask = bpmTaskService.getTask(reqVO.getId());
         // 审批同意
         bpmTaskService.approveTask(userId, reqVO);
 
         Task nextTask = taskService.createTaskQuery().processInstanceId(currentTask.getProcessInstanceId()).singleResult();
         if (nextTask != null) {
-            LambdaUpdateWrapper<OaDimissionDO> updateWrapper = new LambdaUpdateWrapper<>();
-            updateWrapper.set(OaDimissionDO::getAuditStatus, "2")
-                    .set(OaDimissionDO::getCurrentAuditEmployeeId, nextTask.getAssignee())
-                    .set(OaDimissionDO::getFinalAuditDate, new Date())
-                    .eq(OaDimissionDO::getProcInstId, currentTask.getProcessInstanceId());
-            oaDimissionMapper.update(updateWrapper);
+            LambdaUpdateWrapper<OaTurnoverDO> updateWrapper = new LambdaUpdateWrapper<>();
+            updateWrapper.set(OaTurnoverDO::getAuditStatus, "2")
+                    .set(OaTurnoverDO::getCurrentAuditEmployeeId, nextTask.getAssignee())
+                    .set(OaTurnoverDO::getFinalAuditDate, new Date())
+                    .eq(OaTurnoverDO::getProcInstId, currentTask.getProcessInstanceId());
+            oaTurnOverMapper.update(updateWrapper);
         } else {
-            LambdaUpdateWrapper<OaDimissionDO> updateWrapper = new LambdaUpdateWrapper<>();
-            updateWrapper.set(OaDimissionDO::getAuditStatus, "3")
-                    .set(OaDimissionDO::getCurrentAuditEmployeeId, null)
-                    .set(OaDimissionDO::getFinalAuditDate, new Date())
-                    .eq(OaDimissionDO::getProcInstId, currentTask.getProcessInstanceId());
-            oaDimissionMapper.update(updateWrapper);
+            LambdaUpdateWrapper<OaTurnoverDO> updateWrapper = new LambdaUpdateWrapper<>();
+            updateWrapper.set(OaTurnoverDO::getAuditStatus, "3")
+                    .set(OaTurnoverDO::getCurrentAuditEmployeeId, null)
+                    .set(OaTurnoverDO::getFinalAuditDate, new Date())
+                    .eq(OaTurnoverDO::getProcInstId, currentTask.getProcessInstanceId());
+            oaTurnOverMapper.update(updateWrapper);
 
             // TODO 复制业务单据信息到业务模块单据表
 
@@ -151,7 +151,7 @@ public class OaDimissionServiceImpl extends ServiceImpl<OaDimissionMapper, OaDim
     }
 
     @Override
-    public Long completeFalseOaDimission(Long userId, BpmTaskApproveReqVO reqVO) {
+    public Long completeFalseOaTurnover(Long userId, BpmTaskApproveReqVO reqVO) {
 
         Task currentTask = bpmTaskService.getTask(reqVO.getId());
 
@@ -162,12 +162,12 @@ public class OaDimissionServiceImpl extends ServiceImpl<OaDimissionMapper, OaDim
         Task nextTask = taskService.createTaskQuery().processInstanceId(currentTask.getProcessInstanceId()).singleResult();
 
         // 更新单据状态，当前处理人，最后处理时间
-        LambdaUpdateWrapper<OaDimissionDO> updateWrapper = new LambdaUpdateWrapper<>();
-        updateWrapper.set(OaDimissionDO::getCurrentAuditEmployeeId, nextTask.getAssignee())
-                .set(OaDimissionDO::getFinalAuditDate, new Date())
-                .set(OaDimissionDO::getAuditStatus, "0")
-                .eq(OaDimissionDO::getProcInstId, currentTask.getProcessInstanceId());
-        oaDimissionMapper.update(updateWrapper);
+        LambdaUpdateWrapper<OaTurnoverDO> updateWrapper = new LambdaUpdateWrapper<>();
+        updateWrapper.set(OaTurnoverDO::getCurrentAuditEmployeeId, nextTask.getAssignee())
+                .set(OaTurnoverDO::getFinalAuditDate, new Date())
+                .set(OaTurnoverDO::getAuditStatus, "0")
+                .eq(OaTurnoverDO::getProcInstId, currentTask.getProcessInstanceId());
+        oaTurnOverMapper.update(updateWrapper);
 
         // 发送通知
 
@@ -176,13 +176,13 @@ public class OaDimissionServiceImpl extends ServiceImpl<OaDimissionMapper, OaDim
     }
 
     @Override
-    public Long updateCompleteOaDimission(Long userId, OaDimissionSaveReqVO createReqVO, BpmTaskApproveReqVO reqVO) {
+    public Long updateCompleteOaTurnover(Long userId, OaTurnoverSaveReqVO createReqVO, BpmTaskApproveReqVO reqVO) {
         // 判断是否已经发起流程
         Boolean auditPass = createReqVO.getAuditPass();
 
-        OaDimissionDO oaDimission = BeanUtils.toBean(createReqVO, OaDimissionDO.class);
+        OaTurnoverDO oaTurnover = BeanUtils.toBean(createReqVO, OaTurnoverDO.class);
 
-        Task currentTask = taskService.createTaskQuery().processInstanceId(oaDimission.getProcInstId()).singleResult();
+        Task currentTask = taskService.createTaskQuery().processInstanceId(oaTurnover.getProcInstId()).singleResult();
 
         //审批通过
         bpmTaskService.approveTask(userId, reqVO);
@@ -191,64 +191,64 @@ public class OaDimissionServiceImpl extends ServiceImpl<OaDimissionMapper, OaDim
         if (auditPass) {
             Task nextTask = taskService.createTaskQuery().processInstanceId(currentTask.getProcessInstanceId()).singleResult();
 
-            oaDimission.setAuditStatus("1");
-            oaDimission.setCurrentAuditEmployeeId(Long.valueOf(nextTask.getAssignee()));
-            oaDimission.setFinalAuditDate(LocalDateTime.now());
-            oaDimissionMapper.updateById(oaDimission);
+            oaTurnover.setAuditStatus("1");
+            oaTurnover.setCurrentAuditEmployeeId(Long.valueOf(nextTask.getAssignee()));
+            oaTurnover.setFinalAuditDate(LocalDateTime.now());
+            oaTurnOverMapper.updateById(oaTurnover);
 
         } else {
-            OaDimissionDO oaDimissionClose = new OaDimissionDO();
-            oaDimissionClose.setId(oaDimission.getId());
-            oaDimissionClose.setAuditStatus("4");
-            oaDimissionClose.setCurrentAuditEmployeeId(null);
-            oaDimissionClose.setFinalAuditDate(LocalDateTime.now());
-            oaDimissionMapper.updateById(oaDimissionClose);
+            OaTurnoverDO oaTurnoverClose = new OaTurnoverDO();
+            oaTurnoverClose.setId(oaTurnover.getId());
+            oaTurnoverClose.setAuditStatus("4");
+            oaTurnoverClose.setCurrentAuditEmployeeId(null);
+            oaTurnoverClose.setFinalAuditDate(LocalDateTime.now());
+            oaTurnOverMapper.updateById(oaTurnoverClose);
         }
 
-        return oaDimission.getId();
+        return oaTurnover.getId();
     }
 
 
     @Override
-    public Long createOaDimission(OaDimissionSaveReqVO createReqVO) {
+    public Long createOaTurnover(OaTurnoverSaveReqVO createReqVO) {
         // 插入
-        OaDimissionDO oaDimission = BeanUtils.toBean(createReqVO, OaDimissionDO.class);
-        oaDimissionMapper.insert(oaDimission);
+        OaTurnoverDO oaTurnover = BeanUtils.toBean(createReqVO, OaTurnoverDO.class);
+        oaTurnOverMapper.insert(oaTurnover);
         // 返回
-        return oaDimission.getId();
+        return oaTurnover.getId();
     }
 
     @Override
-    public void updateOaDimission(OaDimissionSaveReqVO updateReqVO) {
+    public void updateOaTurnover(OaTurnoverSaveReqVO updateReqVO) {
         // 校验存在
-        validateOaDimissionExists(updateReqVO.getId());
+        validateOaTurnoverExists(updateReqVO.getId());
         // 更新
-        OaDimissionDO updateObj = BeanUtils.toBean(updateReqVO, OaDimissionDO.class);
-        oaDimissionMapper.updateById(updateObj);
+        OaTurnoverDO updateObj = BeanUtils.toBean(updateReqVO, OaTurnoverDO.class);
+        oaTurnOverMapper.updateById(updateObj);
     }
 
     @Override
-    public void deleteOaDimission(Long id) {
+    public void deleteOaTurnover(Long id) {
         // 校验存在
-        validateOaDimissionExists(id);
+        validateOaTurnoverExists(id);
         // 删除
-        oaDimissionMapper.deleteById(id);
+        oaTurnOverMapper.deleteById(id);
     }
 
-    private void validateOaDimissionExists(Long id) {
-        if (oaDimissionMapper.selectById(id) == null) {
+    private void validateOaTurnoverExists(Long id) {
+        if (oaTurnOverMapper.selectById(id) == null) {
             throw exception(OA_DIMISSION_NOT_EXISTS);
         }
     }
 
     @Override
-    public OaDimissionDO getOaDimission(Long id) {
-        return oaDimissionMapper.selectById(id);
+    public OaTurnoverDO getOaTurnover(Long id) {
+        return oaTurnOverMapper.selectById(id);
     }
 
     @Override
-    public PageResult<OaDimissionDO> getOaDimissionPage(OaDimissionPageReqVO pageReqVO) {
-        return oaDimissionMapper.selectPage(pageReqVO);
+    public PageResult<OaTurnoverDO> getOaTurnoverPage(OaTurnoverPageReqVO pageReqVO) {
+        return oaTurnOverMapper.selectPage(pageReqVO);
     }
 
 }

yudao-module-bpm/yudao-module-bpm-biz/src/test/java/cn/iocoder/yudao/module/bpm/service/oa/dimission/OaDimissionServiceImplTest.java

@@ -1,209 +0,0 @@
-package cn.iocoder.yudao.module.bpm.service.oa.dimission;
-
-import cn.iocoder.yudao.module.bpm.controller.admin.oa.dimission.vo.OaDimissionPageReqVO;
-import cn.iocoder.yudao.module.bpm.controller.admin.oa.dimission.vo.OaDimissionSaveReqVO;
-import cn.iocoder.yudao.module.bpm.service.oa.dimission.OaDimissionServiceImpl;
-import org.junit.jupiter.api.Disabled;
-import org.junit.jupiter.api.Test;
-
-import javax.annotation.Resource;
-
-import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest;
-
-import cn.iocoder.yudao.module.bpm.dal.dataobject.oa.dimission.OaDimissionDO;
-import cn.iocoder.yudao.module.bpm.dal.mysql.oa.dimission.OaDimissionMapper;
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
-
-import org.springframework.context.annotation.Import;
-
-import static cn.iocoder.yudao.module.bpm.enums.ErrorCodeConstants.*;
-import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.*;
-import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.*;
-import static cn.iocoder.yudao.framework.common.util.date.LocalDateTimeUtils.*;
-import static cn.iocoder.yudao.framework.common.util.object.ObjectUtils.*;
-import static org.junit.jupiter.api.Assertions.*;
-
-/**
- * {@link OaDimissionServiceImpl} 的单元测试类
- *
- * @author dp
- */
-@Import(OaDimissionServiceImpl.class)
-public class OaDimissionServiceImplTest extends BaseDbUnitTest {
-
-    @Resource
-    private OaDimissionServiceImpl oaDimissionService;
-
-    @Resource
-    private OaDimissionMapper oaDimissionMapper;
-
-    @Test
-    public void testCreateOaDimission_success() {
-        // 准备参数
-        OaDimissionSaveReqVO createReqVO = randomPojo(OaDimissionSaveReqVO.class).setId(null);
-
-        // 调用
-        Long oaDimissionId = oaDimissionService.createOaDimission(createReqVO);
-        // 断言
-        assertNotNull(oaDimissionId);
-        // 校验记录的属性是否正确
-        OaDimissionDO oaDimission = oaDimissionMapper.selectById(oaDimissionId);
-        assertPojoEquals(createReqVO, oaDimission, "id");
-    }
-
-    @Test
-    public void testUpdateOaDimission_success() {
-        // mock 数据
-        OaDimissionDO dbOaDimission = randomPojo(OaDimissionDO.class);
-        oaDimissionMapper.insert(dbOaDimission);// @Sql: 先插入出一条存在的数据
-        // 准备参数
-        OaDimissionSaveReqVO updateReqVO = randomPojo(OaDimissionSaveReqVO.class, o -> {
-            o.setId(dbOaDimission.getId()); // 设置更新的 ID
-        });
-
-        // 调用
-        oaDimissionService.updateOaDimission(updateReqVO);
-        // 校验是否更新正确
-        OaDimissionDO oaDimission = oaDimissionMapper.selectById(updateReqVO.getId()); // 获取最新的
-        assertPojoEquals(updateReqVO, oaDimission);
-    }
-
-    @Test
-    public void testUpdateOaDimission_notExists() {
-        // 准备参数
-        OaDimissionSaveReqVO updateReqVO = randomPojo(OaDimissionSaveReqVO.class);
-
-        // 调用, 并断言异常
-        assertServiceException(() -> oaDimissionService.updateOaDimission(updateReqVO), OA_DIMISSION_NOT_EXISTS);
-    }
-
-    @Test
-    public void testDeleteOaDimission_success() {
-        // mock 数据
-        OaDimissionDO dbOaDimission = randomPojo(OaDimissionDO.class);
-        oaDimissionMapper.insert(dbOaDimission);// @Sql: 先插入出一条存在的数据
-        // 准备参数
-        Long id = dbOaDimission.getId();
-
-        // 调用
-        oaDimissionService.deleteOaDimission(id);
-       // 校验数据不存在了
-       assertNull(oaDimissionMapper.selectById(id));
-    }
-
-    @Test
-    public void testDeleteOaDimission_notExists() {
-        // 准备参数
-        Long id = randomLongId();
-
-        // 调用, 并断言异常
-        assertServiceException(() -> oaDimissionService.deleteOaDimission(id), OA_DIMISSION_NOT_EXISTS);
-    }
-
-    @Test
-    @Disabled  // TODO 请修改 null 为需要的值，然后删除 @Disabled 注解
-    public void testGetOaDimissionPage() {
-       // mock 数据
-       OaDimissionDO dbOaDimission = randomPojo(OaDimissionDO.class, o -> { // 等会查询到
-           o.setDimissionId(null);
-           o.setEmployeeId(null);
-           o.setEmployeeUuid(null);
-           o.setEmployeeName(null);
-           o.setUserId(null);
-           o.setUserUuid(null);
-           o.setDeptId(null);
-           o.setDeptUuid(null);
-           o.setPosition(null);
-           o.setStartDate(null);
-           o.setDimissionDate(null);
-           o.setDimissionReason(null);
-           o.setRemarks(null);
-           o.setProcInstId(null);
-           o.setAuditStatus(null);
-           o.setCurrentAuditUserId(null);
-           o.setCurrentAuditUserUuid(null);
-           o.setCurrentAuditEmployeeId(null);
-           o.setCurrentAuditEmployeeUuid(null);
-           o.setFinalAuditDate(null);
-           o.setInfoSource(null);
-           o.setCreateTime(null);
-       });
-       oaDimissionMapper.insert(dbOaDimission);
-       // 测试 dimissionId 不匹配
-       oaDimissionMapper.insert(cloneIgnoreId(dbOaDimission, o -> o.setDimissionId(null)));
-       // 测试 employeeId 不匹配
-       oaDimissionMapper.insert(cloneIgnoreId(dbOaDimission, o -> o.setEmployeeId(null)));
-       // 测试 employeeUuid 不匹配
-       oaDimissionMapper.insert(cloneIgnoreId(dbOaDimission, o -> o.setEmployeeUuid(null)));
-       // 测试 employeeName 不匹配
-       oaDimissionMapper.insert(cloneIgnoreId(dbOaDimission, o -> o.setEmployeeName(null)));
-       // 测试 userId 不匹配
-       oaDimissionMapper.insert(cloneIgnoreId(dbOaDimission, o -> o.setUserId(null)));
-       // 测试 userUuid 不匹配
-       oaDimissionMapper.insert(cloneIgnoreId(dbOaDimission, o -> o.setUserUuid(null)));
-       // 测试 deptId 不匹配
-       oaDimissionMapper.insert(cloneIgnoreId(dbOaDimission, o -> o.setDeptId(null)));
-       // 测试 deptUuid 不匹配
-       oaDimissionMapper.insert(cloneIgnoreId(dbOaDimission, o -> o.setDeptUuid(null)));
-       // 测试 position 不匹配
-       oaDimissionMapper.insert(cloneIgnoreId(dbOaDimission, o -> o.setPosition(null)));
-       // 测试 startDate 不匹配
-       oaDimissionMapper.insert(cloneIgnoreId(dbOaDimission, o -> o.setStartDate(null)));
-       // 测试 dimissionDate 不匹配
-       oaDimissionMapper.insert(cloneIgnoreId(dbOaDimission, o -> o.setDimissionDate(null)));
-       // 测试 dimissionReason 不匹配
-       oaDimissionMapper.insert(cloneIgnoreId(dbOaDimission, o -> o.setDimissionReason(null)));
-       // 测试 remarks 不匹配
-       oaDimissionMapper.insert(cloneIgnoreId(dbOaDimission, o -> o.setRemarks(null)));
-       // 测试 procInstId 不匹配
-       oaDimissionMapper.insert(cloneIgnoreId(dbOaDimission, o -> o.setProcInstId(null)));
-       // 测试 auditStatus 不匹配
-       oaDimissionMapper.insert(cloneIgnoreId(dbOaDimission, o -> o.setAuditStatus(null)));
-       // 测试 currentAuditUserId 不匹配
-       oaDimissionMapper.insert(cloneIgnoreId(dbOaDimission, o -> o.setCurrentAuditUserId(null)));
-       // 测试 currentAuditUserUuid 不匹配
-       oaDimissionMapper.insert(cloneIgnoreId(dbOaDimission, o -> o.setCurrentAuditUserUuid(null)));
-       // 测试 currentAuditEmployeeId 不匹配
-       oaDimissionMapper.insert(cloneIgnoreId(dbOaDimission, o -> o.setCurrentAuditEmployeeId(null)));
-       // 测试 currentAuditEmployeeUuid 不匹配
-       oaDimissionMapper.insert(cloneIgnoreId(dbOaDimission, o -> o.setCurrentAuditEmployeeUuid(null)));
-       // 测试 finalAuditDate 不匹配
-       oaDimissionMapper.insert(cloneIgnoreId(dbOaDimission, o -> o.setFinalAuditDate(null)));
-       // 测试 infoSource 不匹配
-       oaDimissionMapper.insert(cloneIgnoreId(dbOaDimission, o -> o.setInfoSource(null)));
-       // 测试 createTime 不匹配
-       oaDimissionMapper.insert(cloneIgnoreId(dbOaDimission, o -> o.setCreateTime(null)));
-       // 准备参数
-       OaDimissionPageReqVO reqVO = new OaDimissionPageReqVO();
-       reqVO.setDimissionId(null);
-       reqVO.setEmployeeId(null);
-       reqVO.setEmployeeUuid(null);
-       reqVO.setEmployeeName(null);
-       reqVO.setUserId(null);
-       reqVO.setUserUuid(null);
-       reqVO.setDeptId(null);
-       reqVO.setDeptUuid(null);
-       reqVO.setPosition(null);
-       reqVO.setStartDate(null);
-       reqVO.setDimissionDate(null);
-       reqVO.setDimissionReason(null);
-       reqVO.setRemarks(null);
-       reqVO.setProcInstId(null);
-       reqVO.setAuditStatus(null);
-       reqVO.setCurrentAuditUserId(null);
-       reqVO.setCurrentAuditUserUuid(null);
-       reqVO.setCurrentAuditEmployeeId(null);
-       reqVO.setCurrentAuditEmployeeUuid(null);
-       reqVO.setFinalAuditDate(buildBetweenTime(2023, 2, 1, 2023, 2, 28));
-       reqVO.setInfoSource(null);
-       reqVO.setCreateTime(buildBetweenTime(2023, 2, 1, 2023, 2, 28));
-
-       // 调用
-       PageResult<OaDimissionDO> pageResult = oaDimissionService.getOaDimissionPage(reqVO);
-       // 断言
-       assertEquals(1, pageResult.getTotal());
-       assertEquals(1, pageResult.getList().size());
-       assertPojoEquals(dbOaDimission, pageResult.getList().get(0));
-    }
-
-}

yudao-module-bpm/yudao-module-bpm-biz/src/test/java/cn/iocoder/yudao/module/bpm/service/oa/turnover/OaTurnoverServiceImplTest.java

@@ -0,0 +1,208 @@
+// package cn.iocoder.yudao.module.bpm.service.oa.turnover;
+//
+// import cn.iocoder.yudao.module.bpm.controller.admin.oa.turnover.vo.OaTurnoverPageReqVO;
+// import cn.iocoder.yudao.module.bpm.controller.admin.oa.turnover.vo.OaTurnoverSaveReqVO;
+// import org.junit.jupiter.api.Disabled;
+// import org.junit.jupiter.api.Test;
+//
+// import javax.annotation.Resource;
+//
+// import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest;
+//
+// import cn.iocoder.yudao.module.bpm.dal.dataobject.oa.turnover.OaTurnoverDO;
+// import cn.iocoder.yudao.module.bpm.dal.mysql.oa.turnover.OaTurnOverMapper;
+// import cn.iocoder.yudao.framework.common.pojo.PageResult;
+//
+// import org.springframework.context.annotation.Import;
+//
+// import static cn.iocoder.yudao.module.bpm.enums.ErrorCodeConstants.*;
+// import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.*;
+// import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.*;
+// import static cn.iocoder.yudao.framework.common.util.date.LocalDateTimeUtils.*;
+// import static cn.iocoder.yudao.framework.common.util.object.ObjectUtils.*;
+// import static org.junit.jupiter.api.Assertions.*;
+//
+// /**
+//  * {@link OaTurnoverServiceImpl} 的单元测试类
+//  *
+//  * @author dp
+//  */
+// @Import(OaTurnoverServiceImpl.class)
+// public class OaTurnoverServiceImplTest extends BaseDbUnitTest {
+//
+//     @Resource
+//     private OaTurnoverServiceImpl oaTurnoverService;
+//
+//     @Resource
+//     private OaTurnOverMapper oaTurnOverMapper;
+//
+//     @Test
+//     public void testCreateOaTurnover_success() {
+//         // 准备参数
+//         OaTurnoverSaveReqVO createReqVO = randomPojo(OaTurnoverSaveReqVO.class).setId(null);
+//
+//         // 调用
+//         Long oaTurnoverId = oaTurnoverService.createOaTurnover(createReqVO);
+//         // 断言
+//         assertNotNull(oaTurnoverId);
+//         // 校验记录的属性是否正确
+//         OaTurnoverDO oaTurnover = oaTurnOverMapper.selectById(oaTurnoverId);
+//         assertPojoEquals(createReqVO, oaTurnover, "id");
+//     }
+//
+//     @Test
+//     public void testUpdateOaTurnover_success() {
+//         // mock 数据
+//         OaTurnoverDO dbOaTurnover = randomPojo(OaTurnoverDO.class);
+//         oaTurnOverMapper.insert(dbOaTurnover);// @Sql: 先插入出一条存在的数据
+//         // 准备参数
+//         OaTurnoverSaveReqVO updateReqVO = randomPojo(OaTurnoverSaveReqVO.class, o -> {
+//             o.setId(dbOaTurnover.getId()); // 设置更新的 ID
+//         });
+//
+//         // 调用
+//         oaTurnoverService.updateOaTurnover(updateReqVO);
+//         // 校验是否更新正确
+//         OaTurnoverDO oaTurnover = oaTurnOverMapper.selectById(updateReqVO.getId()); // 获取最新的
+//         assertPojoEquals(updateReqVO, oaTurnover);
+//     }
+//
+//     @Test
+//     public void testUpdateOaTurnover_notExists() {
+//         // 准备参数
+//         OaTurnoverSaveReqVO updateReqVO = randomPojo(OaTurnoverSaveReqVO.class);
+//
+//         // 调用, 并断言异常
+//         assertServiceException(() -> oaTurnoverService.updateOaTurnover(updateReqVO), OA_DIMISSION_NOT_EXISTS);
+//     }
+//
+//     @Test
+//     public void testDeleteOaTurnover_success() {
+//         // mock 数据
+//         OaTurnoverDO dbOaTurnover = randomPojo(OaTurnoverDO.class);
+//         oaTurnOverMapper.insert(dbOaTurnover);// @Sql: 先插入出一条存在的数据
+//         // 准备参数
+//         Long id = dbOaTurnover.getId();
+//
+//         // 调用
+//         oaTurnoverService.deleteOaTurnover(id);
+//        // 校验数据不存在了
+//        assertNull(oaTurnOverMapper.selectById(id));
+//     }
+//
+//     @Test
+//     public void testDeleteOaTurnover_notExists() {
+//         // 准备参数
+//         Long id = randomLongId();
+//
+//         // 调用, 并断言异常
+//         assertServiceException(() -> oaTurnoverService.deleteOaTurnover(id), OA_DIMISSION_NOT_EXISTS);
+//     }
+//
+//     @Test
+//     @Disabled  // TODO 请修改 null 为需要的值，然后删除 @Disabled 注解
+//     public void testGetOaTurnoverPage() {
+//        // mock 数据
+//        OaTurnoverDO dbOaTurnover = randomPojo(OaTurnoverDO.class, o -> { // 等会查询到
+//            o.setTurnoverId(null);
+//            o.setEmployeeId(null);
+//            o.setEmployeeUuid(null);
+//            o.setEmployeeName(null);
+//            o.setUserId(null);
+//            o.setUserUuid(null);
+//            o.setDeptId(null);
+//            o.setDeptUuid(null);
+//            o.setPosition(null);
+//            o.setStartDate(null);
+//            o.setTurnoverDate(null);
+//            o.setTurnoverReason(null);
+//            o.setRemarks(null);
+//            o.setProcInstId(null);
+//            o.setAuditStatus(null);
+//            o.setCurrentAuditUserId(null);
+//            o.setCurrentAuditUserUuid(null);
+//            o.setCurrentAuditEmployeeId(null);
+//            o.setCurrentAuditEmployeeUuid(null);
+//            o.setFinalAuditDate(null);
+//            o.setInfoSource(null);
+//            o.setCreateTime(null);
+//        });
+//        oaTurnOverMapper.insert(dbOaTurnover);
+//        // 测试 dimissionId 不匹配
+//        oaTurnOverMapper.insert(cloneIgnoreId(dbOaTurnover, o -> o.setTurnoverId(null)));
+//        // 测试 employeeId 不匹配
+//        oaTurnOverMapper.insert(cloneIgnoreId(dbOaTurnover, o -> o.setEmployeeId(null)));
+//        // 测试 employeeUuid 不匹配
+//        oaTurnOverMapper.insert(cloneIgnoreId(dbOaTurnover, o -> o.setEmployeeUuid(null)));
+//        // 测试 employeeName 不匹配
+//        oaTurnOverMapper.insert(cloneIgnoreId(dbOaTurnover, o -> o.setEmployeeName(null)));
+//        // 测试 userId 不匹配
+//        oaTurnOverMapper.insert(cloneIgnoreId(dbOaTurnover, o -> o.setUserId(null)));
+//        // 测试 userUuid 不匹配
+//        oaTurnOverMapper.insert(cloneIgnoreId(dbOaTurnover, o -> o.setUserUuid(null)));
+//        // 测试 deptId 不匹配
+//        oaTurnOverMapper.insert(cloneIgnoreId(dbOaTurnover, o -> o.setDeptId(null)));
+//        // 测试 deptUuid 不匹配
+//        oaTurnOverMapper.insert(cloneIgnoreId(dbOaTurnover, o -> o.setDeptUuid(null)));
+//        // 测试 position 不匹配
+//        oaTurnOverMapper.insert(cloneIgnoreId(dbOaTurnover, o -> o.setPosition(null)));
+//        // 测试 startDate 不匹配
+//        oaTurnOverMapper.insert(cloneIgnoreId(dbOaTurnover, o -> o.setStartDate(null)));
+//        // 测试 dimissionDate 不匹配
+//        oaTurnOverMapper.insert(cloneIgnoreId(dbOaTurnover, o -> o.setTurnoverDate(null)));
+//        // 测试 dimissionReason 不匹配
+//        oaTurnOverMapper.insert(cloneIgnoreId(dbOaTurnover, o -> o.setTurnoverReason(null)));
+//        // 测试 remarks 不匹配
+//        oaTurnOverMapper.insert(cloneIgnoreId(dbOaTurnover, o -> o.setRemarks(null)));
+//        // 测试 procInstId 不匹配
+//        oaTurnOverMapper.insert(cloneIgnoreId(dbOaTurnover, o -> o.setProcInstId(null)));
+//        // 测试 auditStatus 不匹配
+//        oaTurnOverMapper.insert(cloneIgnoreId(dbOaTurnover, o -> o.setAuditStatus(null)));
+//        // 测试 currentAuditUserId 不匹配
+//        oaTurnOverMapper.insert(cloneIgnoreId(dbOaTurnover, o -> o.setCurrentAuditUserId(null)));
+//        // 测试 currentAuditUserUuid 不匹配
+//        oaTurnOverMapper.insert(cloneIgnoreId(dbOaTurnover, o -> o.setCurrentAuditUserUuid(null)));
+//        // 测试 currentAuditEmployeeId 不匹配
+//        oaTurnOverMapper.insert(cloneIgnoreId(dbOaTurnover, o -> o.setCurrentAuditEmployeeId(null)));
+//        // 测试 currentAuditEmployeeUuid 不匹配
+//        oaTurnOverMapper.insert(cloneIgnoreId(dbOaTurnover, o -> o.setCurrentAuditEmployeeUuid(null)));
+//        // 测试 finalAuditDate 不匹配
+//        oaTurnOverMapper.insert(cloneIgnoreId(dbOaTurnover, o -> o.setFinalAuditDate(null)));
+//        // 测试 infoSource 不匹配
+//        oaTurnOverMapper.insert(cloneIgnoreId(dbOaTurnover, o -> o.setInfoSource(null)));
+//        // 测试 createTime 不匹配
+//        oaTurnOverMapper.insert(cloneIgnoreId(dbOaTurnover, o -> o.setCreateTime(null)));
+//        // 准备参数
+//        OaTurnoverPageReqVO reqVO = new OaTurnoverPageReqVO();
+//        reqVO.setTurnoverId(null);
+//        reqVO.setEmployeeId(null);
+//        reqVO.setEmployeeUuid(null);
+//        reqVO.setEmployeeName(null);
+//        reqVO.setUserId(null);
+//        reqVO.setUserUuid(null);
+//        reqVO.setDeptId(null);
+//        reqVO.setDeptUuid(null);
+//        reqVO.setPosition(null);
+//        reqVO.setStartDate(null);
+//        reqVO.setTurnoverDate(null);
+//        reqVO.setTurnoverReason(null);
+//        reqVO.setRemarks(null);
+//        reqVO.setProcInstId(null);
+//        reqVO.setAuditStatus(null);
+//        reqVO.setCurrentAuditUserId(null);
+//        reqVO.setCurrentAuditUserUuid(null);
+//        reqVO.setCurrentAuditEmployeeId(null);
+//        reqVO.setCurrentAuditEmployeeUuid(null);
+//        reqVO.setFinalAuditDate(buildBetweenTime(2023, 2, 1, 2023, 2, 28));
+//        reqVO.setInfoSource(null);
+//        reqVO.setCreateTime(buildBetweenTime(2023, 2, 1, 2023, 2, 28));
+//
+//        // 调用
+//        PageResult<OaTurnoverDO> pageResult = oaTurnoverService.getOaTurnoverPage(reqVO);
+//        // 断言
+//        assertEquals(1, pageResult.getTotal());
+//        assertEquals(1, pageResult.getList().size());
+//        assertPojoEquals(dbOaTurnover, pageResult.getList().get(0));
+//     }
+//
+// }

yudao-server/src/main/java/cn/iocoder/yudao/server/controller/DefaultController.java

@@ -18,7 +18,7 @@ public class DefaultController {
     @RequestMapping("/admin-api/bpm/**")
     public CommonResult<Boolean> bpm404() {
         return CommonResult.error(NOT_IMPLEMENTED.getCode(),
-                "[工作流模块 yudao-module-bpm - 已禁用][参考 https://doc.iocoder.cn/bpm/ 开启]");
+                "[路径不存在或工作流模块 yudao-module-bpm - 已禁用][参考 https://doc.iocoder.cn/bpm/ 开启]");
     }
 
     @RequestMapping("/admin-api/mp/**")