Explorar el Código

转正流程信息代码生成

dongpo hace 7 meses
padre
commit
1441a94b8a
Se han modificado 13 ficheros con 960 adiciones y 0 borrados
  1. 3 0
      yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/ErrorCodeConstants.java
  2. 96 0
      yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/conversion/OaConversionController.java
  3. 95 0
      yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/conversion/vo/OaConversionPageReqVO.java
  4. 116 0
      yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/conversion/vo/OaConversionRespVO.java
  5. 86 0
      yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/conversion/vo/OaConversionSaveReqVO.java
  6. 124 0
      yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/oa/conversion/OaConversionDO.java
  7. 47 0
      yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/mysql/oa/conversion/OaConversionMapper.java
  8. 55 0
      yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/conversion/OaConversionService.java
  9. 72 0
      yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/conversion/OaConversionServiceImpl.java
  10. 12 0
      yudao-module-bpm/yudao-module-bpm-biz/src/main/resources/mapper/oa/conversion/OaConversionMapper.xml
  11. 217 0
      yudao-module-bpm/yudao-module-bpm-biz/src/test/java/cn/iocoder/yudao/module/bpm/service/oa/conversion/OaConversionServiceImplTest.java
  12. 2 0
      yudao-module-bpm/yudao-module-bpm-biz/src/test/resources/sql/clean.sql
  13. 35 0
      yudao-module-bpm/yudao-module-bpm-biz/src/test/resources/sql/create_tables.sql

+ 3 - 0
yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/ErrorCodeConstants.java

@@ -90,4 +90,7 @@ public interface ErrorCodeConstants {
 
     // ========== 请假流程信息 1-009-017-000 ==========
     ErrorCode OA_LEAVE_NOT_EXISTS = new ErrorCode(1009017000, "请假流程信息不存在");
+
+    // ========== 转正流程信息 1-009_017_002 ==========
+    ErrorCode OA_CONVERSION_NOT_EXISTS = new ErrorCode(1009017002, "转正流程信息不存在");
 }

+ 96 - 0
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/conversion/OaConversionController.java

@@ -0,0 +1,96 @@
+package cn.iocoder.yudao.module.bpm.controller.admin.oa.conversion;
+
+import cn.iocoder.yudao.module.bpm.controller.admin.oa.conversion.vo.OaConversionPageReqVO;
+import cn.iocoder.yudao.module.bpm.controller.admin.oa.conversion.vo.OaConversionRespVO;
+import cn.iocoder.yudao.module.bpm.controller.admin.oa.conversion.vo.OaConversionSaveReqVO;
+import org.springframework.web.bind.annotation.*;
+import javax.annotation.Resource;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.security.access.prepost.PreAuthorize;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.Operation;
+
+import javax.validation.*;
+import javax.servlet.http.*;
+import java.util.*;
+import java.io.IOException;
+
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+
+import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
+
+import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
+import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.*;
+
+import cn.iocoder.yudao.module.bpm.dal.dataobject.oa.conversion.OaConversionDO;
+import cn.iocoder.yudao.module.bpm.service.oa.conversion.OaConversionService;
+
+@Tag(name = "管理后台 - 转正流程信息")
+@RestController
+@RequestMapping("/bpm/oa-conversion")
+@Validated
+public class OaConversionController {
+
+    @Resource
+    private OaConversionService oaConversionService;
+
+    @PostMapping("/create")
+    @Operation(summary = "创建转正流程信息")
+    @PreAuthorize("@ss.hasPermission('bpm:oa-conversion:create')")
+    public CommonResult<Long> createOaConversion(@Valid @RequestBody OaConversionSaveReqVO createReqVO) {
+        return success(oaConversionService.createOaConversion(createReqVO));
+    }
+
+    @PutMapping("/update")
+    @Operation(summary = "更新转正流程信息")
+    @PreAuthorize("@ss.hasPermission('bpm:oa-conversion:update')")
+    public CommonResult<Boolean> updateOaConversion(@Valid @RequestBody OaConversionSaveReqVO updateReqVO) {
+        oaConversionService.updateOaConversion(updateReqVO);
+        return success(true);
+    }
+
+    @DeleteMapping("/delete")
+    @Operation(summary = "删除转正流程信息")
+    @Parameter(name = "id", description = "编号", required = true)
+    @PreAuthorize("@ss.hasPermission('bpm:oa-conversion:delete')")
+    public CommonResult<Boolean> deleteOaConversion(@RequestParam("id") Long id) {
+        oaConversionService.deleteOaConversion(id);
+        return success(true);
+    }
+
+    @GetMapping("/get")
+    @Operation(summary = "获得转正流程信息")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    @PreAuthorize("@ss.hasPermission('bpm:oa-conversion:query')")
+    public CommonResult<OaConversionRespVO> getOaConversion(@RequestParam("id") Long id) {
+        OaConversionDO oaConversion = oaConversionService.getOaConversion(id);
+        return success(BeanUtils.toBean(oaConversion, OaConversionRespVO.class));
+    }
+
+    @GetMapping("/page")
+    @Operation(summary = "获得转正流程信息分页")
+    @PreAuthorize("@ss.hasPermission('bpm:oa-conversion:query')")
+    public CommonResult<PageResult<OaConversionRespVO>> getOaConversionPage(@Valid OaConversionPageReqVO pageReqVO) {
+        PageResult<OaConversionDO> pageResult = oaConversionService.getOaConversionPage(pageReqVO);
+        return success(BeanUtils.toBean(pageResult, OaConversionRespVO.class));
+    }
+
+    @GetMapping("/export-excel")
+    @Operation(summary = "导出转正流程信息 Excel")
+    @PreAuthorize("@ss.hasPermission('bpm:oa-conversion:export')")
+    @ApiAccessLog(operateType = EXPORT)
+    public void exportOaConversionExcel(@Valid OaConversionPageReqVO pageReqVO,
+              HttpServletResponse response) throws IOException {
+        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
+        List<OaConversionDO> list = oaConversionService.getOaConversionPage(pageReqVO).getList();
+        // 导出 Excel
+        ExcelUtils.write(response, "转正流程信息.xls", "数据", OaConversionRespVO.class,
+                        BeanUtils.toBean(list, OaConversionRespVO.class));
+    }
+
+}

+ 95 - 0
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/conversion/vo/OaConversionPageReqVO.java

@@ -0,0 +1,95 @@
+package cn.iocoder.yudao.module.bpm.controller.admin.oa.conversion.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;
+import java.time.LocalDateTime;
+
+import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+@Schema(description = "管理后台 - 转正流程信息分页 Request VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class OaConversionPageReqVO extends PageParam {
+
+    @Schema(description = "uuid", example = "8575")
+    private String officialId;
+
+    @Schema(description = "转正人id", example = "8274")
+    private Long employeeId;
+
+    @Schema(description = "转正人uuid", example = "12691")
+    private String employeeUuid;
+
+    @Schema(description = "转正员工姓名", example = "李四")
+    private String employeeName;
+
+    @Schema(description = "用户账号id", example = "23689")
+    private Long userId;
+
+    @Schema(description = "用户账号uuid", example = "14280")
+    private String userUuid;
+
+    @Schema(description = "部门id", example = "14341")
+    private Long deptId;
+
+    @Schema(description = "部门uuid", example = "3755")
+    private String deptUuid;
+
+    @Schema(description = "职位")
+    private String position;
+
+    @Schema(description = "入职日期")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private String[] entryDate;
+
+    @Schema(description = "试用期结束日期")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private String[] probationEndDate;
+
+    @Schema(description = "转正日期")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private String[] conversionDate;
+
+    @Schema(description = "转正申请理由", example = "不香")
+    private String conversionReason;
+
+    @Schema(description = "工作总结")
+    private String workSummary;
+
+    @Schema(description = "备注")
+    private String remarks;
+
+    @Schema(description = "流程实例id", example = "10952")
+    private String procInstId;
+
+    @Schema(description = "审核状态(0暂存、1已提交、2审核中、3已审核、4已关闭、5已驳回)", example = "2")
+    private String auditStatus;
+
+    @Schema(description = "当前审核人用户id", example = "13372")
+    private Long currentAuditUserId;
+
+    @Schema(description = "当前审核人用户uuid", example = "15583")
+    private String currentAuditUserUuid;
+
+    @Schema(description = "当前审核人员工id", example = "20635")
+    private Long currentAuditEmployeeId;
+
+    @Schema(description = "当前审核人员工uuid", example = "32658")
+    private String currentAuditEmployeeUuid;
+
+    @Schema(description = "最后审核时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] finalAuditDate;
+
+    @Schema(description = "数据来源,0流程添加、1手动添加")
+    private String infoSource;
+
+    @Schema(description = "创建时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] createTime;
+
+}

+ 116 - 0
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/conversion/vo/OaConversionRespVO.java

@@ -0,0 +1,116 @@
+package cn.iocoder.yudao.module.bpm.controller.admin.oa.conversion.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 OaConversionRespVO {
+
+    @Schema(description = "转正表单主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "27266")
+    @ExcelProperty("转正表单主键")
+    private Long id;
+
+    @Schema(description = "uuid", example = "8575")
+    @ExcelProperty("uuid")
+    private String officialId;
+
+    @Schema(description = "转正人id", example = "8274")
+    @ExcelProperty("转正人id")
+    private Long employeeId;
+
+    @Schema(description = "转正人uuid", example = "12691")
+    @ExcelProperty("转正人uuid")
+    private String employeeUuid;
+
+    @Schema(description = "转正员工姓名", example = "李四")
+    @ExcelProperty("转正员工姓名")
+    private String employeeName;
+
+    @Schema(description = "用户账号id", example = "23689")
+    @ExcelProperty("用户账号id")
+    private Long userId;
+
+    @Schema(description = "用户账号uuid", example = "14280")
+    @ExcelProperty("用户账号uuid")
+    private String userUuid;
+
+    @Schema(description = "部门id", example = "14341")
+    @ExcelProperty("部门id")
+    private Long deptId;
+
+    @Schema(description = "部门uuid", example = "3755")
+    @ExcelProperty("部门uuid")
+    private String deptUuid;
+
+    @Schema(description = "职位")
+    @ExcelProperty("职位")
+    private String position;
+
+    @Schema(description = "入职日期")
+    @ExcelProperty("入职日期")
+    private String entryDate;
+
+    @Schema(description = "试用期结束日期")
+    @ExcelProperty("试用期结束日期")
+    private String probationEndDate;
+
+    @Schema(description = "转正日期")
+    @ExcelProperty("转正日期")
+    private String conversionDate;
+
+    @Schema(description = "转正申请理由", example = "不香")
+    @ExcelProperty("转正申请理由")
+    private String conversionReason;
+
+    @Schema(description = "工作总结")
+    @ExcelProperty("工作总结")
+    private String workSummary;
+
+    @Schema(description = "备注")
+    @ExcelProperty("备注")
+    private String remarks;
+
+    @Schema(description = "流程实例id", example = "10952")
+    @ExcelProperty("流程实例id")
+    private String procInstId;
+
+    @Schema(description = "审核状态(0暂存、1已提交、2审核中、3已审核、4已关闭、5已驳回)", example = "2")
+    @ExcelProperty("审核状态(0暂存、1已提交、2审核中、3已审核、4已关闭、5已驳回)")
+    private String auditStatus;
+
+    @Schema(description = "当前审核人用户id", example = "13372")
+    @ExcelProperty("当前审核人用户id")
+    private Long currentAuditUserId;
+
+    @Schema(description = "当前审核人用户uuid", example = "15583")
+    @ExcelProperty("当前审核人用户uuid")
+    private String currentAuditUserUuid;
+
+    @Schema(description = "当前审核人员工id", example = "20635")
+    @ExcelProperty("当前审核人员工id")
+    private Long currentAuditEmployeeId;
+
+    @Schema(description = "当前审核人员工uuid", example = "32658")
+    @ExcelProperty("当前审核人员工uuid")
+    private String currentAuditEmployeeUuid;
+
+    @Schema(description = "最后审核时间")
+    @ExcelProperty("最后审核时间")
+    private LocalDateTime finalAuditDate;
+
+    @Schema(description = "数据来源,0流程添加、1手动添加")
+    @ExcelProperty("数据来源,0流程添加、1手动添加")
+    private String infoSource;
+
+    @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("创建时间")
+    private LocalDateTime createTime;
+
+}

+ 86 - 0
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/conversion/vo/OaConversionSaveReqVO.java

@@ -0,0 +1,86 @@
+package cn.iocoder.yudao.module.bpm.controller.admin.oa.conversion.vo;
+
+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 OaConversionSaveReqVO {
+
+    @Schema(description = "转正表单主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "27266")
+    private Long id;
+
+    @Schema(description = "uuid", example = "8575")
+    private String officialId;
+
+    @Schema(description = "转正人id", example = "8274")
+    private Long employeeId;
+
+    @Schema(description = "转正人uuid", example = "12691")
+    private String employeeUuid;
+
+    @Schema(description = "转正员工姓名", example = "李四")
+    private String employeeName;
+
+    @Schema(description = "用户账号id", example = "23689")
+    private Long userId;
+
+    @Schema(description = "用户账号uuid", example = "14280")
+    private String userUuid;
+
+    @Schema(description = "部门id", example = "14341")
+    private Long deptId;
+
+    @Schema(description = "部门uuid", example = "3755")
+    private String deptUuid;
+
+    @Schema(description = "职位")
+    private String position;
+
+    @Schema(description = "入职日期")
+    private String entryDate;
+
+    @Schema(description = "试用期结束日期")
+    private String probationEndDate;
+
+    @Schema(description = "转正日期")
+    private String conversionDate;
+
+    @Schema(description = "转正申请理由", example = "不香")
+    private String conversionReason;
+
+    @Schema(description = "工作总结")
+    private String workSummary;
+
+    @Schema(description = "备注")
+    private String remarks;
+
+    @Schema(description = "流程实例id", example = "10952")
+    private String procInstId;
+
+    @Schema(description = "审核状态(0暂存、1已提交、2审核中、3已审核、4已关闭、5已驳回)", example = "2")
+    private String auditStatus;
+
+    @Schema(description = "当前审核人用户id", example = "13372")
+    private Long currentAuditUserId;
+
+    @Schema(description = "当前审核人用户uuid", example = "15583")
+    private String currentAuditUserUuid;
+
+    @Schema(description = "当前审核人员工id", example = "20635")
+    private Long currentAuditEmployeeId;
+
+    @Schema(description = "当前审核人员工uuid", example = "32658")
+    private String currentAuditEmployeeUuid;
+
+    @Schema(description = "最后审核时间")
+    private LocalDateTime finalAuditDate;
+
+    @Schema(description = "数据来源,0流程添加、1手动添加")
+    private String infoSource;
+
+}

+ 124 - 0
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/oa/conversion/OaConversionDO.java

@@ -0,0 +1,124 @@
+package cn.iocoder.yudao.module.bpm.dal.dataobject.oa.conversion;
+
+import lombok.*;
+import java.util.*;
+import java.time.LocalDateTime;
+import java.time.LocalDateTime;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.*;
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+
+/**
+ * 转正流程信息 DO
+ *
+ * @author 芋道源码
+ */
+@TableName("bpm_oa_conversion")
+@KeySequence("bpm_oa_conversion_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库,可不写。
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class OaConversionDO extends BaseDO {
+
+    /**
+     * 转正表单主键
+     */
+    @TableId
+    private Long id;
+    /**
+     * uuid
+     */
+    private String officialId;
+    /**
+     * 转正人id
+     */
+    private Long employeeId;
+    /**
+     * 转正人uuid
+     */
+    private String employeeUuid;
+    /**
+     * 转正员工姓名
+     */
+    private String employeeName;
+    /**
+     * 用户账号id
+     */
+    private Long userId;
+    /**
+     * 用户账号uuid
+     */
+    private String userUuid;
+    /**
+     * 部门id
+     */
+    private Long deptId;
+    /**
+     * 部门uuid
+     */
+    private String deptUuid;
+    /**
+     * 职位
+     */
+    private String position;
+    /**
+     * 入职日期
+     */
+    private String entryDate;
+    /**
+     * 试用期结束日期
+     */
+    private String probationEndDate;
+    /**
+     * 转正日期
+     */
+    private String conversionDate;
+    /**
+     * 转正申请理由
+     */
+    private String conversionReason;
+    /**
+     * 工作总结
+     */
+    private String workSummary;
+    /**
+     * 备注
+     */
+    private String remarks;
+    /**
+     * 流程实例id
+     */
+    private String procInstId;
+    /**
+     * 审核状态(0暂存、1已提交、2审核中、3已审核、4已关闭、5已驳回)
+     */
+    private String auditStatus;
+    /**
+     * 当前审核人用户id
+     */
+    private Long currentAuditUserId;
+    /**
+     * 当前审核人用户uuid
+     */
+    private String currentAuditUserUuid;
+    /**
+     * 当前审核人员工id
+     */
+    private Long currentAuditEmployeeId;
+    /**
+     * 当前审核人员工uuid
+     */
+    private String currentAuditEmployeeUuid;
+    /**
+     * 最后审核时间
+     */
+    private LocalDateTime finalAuditDate;
+    /**
+     * 数据来源,0流程添加、1手动添加
+     */
+    private String infoSource;
+
+}

+ 47 - 0
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/mysql/oa/conversion/OaConversionMapper.java

@@ -0,0 +1,47 @@
+package cn.iocoder.yudao.module.bpm.dal.mysql.oa.conversion;
+
+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.conversion.vo.OaConversionPageReqVO;
+import cn.iocoder.yudao.module.bpm.dal.dataobject.oa.conversion.OaConversionDO;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 转正流程信息 Mapper
+ *
+ * @author 芋道源码
+ */
+@Mapper
+public interface OaConversionMapper extends BaseMapperX<OaConversionDO> {
+
+    default PageResult<OaConversionDO> selectPage(OaConversionPageReqVO reqVO) {
+        return selectPage(reqVO, new LambdaQueryWrapperX<OaConversionDO>()
+                .eqIfPresent(OaConversionDO::getOfficialId, reqVO.getOfficialId())
+                .eqIfPresent(OaConversionDO::getEmployeeId, reqVO.getEmployeeId())
+                .eqIfPresent(OaConversionDO::getEmployeeUuid, reqVO.getEmployeeUuid())
+                .likeIfPresent(OaConversionDO::getEmployeeName, reqVO.getEmployeeName())
+                .eqIfPresent(OaConversionDO::getUserId, reqVO.getUserId())
+                .eqIfPresent(OaConversionDO::getUserUuid, reqVO.getUserUuid())
+                .eqIfPresent(OaConversionDO::getDeptId, reqVO.getDeptId())
+                .eqIfPresent(OaConversionDO::getDeptUuid, reqVO.getDeptUuid())
+                .eqIfPresent(OaConversionDO::getPosition, reqVO.getPosition())
+                .betweenIfPresent(OaConversionDO::getEntryDate, reqVO.getEntryDate())
+                .betweenIfPresent(OaConversionDO::getProbationEndDate, reqVO.getProbationEndDate())
+                .betweenIfPresent(OaConversionDO::getConversionDate, reqVO.getConversionDate())
+                .eqIfPresent(OaConversionDO::getConversionReason, reqVO.getConversionReason())
+                .eqIfPresent(OaConversionDO::getWorkSummary, reqVO.getWorkSummary())
+                .eqIfPresent(OaConversionDO::getRemarks, reqVO.getRemarks())
+                .eqIfPresent(OaConversionDO::getProcInstId, reqVO.getProcInstId())
+                .eqIfPresent(OaConversionDO::getAuditStatus, reqVO.getAuditStatus())
+                .eqIfPresent(OaConversionDO::getCurrentAuditUserId, reqVO.getCurrentAuditUserId())
+                .eqIfPresent(OaConversionDO::getCurrentAuditUserUuid, reqVO.getCurrentAuditUserUuid())
+                .eqIfPresent(OaConversionDO::getCurrentAuditEmployeeId, reqVO.getCurrentAuditEmployeeId())
+                .eqIfPresent(OaConversionDO::getCurrentAuditEmployeeUuid, reqVO.getCurrentAuditEmployeeUuid())
+                .betweenIfPresent(OaConversionDO::getFinalAuditDate, reqVO.getFinalAuditDate())
+                .eqIfPresent(OaConversionDO::getInfoSource, reqVO.getInfoSource())
+                .betweenIfPresent(OaConversionDO::getCreateTime, reqVO.getCreateTime())
+                .orderByDesc(OaConversionDO::getId));
+    }
+
+}

+ 55 - 0
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/conversion/OaConversionService.java

@@ -0,0 +1,55 @@
+package cn.iocoder.yudao.module.bpm.service.oa.conversion;
+
+import javax.validation.*;
+
+import cn.iocoder.yudao.module.bpm.controller.admin.oa.conversion.vo.OaConversionPageReqVO;
+import cn.iocoder.yudao.module.bpm.controller.admin.oa.conversion.vo.OaConversionSaveReqVO;
+import cn.iocoder.yudao.module.bpm.dal.dataobject.oa.conversion.OaConversionDO;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+
+/**
+ * 转正流程信息 Service 接口
+ *
+ * @author 芋道源码
+ */
+public interface OaConversionService {
+
+    /**
+     * 创建转正流程信息
+     *
+     * @param createReqVO 创建信息
+     * @return 编号
+     */
+    Long createOaConversion(@Valid OaConversionSaveReqVO createReqVO);
+
+    /**
+     * 更新转正流程信息
+     *
+     * @param updateReqVO 更新信息
+     */
+    void updateOaConversion(@Valid OaConversionSaveReqVO updateReqVO);
+
+    /**
+     * 删除转正流程信息
+     *
+     * @param id 编号
+     */
+    void deleteOaConversion(Long id);
+
+    /**
+     * 获得转正流程信息
+     *
+     * @param id 编号
+     * @return 转正流程信息
+     */
+    OaConversionDO getOaConversion(Long id);
+
+    /**
+     * 获得转正流程信息分页
+     *
+     * @param pageReqVO 分页查询
+     * @return 转正流程信息分页
+     */
+    PageResult<OaConversionDO> getOaConversionPage(OaConversionPageReqVO pageReqVO);
+
+}

+ 72 - 0
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/conversion/OaConversionServiceImpl.java

@@ -0,0 +1,72 @@
+package cn.iocoder.yudao.module.bpm.service.oa.conversion;
+
+import cn.iocoder.yudao.module.bpm.controller.admin.oa.conversion.vo.OaConversionPageReqVO;
+import cn.iocoder.yudao.module.bpm.controller.admin.oa.conversion.vo.OaConversionSaveReqVO;
+import org.springframework.stereotype.Service;
+import javax.annotation.Resource;
+import org.springframework.validation.annotation.Validated;
+
+import cn.iocoder.yudao.module.bpm.dal.dataobject.oa.conversion.OaConversionDO;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+
+import cn.iocoder.yudao.module.bpm.dal.mysql.oa.conversion.OaConversionMapper;
+
+import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.iocoder.yudao.module.bpm.enums.ErrorCodeConstants.*;
+
+/**
+ * 转正流程信息 Service 实现类
+ *
+ * @author 芋道源码
+ */
+@Service
+@Validated
+public class OaConversionServiceImpl implements OaConversionService {
+
+    @Resource
+    private OaConversionMapper oaConversionMapper;
+
+    @Override
+    public Long createOaConversion(OaConversionSaveReqVO createReqVO) {
+        // 插入
+        OaConversionDO oaConversion = BeanUtils.toBean(createReqVO, OaConversionDO.class);
+        oaConversionMapper.insert(oaConversion);
+        // 返回
+        return oaConversion.getId();
+    }
+
+    @Override
+    public void updateOaConversion(OaConversionSaveReqVO updateReqVO) {
+        // 校验存在
+        validateOaConversionExists(updateReqVO.getId());
+        // 更新
+        OaConversionDO updateObj = BeanUtils.toBean(updateReqVO, OaConversionDO.class);
+        oaConversionMapper.updateById(updateObj);
+    }
+
+    @Override
+    public void deleteOaConversion(Long id) {
+        // 校验存在
+        validateOaConversionExists(id);
+        // 删除
+        oaConversionMapper.deleteById(id);
+    }
+
+    private void validateOaConversionExists(Long id) {
+        if (oaConversionMapper.selectById(id) == null) {
+            throw exception(OA_CONVERSION_NOT_EXISTS);
+        }
+    }
+
+    @Override
+    public OaConversionDO getOaConversion(Long id) {
+        return oaConversionMapper.selectById(id);
+    }
+
+    @Override
+    public PageResult<OaConversionDO> getOaConversionPage(OaConversionPageReqVO pageReqVO) {
+        return oaConversionMapper.selectPage(pageReqVO);
+    }
+
+}

+ 12 - 0
yudao-module-bpm/yudao-module-bpm-biz/src/main/resources/mapper/oa/conversion/OaConversionMapper.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.iocoder.yudao.module.bpm.dal.mysql.oa.conversion.OaConversionMapper">
+
+    <!--
+        一般情况下,尽可能使用 Mapper 进行 CRUD 增删改查即可。
+        无法满足的场景,例如说多表关联查询,才使用 XML 编写 SQL。
+        代码生成器暂时只生成 Mapper XML 文件本身,更多推荐 MybatisX 快速开发插件来生成查询。
+        文档可见:https://www.iocoder.cn/MyBatis/x-plugins/
+     -->
+
+</mapper>

+ 217 - 0
yudao-module-bpm/yudao-module-bpm-biz/src/test/java/cn/iocoder/yudao/module/bpm/service/oa/conversion/OaConversionServiceImplTest.java

@@ -0,0 +1,217 @@
+package cn.iocoder.yudao.module.bpm.service.oa.conversion;
+
+import cn.iocoder.yudao.module.bpm.controller.admin.oa.conversion.vo.OaConversionPageReqVO;
+import cn.iocoder.yudao.module.bpm.controller.admin.oa.conversion.vo.OaConversionSaveReqVO;
+import cn.iocoder.yudao.module.bpm.service.oa.conversion.OaConversionServiceImpl;
+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.conversion.OaConversionDO;
+import cn.iocoder.yudao.module.bpm.dal.mysql.oa.conversion.OaConversionMapper;
+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 OaConversionServiceImpl} 的单元测试类
+ *
+ * @author 芋道源码
+ */
+@Import(OaConversionServiceImpl.class)
+public class OaConversionServiceImplTest extends BaseDbUnitTest {
+
+    @Resource
+    private OaConversionServiceImpl oaConversionService;
+
+    @Resource
+    private OaConversionMapper oaConversionMapper;
+
+    @Test
+    public void testCreateOaConversion_success() {
+        // 准备参数
+        OaConversionSaveReqVO createReqVO = randomPojo(OaConversionSaveReqVO.class).setId(null);
+
+        // 调用
+        Long oaConversionId = oaConversionService.createOaConversion(createReqVO);
+        // 断言
+        assertNotNull(oaConversionId);
+        // 校验记录的属性是否正确
+        OaConversionDO oaConversion = oaConversionMapper.selectById(oaConversionId);
+        assertPojoEquals(createReqVO, oaConversion, "id");
+    }
+
+    @Test
+    public void testUpdateOaConversion_success() {
+        // mock 数据
+        OaConversionDO dbOaConversion = randomPojo(OaConversionDO.class);
+        oaConversionMapper.insert(dbOaConversion);// @Sql: 先插入出一条存在的数据
+        // 准备参数
+        OaConversionSaveReqVO updateReqVO = randomPojo(OaConversionSaveReqVO.class, o -> {
+            o.setId(dbOaConversion.getId()); // 设置更新的 ID
+        });
+
+        // 调用
+        oaConversionService.updateOaConversion(updateReqVO);
+        // 校验是否更新正确
+        OaConversionDO oaConversion = oaConversionMapper.selectById(updateReqVO.getId()); // 获取最新的
+        assertPojoEquals(updateReqVO, oaConversion);
+    }
+
+    @Test
+    public void testUpdateOaConversion_notExists() {
+        // 准备参数
+        OaConversionSaveReqVO updateReqVO = randomPojo(OaConversionSaveReqVO.class);
+
+        // 调用, 并断言异常
+        assertServiceException(() -> oaConversionService.updateOaConversion(updateReqVO), OA_CONVERSION_NOT_EXISTS);
+    }
+
+    @Test
+    public void testDeleteOaConversion_success() {
+        // mock 数据
+        OaConversionDO dbOaConversion = randomPojo(OaConversionDO.class);
+        oaConversionMapper.insert(dbOaConversion);// @Sql: 先插入出一条存在的数据
+        // 准备参数
+        Long id = dbOaConversion.getId();
+
+        // 调用
+        oaConversionService.deleteOaConversion(id);
+       // 校验数据不存在了
+       assertNull(oaConversionMapper.selectById(id));
+    }
+
+    @Test
+    public void testDeleteOaConversion_notExists() {
+        // 准备参数
+        Long id = randomLongId();
+
+        // 调用, 并断言异常
+        assertServiceException(() -> oaConversionService.deleteOaConversion(id), OA_CONVERSION_NOT_EXISTS);
+    }
+
+    @Test
+    // @Disabled  // TODO 请修改 null 为需要的值,然后删除 @Disabled 注解
+    public void testGetOaConversionPage() {
+       // mock 数据
+       OaConversionDO dbOaConversion = randomPojo(OaConversionDO.class, o -> { // 等会查询到
+           o.setOfficialId(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.setEntryDate(null);
+           o.setProbationEndDate(null);
+           o.setConversionDate(null);
+           o.setConversionReason(null);
+           o.setWorkSummary(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);
+       });
+       oaConversionMapper.insert(dbOaConversion);
+       // 测试 officialId 不匹配
+       oaConversionMapper.insert(cloneIgnoreId(dbOaConversion, o -> o.setOfficialId(null)));
+       // 测试 employeeId 不匹配
+       oaConversionMapper.insert(cloneIgnoreId(dbOaConversion, o -> o.setEmployeeId(null)));
+       // 测试 employeeUuid 不匹配
+       oaConversionMapper.insert(cloneIgnoreId(dbOaConversion, o -> o.setEmployeeUuid(null)));
+       // 测试 employeeName 不匹配
+       oaConversionMapper.insert(cloneIgnoreId(dbOaConversion, o -> o.setEmployeeName(null)));
+       // 测试 userId 不匹配
+       oaConversionMapper.insert(cloneIgnoreId(dbOaConversion, o -> o.setUserId(null)));
+       // 测试 userUuid 不匹配
+       oaConversionMapper.insert(cloneIgnoreId(dbOaConversion, o -> o.setUserUuid(null)));
+       // 测试 deptId 不匹配
+       oaConversionMapper.insert(cloneIgnoreId(dbOaConversion, o -> o.setDeptId(null)));
+       // 测试 deptUuid 不匹配
+       oaConversionMapper.insert(cloneIgnoreId(dbOaConversion, o -> o.setDeptUuid(null)));
+       // 测试 position 不匹配
+       oaConversionMapper.insert(cloneIgnoreId(dbOaConversion, o -> o.setPosition(null)));
+       // 测试 entryDate 不匹配
+       oaConversionMapper.insert(cloneIgnoreId(dbOaConversion, o -> o.setEntryDate(null)));
+       // 测试 probationEndDate 不匹配
+       oaConversionMapper.insert(cloneIgnoreId(dbOaConversion, o -> o.setProbationEndDate(null)));
+       // 测试 conversionDate 不匹配
+       oaConversionMapper.insert(cloneIgnoreId(dbOaConversion, o -> o.setConversionDate(null)));
+       // 测试 conversionReason 不匹配
+       oaConversionMapper.insert(cloneIgnoreId(dbOaConversion, o -> o.setConversionReason(null)));
+       // 测试 workSummary 不匹配
+       oaConversionMapper.insert(cloneIgnoreId(dbOaConversion, o -> o.setWorkSummary(null)));
+       // 测试 remarks 不匹配
+       oaConversionMapper.insert(cloneIgnoreId(dbOaConversion, o -> o.setRemarks(null)));
+       // 测试 procInstId 不匹配
+       oaConversionMapper.insert(cloneIgnoreId(dbOaConversion, o -> o.setProcInstId(null)));
+       // 测试 auditStatus 不匹配
+       oaConversionMapper.insert(cloneIgnoreId(dbOaConversion, o -> o.setAuditStatus(null)));
+       // 测试 currentAuditUserId 不匹配
+       oaConversionMapper.insert(cloneIgnoreId(dbOaConversion, o -> o.setCurrentAuditUserId(null)));
+       // 测试 currentAuditUserUuid 不匹配
+       oaConversionMapper.insert(cloneIgnoreId(dbOaConversion, o -> o.setCurrentAuditUserUuid(null)));
+       // 测试 currentAuditEmployeeId 不匹配
+       oaConversionMapper.insert(cloneIgnoreId(dbOaConversion, o -> o.setCurrentAuditEmployeeId(null)));
+       // 测试 currentAuditEmployeeUuid 不匹配
+       oaConversionMapper.insert(cloneIgnoreId(dbOaConversion, o -> o.setCurrentAuditEmployeeUuid(null)));
+       // 测试 finalAuditDate 不匹配
+       oaConversionMapper.insert(cloneIgnoreId(dbOaConversion, o -> o.setFinalAuditDate(null)));
+       // 测试 infoSource 不匹配
+       oaConversionMapper.insert(cloneIgnoreId(dbOaConversion, o -> o.setInfoSource(null)));
+       // 测试 createTime 不匹配
+       oaConversionMapper.insert(cloneIgnoreId(dbOaConversion, o -> o.setCreateTime(null)));
+       // 准备参数
+       OaConversionPageReqVO reqVO = new OaConversionPageReqVO();
+       reqVO.setOfficialId(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.setEntryDate(null);
+       reqVO.setProbationEndDate(null);
+       reqVO.setConversionDate(null);
+       reqVO.setConversionReason(null);
+       reqVO.setWorkSummary(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<OaConversionDO> pageResult = oaConversionService.getOaConversionPage(reqVO);
+       // 断言
+       assertEquals(1, pageResult.getTotal());
+       assertEquals(1, pageResult.getList().size());
+       assertPojoEquals(dbOaConversion, pageResult.getList().get(0));
+    }
+
+}

+ 2 - 0
yudao-module-bpm/yudao-module-bpm-biz/src/test/resources/sql/clean.sql

@@ -1,3 +1,5 @@
 DELETE FROM "bpm_form";
 DELETE FROM "bpm_user_group";
 DELETE FROM "bpm_category";
+-- 将该删表 SQL 语句,添加到 yudao-module-bpm-biz 模块的 test/resources/sql/clean.sql 文件里
+DELETE FROM "bpm_oa_conversion";

+ 35 - 0
yudao-module-bpm/yudao-module-bpm-biz/src/test/resources/sql/create_tables.sql

@@ -41,3 +41,38 @@ CREATE TABLE IF NOT EXISTS "bpm_form" (
     "deleted" bit NOT NULL DEFAULT FALSE,
     PRIMARY KEY ("id")
 ) COMMENT '动态表单';
+
+-- 将该建表 SQL 语句,添加到 yudao-module-bpm-biz 模块的 test/resources/sql/create_tables.sql 文件里
+CREATE TABLE IF NOT EXISTS "bpm_oa_conversion" (
+    "id" bigint NOT NULL GENERATED BY DEFAULT AS IDENTITY,
+    "official_id" varchar,
+    "employee_id" bigint,
+    "employee_uuid" varchar,
+    "employee_name" varchar,
+    "user_id" bigint,
+    "user_uuid" varchar,
+    "dept_id" bigint,
+    "dept_uuid" varchar,
+    "position" varchar,
+    "entry_date" varchar,
+    "probation_end_date" varchar,
+    "conversion_date" varchar,
+    "conversion_reason" varchar,
+    "work_summary" varchar,
+    "remarks" varchar,
+    "proc_inst_id" varchar,
+    "audit_status" varchar,
+    "current_audit_user_id" bigint,
+    "current_audit_user_uuid" varchar,
+    "current_audit_employee_id" bigint,
+    "current_audit_employee_uuid" varchar,
+    "final_audit_date" varchar,
+    "info_source" varchar,
+    "creator" varchar DEFAULT '',
+    "create_time" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updater" varchar DEFAULT '',
+    "update_time" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+    `deleted` int NOT NULL DEFAULT 0,
+    "tenant_id" bigint NOT NULL default 0,
+    PRIMARY KEY ("id")
+    ) COMMENT '转正流程信息表';