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
97ebb8fb
Commit
97ebb8fb
authored
May 23, 2023
by
hongguangwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MVP1.5.4-派单委托备注(合同起缴日期等)
parent
7ad8575f
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
1 deletion
+1
-1
TDispatchInfoServiceImpl.java
...v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
+1
-1
No files found.
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
View file @
97ebb8fb
...
...
@@ -2252,7 +2252,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
if
(
Common
.
isEmpty
(
empVo
.
getContractName
())
&&
validContractInfo
(
errorMessageList
,
excel
))
{
return
true
;
}
if
(
Common
.
isNotNull
(
empVo
.
getContractStart
()))
{
if
(
Common
.
isNotNull
(
empVo
.
getContractStart
())
&&
Common
.
isNotNull
(
excel
.
getContractStart
())
)
{
// 系统已存在的合同起缴日期
String
conYearMonthDay
=
DateUtil
.
formatDatePatten
(
empVo
.
getContractStart
(),
DateUtil
.
ISO_EXPANDED_DATE_FORMAT
);
String
excelConYearMonthDay
=
DateUtil
.
formatDatePatten
(
excel
.
getContractStart
(),
DateUtil
.
ISO_EXPANDED_DATE_FORMAT
);
...
...
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