This commit is contained in:
furongxin 2024-03-07 18:26:48 +08:00
parent af65b8e803
commit 0cf92385da
20 changed files with 411 additions and 26 deletions

View File

@ -28,6 +28,8 @@ public interface ErrorCodeConstants {
ErrorCode OA_CASH_NOT_EXISTS = new ErrorCode(1_009_001_104, "现金支出申请不存在");
ErrorCode OA_OVERTIME_NOT_EXISTS = new ErrorCode(1_009_001_105, "加班申请不存在");
ErrorCode OA_REGULAR_NOT_EXISTS = new ErrorCode(1_009_001_106, "转正申请不存在");
ErrorCode OA_SHIFTJOBS_NOT_EXISTS = new ErrorCode(1_009_001_107, "调岗申请不存在");
ErrorCode OA_SECOND_NOT_EXISTS = new ErrorCode(1_009_001_108, "借调申请不存在");
// ========== 流程模型 1-009-002-000 ==========
ErrorCode MODEL_KEY_EXISTS = new ErrorCode(1_009_002_000, "已经存在流程标识为【{}】的流程");

View File

@ -0,0 +1,47 @@
package cn.iocoder.yudao.module.bpm.controller.admin.oa;
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.second.BpmOASecondCreateReqVO;
import cn.iocoder.yudao.module.bpm.convert.oa.BpmOASecondConvert;
import cn.iocoder.yudao.module.bpm.dal.dataobject.oa.BpmOASecondDO;
import cn.iocoder.yudao.module.bpm.service.oa.BpmOASecondService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import javax.validation.Valid;
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
/**
* OA 借调申请 Controller
*
* @author 符溶馨
*/
@Tag(name = "管理后台 - OA 借调申请")
@RestController
@RequestMapping("/bpm/oa/second")
@Validated
public class BpmOASecondController {
@Resource
private BpmOASecondService service;
@PostMapping("/create")
@Operation(summary = "创建借调申请")
public CommonResult<Long> createLeave(@Valid @RequestBody BpmOASecondCreateReqVO createReqVO) {
return success(service.createSecond(getLoginUserId(), createReqVO));
}
@GetMapping("/get")
@Operation(summary = "获得借调申请")
@Parameter(name = "id", description = "编号", required = true, example = "1024")
public CommonResult<?> getLeave(@RequestParam("id") Long id) {
BpmOASecondDO second = service.getSecond(id);
return success(BpmOASecondConvert.INSTANCE.convert(second));
}
}

View File

@ -1,7 +1,5 @@
package cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.procure;
import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.reimbursement.ProcureDetail;
import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.reimbursement.Reimbursement;
import lombok.*;
import io.swagger.v3.oas.annotations.media.Schema;
import cn.iocoder.yudao.framework.common.pojo.PageParam;

View File

@ -1,6 +1,5 @@
package cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.procure;
import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.reimbursement.ProcureDetail;
import cn.iocoder.yudao.module.bpm.controller.admin.upload.UploadUserFile;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;

View File

@ -1,6 +1,5 @@
package cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.procure;
import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.reimbursement.ProcureDetail;
import cn.iocoder.yudao.module.bpm.controller.admin.upload.UploadUserFile;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;

View File

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

View File

@ -0,0 +1,39 @@
package cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.second;
import cn.iocoder.yudao.module.bpm.controller.admin.upload.UploadUserFile;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.ToString;
import javax.validation.constraints.NotNull;
import java.util.List;
/**
* 借调申请 创建 Request VO
*
* @author 符溶馨
*/
@Schema(description = "管理后台 - 借调申请创建 Request VO")
@Data
@EqualsAndHashCode()
@ToString(callSuper = true)
public class BpmOASecondCreateReqVO {
@Schema(description = "借调类型", requiredMode = Schema.RequiredMode.REQUIRED)
@NotNull(message = "借调类型不能为空")
private String type;
@Schema(description = "借调说明", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
private String reason;
@Schema(description = "借调明细", requiredMode = Schema.RequiredMode.REQUIRED)
@NotNull(message = "借调项目不能为空")
private List<Second> seconds;
@Schema(description = "押金", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
private Long deposit;
@Schema(description = "上传文件", requiredMode = Schema.RequiredMode.REQUIRED)
private List<UploadUserFile> fileItems ;
}

View File

@ -0,0 +1,35 @@
package cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.second;
import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.BpmOABaseRespVO;
import cn.iocoder.yudao.module.bpm.controller.admin.upload.UploadUserFile;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.ToString;
import javax.validation.constraints.NotNull;
import java.util.List;
@Schema(description = "管理后台 - 借调申请创建 Request VO")
@Data
@EqualsAndHashCode(callSuper = true)
@ToString(callSuper = true)
public class BpmOASecondRespVO extends BpmOABaseRespVO {
@Schema(description = "借调类型", requiredMode = Schema.RequiredMode.REQUIRED)
@NotNull(message = "借调类型不能为空")
private String type;
@Schema(description = "借调说明", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
private String reason;
@Schema(description = "借调明细", requiredMode = Schema.RequiredMode.REQUIRED)
@NotNull(message = "借调项目不能为空")
private List<Second> seconds;
@Schema(description = "押金", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
private Long deposit;
@Schema(description = "上传文件", requiredMode = Schema.RequiredMode.REQUIRED)
private List<UploadUserFile> fileItems ;
}

View File

@ -8,7 +8,6 @@ import lombok.ToString;
import javax.validation.constraints.NotNull;
import java.util.List;
import java.util.Set;
/**
* 调岗申请 创建 Request VO
@ -27,27 +26,27 @@ public class BpmOAShiftjobsCreateReqVO {
@Schema(description = "原部门编号", requiredMode = Schema.RequiredMode.REQUIRED)
@NotNull(message = "原部门不能为空")
private Long oldDpetId;
private Long oldDeptId;
@Schema(description = "原上级领导编号", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
private Long oldParentId;
@Schema(description = "原岗位编号", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
private Set<Long> oldPostId;
private Long oldPostId;
@Schema(description = "新部门编号", requiredMode = Schema.RequiredMode.REQUIRED)
@NotNull(message = "新部门不能为空")
private Long newDpetId;
private Long newDeptId;
@Schema(description = "新上级领导编号", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
private Long newParentId;
@Schema(description = "新岗位编号", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
private Set<Long> newPostId;
private Long newPostId;
@Schema(description = "备注", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
private String notes;
@Schema(description = "上传文件", requiredMode = Schema.RequiredMode.REQUIRED)
@Schema(description = "上传文件", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
private List<UploadUserFile> fileItems;
}

View File

@ -9,7 +9,6 @@ import lombok.ToString;
import javax.validation.constraints.NotNull;
import java.util.List;
import java.util.Set;
/**
* @author 符溶馨
@ -26,23 +25,23 @@ public class BpmOAShiftjobsRespVO extends BpmOABaseRespVO {
@Schema(description = "原部门编号", requiredMode = Schema.RequiredMode.REQUIRED)
@NotNull(message = "原部门不能为空")
private Long oldDpetId;
private Long oldDeptId;
@Schema(description = "原上级领导编号", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
private Long oldParentId;
@Schema(description = "原岗位编号", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
private Set<Long> oldPostId;
private Long oldPostId;
@Schema(description = "新部门编号", requiredMode = Schema.RequiredMode.REQUIRED)
@NotNull(message = "新部门不能为空")
private Long newDpetId;
private Long newDeptId;
@Schema(description = "新上级领导编号", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
private Long newParentId;
@Schema(description = "新岗位编号", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
private Set<Long> newPostId;
private Long newPostId;
@Schema(description = "备注", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
private String notes;

View File

@ -0,0 +1,22 @@
package cn.iocoder.yudao.module.bpm.convert.oa;
import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.second.BpmOASecondCreateReqVO;
import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.second.BpmOASecondRespVO;
import cn.iocoder.yudao.module.bpm.dal.dataobject.oa.BpmOASecondDO;
import org.mapstruct.Mapper;
import org.mapstruct.factory.Mappers;
/**
* 借调申请 Convert
*
* @author 符溶馨
*/
@Mapper
public interface BpmOASecondConvert {
BpmOASecondConvert INSTANCE = Mappers.getMapper(BpmOASecondConvert.class);
BpmOASecondDO convert(BpmOASecondCreateReqVO bean);
BpmOASecondRespVO convert(BpmOASecondDO bean);
}

View File

@ -1,7 +1,7 @@
package cn.iocoder.yudao.module.bpm.dal.dataobject.oa;
import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.reimbursement.ProcureDetail;
import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.procure.ProcureDetail;
import cn.iocoder.yudao.module.bpm.controller.admin.upload.UploadUserFile;
import com.baomidou.mybatisplus.annotation.KeySequence;
import com.baomidou.mybatisplus.annotation.TableField;

View File

@ -0,0 +1,84 @@
package cn.iocoder.yudao.module.bpm.dal.dataobject.oa;
import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.second.Second;
import cn.iocoder.yudao.module.bpm.controller.admin.upload.UploadUserFile;
import cn.iocoder.yudao.module.bpm.enums.task.BpmProcessInstanceResultEnum;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
import lombok.*;
import java.util.List;
/**
* OA 借调申请 DO
*
*
* @author 符溶馨
*/
@TableName(value ="bpm_oa_second", autoResultMap = true)
@Data
@EqualsAndHashCode(callSuper = true)
@ToString(callSuper = true)
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class BpmOASecondDO extends BaseDO {
/**
* 请假表单主键
*/
@TableId
private Long id;
/**
* 申请人的用户编号
* 关联 AdminUserDO id 属性
*/
private Long userId;
/**
* 借调类型
*/
private String type;
/**
* 借调说明
*/
private String reason;
/**
* 借调明细数据JSON
*/
@TableField(typeHandler = JacksonTypeHandler.class)
private List<Second> seconds;
/**
* 押金
*/
private Long deposit;
/**
* 结果
*
* 枚举 {@link BpmProcessInstanceResultEnum}
* 考虑到简单所以直接复用了 BpmProcessInstanceResultEnum 枚举也可以自己定义一个枚举哈
*/
private Integer result;
/**
* 对应的流程编号
*
* 关联 ProcessInstance id 属性
*/
private String processInstanceId;
/**
* 附件基本信息
*/
@TableField(typeHandler = JacksonTypeHandler.class)
private List<UploadUserFile> fileItems;
}

View File

@ -1,7 +1,6 @@
package cn.iocoder.yudao.module.bpm.dal.dataobject.oa;
import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
import cn.iocoder.yudao.framework.mybatis.core.type.JsonLongSetTypeHandler;
import cn.iocoder.yudao.module.bpm.controller.admin.upload.UploadUserFile;
import cn.iocoder.yudao.module.bpm.enums.task.BpmProcessInstanceResultEnum;
import com.baomidou.mybatisplus.annotation.TableField;
@ -11,7 +10,6 @@ import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
import lombok.*;
import java.util.List;
import java.util.Set;
/**
* OA 调岗申请 DO
@ -60,8 +58,7 @@ public class BpmOAShiftjobsDO extends BaseDO {
/**
* 原岗位编号
*/
@TableField(typeHandler = JsonLongSetTypeHandler.class)
private Set<Long> oldPostId;
private Long oldPostId;
/**
* 新部门编号
@ -76,8 +73,7 @@ public class BpmOAShiftjobsDO extends BaseDO {
/**
* 新岗位编号
*/
@TableField(typeHandler = JsonLongSetTypeHandler.class)
private Set<Long> newPostId;
private Long newPostId;
/**
* 备注

View File

@ -0,0 +1,15 @@
package cn.iocoder.yudao.module.bpm.dal.mysql.oa;
import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
import cn.iocoder.yudao.module.bpm.dal.dataobject.oa.BpmOASecondDO;
import org.apache.ibatis.annotations.Mapper;
/**
* 借调申请 Mapper
*
* @author 符溶馨
*/
@Mapper
public interface BpmOASecondMapper extends BaseMapperX<BpmOASecondDO> {
}

View File

@ -8,7 +8,6 @@ import org.apache.ibatis.annotations.Mapper;
* 调岗申请 Mapper
*
* @author 符溶馨
*/
@Mapper
public interface BpmOAShiftjobsMapper extends BaseMapperX<BpmOAShiftjobsDO> {

View File

@ -0,0 +1,40 @@
package cn.iocoder.yudao.module.bpm.service.oa;
import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.second.BpmOASecondCreateReqVO;
import cn.iocoder.yudao.module.bpm.dal.dataobject.oa.BpmOASecondDO;
import javax.validation.Valid;
/**
* 借调申请 Service 接口
*
* @author 符溶馨
*/
public interface BpmOASecondService {
/**
* 创建借调申请
*
* @param userId 用户编号
* @param createReqVO 创建信息
* @return 编号
*/
Long createSecond(Long userId, @Valid BpmOASecondCreateReqVO createReqVO);
/**
* 更新借调申请的状态
*
* @param id 编号
* @param result 结果
*/
void updateSecondResult(Long id, Integer result);
/**
* 获得借调申请
*
* @param id 编号
* @return 借调申请
*/
BpmOASecondDO getSecond(Long id);
}

View File

@ -0,0 +1,83 @@
package cn.iocoder.yudao.module.bpm.service.oa;
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.second.BpmOASecondCreateReqVO;
import cn.iocoder.yudao.module.bpm.controller.admin.upload.UploadUserFile;
import cn.iocoder.yudao.module.bpm.convert.oa.BpmOASecondConvert;
import cn.iocoder.yudao.module.bpm.dal.dataobject.oa.BpmOASecondDO;
import cn.iocoder.yudao.module.bpm.dal.mysql.oa.BpmOASecondMapper;
import cn.iocoder.yudao.module.bpm.enums.task.BpmProcessInstanceResultEnum;
import org.springframework.stereotype.Service;
import org.springframework.validation.annotation.Validated;
import javax.annotation.Resource;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.iocoder.yudao.module.bpm.enums.ErrorCodeConstants.OA_SECOND_NOT_EXISTS;
/**
* 功能描述
* OA 借调申请 Service 实现类
*
* @author 符溶馨
*/
@Service
@Validated
public class BpmOASecondServiceImpl extends BpmOABaseService implements BpmOASecondService{
/**
* OA 请假对应的流程定义 KEY
*/
public static final String PROCESS_KEY = "oa_second";
@Resource
private BpmOASecondMapper secondMapper ;
@Resource
private BpmProcessInstanceApi processInstanceApi;
@Override
public Long createSecond(Long userId, BpmOASecondCreateReqVO createReqVO) {
BpmOASecondDO second = BpmOASecondConvert.INSTANCE.convert(createReqVO).setUserId(userId)
.setResult(BpmProcessInstanceResultEnum.PROCESS.getResult());
secondMapper.insert(second) ;
// 发起 BPM 流程
Map<String, Object> processInstanceVariables = new HashMap<>();
String processInstanceId = processInstanceApi.createProcessInstance(userId,
new BpmProcessInstanceCreateReqDTO().setProcessDefinitionKey(PROCESS_KEY)
.setVariables(processInstanceVariables).setBusinessKey(String.valueOf(second.getId()))).getCheckedData();
// 将工作流的编号更新到 OA 请假单中
secondMapper.updateById(new BpmOASecondDO().setId(second.getId()).setProcessInstanceId(processInstanceId));
List<UploadUserFile> fileItems = createReqVO.getFileItems() ;
//这里的逻辑如果fileItems不为空且有数据那么说明是上传了附件的则需要更工作流文件表对应的实例Id
if (fileItems != null && !fileItems.isEmpty()) {
uploadBpmFileProcessInstanceId(processInstanceId,fileItems) ;
}
return second.getId();
}
@Override
public void updateSecondResult(Long id, Integer result) {
validateLeaveExists(id);
secondMapper.updateById(new BpmOASecondDO().setId(id).setResult(result));
}
private void validateLeaveExists(Long id) {
if (secondMapper.selectById(id) == null) {
throw exception(OA_SECOND_NOT_EXISTS);
}
}
@Override
public BpmOASecondDO getSecond(Long id) {
return secondMapper.selectById(id);
}
}

View File

@ -17,7 +17,7 @@ import java.util.List;
import java.util.Map;
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.iocoder.yudao.module.bpm.enums.ErrorCodeConstants.OA_SEAL_NOT_EXISTS;
import static cn.iocoder.yudao.module.bpm.enums.ErrorCodeConstants.OA_SHIFTJOBS_NOT_EXISTS;
/**
* OA 调岗申请 Service 实现类
@ -74,7 +74,7 @@ public class BpmOAShiftjobsServiceImpl extends BpmOABaseService implements BpmOA
private void validateLeaveExists(Long id) {
if (shiftjobsMapper.selectById(id) == null) {
throw exception(OA_SEAL_NOT_EXISTS);
throw exception(OA_SHIFTJOBS_NOT_EXISTS);
}
}

View File

@ -0,0 +1,29 @@
package cn.iocoder.yudao.module.bpm.service.oa.listener;
import cn.iocoder.yudao.module.bpm.framework.bpm.core.event.BpmProcessInstanceResultEvent;
import cn.iocoder.yudao.module.bpm.framework.bpm.core.event.BpmProcessInstanceResultEventListener;
import cn.iocoder.yudao.module.bpm.service.oa.BpmOASecondService;
import cn.iocoder.yudao.module.bpm.service.oa.BpmOASecondServiceImpl;
import org.springframework.stereotype.Component;
import javax.annotation.Resource;
/**
* OA 借调单的结果的监听器实现类
*/
@Component
public class BpmOASecondResultListener extends BpmProcessInstanceResultEventListener {
@Resource
private BpmOASecondService secondService;
@Override
protected String getProcessDefinitionKey() {
return BpmOASecondServiceImpl.PROCESS_KEY;
}
@Override
protected void onEvent(BpmProcessInstanceResultEvent event) {
secondService.updateSecondResult(Long.parseLong(event.getBusinessKey()), event.getResult());
}
}