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
9eddcc1a
Commit
9eddcc1a
authored
Mar 24, 2025
by
hongguangwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MVP1.7.8-hgw(判断简档详档)
parent
4b2c6c5a
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
5 deletions
+5
-5
TPreEmpMainServiceImpl.java
...v1/yifu/archives/service/impl/TPreEmpMainServiceImpl.java
+4
-0
EmployeeRegistrationPreMapper.xml
...c/main/resources/mapper/EmployeeRegistrationPreMapper.xml
+1
-5
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TPreEmpMainServiceImpl.java
View file @
9eddcc1a
...
...
@@ -1589,6 +1589,10 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
tPreEmpMainLogService
.
save
(
auditLog
);
updateToEmployeeByPre
(
vo
,
isSimpleBoo
);
}
if
(
Common
.
isEmpty
(
pre
.
getProcessStatus
())
||
CommonConstants
.
ONE_STRING
.
equals
(
pre
.
getProcessStatus
()))
{
pre
.
setProcessStatus
(
CommonConstants
.
TWO_STRING
);
registrationPreService
.
updateById
(
pre
);
}
}
main
.
setStatus
(
status
);
main
.
setCreateBy
(
user
.
getId
());
...
...
yifu-archives/yifu-archives-biz/src/main/resources/mapper/EmployeeRegistrationPreMapper.xml
View file @
9eddcc1a
...
...
@@ -292,11 +292,7 @@
<!-- 获取员工类型与档案地市-优先从档案维护任务表 -->
<select
id=
"getPreByPre"
resultMap=
"employeeRegistrationPreMap"
>
select
a.id,
a.emp_nature,
a.file_province,
a.file_city,
a.file_town
<include
refid=
"Base_Column_List"
/>
from employee_registration_pre a where a.emp_idcard = #{empIdCard} and a.dept_id = #{deptId}
</select>
<!-- 获取员工类型与档案地市-从项目档案表 -->
...
...
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