转正修改official_id字段名为conversion_id

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

@@ -16,7 +16,7 @@ import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_
 public class OaConversionPageReqVO extends PageParam {
 
     @Schema(description = "uuid", example = "8575")
-    private String officialId;
+    private String conversionId;
 
     @Schema(description = "转正人id", example = "8274")
     private Long employeeId;

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

@@ -19,7 +19,7 @@ public class OaConversionRespVO {
 
     @Schema(description = "uuid", example = "8575")
     @ExcelProperty("uuid")
-    private String officialId;
+    private String conversionId;
 
     @Schema(description = "转正人id", example = "8274")
     @ExcelProperty("转正人id")

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

@@ -1,5 +1,6 @@
 package cn.iocoder.yudao.module.bpm.controller.admin.oa.conversion.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.*;
@@ -15,7 +16,7 @@ public class OaConversionSaveReqVO {
     private Long id;
 
     @Schema(description = "uuid", example = "8575")
-    private String officialId;
+    private String conversionId;
 
     @Schema(description = "转正人id", example = "8274")
     private Long employeeId;
@@ -83,4 +84,17 @@ public class OaConversionSaveReqVO {
     @Schema(description = "数据来源，0流程添加、1手动添加")
     private String infoSource;
 
+    @Schema(description = "审批，true 通过，false 驳回", example = "true")
+    private Boolean auditPass;
+
+    @Schema(description = "发起人自选审批人 Map", example = " [1, 1]")
+    private List<Long> startUserSelectAssignees;
+
+    @Schema(description = "附件主键id", example = "[1, 2]")
+    private List<Long> fileIdList;
+
+    @Schema(description = "审批信息")
+    private BpmTaskApproveReqVO bpmTaskApproveReqVO;
+
+
 }

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

@@ -31,7 +31,7 @@ public class OaConversionDO extends BaseDO {
     /**
      * uuid
      */
-    private String officialId;
+    private String conversionId;
     /**
      * 转正人id
      */

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

@@ -17,7 +17,7 @@ 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::getConversionId, reqVO.getConversionId())
                 .eqIfPresent(OaConversionDO::getEmployeeId, reqVO.getEmployeeId())
                 .eqIfPresent(OaConversionDO::getEmployeeUuid, reqVO.getEmployeeUuid())
                 .likeIfPresent(OaConversionDO::getEmployeeName, reqVO.getEmployeeName())

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

@@ -105,7 +105,7 @@ public class OaConversionServiceImplTest extends BaseDbUnitTest {
     public void testGetOaConversionPage() {
        // mock 数据
        OaConversionDO dbOaConversion = randomPojo(OaConversionDO.class, o -> { // 等会查询到
-           o.setOfficialId(null);
+           o.setConversionId(null);
            o.setEmployeeId(null);
            o.setEmployeeUuid(null);
            o.setEmployeeName(null);
@@ -131,8 +131,8 @@ public class OaConversionServiceImplTest extends BaseDbUnitTest {
            o.setCreateTime(null);
        });
        oaConversionMapper.insert(dbOaConversion);
-       // 测试 officialId 不匹配
-       oaConversionMapper.insert(cloneIgnoreId(dbOaConversion, o -> o.setOfficialId(null)));
+       // 测试 conversionId 不匹配
+       oaConversionMapper.insert(cloneIgnoreId(dbOaConversion, o -> o.setConversionId(null)));
        // 测试 employeeId 不匹配
        oaConversionMapper.insert(cloneIgnoreId(dbOaConversion, o -> o.setEmployeeId(null)));
        // 测试 employeeUuid 不匹配
@@ -181,7 +181,7 @@ public class OaConversionServiceImplTest extends BaseDbUnitTest {
        oaConversionMapper.insert(cloneIgnoreId(dbOaConversion, o -> o.setCreateTime(null)));
        // 准备参数
        OaConversionPageReqVO reqVO = new OaConversionPageReqVO();
-       reqVO.setOfficialId(null);
+       reqVO.setConversionId(null);
        reqVO.setEmployeeId(null);
        reqVO.setEmployeeUuid(null);
        reqVO.setEmployeeName(null);