【修改】调整OA包结构

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

@@ -1,112 +0,0 @@
-package cn.iocoder.yudao.module.bpm.controller.admin.oa;
-
-import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.entry.OaEntryPageReqVO;
-import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.entry.OaEntryRespVO;
-import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.entry.OaEntrySaveReqVO;
-import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.task.BpmTaskApproveReqVO;
-import cn.iocoder.yudao.module.bpm.dal.dataobject.oa.OaEntryDO;
-import cn.iocoder.yudao.module.bpm.service.oa.entry.OaEntryService;
-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 static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
-
-
-@Tag(name = "管理后台 - 入职流程信息")
-@RestController
-@RequestMapping("/bpm/oa-entry")
-@Validated
-public class OaEntryController {
-
-    @Resource
-    private OaEntryService oaEntryService;
-
-    @PostMapping("/start")
-    @Operation(summary = "提交入职流程信息")
-    @PreAuthorize("@ss.hasPermission('bpm:oa-entry:start')")
-    public CommonResult<Integer> startOaEntry(@Valid @RequestBody OaEntrySaveReqVO createReqVO) {
-        return success(oaEntryService.startOaEntry(getLoginUserId(),createReqVO));
-    }
-
-    @PostMapping("/complete")
-    @Operation(summary = "审批入职流程信息")
-    @PreAuthorize("@ss.hasPermission('bpm:oa-entry:start')")
-    public CommonResult<Integer> completeOaEntry(@Valid @RequestBody OaEntrySaveReqVO createReqVO,@Valid @RequestBody BpmTaskApproveReqVO reqVO) {
-        return success(oaEntryService.completeOaEntry(getLoginUserId(),createReqVO,reqVO));
-    }
-
-//    @PostMapping("/return")
-//    @Operation(summary = "撤回入职流程信息")
-//    @PreAuthorize("@ss.hasPermission('bpm:oa-entry:start')")
-//    public CommonResult<Integer> returnCompelete(@Valid @RequestBody OaEntrySaveReqVO createReqVO,@Valid @RequestBody BpmTaskApproveReqVO reqVO) {
-//        return success(oaEntryService.completeOaEntry(getLoginUserId(),createReqVO,reqVO));
-//    }
-
-//    @PutMapping("/update")
-//    @Operation(summary = "更新入职流程信息")
-//    @PreAuthorize("@ss.hasPermission('bpm:oa-entry:update')")
-//    public CommonResult<Boolean> updateOaEntry(@Valid @RequestBody OaEntrySaveReqVO updateReqVO) {
-//        oaEntryService.updateOaEntry(updateReqVO);
-//        return success(true);
-//    }
-
-    @DeleteMapping("/delete")
-    @Operation(summary = "删除入职流程信息")
-    @Parameter(name = "id", description = "编号", required = true)
-    @PreAuthorize("@ss.hasPermission('bpm:oa-entry:delete')")
-    public CommonResult<Boolean> deleteOaEntry(@RequestParam("id") Integer id) {
-        oaEntryService.deleteOaEntry(id);
-        return success(true);
-    }
-
-    @GetMapping("/get")
-    @Operation(summary = "获得入职流程信息")
-    @Parameter(name = "id", description = "编号", required = true, example = "1024")
-    @PreAuthorize("@ss.hasPermission('bpm:oa-entry:query')")
-    public CommonResult<OaEntryRespVO> getOaEntry(@RequestParam("id") Integer id) {
-        OaEntryDO oaEntry = oaEntryService.getOaEntry(id);
-        return success(BeanUtils.toBean(oaEntry, OaEntryRespVO.class));
-    }
-
-    @GetMapping("/page")
-    @Operation(summary = "获得入职流程信息分页")
-    @PreAuthorize("@ss.hasPermission('bpm:oa-entry:query')")
-    public CommonResult<PageResult<OaEntryRespVO>> getOaEntryPage(@Valid OaEntryPageReqVO pageReqVO) {
-        PageResult<OaEntryDO> pageResult = oaEntryService.getOaEntryPage(pageReqVO);
-        return success(BeanUtils.toBean(pageResult, OaEntryRespVO.class));
-    }
-
-    @GetMapping("/export-excel")
-    @Operation(summary = "导出入职流程信息 Excel")
-    @PreAuthorize("@ss.hasPermission('bpm:oa-entry:export')")
-    @ApiAccessLog(operateType = EXPORT)
-    public void exportOaEntryExcel(@Valid OaEntryPageReqVO pageReqVO,
-              HttpServletResponse response) throws IOException {
-        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
-        List<OaEntryDO> list = oaEntryService.getOaEntryPage(pageReqVO).getList();
-        // 导出 Excel
-        ExcelUtils.write(response, "入职流程信息.xls", "数据", OaEntryRespVO.class,
-                        BeanUtils.toBean(list, OaEntryRespVO.class));
-    }
-
-}

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

@@ -1,8 +1,8 @@
-package cn.iocoder.yudao.module.bpm.controller.admin.oa;
+package cn.iocoder.yudao.module.bpm.controller.admin.oa.leave;
 
-import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.leave.OaLeavePageReqVO;
-import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.leave.OaLeaveRespVO;
-import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.leave.OaLeaveSaveReqVO;
+import cn.iocoder.yudao.module.bpm.controller.admin.oa.leave.vo.OaLeavePageReqVO;
+import cn.iocoder.yudao.module.bpm.controller.admin.oa.leave.vo.OaLeaveRespVO;
+import cn.iocoder.yudao.module.bpm.controller.admin.oa.leave.vo.OaLeaveSaveReqVO;
 import cn.iocoder.yudao.module.bpm.dal.dataobject.oa.OaLeaveDO;
 import cn.iocoder.yudao.module.bpm.service.oa.leave.OaLeaveService;
 import org.springframework.web.bind.annotation.*;
@@ -13,7 +13,6 @@ 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.constraints.*;
 import javax.validation.*;
 import javax.servlet.http.*;
 import java.util.*;

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

@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.leave;
+package cn.iocoder.yudao.module.bpm.controller.admin.oa.leave.vo;
 
 import lombok.*;
 import java.util.*;

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

@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.leave;
+package cn.iocoder.yudao.module.bpm.controller.admin.oa.leave.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;

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

@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.leave;
+package cn.iocoder.yudao.module.bpm.controller.admin.oa.leave.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;

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

@@ -1,12 +1,12 @@
-package cn.iocoder.yudao.module.bpm.controller.admin.oa;
+package cn.iocoder.yudao.module.bpm.controller.admin.oa.oldLeave;
 
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
-import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.BpmOALeavePageReqVO;
+import cn.iocoder.yudao.module.bpm.controller.admin.oa.oldLeave.vo.BpmOALeavePageReqVO;
 
-import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.oldLeave.BpmOALeaveCreateReqVO;
-import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.oldLeave.BpmOALeaveRespVO;
+import cn.iocoder.yudao.module.bpm.controller.admin.oa.oldLeave.vo.BpmOALeaveCreateReqVO;
+import cn.iocoder.yudao.module.bpm.controller.admin.oa.oldLeave.vo.BpmOALeaveRespVO;
 import cn.iocoder.yudao.module.bpm.dal.dataobject.oa.BpmOALeaveDO;
 
 import cn.iocoder.yudao.module.bpm.service.oa.oldLeave.BpmOALeaveService;

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/package-info.java

@@ -2,4 +2,4 @@
  * OA 示例，用于演示外部业务接入 BPM 工作流的示例
  * 一般的接入方式，只需要调用 接口，后续 Admin 用户在管理后台的【待办事务】进行审批
  */
-package cn.iocoder.yudao.module.bpm.controller.admin.oa;
+package cn.iocoder.yudao.module.bpm.controller.admin.oa.oldLeave;

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

@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.oldLeave;
+package cn.iocoder.yudao.module.bpm.controller.admin.oa.oldLeave.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

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

@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.module.bpm.controller.admin.oa.vo;
+package cn.iocoder.yudao.module.bpm.controller.admin.oa.oldLeave.vo;
 
 import cn.iocoder.yudao.framework.common.pojo.PageParam;
 import io.swagger.v3.oas.annotations.media.Schema;

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

@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.oldLeave;
+package cn.iocoder.yudao.module.bpm.controller.admin.oa.oldLeave.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

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

@@ -1,78 +0,0 @@
-package cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.entry;
-
-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 OaEntryPageReqVO extends PageParam {
-
-    @Schema(description = "uuid", example = "13471")
-    private String entryId;
-
-    @Schema(description = "部门", example = "2937")
-    private String deptId;
-
-    @Schema(description = "职位")
-    private String position;
-
-    @Schema(description = "员工类型", example = "1")
-    private String employeeType;
-
-    @Schema(description = "性别")
-    private String gender;
-
-    @Schema(description = "出身日期")
-    private String birthday;
-
-    @Schema(description = "联系电话")
-    private String contactNumber;
-
-    @Schema(description = "电子邮箱")
-    private String email;
-
-    @Schema(description = "教育背景")
-    private String education;
-
-    @Schema(description = "工作经验")
-    private String workExperience;
-
-    @Schema(description = "备注")
-    private String remarks;
-
-    @Schema(description = "最后审核时间")
-    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
-    private String[] finalAuditDate;
-
-    @Schema(description = "创建时间")
-    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
-    private LocalDateTime[] createTime;
-
-    @Schema(description = "入职人", example = "李四")
-    private String entryName;
-
-    @Schema(description = "入职日期")
-    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
-    private String[] entryDate;
-
-    @Schema(description = "流程实例id", example = "9407")
-    private String procInstId;
-
-    @Schema(description = "审核状态（0暂存、1已提交、2审核中、3已审核、4已关闭、5驳回）", example = "2")
-    private String auditStatus;
-
-    @Schema(description = "当前审核人编号", example = "29870")
-    private String currentAuditEmployeeId;
-
-    @Schema(description = "数据来源，0流程添加、1手动添加")
-    private String infoSource;
-
-}

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

@@ -1,96 +0,0 @@
-package cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.entry;
-
-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 OaEntryRespVO {
-
-    @Schema(description = "uuid", example = "13471")
-    @ExcelProperty("uuid")
-    private String entryId;
-
-    @Schema(description = "部门", example = "2937")
-    @ExcelProperty("部门")
-    private String deptId;
-
-    @Schema(description = "职位")
-    @ExcelProperty("职位")
-    private String position;
-
-    @Schema(description = "员工类型", example = "1")
-    @ExcelProperty("员工类型")
-    private String employeeType;
-
-    @Schema(description = "性别")
-    @ExcelProperty("性别")
-    private String gender;
-
-    @Schema(description = "出身日期")
-    @ExcelProperty("出身日期")
-    private String birthday;
-
-    @Schema(description = "联系电话")
-    @ExcelProperty("联系电话")
-    private String contactNumber;
-
-    @Schema(description = "电子邮箱")
-    @ExcelProperty("电子邮箱")
-    private String email;
-
-    @Schema(description = "教育背景")
-    @ExcelProperty("教育背景")
-    private String education;
-
-    @Schema(description = "工作经验")
-    @ExcelProperty("工作经验")
-    private String workExperience;
-
-    @Schema(description = "备注")
-    @ExcelProperty("备注")
-    private String remarks;
-
-    @Schema(description = "最后审核时间", requiredMode = Schema.RequiredMode.REQUIRED)
-    @ExcelProperty("最后审核时间")
-    private String finalAuditDate;
-
-    @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
-    @ExcelProperty("创建时间")
-    private LocalDateTime createTime;
-
-    @Schema(description = "入职表单主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "27428")
-    @ExcelProperty("入职表单主键")
-    private Integer id;
-
-    @Schema(description = "入职人", example = "李四")
-    @ExcelProperty("入职人")
-    private String entryName;
-
-    @Schema(description = "入职日期")
-    @ExcelProperty("入职日期")
-    private String entryDate;
-
-    @Schema(description = "流程实例id", example = "9407")
-    @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 = "当前审核人编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "29870")
-    @ExcelProperty("当前审核人编号")
-    private String currentAuditEmployeeId;
-
-    @Schema(description = "数据来源，0流程添加、1手动添加", requiredMode = Schema.RequiredMode.REQUIRED)
-    @ExcelProperty("数据来源，0流程添加、1手动添加")
-    private String infoSource;
-
-}

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

@@ -1,78 +0,0 @@
-package cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.entry;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-import java.util.*;
-import javax.validation.constraints.*;
-
-@Schema(description = "管理后台 - 入职流程信息新增/修改 Request VO")
-@Data
-public class OaEntrySaveReqVO {
-
-    @Schema(description = "uuid", example = "13471")
-    private String entryId;
-
-    @Schema(description = "部门", example = "2937")
-    private String deptId;
-
-    @Schema(description = "职位")
-    private String position;
-
-    @Schema(description = "员工类型", example = "1")
-    private String employeeType;
-
-    @Schema(description = "性别")
-    private String gender;
-
-    @Schema(description = "出身日期")
-    private String birthday;
-
-    @Schema(description = "联系电话")
-    private String contactNumber;
-
-    @Schema(description = "电子邮箱")
-    private String email;
-
-    @Schema(description = "教育背景")
-    private String education;
-
-    @Schema(description = "工作经验")
-    private String workExperience;
-
-    @Schema(description = "备注")
-    private String remarks;
-
-    @Schema(description = "最后审核时间", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotEmpty(message = "最后审核时间不能为空")
-    private String finalAuditDate;
-
-    @Schema(description = "入职表单主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "27428")
-    private Integer id;
-
-    @Schema(description = "入职人", example = "李四")
-    private String entryName;
-
-    @Schema(description = "入职日期")
-    private String entryDate;
-
-    @Schema(description = "流程实例id", example = "9407")
-    private String procInstId;
-
-    @Schema(description = "审核状态（0暂存、1已提交、2审核中、3已审核、4已关闭、5驳回）", example = "2")
-    private String auditStatus;
-
-    @Schema(description = "当前审核人编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "29870")
-    @NotEmpty(message = "当前审核人编号不能为空")
-    private String currentAuditEmployeeId;
-
-    @Schema(description = "数据来源，0流程添加、1手动添加", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotEmpty(message = "数据来源，0流程添加、1手动添加不能为空")
-    private String infoSource;
-
-    @Schema(description = "审批，true 通过，false 驳回", example = "true")
-    private Boolean auditPass;
-
-    @Schema(description = "发起人自选审批人 Map", example = "{taskKey1: [1, 2]}")
-    private Map<String, List<Long>> startUserSelectAssignees;
-
-}

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

@@ -1,5 +1,5 @@
 package cn.iocoder.yudao.module.bpm.dal.mysql.oa;
-import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.BpmOALeavePageReqVO;
+import cn.iocoder.yudao.module.bpm.controller.admin.oa.oldLeave.vo.BpmOALeavePageReqVO;
 import cn.iocoder.yudao.module.bpm.dal.dataobject.oa.BpmOALeaveDO;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;

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

@@ -1,12 +1,10 @@
 package cn.iocoder.yudao.module.bpm.dal.mysql.oa;
 
-import java.util.*;
-
 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.vo.entry.OaEntryPageReqVO;
+import cn.iocoder.yudao.module.bpm.controller.admin.oa.leave.vo.entry.vo.OaEntryPageReqVO;
 import cn.iocoder.yudao.module.bpm.dal.dataobject.oa.OaEntryDO;
 import org.apache.ibatis.annotations.Mapper;
 /**

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

@@ -4,7 +4,7 @@ import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
 import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
 
-import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.leave.OaLeavePageReqVO;
+import cn.iocoder.yudao.module.bpm.controller.admin.oa.leave.vo.OaLeavePageReqVO;
 import cn.iocoder.yudao.module.bpm.dal.dataobject.oa.OaLeaveDO;
 import org.apache.ibatis.annotations.Mapper;
 

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/entry/OaEntryService.java

@@ -3,8 +3,8 @@ package cn.iocoder.yudao.module.bpm.service.oa.entry;
 import javax.validation.*;
 
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.entry.OaEntryPageReqVO;
-import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.entry.OaEntrySaveReqVO;
+import cn.iocoder.yudao.module.bpm.controller.admin.oa.leave.vo.entry.vo.OaEntryPageReqVO;
+import cn.iocoder.yudao.module.bpm.controller.admin.oa.leave.vo.entry.vo.OaEntrySaveReqVO;
 import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.task.BpmTaskApproveReqVO;
 import cn.iocoder.yudao.module.bpm.dal.dataobject.oa.OaEntryDO;
 

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/entry/OaEntryServiceImpl.java

@@ -3,8 +3,8 @@ package cn.iocoder.yudao.module.bpm.service.oa.entry;
 import cn.hutool.core.util.IdUtil;
 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.vo.entry.OaEntryPageReqVO;
-import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.entry.OaEntrySaveReqVO;
+import cn.iocoder.yudao.module.bpm.controller.admin.oa.leave.vo.entry.vo.OaEntryPageReqVO;
+import cn.iocoder.yudao.module.bpm.controller.admin.oa.leave.vo.entry.vo.OaEntrySaveReqVO;
 import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.task.BpmTaskApproveReqVO;
 import cn.iocoder.yudao.module.bpm.dal.dataobject.oa.OaEntryDO;
 import cn.iocoder.yudao.module.bpm.dal.mysql.oa.OaEntryMapper;
@@ -17,11 +17,10 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.transaction.annotation.Transactional;
+
 import java.util.*;
 
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.common.pojo.PageParam;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
 
 

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/leave/OaLeaveService.java

@@ -1,13 +1,11 @@
 package cn.iocoder.yudao.module.bpm.service.oa.leave;
 
-import java.util.*;
 import javax.validation.*;
 
-import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.leave.OaLeavePageReqVO;
-import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.leave.OaLeaveSaveReqVO;
+import cn.iocoder.yudao.module.bpm.controller.admin.oa.leave.vo.OaLeavePageReqVO;
+import cn.iocoder.yudao.module.bpm.controller.admin.oa.leave.vo.OaLeaveSaveReqVO;
 
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.common.pojo.PageParam;
 import cn.iocoder.yudao.module.bpm.dal.dataobject.oa.OaLeaveDO;
 
 /**

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/leave/OaLeaveServiceImpl.java

@@ -1,18 +1,14 @@
 package cn.iocoder.yudao.module.bpm.service.oa.leave;
 
-import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.leave.OaLeavePageReqVO;
-import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.leave.OaLeaveSaveReqVO;
+import cn.iocoder.yudao.module.bpm.controller.admin.oa.leave.vo.OaLeavePageReqVO;
+import cn.iocoder.yudao.module.bpm.controller.admin.oa.leave.vo.OaLeaveSaveReqVO;
 import cn.iocoder.yudao.module.bpm.dal.dataobject.oa.OaLeaveDO;
 import cn.iocoder.yudao.module.bpm.dal.mysql.oa.OaLeaveMapper;
 import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.*;
 
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.common.pojo.PageParam;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
 
 

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/oldLeave/BpmOALeaveService.java

@@ -4,8 +4,8 @@ package cn.iocoder.yudao.module.bpm.service.oa.oldLeave;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 
 
-import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.BpmOALeavePageReqVO;
-import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.oldLeave.BpmOALeaveCreateReqVO;
+import cn.iocoder.yudao.module.bpm.controller.admin.oa.oldLeave.vo.BpmOALeavePageReqVO;
+import cn.iocoder.yudao.module.bpm.controller.admin.oa.oldLeave.vo.BpmOALeaveCreateReqVO;
 import cn.iocoder.yudao.module.bpm.dal.dataobject.oa.BpmOALeaveDO;
 
 import javax.validation.Valid;

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/oldLeave/BpmOALeaveServiceImpl.java

@@ -7,8 +7,8 @@ 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.vo.BpmOALeavePageReqVO;
-import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.oldLeave.BpmOALeaveCreateReqVO;
+import cn.iocoder.yudao.module.bpm.controller.admin.oa.oldLeave.vo.BpmOALeavePageReqVO;
+import cn.iocoder.yudao.module.bpm.controller.admin.oa.oldLeave.vo.BpmOALeaveCreateReqVO;
 import cn.iocoder.yudao.module.bpm.dal.dataobject.oa.BpmOALeaveDO;
 import cn.iocoder.yudao.module.bpm.dal.mysql.oa.BpmOALeaveMapper;
 import cn.iocoder.yudao.module.bpm.enums.task.BpmTaskStatusEnum;