新增资产申领功能及相关流程处理
添加了资产申领的后台管理功能，包括创建、查询和更新资产申领状态的功能。实现了与流程实例的绑定及监听器处理。优化了文件上传与流程实例的关联逻辑，确保附件能正确绑定流程实例。 此次更新包括： 1. 新增资产申领的错误代码常量。 2. 创建了资产申领的Controller，提供创建和查询资产申领的API。 3. 设计了资产申领的请求和响应VO类。 4. 实现了资产申领的Mapper接口及Service接口和实现类。 5. 添加了资产申领的结果监听器，处理流程实例结果事件。 6. 优化了资产申领的流程实例绑定逻辑和文件上传处理。 此次功能的添加，将有效支持资产申领的业务流程管理，提升资产申领处理的效率。
This commit is contained in:
furongxin
parent
f9106520c9
commit
e1c34381a0
@ -37,6 +37,7 @@ public interface ErrorCodeConstants {
|
|||||||
ErrorCode OA_ENTRY_NOT_EXISTS = new ErrorCode(1_009_001_111, "入职申请不存在");
|
ErrorCode OA_ENTRY_NOT_EXISTS = new ErrorCode(1_009_001_111, "入职申请不存在");
|
||||||
ErrorCode OA_GOOut_NOT_EXISTS = new ErrorCode(1_009_001_112, "外出申请不存在");
|
ErrorCode OA_GOOut_NOT_EXISTS = new ErrorCode(1_009_001_112, "外出申请不存在");
|
||||||
ErrorCode OA_SALARY_NOT_EXISTS = new ErrorCode(1_009_001_113, "薪资付款申请不存在");
|
ErrorCode OA_SALARY_NOT_EXISTS = new ErrorCode(1_009_001_113, "薪资付款申请不存在");
|
||||||
|
ErrorCode OA_ASSET_NOT_EXISTS = new ErrorCode(1_009_001_114, "资产申领不存在");
|
||||||
|
|
||||||
// ========== 流程模型 1-009-002-000 ==========
|
// ========== 流程模型 1-009-002-000 ==========
|
||||||
ErrorCode MODEL_KEY_EXISTS = new ErrorCode(1_009_002_000, "已经存在流程标识为【{}】的流程");
|
ErrorCode MODEL_KEY_EXISTS = new ErrorCode(1_009_002_000, "已经存在流程标识为【{}】的流程");
|
||||||
|
|||||||
@ -0,0 +1,56 @@
|
|||||||
|
package cn.iocoder.yudao.module.bpm.controller.admin.oa;
|
||||||
|
|
||||||
|
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
|
||||||
|
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
|
||||||
|
import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.assetClaim.BpmOAAssetClaimCreateReqVO;
|
||||||
|
import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.assetClaim.BpmOAAssetClaimRespVO;
|
||||||
|
import cn.iocoder.yudao.module.bpm.dal.dataobject.oa.BpmOAAssetClaimDO;
|
||||||
|
import cn.iocoder.yudao.module.bpm.service.oa.BpmOAAssetClaimService;
|
||||||
|
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;
|
||||||
|
|
||||||
|
@Tag(name = "管理后台 - OA 资金申领")
|
||||||
|
@RestController
|
||||||
|
@RequestMapping("/bpm/oa/assetClaim")
|
||||||
|
@Validated
|
||||||
|
public class BpmOAAssetClaimController {
|
||||||
|
|
||||||
|
@Resource
|
||||||
|
private BpmOAAssetClaimService assetClaimService;
|
||||||
|
|
||||||
|
@PostMapping("/create")
|
||||||
|
@Operation(summary = "创建请求申请")
|
||||||
|
public CommonResult<Long> createAssetClaim(@Valid @RequestBody BpmOAAssetClaimCreateReqVO createReqVO) {
|
||||||
|
|
||||||
|
return success(assetClaimService.createAssetClaim(getLoginUserId(), createReqVO));
|
||||||
|
}
|
||||||
|
|
||||||
|
@GetMapping("/get")
|
||||||
|
@Operation(summary = "获得资金申领申请")
|
||||||
|
@Parameter(name = "id", description = "编号", required = true, example = "1024")
|
||||||
|
public CommonResult<BpmOAAssetClaimRespVO> getAssetClaim(@RequestParam("id") Long id) {
|
||||||
|
|
||||||
|
BpmOAAssetClaimDO assetClaimDO = assetClaimService.getAssetClaim(id);
|
||||||
|
|
||||||
|
return success(BeanUtils.toBean(assetClaimDO, BpmOAAssetClaimRespVO.class));
|
||||||
|
}
|
||||||
|
|
||||||
|
@GetMapping("/getByProcessInstanceId")
|
||||||
|
@Operation(summary = "获得资金申领申请")
|
||||||
|
@Parameter(name = "processInstanceId", description = "流程实例编号", required = true, example = "1024")
|
||||||
|
public CommonResult<BpmOAAssetClaimRespVO> getAssetClaimByProcessInstanceId(@RequestParam("processInstanceId") String processInstanceId) {
|
||||||
|
|
||||||
|
BpmOAAssetClaimDO assetClaimDO = assetClaimService.getByProcessInstanceId(processInstanceId);
|
||||||
|
|
||||||
|
return success(BeanUtils.toBean(assetClaimDO, BpmOAAssetClaimRespVO.class));
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -0,0 +1,41 @@
|
|||||||
|
package cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.assetClaim;
|
||||||
|
|
||||||
|
import cn.iocoder.yudao.framework.common.pojo.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 BpmOAAssetClaimCreateReqVO {
|
||||||
|
|
||||||
|
@Schema(description = "收款人信息", requiredMode = Schema.RequiredMode.REQUIRED)
|
||||||
|
@NotNull(message = "报销总金额不能为空")
|
||||||
|
private Long assetsTypeId;
|
||||||
|
|
||||||
|
@Schema(description = "现金支出明细")
|
||||||
|
private Integer num;
|
||||||
|
|
||||||
|
@Schema(description = "单位")
|
||||||
|
private String util;
|
||||||
|
|
||||||
|
@Schema(description = "流程实例编号")
|
||||||
|
private String processInstanceId;
|
||||||
|
|
||||||
|
@Schema(description = "状态-参见 bpm_process_instance_result 枚举", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
|
||||||
|
private Integer result;
|
||||||
|
|
||||||
|
@Schema(description = "上传文件", requiredMode = Schema.RequiredMode.REQUIRED)
|
||||||
|
private List<UploadUserFile> fileItems;
|
||||||
|
}
|
||||||
@ -0,0 +1,36 @@
|
|||||||
|
package cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.assetClaim;
|
||||||
|
|
||||||
|
import cn.iocoder.yudao.framework.common.pojo.UploadUserFile;
|
||||||
|
import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.BpmOABaseRespVO;
|
||||||
|
import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.cash.Cash;
|
||||||
|
import io.swagger.v3.oas.annotations.media.Schema;
|
||||||
|
import lombok.Data;
|
||||||
|
import lombok.EqualsAndHashCode;
|
||||||
|
import lombok.ToString;
|
||||||
|
|
||||||
|
import javax.validation.constraints.NotNull;
|
||||||
|
import java.math.BigDecimal;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @author 符溶馨
|
||||||
|
*/
|
||||||
|
@Schema(description = "管理后台 - 现金支出 请求Request VO")
|
||||||
|
@Data
|
||||||
|
@EqualsAndHashCode(callSuper = true)
|
||||||
|
@ToString(callSuper = true)
|
||||||
|
public class BpmOAAssetClaimRespVO extends BpmOABaseRespVO {
|
||||||
|
|
||||||
|
@Schema(description = "收款人信息")
|
||||||
|
private Long assetsTypeId;
|
||||||
|
|
||||||
|
@Schema(description = "现金支出明细")
|
||||||
|
private List<Cash> num;
|
||||||
|
|
||||||
|
@Schema(description = "报销总金额", requiredMode = Schema.RequiredMode.REQUIRED)
|
||||||
|
@NotNull(message = "报销总金额不能为空")
|
||||||
|
private BigDecimal util;
|
||||||
|
|
||||||
|
@Schema(description = "上传文件", requiredMode = Schema.RequiredMode.REQUIRED)
|
||||||
|
private List<UploadUserFile> fileItems;
|
||||||
|
}
|
||||||
@ -0,0 +1,78 @@
|
|||||||
|
package cn.iocoder.yudao.module.bpm.dal.dataobject.oa;
|
||||||
|
|
||||||
|
import cn.iocoder.yudao.framework.common.pojo.UploadUserFile;
|
||||||
|
import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
|
||||||
|
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_asset_claim", autoResultMap = true)
|
||||||
|
@Data
|
||||||
|
@EqualsAndHashCode(callSuper = true)
|
||||||
|
@ToString(callSuper = true)
|
||||||
|
@Builder
|
||||||
|
@NoArgsConstructor
|
||||||
|
@AllArgsConstructor
|
||||||
|
public class BpmOAAssetClaimDO extends BaseDO {
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 出差表单主键
|
||||||
|
*/
|
||||||
|
@TableId
|
||||||
|
private Long id;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 申请人的用户编号
|
||||||
|
* 关联 AdminUserDO 的 id 属性
|
||||||
|
*/
|
||||||
|
private Long userId;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 资产类型编号
|
||||||
|
*/
|
||||||
|
private Long assetsTypeId;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 数量
|
||||||
|
*/
|
||||||
|
private Integer num;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 单位
|
||||||
|
*/
|
||||||
|
private String util;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 申请事由
|
||||||
|
*/
|
||||||
|
private String reason;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 用章的结果
|
||||||
|
* 枚举 {@link BpmProcessInstanceResultEnum}、
|
||||||
|
* 考虑到简单，所以直接复用了 BpmProcessInstanceResultEnum 枚举，也可以自己定义一个枚举哈
|
||||||
|
*/
|
||||||
|
private Integer result;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 对应的流程编号
|
||||||
|
* 关联 ProcessInstance 的 id 属性
|
||||||
|
*/
|
||||||
|
private String processInstanceId;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 附件基本信息
|
||||||
|
*/
|
||||||
|
@TableField(typeHandler = JacksonTypeHandler.class)
|
||||||
|
private List<UploadUserFile> fileItems;
|
||||||
|
}
|
||||||
@ -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.BpmOAAssetClaimDO;
|
||||||
|
import org.apache.ibatis.annotations.Mapper;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 资产申领 Mapper
|
||||||
|
*
|
||||||
|
* @author 符溶馨
|
||||||
|
|
||||||
|
*/
|
||||||
|
@Mapper
|
||||||
|
public interface BpmOAAssetClaimMapper extends BaseMapperX<BpmOAAssetClaimDO> {
|
||||||
|
}
|
||||||
@ -0,0 +1,37 @@
|
|||||||
|
package cn.iocoder.yudao.module.bpm.service.oa;
|
||||||
|
|
||||||
|
import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.assetClaim.BpmOAAssetClaimCreateReqVO;
|
||||||
|
import cn.iocoder.yudao.module.bpm.dal.dataobject.oa.BpmOAAssetClaimDO;
|
||||||
|
|
||||||
|
public interface BpmOAAssetClaimService {
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 创建请求申请
|
||||||
|
* @param userId 用户id
|
||||||
|
* @param createReqVO 创建信息
|
||||||
|
* @return 创建的申请id
|
||||||
|
*/
|
||||||
|
Long createAssetClaim(Long userId, BpmOAAssetClaimCreateReqVO createReqVO);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 获得资产申领申请
|
||||||
|
* @param id id
|
||||||
|
* @return 资产申领申请
|
||||||
|
*/
|
||||||
|
BpmOAAssetClaimDO getAssetClaim(Long id);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 获得资产申领申请
|
||||||
|
* @param processInstanceId 流程实例编号
|
||||||
|
* @return 资产申领申请
|
||||||
|
*/
|
||||||
|
BpmOAAssetClaimDO getByProcessInstanceId(String processInstanceId);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 更新资产申领的状态
|
||||||
|
*
|
||||||
|
* @param id 编号
|
||||||
|
* @param result 结果
|
||||||
|
*/
|
||||||
|
void updateAssetClaimResult(String processInstanceId, Long id, Integer result);
|
||||||
|
}
|
||||||
@ -0,0 +1,101 @@
|
|||||||
|
package cn.iocoder.yudao.module.bpm.service.oa;
|
||||||
|
|
||||||
|
import cn.iocoder.yudao.framework.common.pojo.UploadUserFile;
|
||||||
|
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
|
||||||
|
import cn.iocoder.yudao.module.bpm.api.task.dto.BpmProcessInstanceCreateReqDTO;
|
||||||
|
import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.assetClaim.BpmOAAssetClaimCreateReqVO;
|
||||||
|
import cn.iocoder.yudao.module.bpm.dal.dataobject.oa.BpmOAAssetClaimDO;
|
||||||
|
import cn.iocoder.yudao.module.bpm.dal.mysql.oa.BpmOAAssetClaimMapper;
|
||||||
|
import cn.iocoder.yudao.module.bpm.enums.task.BpmProcessInstanceResultEnum;
|
||||||
|
import cn.iocoder.yudao.module.bpm.service.task.BpmHistoryProcessInstanceService;
|
||||||
|
import cn.iocoder.yudao.module.bpm.service.task.BpmProcessInstanceService;
|
||||||
|
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_ASSET_NOT_EXISTS;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* OA 资产申领 Service 实现类
|
||||||
|
*
|
||||||
|
* @author 符溶馨
|
||||||
|
*/
|
||||||
|
@Service
|
||||||
|
@Validated
|
||||||
|
public class BpmOAAssetClaimServiceImpl extends BpmOABaseService implements BpmOAAssetClaimService{
|
||||||
|
|
||||||
|
/**
|
||||||
|
* OA 资产申领对应的流程定义 KEY
|
||||||
|
*/
|
||||||
|
public static final String PROCESS_KEY = "oa_asset_claim_2";
|
||||||
|
|
||||||
|
@Resource
|
||||||
|
private BpmOAAssetClaimMapper assetClaimMapper;
|
||||||
|
|
||||||
|
@Resource
|
||||||
|
private BpmProcessInstanceService processInstanceService;
|
||||||
|
|
||||||
|
@Resource
|
||||||
|
private BpmHistoryProcessInstanceService historyProcessInstanceService;
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Long createAssetClaim(Long userId, BpmOAAssetClaimCreateReqVO createReqVO) {
|
||||||
|
|
||||||
|
//插入OA 现金支出申请
|
||||||
|
BpmOAAssetClaimDO assetClaim = BeanUtils.toBean(createReqVO, BpmOAAssetClaimDO.class).setUserId(userId)
|
||||||
|
.setResult(BpmProcessInstanceResultEnum.PROCESS.getResult());
|
||||||
|
assetClaimMapper.insert(assetClaim);
|
||||||
|
|
||||||
|
// 发起 BPM 流程
|
||||||
|
Map<String, Object> processInstanceVariables = new HashMap<>();
|
||||||
|
String processInstanceId = processInstanceService.createProcessInstance(userId,
|
||||||
|
new BpmProcessInstanceCreateReqDTO().setProcessDefinitionKey(PROCESS_KEY)
|
||||||
|
.setVariables(processInstanceVariables).setBusinessKey(String.valueOf(assetClaim.getId())));
|
||||||
|
|
||||||
|
// 将工作流的编号，更新到 OA 现金支出单中
|
||||||
|
assetClaimMapper.updateById(new BpmOAAssetClaimDO().setId(assetClaim.getId()).setProcessInstanceId(processInstanceId));
|
||||||
|
|
||||||
|
// 判断是否为重新发起的流程
|
||||||
|
if (createReqVO.getProcessInstanceId() != null && createReqVO.getResult() == 3) {
|
||||||
|
|
||||||
|
historyProcessInstanceService.createHistoryProcessInstance(processInstanceId, createReqVO.getProcessInstanceId());
|
||||||
|
}
|
||||||
|
|
||||||
|
List<UploadUserFile> fileItems = createReqVO.getFileItems();
|
||||||
|
//这里的逻辑，如果fileItems不为空，且有数据，那么说明是上传了附件的，则需要更工作流文件表对应的实例Id
|
||||||
|
if (fileItems != null && !fileItems.isEmpty()) {
|
||||||
|
uploadBpmFileProcessInstanceId(processInstanceId, fileItems);
|
||||||
|
}
|
||||||
|
return assetClaim.getId();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public BpmOAAssetClaimDO getAssetClaim(Long id) {
|
||||||
|
|
||||||
|
return assetClaimMapper.selectById(id);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public BpmOAAssetClaimDO getByProcessInstanceId(String processInstanceId) {
|
||||||
|
|
||||||
|
return assetClaimMapper.selectOne(BpmOAAssetClaimDO::getProcessInstanceId, processInstanceId);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void updateAssetClaimResult(String processInstanceId, Long id, Integer result) {
|
||||||
|
|
||||||
|
validateLeaveExists(id);
|
||||||
|
assetClaimMapper.updateById(new BpmOAAssetClaimDO().setId(id).setResult(result));
|
||||||
|
}
|
||||||
|
|
||||||
|
private void validateLeaveExists(Long id) {
|
||||||
|
if (assetClaimMapper.selectById(id) == null) {
|
||||||
|
throw exception(OA_ASSET_NOT_EXISTS);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -0,0 +1,32 @@
|
|||||||
|
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.BpmOAAssetClaimService;
|
||||||
|
import cn.iocoder.yudao.module.bpm.service.oa.BpmOAAssetClaimServiceImpl;
|
||||||
|
import org.springframework.stereotype.Component;
|
||||||
|
|
||||||
|
import javax.annotation.Resource;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* OA 现金支出的结果的监听器实现类
|
||||||
|
*
|
||||||
|
* @author 符溶馨
|
||||||
|
*/
|
||||||
|
@Component
|
||||||
|
public class BpmOAAssetClaimResultListener extends BpmProcessInstanceResultEventListener {
|
||||||
|
@Resource
|
||||||
|
private BpmOAAssetClaimService assetClaimService;
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected String getProcessDefinitionKey() {
|
||||||
|
|
||||||
|
return BpmOAAssetClaimServiceImpl.PROCESS_KEY;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void onEvent(BpmProcessInstanceResultEvent event) {
|
||||||
|
|
||||||
|
assetClaimService.updateAssetClaimResult(event.getId(), Long.parseLong(event.getBusinessKey()), event.getResult());
|
||||||
|
}
|
||||||
|
}
|
||||||
Loading…
Reference in New Issue
Block a user