feat(bpm): 请假流程添加结束时间字段

- 在 BpmOAGoOutDO、BpmOAGoOutCreateReqVO 和 BpmOAGoOutRespVO 中添加 endTime 字段
- 更新 BpmOAGoOutController 和 BpmOAGoOutServiceImpl 中的相关方法
- 优化代码格式和注释
This commit is contained in:
aikai 2025-07-08 09:54:34 +08:00
parent f9ff1be782
commit f01f8d78f0
5 changed files with 23 additions and 2 deletions

View File

@ -42,7 +42,7 @@ public class BpmOAGoOutController {
}
@GetMapping("/get")
@Operation(summary = "获得入职申请")
@Operation(summary = "获得外出申请")
@Parameter(name = "id", description = "编号", required = true, example = "1024")
public CommonResult<BpmOAGoOutRespVO> getGoOut(@RequestParam("id") Long id) {

View File

@ -36,6 +36,11 @@ public class BpmOAGoOutCreateReqVO {
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime startTime;
@Schema(description = "外出的结束时间", requiredMode = Schema.RequiredMode.REQUIRED)
@NotNull(message = "结束时间不能为空")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime endTime;
@Schema(description = "流程实例编号")
private String processInstanceId;

View File

@ -8,6 +8,7 @@ import lombok.EqualsAndHashCode;
import lombok.ToString;
import org.springframework.format.annotation.DateTimeFormat;
import javax.validation.constraints.NotNull;
import java.time.LocalDateTime;
import java.util.List;
@ -34,6 +35,11 @@ public class BpmOAGoOutRespVO extends BpmOABaseRespVO {
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime startTime;
@Schema(description = "外出的结束时间", requiredMode = Schema.RequiredMode.REQUIRED)
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime endTime;
@Schema(description = "流程实例编号")
private String processInstanceId;

View File

@ -7,11 +7,16 @@ 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 io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
import org.springframework.format.annotation.DateTimeFormat;
import javax.validation.constraints.NotNull;
import java.time.LocalDateTime;
import java.util.List;
import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
/**
* OA 外出申请 DO
*
@ -55,6 +60,11 @@ public class BpmOAGoOutDO extends BaseDO {
*/
private LocalDateTime startTime;
/**
* 外出的结束时间
*/
private LocalDateTime endTime;
/**
* 出差的结果
* 枚举 {@link BpmProcessInstanceResultEnum}

View File

@ -56,7 +56,7 @@ public class BpmOAGoOutServiceImpl extends BpmOABaseService implements BpmOAGoOu
//插入OA 出差申请
BpmOAGoOutDO goOut = BpmOAGoOutConvert.INSTANCE.convert(createReqVO).setUserId(userId)
.setResult(BpmProcessInstanceResultEnum.PROCESS.getResult());
goOutMapper.insert(goOut) ;
goOutMapper.insert(goOut);
// 发起 BPM 流程
Map<String, Object> processInstanceVariables = new HashMap<>();