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
913666b2
Commit
913666b2
authored
Nov 30, 2022
by
hongguangwu
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/develop' into develop
parents
d6d32250
0ebd94d3
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
3 deletions
+5
-3
TDispatchInfoServiceImpl.java
...v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
+5
-3
No files found.
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
View file @
913666b2
...
@@ -1349,10 +1349,12 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
...
@@ -1349,10 +1349,12 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
if
(
Common
.
isNotNull
(
empVo
)){
if
(
Common
.
isNotNull
(
empVo
)){
fund
.
setEmpId
(
empVo
.
getId
());
fund
.
setEmpId
(
empVo
.
getId
());
fund
.
setEmpNo
(
empVo
.
getEmpNo
());
fund
.
setEmpNo
(
empVo
.
getEmpNo
());
fund
.
setSettleDomain
(
empVo
.
getDeptId
());
fund
.
setEmpIdcard
(
empVo
.
getEmpIdcard
());
}
fund
.
setEmpName
(
empVo
.
getEmpName
());
}
else
{
fund
.
setEmpIdcard
(
excel
.
getEmpIdcard
());
fund
.
setEmpIdcard
(
excel
.
getEmpIdcard
());
fund
.
setEmpName
(
excel
.
getEmpName
());
fund
.
setEmpName
(
excel
.
getEmpName
());
}
fund
.
setTrustRemark
(
excel
.
getTrustRemark
());
fund
.
setTrustRemark
(
excel
.
getTrustRemark
());
fund
.
setUnitProvidengCardinal
(
excel
.
getProvidentCardinal
());
fund
.
setUnitProvidengCardinal
(
excel
.
getProvidentCardinal
());
fund
.
setPersonalProvidentCardinal
(
excel
.
getProvidentCardinal
());
fund
.
setPersonalProvidentCardinal
(
excel
.
getProvidentCardinal
());
...
...
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