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
8bf16c37
Commit
8bf16c37
authored
Mar 20, 2025
by
hongguangwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MVP1.7.8-hgw(判断简档详档)
parent
841d5a7a
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
74 additions
and
0 deletions
+74
-0
EmployeeRegistrationPreController.java
...rchives/controller/EmployeeRegistrationPreController.java
+14
-0
EmployeeRegistrationPreMapper.java
...1/yifu/archives/mapper/EmployeeRegistrationPreMapper.java
+17
-0
EmployeeRegistrationPreService.java
...yifu/archives/service/EmployeeRegistrationPreService.java
+10
-0
EmployeeRegistrationPreServiceImpl.java
...ives/service/impl/EmployeeRegistrationPreServiceImpl.java
+19
-0
EmployeeRegistrationPreMapper.xml
...c/main/resources/mapper/EmployeeRegistrationPreMapper.xml
+14
-0
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/EmployeeRegistrationPreController.java
View file @
8bf16c37
...
...
@@ -170,4 +170,18 @@ public class EmployeeRegistrationPreController {
public
R
batchSendMessage
(
@RequestBody
List
<
SendMessageUpdateVo
>
vo
,
String
type
)
{
return
employeeRegistrationPreService
.
batchSendMessage
(
vo
,
type
);
}
/**
* @Description: 判断简档详档(员工类型:代理的是简档,“非代理”且员工合同类型为:空、标准合同、劳务派遣合同、补贴合同 是详档,其余为简档)
* @Author: hgw
* @Date: 2025/3/20 15:24
* @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R<java.lang.String>
**/
@Operation
(
summary
=
"判断简档详档"
,
description
=
"判断简档详档"
)
@SysLog
(
"判断简档详档"
)
@GetMapping
(
"/judgeIsSimple"
)
public
R
<
String
>
judgeIsSimple
(
@RequestParam
String
empIdCard
,
@RequestParam
String
deptId
)
{
return
R
.
ok
(
employeeRegistrationPreService
.
judgeIsSimple
(
empIdCard
,
deptId
));
}
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/mapper/EmployeeRegistrationPreMapper.java
View file @
8bf16c37
...
...
@@ -48,4 +48,21 @@ public interface EmployeeRegistrationPreMapper extends BaseMapper<EmployeeRegist
List
<
EmployeeRegistrationPreInfoExportVo
>
selectConfirmExportList
(
@Param
(
"employeeRegistrationPre"
)
EmployeeRegistrationPreSearchVo
searchVo
);
MessageTempleteVo
selectTempleteVo
(
@Param
(
"id"
)
String
id
);
/**
* @Description: 判断简档详档-优先从档案维护任务表
* @Author: hgw
* @Date: 2025/3/20 15:20
* @return: java.lang.String
**/
String
judegIsSimpleByPre
(
@Param
(
"empIdCard"
)
String
empIdCard
,
@Param
(
"deptId"
)
String
deptId
);
/**
* @Description: 判断简档详档-从项目档案表
* @Author: hgw
* @Date: 2025/3/20 15:20
* @return: java.lang.String
**/
String
judegIsSimpleByEmpProject
(
@Param
(
"empIdCard"
)
String
empIdCard
,
@Param
(
"deptId"
)
String
deptId
);
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/EmployeeRegistrationPreService.java
View file @
8bf16c37
...
...
@@ -84,4 +84,14 @@ public interface EmployeeRegistrationPreService extends IService<EmployeeRegistr
R
batchSendMessage
(
List
<
SendMessageUpdateVo
>
vo
,
String
type
);
void
updatePreStatusToEnd
(
String
deptNo
,
String
empIdcard
);
/**
* @param empIdCard 身份证
* @param deptId 项目ID
* @Description: 判断简档详档(员工类型:代理的是简档,“非代理”且员工合同类型为:空、标准合同、劳务派遣合同、补贴合同 是详档,其余为简档)
* @Author: hgw
* @Date: 2025/3/20 15:03
* @return: java.lang.String
**/
String
judgeIsSimple
(
String
empIdCard
,
String
deptId
);
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/EmployeeRegistrationPreServiceImpl.java
View file @
8bf16c37
...
...
@@ -521,4 +521,23 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi
return
false
;
}
/**
* @Description: 判断简档详档(员工类型:代理的是简档,“非代理”且员工合同类型为:空、标准合同、劳务派遣合同、补贴合同 是详档,其余为简档)
* @Author: hgw
* @Date: 2025/3/20 15:22
* @return: java.lang.String
**/
@Override
public
String
judgeIsSimple
(
String
empIdCard
,
String
deptId
)
{
// 类型1详档2简档
String
type
=
baseMapper
.
judegIsSimpleByPre
(
empIdCard
,
deptId
);
if
(
Common
.
isEmpty
(
type
))
{
type
=
baseMapper
.
judegIsSimpleByEmpProject
(
empIdCard
,
deptId
);
}
if
(
Common
.
isEmpty
(
type
))
{
type
=
CommonConstants
.
ONE_STRING
;
}
return
type
;
}
}
yifu-archives/yifu-archives-biz/src/main/resources/mapper/EmployeeRegistrationPreMapper.xml
View file @
8bf16c37
...
...
@@ -268,4 +268,18 @@
from t_message_templete a
where id = #{id}
</select>
<!-- 判断简档详档-优先从档案维护任务表 -->
<select
id=
"judegIsSimpleByPre"
resultType=
"java.lang.String"
>
select
if(a.emp_nature is null or (a.emp_nature != '2' and (a.contract_type is null or a.contract_type in ('1','20','9'))),1,2) 类型1详档2简档
from employee_registration_pre a where a.emp_idcard = #{empIdCard} and a.dept_id = #{deptId}
</select>
<!-- 判断简档详档-从项目档案表 -->
<select
id=
"judegIsSimpleByEmpProject"
resultType=
"java.lang.String"
>
select
if(a.EMP_NATRUE is null or (a.EMP_NATRUE != '2' and (a.contract_type is null or a.contract_type in ('1','20','9'))),1,2) 类型1详档2简档
from t_employee_project a where a.DELETE_FLAG = '0' and a.PROJECT_STATUS = 0 and a.emp_idcard = #{empIdCard} and a.dept_id = #{deptId}
</select>
</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