Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
Y
yifu-mvp
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
fangxinjiang
yifu-mvp
Commits
562d25d0
Commit
562d25d0
authored
Jun 25, 2025
by
huyuchen
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.7.12' into MVP1.7.12
parents
da41d317
29747df9
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
57 additions
and
6 deletions
+57
-6
TAutoContractRuleInfo.java
...d/plus/v1/yifu/archives/entity/TAutoContractRuleInfo.java
+13
-3
TAutoContractScheme.java
...oud/plus/v1/yifu/archives/entity/TAutoContractScheme.java
+44
-3
No files found.
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/TAutoContractRuleInfo.java
View file @
562d25d0
...
@@ -18,9 +18,7 @@
...
@@ -18,9 +18,7 @@
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
archives
.
entity
;
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
archives
.
entity
;
import
com.alibaba.excel.annotation.ExcelProperty
;
import
com.alibaba.excel.annotation.ExcelProperty
;
import
com.baomidou.mybatisplus.annotation.IdType
;
import
com.baomidou.mybatisplus.annotation.*
;
import
com.baomidou.mybatisplus.annotation.TableId
;
import
com.baomidou.mybatisplus.annotation.TableName
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute
;
import
com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity
;
import
com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity
;
import
io.swagger.v3.oas.annotations.media.Schema
;
import
io.swagger.v3.oas.annotations.media.Schema
;
...
@@ -65,6 +63,7 @@ public class TAutoContractRuleInfo extends BaseEntity {
...
@@ -65,6 +63,7 @@ public class TAutoContractRuleInfo extends BaseEntity {
@Length
(
max
=
1
,
message
=
"新签合同发起时间类型 不能超过1个字符"
)
@Length
(
max
=
1
,
message
=
"新签合同发起时间类型 不能超过1个字符"
)
@ExcelProperty
(
"新签合同发起时间类型 "
)
@ExcelProperty
(
"新签合同发起时间类型 "
)
@Schema
(
description
=
"新签合同发起时间类型 0 入职日期 1入职3天后 2入职1周后 3入职2周后 4入职3周后"
)
@Schema
(
description
=
"新签合同发起时间类型 0 入职日期 1入职3天后 2入职1周后 3入职2周后 4入职3周后"
)
@TableField
(
updateStrategy
=
FieldStrategy
.
IGNORED
)
private
String
newSignType
;
private
String
newSignType
;
/**
/**
* 新签合同发起时间
* 新签合同发起时间
...
@@ -73,6 +72,7 @@ public class TAutoContractRuleInfo extends BaseEntity {
...
@@ -73,6 +72,7 @@ public class TAutoContractRuleInfo extends BaseEntity {
@Length
(
max
=
10
,
message
=
"新签合同发起时间不能超过10个字符"
)
@Length
(
max
=
10
,
message
=
"新签合同发起时间不能超过10个字符"
)
@ExcelProperty
(
"新签合同发起时间"
)
@ExcelProperty
(
"新签合同发起时间"
)
@Schema
(
description
=
"新签合同发起时间"
)
@Schema
(
description
=
"新签合同发起时间"
)
@TableField
(
updateStrategy
=
FieldStrategy
.
IGNORED
)
private
String
newSignDate
;
private
String
newSignDate
;
/**
/**
* 确认签署时间类型 0 签订发起日
* 确认签署时间类型 0 签订发起日
...
@@ -81,6 +81,7 @@ public class TAutoContractRuleInfo extends BaseEntity {
...
@@ -81,6 +81,7 @@ public class TAutoContractRuleInfo extends BaseEntity {
@Length
(
max
=
1
,
message
=
"确认签署时间类型 不能超过1个字符"
)
@Length
(
max
=
1
,
message
=
"确认签署时间类型 不能超过1个字符"
)
@ExcelProperty
(
"确认签署时间类型 "
)
@ExcelProperty
(
"确认签署时间类型 "
)
@Schema
(
description
=
"确认签署时间类型 0 签订发起日"
)
@Schema
(
description
=
"确认签署时间类型 0 签订发起日"
)
@TableField
(
updateStrategy
=
FieldStrategy
.
IGNORED
)
private
String
confirmSignType
;
private
String
confirmSignType
;
/**
/**
* 确认签署时间
* 确认签署时间
...
@@ -89,6 +90,7 @@ public class TAutoContractRuleInfo extends BaseEntity {
...
@@ -89,6 +90,7 @@ public class TAutoContractRuleInfo extends BaseEntity {
@Length
(
max
=
10
,
message
=
"确认签署时间不能超过10个字符"
)
@Length
(
max
=
10
,
message
=
"确认签署时间不能超过10个字符"
)
@ExcelProperty
(
"确认签署时间"
)
@ExcelProperty
(
"确认签署时间"
)
@Schema
(
description
=
"确认签署时间"
)
@Schema
(
description
=
"确认签署时间"
)
@TableField
(
updateStrategy
=
FieldStrategy
.
IGNORED
)
private
String
confirmSignDate
;
private
String
confirmSignDate
;
/**
/**
* 续签合同发起时间类型 0 上一份合同到期前一个月
* 续签合同发起时间类型 0 上一份合同到期前一个月
...
@@ -97,6 +99,7 @@ public class TAutoContractRuleInfo extends BaseEntity {
...
@@ -97,6 +99,7 @@ public class TAutoContractRuleInfo extends BaseEntity {
@Length
(
max
=
1
,
message
=
"续签合同发起时间类型 不能超过1个字符"
)
@Length
(
max
=
1
,
message
=
"续签合同发起时间类型 不能超过1个字符"
)
@ExcelProperty
(
"续签合同发起时间类型 "
)
@ExcelProperty
(
"续签合同发起时间类型 "
)
@Schema
(
description
=
"续签合同发起时间类型 0 上一份合同到期前一个月"
)
@Schema
(
description
=
"续签合同发起时间类型 0 上一份合同到期前一个月"
)
@TableField
(
updateStrategy
=
FieldStrategy
.
IGNORED
)
private
String
renewalDateType
;
private
String
renewalDateType
;
/**
/**
* 续签合同发起时间
* 续签合同发起时间
...
@@ -105,6 +108,7 @@ public class TAutoContractRuleInfo extends BaseEntity {
...
@@ -105,6 +108,7 @@ public class TAutoContractRuleInfo extends BaseEntity {
@Length
(
max
=
10
,
message
=
"续签合同发起时间不能超过10个字符"
)
@Length
(
max
=
10
,
message
=
"续签合同发起时间不能超过10个字符"
)
@ExcelProperty
(
"续签合同发起时间"
)
@ExcelProperty
(
"续签合同发起时间"
)
@Schema
(
description
=
"续签合同发起时间"
)
@Schema
(
description
=
"续签合同发起时间"
)
@TableField
(
updateStrategy
=
FieldStrategy
.
IGNORED
)
private
String
renewalDate
;
private
String
renewalDate
;
/**
/**
* 入职确认选择 0 配置方案内选择、1 自定义 2 配置方案+自定义
* 入职确认选择 0 配置方案内选择、1 自定义 2 配置方案+自定义
...
@@ -113,6 +117,7 @@ public class TAutoContractRuleInfo extends BaseEntity {
...
@@ -113,6 +117,7 @@ public class TAutoContractRuleInfo extends BaseEntity {
@Length
(
max
=
1
,
message
=
"入职确认选择不能超过1个字符"
)
@Length
(
max
=
1
,
message
=
"入职确认选择不能超过1个字符"
)
@ExcelProperty
(
"入职确认选择"
)
@ExcelProperty
(
"入职确认选择"
)
@Schema
(
description
=
"入职确认选择 0 配置方案内选择、1 自定义 2 配置方案+自定义"
)
@Schema
(
description
=
"入职确认选择 0 配置方案内选择、1 自定义 2 配置方案+自定义"
)
@TableField
(
updateStrategy
=
FieldStrategy
.
IGNORED
)
private
String
confirmEmpSelect
;
private
String
confirmEmpSelect
;
/**
/**
* 超时未确认是否触发签署任务(电子签) 0 自动触发 1 不触发
* 超时未确认是否触发签署任务(电子签) 0 自动触发 1 不触发
...
@@ -121,6 +126,7 @@ public class TAutoContractRuleInfo extends BaseEntity {
...
@@ -121,6 +126,7 @@ public class TAutoContractRuleInfo extends BaseEntity {
@Length
(
max
=
1
,
message
=
"超时未确认是否触发签署任务(电子签)不能超过1个字符"
)
@Length
(
max
=
1
,
message
=
"超时未确认是否触发签署任务(电子签)不能超过1个字符"
)
@ExcelProperty
(
"超时未确认是否触发签署任务(电子签)"
)
@ExcelProperty
(
"超时未确认是否触发签署任务(电子签)"
)
@Schema
(
description
=
"超时未确认是否触发签署任务(电子签) 0 自动触发 1 不触发"
)
@Schema
(
description
=
"超时未确认是否触发签署任务(电子签) 0 自动触发 1 不触发"
)
@TableField
(
updateStrategy
=
FieldStrategy
.
IGNORED
)
private
String
timeoutElecSign
;
private
String
timeoutElecSign
;
/**
/**
* 签署方式 0 电子签 1 线下签
* 签署方式 0 电子签 1 线下签
...
@@ -130,6 +136,7 @@ public class TAutoContractRuleInfo extends BaseEntity {
...
@@ -130,6 +136,7 @@ public class TAutoContractRuleInfo extends BaseEntity {
@Length
(
max
=
1
,
message
=
"签署方式不能超过1个字符"
)
@Length
(
max
=
1
,
message
=
"签署方式不能超过1个字符"
)
@ExcelProperty
(
"签署方式"
)
@ExcelProperty
(
"签署方式"
)
@Schema
(
description
=
"签署方式 0 电子签 1 线下签"
)
@Schema
(
description
=
"签署方式 0 电子签 1 线下签"
)
@TableField
(
updateStrategy
=
FieldStrategy
.
IGNORED
)
private
String
signType
;
private
String
signType
;
/**
/**
* 项目配置主表ID
* 项目配置主表ID
...
@@ -139,6 +146,7 @@ public class TAutoContractRuleInfo extends BaseEntity {
...
@@ -139,6 +146,7 @@ public class TAutoContractRuleInfo extends BaseEntity {
@Length
(
max
=
32
,
message
=
"项目配置主表ID不能超过32个字符"
)
@Length
(
max
=
32
,
message
=
"项目配置主表ID不能超过32个字符"
)
@ExcelProperty
(
"项目配置主表ID"
)
@ExcelProperty
(
"项目配置主表ID"
)
@Schema
(
description
=
"项目配置主表ID"
)
@Schema
(
description
=
"项目配置主表ID"
)
@TableField
(
updateStrategy
=
FieldStrategy
.
IGNORED
)
private
String
mainId
;
private
String
mainId
;
/**
/**
* 项目编码
* 项目编码
...
@@ -148,6 +156,7 @@ public class TAutoContractRuleInfo extends BaseEntity {
...
@@ -148,6 +156,7 @@ public class TAutoContractRuleInfo extends BaseEntity {
@Length
(
max
=
50
,
message
=
"项目编码不能超过50个字符"
)
@Length
(
max
=
50
,
message
=
"项目编码不能超过50个字符"
)
@ExcelProperty
(
"项目编码"
)
@ExcelProperty
(
"项目编码"
)
@Schema
(
description
=
"项目编码"
)
@Schema
(
description
=
"项目编码"
)
@TableField
(
updateStrategy
=
FieldStrategy
.
IGNORED
)
private
String
deptNo
;
private
String
deptNo
;
/**
/**
* 项目ID
* 项目ID
...
@@ -157,6 +166,7 @@ public class TAutoContractRuleInfo extends BaseEntity {
...
@@ -157,6 +166,7 @@ public class TAutoContractRuleInfo extends BaseEntity {
@Length
(
max
=
32
,
message
=
"项目ID不能超过32个字符"
)
@Length
(
max
=
32
,
message
=
"项目ID不能超过32个字符"
)
@ExcelProperty
(
"项目ID"
)
@ExcelProperty
(
"项目ID"
)
@Schema
(
description
=
"项目ID"
)
@Schema
(
description
=
"项目ID"
)
@TableField
(
updateStrategy
=
FieldStrategy
.
IGNORED
)
private
String
deptId
;
private
String
deptId
;
}
}
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/TAutoContractScheme.java
View file @
562d25d0
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment