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
bb07037a
Commit
bb07037a
authored
Jul 05, 2024
by
hongguangwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MVP1.6.6-预入职相关_同步后的状态
parent
db6a016f
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
14 additions
and
7 deletions
+14
-7
TPreEmpMainServiceImpl.java
...v1/yifu/archives/service/impl/TPreEmpMainServiceImpl.java
+8
-1
TPreEmpBadRecordMapper.xml
...-biz/src/main/resources/mapper/TPreEmpBadRecordMapper.xml
+1
-1
TPreEmpContactInfoMapper.xml
...iz/src/main/resources/mapper/TPreEmpContactInfoMapper.xml
+1
-1
TPreEmpDisabilityInfoMapper.xml
...src/main/resources/mapper/TPreEmpDisabilityInfoMapper.xml
+1
-1
TPreEmpEducationMapper.xml
...-biz/src/main/resources/mapper/TPreEmpEducationMapper.xml
+1
-1
TPreEmployeeInfoMapper.xml
...-biz/src/main/resources/mapper/TPreEmployeeInfoMapper.xml
+1
-1
TPreEmployeeProjectMapper.xml
...z/src/main/resources/mapper/TPreEmployeeProjectMapper.xml
+1
-1
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TPreEmpMainServiceImpl.java
View file @
bb07037a
...
@@ -1352,7 +1352,14 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
...
@@ -1352,7 +1352,14 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
isNew
=
true
;
isNew
=
true
;
project
=
new
TEmployeeProject
();
project
=
new
TEmployeeProject
();
}
}
BeanUtil
.
copyProperties
(
tPreEmployeeProject
,
project
,
ID
);
String
[]
ignoreProperties
=
new
String
[]{
"id"
,
"status"
};
BeanUtil
.
copyProperties
(
tPreEmployeeProject
,
project
,
ignoreProperties
);
if
(
Common
.
isEmpty
(
project
.
getStatus
()))
{
project
.
setStatus
(
CommonConstants
.
ZERO_INT
);
}
if
(
Common
.
isEmpty
(
project
.
getEmpId
())
&&
emp
!=
null
)
{
project
.
setEmpId
(
emp
.
getId
());
}
if
(
isNew
)
{
if
(
isNew
)
{
// 新项目档案塞基本属性
// 新项目档案塞基本属性
this
.
setNewEmpProjectBaseData
(
project
,
emp
,
dept
,
user
);
this
.
setNewEmpProjectBaseData
(
project
,
emp
,
dept
,
user
);
...
...
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TPreEmpBadRecordMapper.xml
View file @
bb07037a
...
@@ -123,7 +123,7 @@
...
@@ -123,7 +123,7 @@
SELECT
SELECT
<include
refid=
"Base_Column_List"
/>
<include
refid=
"Base_Column_List"
/>
FROM t_pre_emp_bad_record a
FROM t_pre_emp_bad_record a
where PRE_MAIN_ID = #{preMainId}
where PRE_MAIN_ID = #{preMainId}
order by a.create_time desc
limit 1
limit 1
</select>
</select>
</mapper>
</mapper>
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TPreEmpContactInfoMapper.xml
View file @
bb07037a
...
@@ -97,7 +97,7 @@
...
@@ -97,7 +97,7 @@
SELECT
SELECT
<include
refid=
"Base_Column_List"
/>
<include
refid=
"Base_Column_List"
/>
FROM t_pre_emp_contact_info a
FROM t_pre_emp_contact_info a
where PRE_MAIN_ID = #{preMainId}
where PRE_MAIN_ID = #{preMainId}
order by a.create_time desc
limit 1
limit 1
</select>
</select>
</mapper>
</mapper>
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TPreEmpDisabilityInfoMapper.xml
View file @
bb07037a
...
@@ -148,7 +148,7 @@
...
@@ -148,7 +148,7 @@
SELECT
SELECT
<include
refid=
"Base_Column_List"
/>
<include
refid=
"Base_Column_List"
/>
FROM t_pre_emp_disability_info a
FROM t_pre_emp_disability_info a
where PRE_MAIN_ID = #{preMainId}
where PRE_MAIN_ID = #{preMainId}
order by a.create_time desc
limit 1
limit 1
</select>
</select>
</mapper>
</mapper>
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TPreEmpEducationMapper.xml
View file @
bb07037a
...
@@ -163,7 +163,7 @@
...
@@ -163,7 +163,7 @@
SELECT
SELECT
<include
refid=
"Base_Column_List"
/>
<include
refid=
"Base_Column_List"
/>
FROM t_pre_emp_education a
FROM t_pre_emp_education a
where PRE_MAIN_ID = #{preMainId}
where PRE_MAIN_ID = #{preMainId}
order by a.create_time desc
limit 1
limit 1
</select>
</select>
</mapper>
</mapper>
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TPreEmployeeInfoMapper.xml
View file @
bb07037a
...
@@ -297,7 +297,7 @@
...
@@ -297,7 +297,7 @@
SELECT
SELECT
<include
refid=
"Base_Column_List"
/>
<include
refid=
"Base_Column_List"
/>
FROM t_pre_employee_info a
FROM t_pre_employee_info a
where PRE_MAIN_ID = #{preMainId}
where PRE_MAIN_ID = #{preMainId}
order by a.create_time desc
limit 1
limit 1
</select>
</select>
</mapper>
</mapper>
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TPreEmployeeProjectMapper.xml
View file @
bb07037a
...
@@ -288,7 +288,7 @@
...
@@ -288,7 +288,7 @@
SELECT
SELECT
<include
refid=
"Base_Column_List"
/>
<include
refid=
"Base_Column_List"
/>
FROM t_pre_employee_project a
FROM t_pre_employee_project a
where PRE_MAIN_ID = #{preMainId}
where PRE_MAIN_ID = #{preMainId}
order by a.create_time desc
limit 1
limit 1
</select>
</select>
</mapper>
</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