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
80da7edd
Commit
80da7edd
authored
Mar 06, 2026
by
hongguangwu
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.7.20' into MVP1.7.20
parents
559f1f53
179eb294
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
1 deletion
+3
-1
EmployeeConstants.java
...ud/plus/v1/yifu/archives/constants/EmployeeConstants.java
+2
-0
TEmployeeContractPreNewServiceImpl.java
...ives/service/impl/TEmployeeContractPreNewServiceImpl.java
+1
-1
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/constants/EmployeeConstants.java
View file @
80da7edd
...
...
@@ -108,6 +108,8 @@ public class EmployeeConstants {
public
static
final
String
DATA_CONTRACT_EXPECTED_SIGN_TIME_ERROR
=
"待续签合同超期一个月,需走线下签"
;
public
static
final
String
DATA_CONTRACT_EXPECTED_SIGN_TIME_ERROR_TWO
=
"发起时间距离合同开始日期已超过一个月,禁止使用电子签,请切换为线下签"
;
public
static
final
String
ERROR_TYPE_CONTRACT
=
"合同"
;
public
static
final
String
ERROR_DUPLICATE_CONFIRM
=
"已确认,请勿重复确认"
;
public
static
final
String
ERROR_NO_ALERT_FOUND
=
"未找到合同续签待办信息"
;
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeContractPreNewServiceImpl.java
View file @
80da7edd
...
...
@@ -264,7 +264,7 @@ public class TEmployeeContractPreNewServiceImpl extends ServiceImpl<TEmployeeCon
LocalDate
reminderDate
=
LocalDateUtil
.
parseLocalDate
(
DateUtil
.
dateToString
(
preVo
.
getContractStart
(),
DateUtil
.
ISO_EXPANDED_DATE_FORMAT
));
LocalDate
nowDate
=
LocalDate
.
now
();
if
(
null
!=
nowDate
&&
nowDate
.
isAfter
(
reminderDate
.
plusMonths
(
1
))){
return
R
.
failed
(
EmployeeConstants
.
DATA_CONTRACT_EXPECTED_SIGN_TIME_ERROR
);
return
R
.
failed
(
EmployeeConstants
.
DATA_CONTRACT_EXPECTED_SIGN_TIME_ERROR
_TWO
);
}
}
////如果电子签是系统自动撤销对应的签署方式必须更新为 线下签
...
...
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