From d84effdc62e40b6dd75161bcf4e73e8c55a01643 Mon Sep 17 00:00:00 2001 From: furongxin <419481438@qq.com> Date: Mon, 23 Sep 2024 17:07:59 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=9F=E6=9C=9B=E8=BD=AC=E6=AD=A3=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E5=AD=97=E6=AE=B5=E6=B7=BB=E5=8A=A0=E5=88=B0=E8=BD=AC?= =?UTF-8?q?=E6=AD=A3=E7=94=B3=E8=AF=B7=E8=A1=A8=E5=8D=95=E5=92=8C=E5=93=8D?= =?UTF-8?q?=E5=BA=94=E4=B8=AD=E5=9C=A8=E8=BD=AC=E6=AD=A3=E7=94=B3=E8=AF=B7?= =?UTF-8?q?=E7=9A=84=E5=88=9B=E5=BB=BA=E8=AF=B7=E6=B1=82=E5=92=8C=E5=93=8D?= =?UTF-8?q?=E5=BA=94=E5=AF=B9=E8=B1=A1=E4=B8=AD=E5=8A=A0=E5=85=A5=E4=BA=86?= =?UTF-8?q?=E4=B8=80=E4=B8=AA=E6=96=B0=E7=9A=84=E6=97=A5=E6=9C=9F=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E2=80=9C=E6=9C=9F=E6=9C=9B=E8=BD=AC=E6=AD=A3=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E2=80=9D=E3=80=82=E8=AF=A5=E5=AD=97=E6=AE=B5=E4=B8=BA?= =?UTF-8?q?=E9=9D=9E=E5=BF=85=E5=A1=AB=E9=A1=B9=EF=BC=8C=E5=85=81=E8=AE=B8?= =?UTF-8?q?=E7=94=B3=E8=AF=B7=E4=BA=BA=E6=8C=87=E5=AE=9A=E4=BB=96=E4=BB=AC?= =?UTF-8?q?=E5=B8=8C=E6=9C=9B=E8=BD=AC=E6=AD=A3=E7=9A=84=E6=97=A5=E6=9C=9F?= =?UTF-8?q?=E3=80=82=E5=90=8E=E7=AB=AF=E6=95=B0=E6=8D=AE=E6=A8=A1=E5=9E=8B?= =?UTF-8?q?=E4=B9=9F=E7=9B=B8=E5=BA=94=E6=9B=B4=E6=96=B0=EF=BC=8C=E4=BB=A5?= =?UTF-8?q?=E5=AD=98=E5=82=A8=E8=BF=99=E4=B8=80=E4=BF=A1=E6=81=AF=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/oa/vo/regular/BpmOARegularCreateReqVO.java | 4 ++++ .../admin/oa/vo/regular/BpmOARegularRespVO.java | 4 ++++ .../module/bpm/dal/dataobject/oa/BpmOARegularDO.java | 8 ++++++-- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/regular/BpmOARegularCreateReqVO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/regular/BpmOARegularCreateReqVO.java index 1ef6b506..41030e41 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/regular/BpmOARegularCreateReqVO.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/regular/BpmOARegularCreateReqVO.java @@ -37,6 +37,10 @@ public class BpmOARegularCreateReqVO { @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY) private LocalDate confirmationDate; + @Schema(description = "期望转正时间", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY) + private LocalDate desireDate; + @Schema(description = "备注", requiredMode = Schema.RequiredMode.NOT_REQUIRED) private String notes; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/regular/BpmOARegularRespVO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/regular/BpmOARegularRespVO.java index a2c20fd3..9a0d45ca 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/regular/BpmOARegularRespVO.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/regular/BpmOARegularRespVO.java @@ -36,6 +36,10 @@ public class BpmOARegularRespVO extends BpmOABaseRespVO { @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY) private LocalDate confirmationDate; + @Schema(description = "期望转正时间", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY) + private LocalDate desireDate; + @Schema(description = "备注", requiredMode = Schema.RequiredMode.NOT_REQUIRED) private String notes; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/oa/BpmOARegularDO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/oa/BpmOARegularDO.java index 12db2ee2..e2aefb23 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/oa/BpmOARegularDO.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/oa/BpmOARegularDO.java @@ -36,7 +36,6 @@ public class BpmOARegularDO extends BaseDO { /** * 申请人的用户编号 - * * 关联 AdminUserDO 的 id 属性 */ private Long userId; @@ -56,13 +55,18 @@ public class BpmOARegularDO extends BaseDO { */ private LocalDate confirmationDate; + /** + * 期望转正时间 + */ + private LocalDate desireDate; + /** * 备注 */ private String notes; /** - * 出差的结果 + * 结果 * * 枚举 {@link BpmProcessInstanceResultEnum} * 考虑到简单，所以直接复用了 BpmProcessInstanceResultEnum 枚举，也可以自己定义一个枚举哈