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
ab95856d
Commit
ab95856d
authored
Jun 28, 2024
by
hongguangwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MVP1.6.6-预入职相关_大专及以上
parent
267c1ced
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
20 additions
and
12 deletions
+20
-12
TEmpProfessionalQualificationMapper.java
.../archives/mapper/TEmpProfessionalQualificationMapper.java
+1
-1
TEmpWorkRecordingMapper.java
...plus/v1/yifu/archives/mapper/TEmpWorkRecordingMapper.java
+1
-1
TEmpProfessionalQualificationService.java
...rchives/service/TEmpProfessionalQualificationService.java
+1
-1
TEmpWorkRecordingService.java
...us/v1/yifu/archives/service/TEmpWorkRecordingService.java
+1
-1
TEmpProfessionalQualificationServiceImpl.java
...ervice/impl/TEmpProfessionalQualificationServiceImpl.java
+2
-2
TEmpWorkRecordingServiceImpl.java
...u/archives/service/impl/TEmpWorkRecordingServiceImpl.java
+2
-2
TEmployeeProjectServiceImpl.java
...fu/archives/service/impl/TEmployeeProjectServiceImpl.java
+8
-0
TPreEmpMainServiceImpl.java
...v1/yifu/archives/service/impl/TPreEmpMainServiceImpl.java
+2
-2
TEmpProfessionalQualification.xml
...c/main/resources/mapper/TEmpProfessionalQualification.xml
+1
-1
TEmpWorkRecordingMapper.xml
...biz/src/main/resources/mapper/TEmpWorkRecordingMapper.xml
+1
-1
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/mapper/TEmpProfessionalQualificationMapper.java
View file @
ab95856d
...
...
@@ -31,5 +31,5 @@ import org.apache.ibatis.annotations.Param;
@Mapper
public
interface
TEmpProfessionalQualificationMapper
extends
BaseMapper
<
TEmpProfessionalQualification
>
{
void
deleteByEmpId
(
@Param
(
"empId"
)
String
empId
);
void
delete
Professional
ByEmpId
(
@Param
(
"empId"
)
String
empId
);
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/mapper/TEmpWorkRecordingMapper.java
View file @
ab95856d
...
...
@@ -31,5 +31,5 @@ import org.apache.ibatis.annotations.Param;
@Mapper
public
interface
TEmpWorkRecordingMapper
extends
BaseMapper
<
TEmpWorkRecording
>
{
void
deleteByEmpId
(
@Param
(
"empId"
)
String
empId
);
void
delete
WorkRecord
ByEmpId
(
@Param
(
"empId"
)
String
empId
);
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/TEmpProfessionalQualificationService.java
View file @
ab95856d
...
...
@@ -65,6 +65,6 @@ public interface TEmpProfessionalQualificationService extends IService<TEmpProfe
* @Date: 2024/6/19 18:27
* @return: void
**/
void
deleteByEmpId
(
String
empId
);
void
delete
Professional
ByEmpId
(
String
empId
);
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/TEmpWorkRecordingService.java
View file @
ab95856d
...
...
@@ -65,6 +65,6 @@ public interface TEmpWorkRecordingService extends IService<TEmpWorkRecording> {
* @Date: 2024/6/19 18:27
* @return: void
**/
void
deleteByEmpId
(
String
empId
);
void
delete
WorkRecord
ByEmpId
(
String
empId
);
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmpProfessionalQualificationServiceImpl.java
View file @
ab95856d
...
...
@@ -66,8 +66,8 @@ public class TEmpProfessionalQualificationServiceImpl extends ServiceImpl<TEmpPr
private
final
TEmployeeInfoMapper
employeeInfoMapper
;
@Override
public
void
deleteByEmpId
(
String
empId
)
{
baseMapper
.
deleteByEmpId
(
empId
);
public
void
delete
Professional
ByEmpId
(
String
empId
)
{
baseMapper
.
delete
Professional
ByEmpId
(
empId
);
}
@Override
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmpWorkRecordingServiceImpl.java
View file @
ab95856d
...
...
@@ -297,8 +297,8 @@ public class TEmpWorkRecordingServiceImpl extends ServiceImpl<TEmpWorkRecordingM
}
@Override
public
void
deleteByEmpId
(
String
empId
)
{
baseMapper
.
deleteByEmpId
(
empId
);
public
void
delete
WorkRecord
ByEmpId
(
String
empId
)
{
baseMapper
.
delete
WorkRecord
ByEmpId
(
empId
);
}
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeProjectServiceImpl.java
View file @
ab95856d
...
...
@@ -1436,6 +1436,14 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
employee
.
setIsCollege
(
CommonConstants
.
ONE_INT
);
if
(
Common
.
isNotNull
(
vo
.
getHighEducation
()))
{
employee
.
setHignEducation
(
vo
.
getHighEducation
());
if
(
"5"
.
equals
(
employee
.
getHignEducation
())
||
"6"
.
equals
(
employee
.
getHignEducation
())
||
"7"
.
equals
(
employee
.
getHignEducation
())
||
"8"
.
equals
(
employee
.
getHignEducation
()))
{
employee
.
setIsCollege
(
CommonConstants
.
ONE_INT
);
}
else
{
employee
.
setIsCollege
(
CommonConstants
.
ZERO_INT
);
}
}
if
(
Common
.
isNotNull
(
vo
.
getSchoolName
())){
employee
.
setSchool
(
vo
.
getSchoolName
());
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TPreEmpMainServiceImpl.java
View file @
ab95856d
...
...
@@ -1131,7 +1131,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
List
<
TPreEmpProfessionalQualification
>
tPreEmpProfessionalQualificationList
=
vo
.
getTpreEmpProfessionalQualificationList
();
if
(
tPreEmpProfessionalQualificationList
!=
null
)
{
// 先删除其他信息
tEmpProfessionalQualificationService
.
deleteByEmpId
(
empId
);
tEmpProfessionalQualificationService
.
delete
Professional
ByEmpId
(
empId
);
TEmpProfessionalQualification
info
;
for
(
TPreEmpProfessionalQualification
preInfo
:
tPreEmpProfessionalQualificationList
)
{
info
=
new
TEmpProfessionalQualification
();
...
...
@@ -1162,7 +1162,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
List
<
TPreEmpWorkRecording
>
tPreEmpWorkRecordingList
=
vo
.
getTpreEmpWorkRecordingList
();
if
(
tPreEmpWorkRecordingList
!=
null
)
{
// 先删除其他信息
tEmpWorkRecordingService
.
deleteByEmpId
(
empId
);
tEmpWorkRecordingService
.
delete
WorkRecord
ByEmpId
(
empId
);
List
<
TEmpWorkRecording
>
tEmpWorkRecordingList
=
new
ArrayList
<>();
TEmpWorkRecording
info
;
for
(
TPreEmpWorkRecording
preInfo
:
tPreEmpWorkRecordingList
)
{
...
...
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TEmpProfessionalQualification.xml
View file @
ab95856d
...
...
@@ -46,7 +46,7 @@
<result
property=
"remark"
column=
"REMARK"
/>
</resultMap>
<delete
id=
"deleteByEmpId"
>
<delete
id=
"delete
Professional
ByEmpId"
>
delete from t_pre_emp_professional_qualification where EMP_ID = #{empId}
</delete>
...
...
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TEmpWorkRecordingMapper.xml
View file @
ab95856d
...
...
@@ -47,7 +47,7 @@
</resultMap>
<delete
id=
"deleteByEmpId"
>
<delete
id=
"delete
WorkRecord
ByEmpId"
>
delete from t_pre_emp_work_recording where EMP_ID = #{empId}
</delete>
</mapper>
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