From f01f8d78f02ec78b40e4588a9da219f05c13dc15 Mon Sep 17 00:00:00 2001 From: aikai Date: Tue, 8 Jul 2025 09:54:34 +0800 Subject: [PATCH] =?UTF-8?q?feat(bpm):=20=E8=AF=B7=E5=81=87=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=E6=B7=BB=E5=8A=A0=E7=BB=93=E6=9D=9F=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在 BpmOAGoOutDO、BpmOAGoOutCreateReqVO 和 BpmOAGoOutRespVO 中添加 endTime 字段 - 更新 BpmOAGoOutController 和 BpmOAGoOutServiceImpl 中的相关方法 - 优化代码格式和注释 --- .../bpm/controller/admin/oa/BpmOAGoOutController.java | 2 +- .../admin/oa/vo/goOut/BpmOAGoOutCreateReqVO.java | 5 +++++ .../controller/admin/oa/vo/goOut/BpmOAGoOutRespVO.java | 6 ++++++ .../module/bpm/dal/dataobject/oa/BpmOAGoOutDO.java | 10 ++++++++++ .../module/bpm/service/oa/BpmOAGoOutServiceImpl.java | 2 +- 5 files changed, 23 insertions(+), 2 deletions(-) diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/BpmOAGoOutController.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/BpmOAGoOutController.java index 6b76c3fd..45ca43e0 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/BpmOAGoOutController.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/BpmOAGoOutController.java @@ -42,7 +42,7 @@ public class BpmOAGoOutController { } @GetMapping("/get") - @Operation(summary = "获得入职申请") + @Operation(summary = "获得外出申请") @Parameter(name = "id", description = "编号", required = true, example = "1024") public CommonResult getGoOut(@RequestParam("id") Long id) { diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/goOut/BpmOAGoOutCreateReqVO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/goOut/BpmOAGoOutCreateReqVO.java index 9f05e218..20811a5e 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/goOut/BpmOAGoOutCreateReqVO.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/goOut/BpmOAGoOutCreateReqVO.java @@ -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; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/goOut/BpmOAGoOutRespVO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/goOut/BpmOAGoOutRespVO.java index 02a86799..c2f45175 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/goOut/BpmOAGoOutRespVO.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/goOut/BpmOAGoOutRespVO.java @@ -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; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/oa/BpmOAGoOutDO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/oa/BpmOAGoOutDO.java index b54342f1..c9c84c8a 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/oa/BpmOAGoOutDO.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/oa/BpmOAGoOutDO.java @@ -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} diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOAGoOutServiceImpl.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOAGoOutServiceImpl.java index 79f83a22..0f815242 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOAGoOutServiceImpl.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOAGoOutServiceImpl.java @@ -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 processInstanceVariables = new HashMap<>();