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
84a9ec2d
Commit
84a9ec2d
authored
Jul 10, 2024
by
hongguangwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MVP1.6.6-预入职相关_导出优化
parent
0ac2012c
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
34 additions
and
15 deletions
+34
-15
TEmpBadRecordServiceImpl.java
.../yifu/archives/service/impl/TEmpBadRecordServiceImpl.java
+2
-1
TEmpContactInfoServiceImpl.java
...ifu/archives/service/impl/TEmpContactInfoServiceImpl.java
+2
-1
TEmpDisabilityInfoServiceImpl.java
.../archives/service/impl/TEmpDisabilityInfoServiceImpl.java
+4
-2
TEmpEducationServiceImpl.java
.../yifu/archives/service/impl/TEmpEducationServiceImpl.java
+11
-2
TPreEmpMainServiceImpl.java
...v1/yifu/archives/service/impl/TPreEmpMainServiceImpl.java
+15
-9
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmpBadRecordServiceImpl.java
View file @
84a9ec2d
...
@@ -273,7 +273,8 @@ public class TEmpBadRecordServiceImpl extends ServiceImpl<TEmpBadRecordMapper, T
...
@@ -273,7 +273,8 @@ public class TEmpBadRecordServiceImpl extends ServiceImpl<TEmpBadRecordMapper, T
@Override
@Override
public
TEmpBadRecord
getByEmpId
(
String
empId
)
{
public
TEmpBadRecord
getByEmpId
(
String
empId
)
{
return
baseMapper
.
selectOne
(
Wrappers
.<
TEmpBadRecord
>
query
().
lambda
().
eq
(
TEmpBadRecord:
:
getEmpId
,
empId
).
last
(
CommonConstants
.
LAST_ONE_SQL
));
return
baseMapper
.
selectOne
(
Wrappers
.<
TEmpBadRecord
>
query
().
lambda
().
eq
(
TEmpBadRecord:
:
getEmpId
,
empId
)
.
orderByDesc
(
TEmpBadRecord:
:
getCreateTime
).
last
(
CommonConstants
.
LAST_ONE_SQL
));
}
}
@Override
@Override
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmpContactInfoServiceImpl.java
View file @
84a9ec2d
...
@@ -258,7 +258,8 @@ public class TEmpContactInfoServiceImpl extends ServiceImpl<TEmpContactInfoMappe
...
@@ -258,7 +258,8 @@ public class TEmpContactInfoServiceImpl extends ServiceImpl<TEmpContactInfoMappe
@Override
@Override
public
TEmpContactInfo
getByEmpId
(
String
empId
)
{
public
TEmpContactInfo
getByEmpId
(
String
empId
)
{
return
baseMapper
.
selectOne
(
Wrappers
.<
TEmpContactInfo
>
query
().
lambda
().
eq
(
TEmpContactInfo:
:
getEmpId
,
empId
).
last
(
CommonConstants
.
LAST_ONE_SQL
));
return
baseMapper
.
selectOne
(
Wrappers
.<
TEmpContactInfo
>
query
().
lambda
().
eq
(
TEmpContactInfo:
:
getEmpId
,
empId
)
.
orderByDesc
(
TEmpContactInfo:
:
getCreateTime
).
last
(
CommonConstants
.
LAST_ONE_SQL
));
}
}
}
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmpDisabilityInfoServiceImpl.java
View file @
84a9ec2d
...
@@ -28,7 +28,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
...
@@ -28,7 +28,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import
com.baomidou.mybatisplus.core.toolkit.Wrappers
;
import
com.baomidou.mybatisplus.core.toolkit.Wrappers
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
;
import
com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
;
import
com.yifu.cloud.plus.v1.yifu.archives.entity.TEmpBadRecord
;
import
com.yifu.cloud.plus.v1.yifu.archives.entity.TEmpDisabilityInfo
;
import
com.yifu.cloud.plus.v1.yifu.archives.entity.TEmpDisabilityInfo
;
import
com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeInfo
;
import
com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeInfo
;
import
com.yifu.cloud.plus.v1.yifu.archives.mapper.TAttaInfoMapper
;
import
com.yifu.cloud.plus.v1.yifu.archives.mapper.TAttaInfoMapper
;
...
@@ -306,7 +305,10 @@ public class TEmpDisabilityInfoServiceImpl extends ServiceImpl<TEmpDisabilityInf
...
@@ -306,7 +305,10 @@ public class TEmpDisabilityInfoServiceImpl extends ServiceImpl<TEmpDisabilityInf
@Override
@Override
public
TEmpDisabilityInfo
getByEmpId
(
String
empId
)
{
public
TEmpDisabilityInfo
getByEmpId
(
String
empId
)
{
return
baseMapper
.
selectOne
(
Wrappers
.<
TEmpDisabilityInfo
>
query
().
lambda
().
eq
(
TEmpDisabilityInfo:
:
getEmpId
,
empId
).
last
(
CommonConstants
.
LAST_ONE_SQL
));
return
baseMapper
.
selectOne
(
Wrappers
.<
TEmpDisabilityInfo
>
query
().
lambda
()
.
eq
(
TEmpDisabilityInfo:
:
getEmpId
,
empId
)
.
eq
(
TEmpDisabilityInfo:
:
getDeleteFlag
,
CommonConstants
.
STATUS_NORMAL
)
.
orderByDesc
(
TEmpDisabilityInfo:
:
getCreateTime
).
last
(
CommonConstants
.
LAST_ONE_SQL
));
}
}
}
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmpEducationServiceImpl.java
View file @
84a9ec2d
...
@@ -544,8 +544,17 @@ public class TEmpEducationServiceImpl extends ServiceImpl<TEmpEducationMapper, T
...
@@ -544,8 +544,17 @@ public class TEmpEducationServiceImpl extends ServiceImpl<TEmpEducationMapper, T
@Override
@Override
public
TEmpEducation
getByEmpId
(
String
empId
)
{
public
TEmpEducation
getByEmpId
(
String
empId
)
{
return
baseMapper
.
selectOne
(
Wrappers
.<
TEmpEducation
>
query
().
lambda
().
eq
(
TEmpEducation:
:
getEmpId
,
empId
)
TEmpEducation
empEducation
=
baseMapper
.
selectOne
(
Wrappers
.<
TEmpEducation
>
query
().
lambda
().
eq
(
TEmpEducation:
:
getEmpId
,
empId
)
.
eq
(
TEmpEducation:
:
getDeleteFlag
,
CommonConstants
.
STATUS_NORMAL
).
last
(
CommonConstants
.
LAST_ONE_SQL
));
.
eq
(
TEmpEducation:
:
getDeleteFlag
,
CommonConstants
.
STATUS_NORMAL
).
eq
(
TEmpEducation:
:
getHighIdentification
,
CommonConstants
.
STATUS_NORMAL
)
.
orderByDesc
(
TEmpEducation:
:
getCreateTime
)
.
last
(
CommonConstants
.
LAST_ONE_SQL
));
if
(
empEducation
==
null
)
{
empEducation
=
baseMapper
.
selectOne
(
Wrappers
.<
TEmpEducation
>
query
().
lambda
().
eq
(
TEmpEducation:
:
getEmpId
,
empId
)
.
eq
(
TEmpEducation:
:
getDeleteFlag
,
CommonConstants
.
STATUS_NORMAL
)
.
orderByDesc
(
TEmpEducation:
:
getCreateTime
).
last
(
CommonConstants
.
LAST_ONE_SQL
));
}
return
empEducation
;
}
}
}
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TPreEmpMainServiceImpl.java
View file @
84a9ec2d
...
@@ -423,9 +423,11 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
...
@@ -423,9 +423,11 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
}
}
record
.
setEmpIdcard
(
empIdCard
);
record
.
setEmpIdcard
(
empIdCard
);
record
.
setPreMainId
(
id
);
record
.
setPreMainId
(
id
);
record
.
setCreateBy
(
user
.
getId
());
if
(
Common
.
isEmpty
(
record
.
getCreateBy
()))
{
record
.
setCreateName
(
user
.
getNickname
());
record
.
setCreateBy
(
user
.
getId
());
record
.
setCreateTime
(
LocalDateTime
.
now
());
record
.
setCreateName
(
user
.
getNickname
());
record
.
setCreateTime
(
LocalDateTime
.
now
());
}
tPreEmpFamilyList
.
add
(
record
);
tPreEmpFamilyList
.
add
(
record
);
}
}
tPreEmpFamilyService
.
saveBatch
(
tPreEmpFamilyList
);
tPreEmpFamilyService
.
saveBatch
(
tPreEmpFamilyList
);
...
@@ -518,9 +520,11 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
...
@@ -518,9 +520,11 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
record
.
setAttaList
(
attaInfoList
);
record
.
setAttaList
(
attaInfoList
);
record
.
setPreMainId
(
id
);
record
.
setPreMainId
(
id
);
record
.
setEmpIdcard
(
empIdCard
);
record
.
setEmpIdcard
(
empIdCard
);
record
.
setCreateBy
(
user
.
getId
());
if
(
Common
.
isEmpty
(
record
.
getCreateBy
()))
{
record
.
setCreateName
(
user
.
getNickname
());
record
.
setCreateBy
(
user
.
getId
());
record
.
setCreateTime
(
LocalDateTime
.
now
());
record
.
setCreateName
(
user
.
getNickname
());
record
.
setCreateTime
(
LocalDateTime
.
now
());
}
tPreEmpProfessionalQualificationList
.
add
(
record
);
tPreEmpProfessionalQualificationList
.
add
(
record
);
}
}
tPreEmpProfessionalService
.
saveBatch
(
tPreEmpProfessionalQualificationList
);
tPreEmpProfessionalService
.
saveBatch
(
tPreEmpProfessionalQualificationList
);
...
@@ -579,9 +583,11 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
...
@@ -579,9 +583,11 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
}
}
record
.
setEmpIdcard
(
empIdCard
);
record
.
setEmpIdcard
(
empIdCard
);
record
.
setPreMainId
(
id
);
record
.
setPreMainId
(
id
);
record
.
setCreateBy
(
user
.
getId
());
if
(
Common
.
isEmpty
(
record
.
getCreateBy
()))
{
record
.
setCreateName
(
user
.
getNickname
());
record
.
setCreateBy
(
user
.
getId
());
record
.
setCreateTime
(
LocalDateTime
.
now
());
record
.
setCreateName
(
user
.
getNickname
());
record
.
setCreateTime
(
LocalDateTime
.
now
());
}
tPreEmpWorkRecordingList
.
add
(
record
);
tPreEmpWorkRecordingList
.
add
(
record
);
}
}
tPreEmpWorkRecordingService
.
saveBatch
(
tPreEmpWorkRecordingList
);
tPreEmpWorkRecordingService
.
saveBatch
(
tPreEmpWorkRecordingList
);
...
...
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