From 7292093bef53f2255c2db7e014df8f993303a462 Mon Sep 17 00:00:00 2001
From: 284718418@qq.com <youlinrc321>
Date: Wed, 10 May 2023 12:08:30 +0800
Subject: [PATCH] 1.添加录用审批流程 2.招聘录用审批添加assoType类型
---
src/main/java/cn/timer/api/bean/spmk/SpmkApprovalTemplate.java | 2 +-
src/main/java/cn/timer/api/bean/spmk/SpmkApproveDrafts.java | 2 +-
src/main/java/cn/timer/api/bean/spmk/SpmkApproveSummary.java | 2 +-
src/main/java/cn/timer/api/bean/spmk/SpmkCustomApproval.java | 2 +-
src/main/java/cn/timer/api/dto/spmk/SpmkApprovalTemplateDto.java | 2 +-
src/main/java/cn/timer/api/dto/spmk/SpmkApproveSummaryDto.java | 6 +++---
src/main/java/cn/timer/api/dto/spmk/SpmkCustomApprovalDto.java | 6 +++---
7 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/src/main/java/cn/timer/api/bean/spmk/SpmkApprovalTemplate.java b/src/main/java/cn/timer/api/bean/spmk/SpmkApprovalTemplate.java
index ff44f1d..97a2219 100644
--- a/src/main/java/cn/timer/api/bean/spmk/SpmkApprovalTemplate.java
+++ b/src/main/java/cn/timer/api/bean/spmk/SpmkApprovalTemplate.java
@@ -75,7 +75,7 @@ public class SpmkApprovalTemplate extends Model<SpmkApprovalTemplate> {
@ApiModelProperty(value = "创建时间 ", example = "创建时间")
private Date createTime;
- @ApiModelProperty(value = "关联类型 0无 1转正 2离职 3调岗 4加班 5请假 6出差 7外出 8补卡 9调薪", example = "1")
+ @ApiModelProperty(value = "关联类型 0无 1转正 2离职 3调岗 4加班 5请假 6出差 7外出 8补卡 9调薪 10调薪 11录用 ", example = "1")
private Integer assoType;
@ApiModelProperty(value = "审批表单 ", example = "审批表单")
diff --git a/src/main/java/cn/timer/api/bean/spmk/SpmkApproveDrafts.java b/src/main/java/cn/timer/api/bean/spmk/SpmkApproveDrafts.java
index 8874a12..f4eddba 100644
--- a/src/main/java/cn/timer/api/bean/spmk/SpmkApproveDrafts.java
+++ b/src/main/java/cn/timer/api/bean/spmk/SpmkApproveDrafts.java
@@ -73,7 +73,7 @@ public class SpmkApproveDrafts extends Model<SpmkApproveDrafts> implements Seria
*/
private String historyApprover;
/**
- * assoType 只能为 0无 1转正 2离职 3调岗 4招聘 5加班 6请假 7出差 8外出 9补卡 10调薪
+ * assoType 只能为 0无 1转正 2离职 3调岗 4招聘 5加班 6请假 7出差 8外出 9补卡 10调薪 11录用
*/
private Integer assoType;
/**
diff --git a/src/main/java/cn/timer/api/bean/spmk/SpmkApproveSummary.java b/src/main/java/cn/timer/api/bean/spmk/SpmkApproveSummary.java
index 9fbb788..245fbe7 100644
--- a/src/main/java/cn/timer/api/bean/spmk/SpmkApproveSummary.java
+++ b/src/main/java/cn/timer/api/bean/spmk/SpmkApproveSummary.java
@@ -74,7 +74,7 @@ public class SpmkApproveSummary extends Model<SpmkApproveSummary> {
@ApiModelProperty(value = "历史审批人 ", example = "历史审批人")
private String historyApprover;
- @ApiModelProperty(value = "1转正 2离职 3调薪 4调岗 5加班 6请假 7出差 8外出 9补卡", example = "1")
+ @ApiModelProperty(value = "1转正 2离职 3调薪 4调岗 5加班 6请假 7出差 8外出 9补卡 10调薪 11录用 ", example = "1")
private Integer assoType;
@TableField(fill = FieldFill.UPDATE)
diff --git a/src/main/java/cn/timer/api/bean/spmk/SpmkCustomApproval.java b/src/main/java/cn/timer/api/bean/spmk/SpmkCustomApproval.java
index 6f62399..3d4a87b 100644
--- a/src/main/java/cn/timer/api/bean/spmk/SpmkCustomApproval.java
+++ b/src/main/java/cn/timer/api/bean/spmk/SpmkCustomApproval.java
@@ -78,7 +78,7 @@ public class SpmkCustomApproval extends Model<SpmkCustomApproval> {
@ApiModelProperty(value = "创建时间 ", example = "创建时间")
private Date createTime;
- @ApiModelProperty(value = "关联类型 0无 1转正 2离职 3调岗 4加班 5请假 6出差 7外出 8补卡 9调薪", example = "1")
+ @ApiModelProperty(value = "关联类型 0无 1转正 2离职 3调岗 4加班 5请假 6出差 7外出 8补卡 9调薪 10调薪 11录用 ", example = "1")
private Integer assoType;
@ApiModelProperty(value = "可见范围 0部分可见 1所有可见 2禁用", example = "1")
diff --git a/src/main/java/cn/timer/api/dto/spmk/SpmkApprovalTemplateDto.java b/src/main/java/cn/timer/api/dto/spmk/SpmkApprovalTemplateDto.java
index d8d339a..babd210 100644
--- a/src/main/java/cn/timer/api/dto/spmk/SpmkApprovalTemplateDto.java
+++ b/src/main/java/cn/timer/api/dto/spmk/SpmkApprovalTemplateDto.java
@@ -61,7 +61,7 @@ public class SpmkApprovalTemplateDto {
@NotNull(message = ValidationMsg.NOTNULL)
@DecimalMax(value = "11",message = ValidationMsg.DECIMALMAX +" 只能为 0无 1转正 2离职 3调岗 4招聘 5加班 6请假 7出差 8外出 9补卡 10调薪 11录用 ")
@DecimalMin(value = "0",message = ValidationMsg.DECIMALMIN +" 只能为 0无 1转正 2离职 3调岗 4招聘 5加班 6请假 7出差 8外出 9补卡 10调薪 11录用 ")
- @ApiModelProperty(value = "关联类型 0无 1转正 2离职 3调岗 4加班 5请假 6出差 7外出 8补卡 9调薪", example = "1")
+ @ApiModelProperty(value = "关联类型 0无 1转正 2离职 3调岗 4加班 5请假 6出差 7外出 8补卡 9调薪10调薪 11录用 ", example = "1")
private Integer assoType;
@NotEmpty(message = ValidationMsg.NOTEMPTY)
diff --git a/src/main/java/cn/timer/api/dto/spmk/SpmkApproveSummaryDto.java b/src/main/java/cn/timer/api/dto/spmk/SpmkApproveSummaryDto.java
index 3d839e8..a62c837 100644
--- a/src/main/java/cn/timer/api/dto/spmk/SpmkApproveSummaryDto.java
+++ b/src/main/java/cn/timer/api/dto/spmk/SpmkApproveSummaryDto.java
@@ -42,9 +42,9 @@ public class SpmkApproveSummaryDto{
private String initiator;
@NotNull(message = ValidationMsg.NOTNULL)
- @DecimalMax(value = "9",message = ValidationMsg.DECIMALMAX +" 只能为 0无 1转正 2离职 3调岗 4招聘 5加班 6请假 7出差 8外出 9补卡 ")
- @DecimalMin(value = "0",message = ValidationMsg.DECIMALMIN +" 只能为 0无 1转正 2离职 3调岗 4招聘 5加班 6请假 7出差 8外出 9补卡 ")
- @ApiModelProperty(value = "关联类型 0无 1转正 2离职 3调岗 4招聘 5加班 6请假 7出差 8外出 9补卡", example = "1")
+ @DecimalMax(value = "11",message = ValidationMsg.DECIMALMAX +" 只能为 0无 1转正 2离职 3调岗 4招聘 5加班 6请假 7出差 8外出 9补卡 10调薪 11录用 ")
+ @DecimalMin(value = "0",message = ValidationMsg.DECIMALMIN +" 只能为 0无 1转正 2离职 3调岗 4招聘 5加班 6请假 7出差 8外出 9补卡 10调薪 11录用 ")
+ @ApiModelProperty(value = "关联类型 0无 1转正 2离职 3调岗 4招聘 5加班 6请假 7出差 8外出 9补卡 10调薪 11录用 ", example = "1")
private Integer assoType;
@NotNull(message = ValidationMsg.NOTNULL)
diff --git a/src/main/java/cn/timer/api/dto/spmk/SpmkCustomApprovalDto.java b/src/main/java/cn/timer/api/dto/spmk/SpmkCustomApprovalDto.java
index 81fbd15..98eadd5 100644
--- a/src/main/java/cn/timer/api/dto/spmk/SpmkCustomApprovalDto.java
+++ b/src/main/java/cn/timer/api/dto/spmk/SpmkCustomApprovalDto.java
@@ -63,9 +63,9 @@ public class SpmkCustomApprovalDto {
private Date createTime;
@NotNull(message = "assoType为空")
- @DecimalMax(value = "11",message = "assoType 只能为 0无 1转正 2离职 3调岗 4招聘 5加班 6请假 7出差 8外出 9补卡 10录用")
- @DecimalMin(value = "0",message = "assoType 只能为 0无 1转正 2离职 3调岗 4招聘 5加班 6请假 7出差 8外出 9补卡 10录用")
- @ApiModelProperty(value = "关联类型 0无 1转正 2离职 3调岗 4招聘 5加班 6请假 7出差 8外出 9补卡 10录用", example = "1")
+ @DecimalMax(value = "11",message = "assoType 只能为 0无 1转正 2离职 3调岗 4招聘 5加班 6请假 7出差 8外出 9补卡 10调薪 11录用 ")
+ @DecimalMin(value = "0",message = "assoType 只能为 0无 1转正 2离职 3调岗 4招聘 5加班 6请假 7出差 8外出 9补卡 10调薪 11录用 ")
+ @ApiModelProperty(value = "关联类型 0无 1转正 2离职 3调岗 4招聘 5加班 6请假 7出差 8外出 9补卡 10调薪 11录用 ", example = "1")
private Integer assoType;
@NotNull(message = "isAllvisible为空")
--
libgit2 0.26.0