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
2e828e73
Commit
2e828e73
authored
Jun 23, 2025
by
hongguangwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MVP1.7.12-保存人员档案1
parent
4fde56fc
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
331 additions
and
18 deletions
+331
-18
TEmployeeInfo.java
...ifu/cloud/plus/v1/yifu/archives/entity/TEmployeeInfo.java
+2
-2
TEmployeeProject.java
.../cloud/plus/v1/yifu/archives/entity/TEmployeeProject.java
+2
-2
TGzEmpInfoMapper.java
.../cloud/plus/v1/yifu/archives/mapper/TGzEmpInfoMapper.java
+9
-0
TEmployeeInfoService.java
...d/plus/v1/yifu/archives/service/TEmployeeInfoService.java
+4
-0
TGzEmpInfoService.java
...loud/plus/v1/yifu/archives/service/TGzEmpInfoService.java
+1
-1
TEmployeeInfoServiceImpl.java
.../yifu/archives/service/impl/TEmployeeInfoServiceImpl.java
+1
-1
TGzEmpInfoServiceImpl.java
.../v1/yifu/archives/service/impl/TGzEmpInfoServiceImpl.java
+299
-9
TGzOfferInfoServiceImpl.java
...1/yifu/archives/service/impl/TGzOfferInfoServiceImpl.java
+4
-1
TGzEmpInfoMapper.xml
...chives-biz/src/main/resources/mapper/TGzEmpInfoMapper.xml
+7
-0
TSettleDomainMapper.xml
...ves-biz/src/main/resources/mapper/TSettleDomainMapper.xml
+2
-2
No files found.
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/TEmployeeInfo.java
View file @
2e828e73
...
@@ -278,9 +278,9 @@ public class TEmployeeInfo extends BaseEntity {
...
@@ -278,9 +278,9 @@ public class TEmployeeInfo extends BaseEntity {
/**
/**
* 人员档案来源(字典:4人员档案新建、5项目档案新建、1社保/公积金、3商险、2薪酬、6电子签)
* 人员档案来源(字典:4人员档案新建、5项目档案新建、1社保/公积金、3商险、2薪酬、6电子签)
* 1=社保、公积金派单,2=人员发薪,3=商险派单,4=档案新建,5=批量导入,6=电子签
* 1=社保、公积金派单,2=人员发薪,3=商险派单,4=档案新建,5=批量导入,6=电子签
,7:预入职,9瓜子
*/
*/
@Schema
(
description
=
"人员档案来源(字典:1=社保、公积金派单,2=人员发薪,3=商险派单,4=档案新建,5=批量导入、6电子签,7:预入职)"
)
@Schema
(
description
=
"人员档案来源(字典:1=社保、公积金派单,2=人员发薪,3=商险派单,4=档案新建,5=批量导入、6电子签,7:预入职
,9瓜子
)"
)
private
String
fileSource
;
private
String
fileSource
;
/**
/**
...
...
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/TEmployeeProject.java
View file @
2e828e73
...
@@ -247,9 +247,9 @@ public class TEmployeeProject extends BaseEntity {
...
@@ -247,9 +247,9 @@ public class TEmployeeProject extends BaseEntity {
private
String
tryPeriod
;
private
String
tryPeriod
;
/**
/**
* 项目档案来源(字典:4人员档案新建、5项目档案新建、1社保/公积金、3商险、2薪酬、6批量导入、7电子签8预入职)
* 项目档案来源(字典:4人员档案新建、5项目档案新建、1社保/公积金、3商险、2薪酬、6批量导入、7电子签8预入职
,9瓜子
)
*/
*/
@Schema
(
description
=
"项目档案来源(字典:4人员档案新建、5项目档案新建、1社保/公积金、3商险、2薪酬、6批量导入、7电子签、8预入职)"
)
@Schema
(
description
=
"项目档案来源(字典:4人员档案新建、5项目档案新建、1社保/公积金、3商险、2薪酬、6批量导入、7电子签、8预入职
,9瓜子
)"
)
private
String
projectSource
;
private
String
projectSource
;
/**
/**
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/mapper/TGzEmpInfoMapper.java
View file @
2e828e73
...
@@ -43,6 +43,15 @@ public interface TGzEmpInfoMapper extends BaseMapper<TGzEmpInfo> {
...
@@ -43,6 +43,15 @@ public interface TGzEmpInfoMapper extends BaseMapper<TGzEmpInfo> {
*/
*/
IPage
<
TGzEmpInfo
>
getTGzEmpInfoPage
(
Page
<
TGzEmpInfo
>
page
,
@Param
(
"tGzEmpInfo"
)
TGzEmpInfoSearchVo
tGzEmpInfo
);
IPage
<
TGzEmpInfo
>
getTGzEmpInfoPage
(
Page
<
TGzEmpInfo
>
page
,
@Param
(
"tGzEmpInfo"
)
TGzEmpInfoSearchVo
tGzEmpInfo
);
/**
* @param offerId
* @Description: 查信息
* @Author: hgw
* @Date: 2025/6/20 15:24
* @return: com.yifu.cloud.plus.v1.yifu.archives.entity.TGzEmpInfo
**/
TGzEmpInfo
getInfoByOfferId
(
@Param
(
"offerId"
)
Integer
offerId
);
/**
/**
* @Description: 导出前先查条数
* @Description: 导出前先查条数
* @Author: hgw
* @Author: hgw
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/TEmployeeInfoService.java
View file @
2e828e73
...
@@ -25,6 +25,7 @@ import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeInfo;
...
@@ -25,6 +25,7 @@ import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeInfo;
import
com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeProject
;
import
com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeProject
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.*
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.*
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.R
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.R
;
import
com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser
;
import
org.springframework.web.multipart.MultipartFile
;
import
org.springframework.web.multipart.MultipartFile
;
import
javax.servlet.http.HttpServletResponse
;
import
javax.servlet.http.HttpServletResponse
;
...
@@ -77,6 +78,9 @@ public interface TEmployeeInfoService extends IService<TEmployeeInfo> {
...
@@ -77,6 +78,9 @@ public interface TEmployeeInfoService extends IService<TEmployeeInfo> {
**/
**/
R
<
TEmployeeInfo
>
checkIdCard
(
TEmployeeInfo
employeeInfo
);
R
<
TEmployeeInfo
>
checkIdCard
(
TEmployeeInfo
employeeInfo
);
// 新员工初始化信息
void
setBaseData
(
TEmployeeInfo
employeeInfo
,
String
fileSource
,
YifuUser
user
);
/**
/**
* @Description: 获取员工主码
* @Description: 获取员工主码
* @Author: hgw
* @Author: hgw
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/TGzEmpInfoService.java
View file @
2e828e73
...
@@ -72,6 +72,6 @@ public interface TGzEmpInfoService extends IService<TGzEmpInfo> {
...
@@ -72,6 +72,6 @@ public interface TGzEmpInfoService extends IService<TGzEmpInfo> {
* @Date: 2025/6/20 14:55
* @Date: 2025/6/20 14:55
* @return: boolean
* @return: boolean
**/
**/
boolean
saveEmpInfoByGz
(
TGzOfferInfo
offerInfo
);
R
<
String
>
saveEmpInfoByGz
(
TGzOfferInfo
offerInfo
);
}
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeInfoServiceImpl.java
View file @
2e828e73
...
@@ -1672,7 +1672,7 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
...
@@ -1672,7 +1672,7 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
* @Date: 2022/6/22 20:21
* @Date: 2022/6/22 20:21
* @return: void
* @return: void
**/
**/
p
rivate
void
setBaseData
(
TEmployeeInfo
employeeInfo
,
String
fileSource
,
YifuUser
user
)
{
p
ublic
void
setBaseData
(
TEmployeeInfo
employeeInfo
,
String
fileSource
,
YifuUser
user
)
{
// 新增档案
// 新增档案
employeeInfo
.
setCreateBy
(
user
.
getId
());
employeeInfo
.
setCreateBy
(
user
.
getId
());
employeeInfo
.
setCreateName
(
user
.
getNickname
());
employeeInfo
.
setCreateName
(
user
.
getNickname
());
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TGzEmpInfoServiceImpl.java
View file @
2e828e73
This diff is collapsed.
Click to expand it.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TGzOfferInfoServiceImpl.java
View file @
2e828e73
...
@@ -275,7 +275,10 @@ public class TGzOfferInfoServiceImpl extends ServiceImpl<TGzOfferInfoMapper, TGz
...
@@ -275,7 +275,10 @@ public class TGzOfferInfoServiceImpl extends ServiceImpl<TGzOfferInfoMapper, TGz
if
(
"97"
.
equals
(
tGzOfferInfo
.
getOfferStatus
())){
if
(
"97"
.
equals
(
tGzOfferInfo
.
getOfferStatus
())){
// 1、生成人员档案信息、项目档案信息
// 1、生成人员档案信息、项目档案信息
// hgw 2025-6-20 14:55:12
// hgw 2025-6-20 14:55:12
tGzEmpInfoService
.
saveEmpInfoByGz
(
findInfo
);
R
<
String
>
saveEmpInfoR
=
tGzEmpInfoService
.
saveEmpInfoByGz
(
findInfo
);
if
(
saveEmpInfoR
!=
null
&&
Common
.
isNotNull
(
saveEmpInfoR
.
getCode
())
&&
saveEmpInfoR
.
getCode
()
!=
CommonConstants
.
SUCCESS
)
{
return
saveEmpInfoR
;
}
// 2、检查 该项目该人员是否有在途或审核通过或已归档的状态为“可用”的合同,
// 2、检查 该项目该人员是否有在途或审核通过或已归档的状态为“可用”的合同,
// 若有则根据当前状态更新Offer状态,合同未审核通过:存【13:待签署】;合同审核通过:存【8:合同审核通过】;合同已归档:存【99:已归档】,
// 若有则根据当前状态更新Offer状态,合同未审核通过:存【13:待签署】;合同审核通过:存【8:合同审核通过】;合同已归档:存【99:已归档】,
...
...
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TGzEmpInfoMapper.xml
View file @
2e828e73
...
@@ -393,6 +393,13 @@
...
@@ -393,6 +393,13 @@
</if>
</if>
</if>
</if>
</sql>
</sql>
<!--查信息-->
<select
id=
"getInfoByOfferId"
resultMap=
"tGzEmpInfoMap"
>
SELECT
<include
refid=
"Base_Column_List"
/>
FROM t_gz_emp_info a
where a.del_flag = '0' and a.offer_id = #{offerId} limit 1
</select>
<!--tGzEmpInfo简单分页查询-->
<!--tGzEmpInfo简单分页查询-->
<select
id=
"getTGzEmpInfoPage"
resultMap=
"tGzEmpInfoMap"
>
<select
id=
"getTGzEmpInfoPage"
resultMap=
"tGzEmpInfoMap"
>
SELECT
SELECT
...
...
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TSettleDomainMapper.xml
View file @
2e828e73
...
@@ -354,7 +354,7 @@
...
@@ -354,7 +354,7 @@
a.INVOICE_TITLE_SALARY as 'businessSubjectName'
a.INVOICE_TITLE_SALARY as 'businessSubjectName'
FROM
FROM
t_settle_domain a
t_settle_domain a
WHERE a.id=#{id}
GROUP BY a.id
WHERE a.id=#{id}
limit 1
</select>
</select>
<select
id=
"getSettleDomainVoByNo"
<select
id=
"getSettleDomainVoByNo"
...
@@ -367,7 +367,7 @@
...
@@ -367,7 +367,7 @@
a.INVOICE_TITLE_SALARY as 'businessSubjectName'
a.INVOICE_TITLE_SALARY as 'businessSubjectName'
FROM
FROM
t_settle_domain a
t_settle_domain a
WHERE a.DEPART_NO = #{deptNo}
GROUP BY a.id
WHERE a.DEPART_NO = #{deptNo}
limit 1
</select>
</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