期望转正时间字段添加到转正申请表单和响应中在转正申请的创建请求和响应对象中加入了一个新的日期字段“期望转正时间”。该字段为非必填项,允许申请人指定他们希望转正的日期。后端数据模型也相应更新,以存储这一信息。
This commit is contained in:
parent
2936acc8b0
commit
d84effdc62
@ -37,6 +37,10 @@ public class BpmOARegularCreateReqVO {
|
|||||||
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY)
|
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY)
|
||||||
private LocalDate confirmationDate;
|
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)
|
@Schema(description = "备注", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
|
||||||
private String notes;
|
private String notes;
|
||||||
|
|
||||||
|
@ -36,6 +36,10 @@ public class BpmOARegularRespVO extends BpmOABaseRespVO {
|
|||||||
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY)
|
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY)
|
||||||
private LocalDate confirmationDate;
|
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)
|
@Schema(description = "备注", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
|
||||||
private String notes;
|
private String notes;
|
||||||
|
|
||||||
|
@ -36,7 +36,6 @@ public class BpmOARegularDO extends BaseDO {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 申请人的用户编号
|
* 申请人的用户编号
|
||||||
*
|
|
||||||
* 关联 AdminUserDO 的 id 属性
|
* 关联 AdminUserDO 的 id 属性
|
||||||
*/
|
*/
|
||||||
private Long userId;
|
private Long userId;
|
||||||
@ -56,13 +55,18 @@ public class BpmOARegularDO extends BaseDO {
|
|||||||
*/
|
*/
|
||||||
private LocalDate confirmationDate;
|
private LocalDate confirmationDate;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 期望转正时间
|
||||||
|
*/
|
||||||
|
private LocalDate desireDate;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 备注
|
* 备注
|
||||||
*/
|
*/
|
||||||
private String notes;
|
private String notes;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 出差的结果
|
* 结果
|
||||||
*
|
*
|
||||||
* 枚举 {@link BpmProcessInstanceResultEnum}
|
* 枚举 {@link BpmProcessInstanceResultEnum}
|
||||||
* 考虑到简单,所以直接复用了 BpmProcessInstanceResultEnum 枚举,也可以自己定义一个枚举哈
|
* 考虑到简单,所以直接复用了 BpmProcessInstanceResultEnum 枚举,也可以自己定义一个枚举哈
|
||||||
|
Loading…
Reference in New Issue
Block a user