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
29747df9
Commit
29747df9
authored
Jun 25, 2025
by
fangxinjiang
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.7.12' into MVP1.7.12
parents
ed01923f
374981fc
Show whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
42 additions
and
21 deletions
+42
-21
EmployeeExportVO.java
...yifu/cloud/plus/v1/yifu/archives/vo/EmployeeExportVO.java
+2
-1
EmployeeProjectExportVO.java
...oud/plus/v1/yifu/archives/vo/EmployeeProjectExportVO.java
+2
-1
TGzEmpInfoExportMain.java
.../cloud/plus/v1/yifu/archives/vo/TGzEmpInfoExportMain.java
+1
-0
TGzContractServiceImpl.java
...v1/yifu/archives/service/impl/TGzContractServiceImpl.java
+5
-3
TGzOfferInfoServiceImpl.java
...1/yifu/archives/service/impl/TGzOfferInfoServiceImpl.java
+1
-1
TEmployeeInfoMapper.xml
...ves-biz/src/main/resources/mapper/TEmployeeInfoMapper.xml
+1
-6
TEmployeeProjectMapper.xml
...-biz/src/main/resources/mapper/TEmployeeProjectMapper.xml
+1
-9
ExcelAttributeConstants.java
...v1/yifu/common/core/constant/ExcelAttributeConstants.java
+4
-0
SysOutRelDictItemServiceImpl.java
...yifu/admin/service/impl/SysOutRelDictItemServiceImpl.java
+25
-0
No files found.
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/EmployeeExportVO.java
View file @
29747df9
...
@@ -171,7 +171,8 @@ public class EmployeeExportVO extends BaseEntity {
...
@@ -171,7 +171,8 @@ public class EmployeeExportVO extends BaseEntity {
* 人员档案来源(字典:4档案新增、5项目档案新建、1社保/公积金、3商险、2薪酬)
* 人员档案来源(字典:4档案新增、5项目档案新建、1社保/公积金、3商险、2薪酬)
* 档案新建、批量导入、社保/公积金派单、商险派单、人员发薪
* 档案新建、批量导入、社保/公积金派单、商险派单、人员发薪
*/
*/
@ExcelAttribute
(
name
=
"人员档案来源"
,
readConverterExp
=
"1=社保、公积金派单,2=人员发薪,3=商险派单,4=档案新建,5=批量导入,6=电子签,7=预入职"
)
//@ExcelAttribute(name = "人员档案来源", readConverterExp = "1=社保、公积金派单,2=人员发薪,3=商险派单,4=档案新建,5=批量导入,6=电子签,7=预入职")
@ExcelAttribute
(
name
=
"人员档案来源"
,
isDataId
=
true
,
dataType
=
ExcelAttributeConstants
.
EMP_SOURCE
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
value
=
"人员档案来源"
)
@ExcelProperty
(
value
=
"人员档案来源"
)
private
String
fileSource
;
private
String
fileSource
;
...
...
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/EmployeeProjectExportVO.java
View file @
29747df9
...
@@ -239,7 +239,8 @@ public class EmployeeProjectExportVO {
...
@@ -239,7 +239,8 @@ public class EmployeeProjectExportVO {
*/
*/
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
value
=
"人员档案来源"
)
@ExcelProperty
(
value
=
"人员档案来源"
)
@ExcelAttribute
(
name
=
"人员档案来源"
,
readConverterExp
=
"1=社保公积金,2=薪酬,3=商险,4=人员档案新建"
)
//@ExcelAttribute(name = "人员档案来源", readConverterExp = "1=社保公积金,2=薪酬,3=商险,4=人员档案新建")
@ExcelAttribute
(
name
=
"人员档案来源"
,
isDataId
=
true
,
dataType
=
ExcelAttributeConstants
.
EMP_SOURCE
)
private
String
fileSource
;
private
String
fileSource
;
/**
/**
...
...
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/TGzEmpInfoExportMain.java
View file @
29747df9
...
@@ -214,6 +214,7 @@ public class TGzEmpInfoExportMain implements Serializable {
...
@@ -214,6 +214,7 @@ public class TGzEmpInfoExportMain implements Serializable {
// 日期格式化
// 日期格式化
@ExcelProperty
(
"合同结束日期"
)
@ExcelProperty
(
"合同结束日期"
)
private
String
contractEndDt
;
private
String
contractEndDt
;
@ExcelAttribute
(
name
=
"试用期"
,
isDataId
=
true
,
dataType
=
ExcelAttributeConstants
.
GZ_PROBATION
)
@ExcelProperty
(
"试用期"
)
@ExcelProperty
(
"试用期"
)
private
String
probation
;
private
String
probation
;
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TGzContractServiceImpl.java
View file @
29747df9
...
@@ -56,7 +56,8 @@ public class TGzContractServiceImpl implements TGzContractService {
...
@@ -56,7 +56,8 @@ public class TGzContractServiceImpl implements TGzContractService {
// 获取档案信息
// 获取档案信息
TGzEmpInfo
gzEmpInfo
=
tGzEmpInfoMapper
.
getInfoByOfferId
(
offerId
);
TGzEmpInfo
gzEmpInfo
=
tGzEmpInfoMapper
.
getInfoByOfferId
(
offerId
);
if
(
Common
.
isNotNull
(
gzEmpInfo
))
{
if
(
Common
.
isNotNull
(
gzEmpInfo
))
{
gzEmpInfo
.
setContractNum
(
contractInfo
.
getContractName
());
// 确认 用合同编号(用户在页面上填写的)
gzEmpInfo
.
setContractNum
(
contractInfo
.
getContractNo
());
// 客服申请处选择“标准合同”传“外签-劳动合同 ”;“实习协议”传“外签-实习协议 ”
// 客服申请处选择“标准合同”传“外签-劳动合同 ”;“实习协议”传“外签-实习协议 ”
if
(
CommonConstants
.
ONE_STRING
.
equals
(
contractInfo
.
getContractType
()))
{
if
(
CommonConstants
.
ONE_STRING
.
equals
(
contractInfo
.
getContractType
()))
{
gzEmpInfo
.
setContractType
(
"1E"
);
gzEmpInfo
.
setContractType
(
"1E"
);
...
@@ -81,14 +82,15 @@ public class TGzContractServiceImpl implements TGzContractService {
...
@@ -81,14 +82,15 @@ public class TGzContractServiceImpl implements TGzContractService {
// 将Date转换为LocalDate
// 将Date转换为LocalDate
LocalDate
localDate
=
contractInfo
.
getContractStart
().
toInstant
().
atZone
(
ZoneId
.
systemDefault
()).
toLocalDate
();
LocalDate
localDate
=
contractInfo
.
getContractStart
().
toInstant
().
atZone
(
ZoneId
.
systemDefault
()).
toLocalDate
();
LocalDate
prcExpLocalDate
=
localDate
.
plusMonths
(
6
);
// 加上6个月
// 加上6个月减一天
LocalDate
prcExpLocalDate
=
localDate
.
plusMonths
(
6
).
minusDays
(
1
);
// 将LocalDate转换回Date对象
// 将LocalDate转换回Date对象
Date
prcExpDt
=
Date
.
from
(
prcExpLocalDate
.
atStartOfDay
(
ZoneId
.
systemDefault
()).
toInstant
());
Date
prcExpDt
=
Date
.
from
(
prcExpLocalDate
.
atStartOfDay
(
ZoneId
.
systemDefault
()).
toInstant
());
// 试用期预计结束日期
// 试用期预计结束日期
gzEmpInfo
.
setPrcExpDt
(
prcExpDt
);
gzEmpInfo
.
setPrcExpDt
(
prcExpDt
);
// 默认等于试用期预计结束日期+1日(自然日),eg:”试用期预计结束日期“为20251202,”预计转正日期“为20251203“
// 默认等于试用期预计结束日期+1日(自然日),eg:”试用期预计结束日期“为20251202,”预计转正日期“为20251203“
LocalDate
probationDtLocalDate
=
prcExpLocalDate
.
plusDays
(
1
);
// 加上+1日(自然日)
LocalDate
probationDtLocalDate
=
prcExpLocalDate
.
plusDays
(
1
);
// 将LocalDate转换回Date对象
// 将LocalDate转换回Date对象
Date
probationDt
=
Date
.
from
(
probationDtLocalDate
.
atStartOfDay
(
ZoneId
.
systemDefault
()).
toInstant
());
Date
probationDt
=
Date
.
from
(
probationDtLocalDate
.
atStartOfDay
(
ZoneId
.
systemDefault
()).
toInstant
());
// 预计转正日期
// 预计转正日期
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TGzOfferInfoServiceImpl.java
View file @
29747df9
...
@@ -951,7 +951,7 @@ public class TGzOfferInfoServiceImpl extends ServiceImpl<TGzOfferInfoMapper, TGz
...
@@ -951,7 +951,7 @@ public class TGzOfferInfoServiceImpl extends ServiceImpl<TGzOfferInfoMapper, TGz
}
}
// 记录状态变更的offer操作日志 记录来源: 手动更新状态
// 记录状态变更的offer操作日志 记录来源: 手动更新状态
this
.
saveOfferStatusRecord
(
tGzOffer
Info
.
getId
(),
CommonConstants
.
ONE_STRING
,
this
.
saveOfferStatusRecord
(
find
Info
.
getId
(),
CommonConstants
.
ONE_STRING
,
findInfo
.
getOfferStatus
(),
tGzOfferInfo
.
getOfferStatus
(),
user
.
getId
(),
user
.
getNickname
());
findInfo
.
getOfferStatus
(),
tGzOfferInfo
.
getOfferStatus
(),
user
.
getId
(),
user
.
getNickname
());
}
}
...
...
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TEmployeeInfoMapper.xml
View file @
29747df9
...
@@ -1068,12 +1068,7 @@
...
@@ -1068,12 +1068,7 @@
a.ADMISSION_DATE,
a.ADMISSION_DATE,
a.GRADUTION_DATE,
a.GRADUTION_DATE,
a.REMARK,
a.REMARK,
CASE WHEN a.FILE_SOURCE=1 THEN "社保、公积金派单"
a.FILE_SOURCE,
WHEN a.FILE_SOURCE =2 THEN "人员发薪"
WHEN a.FILE_SOURCE =3 THEN "商险派单"
WHEN a.FILE_SOURCE =4 THEN "档案新建"
WHEN a.FILE_SOURCE =5 THEN "批量导入"
ELSE a.FILE_SOURCE END as "FILE_SOURCE", # 1=社保、公积金派单,2=人员发薪,3=商险派单,4=档案新建,5=批量导入
/*a.PROJECT_NUM,*/
/*a.PROJECT_NUM,*/
a.CONTRACT_STATUS,
a.CONTRACT_STATUS,
a.INSURANCE_STATUS,
a.INSURANCE_STATUS,
...
...
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TEmployeeProjectMapper.xml
View file @
29747df9
...
@@ -238,15 +238,7 @@
...
@@ -238,15 +238,7 @@
b.ADMISSION_DATE,
b.ADMISSION_DATE,
b.GRADUTION_DATE,
b.GRADUTION_DATE,
b.REMARK,
b.REMARK,
case b.FILE_SOURCE
b.FILE_SOURCE,
when 1 then '派单'
when 2 then '薪酬'
when 3 then '商险'
when 4 then '档案新建'
when 5 then '批量导入'
when 6 then '电子签'
when 7 then '预入职'
else '-' end FILE_SOURCE,
if(a.STATUS='0','草稿',IF(a.PROJECT_STATUS=1,'已减项','已审核')) PROJECT_STATUS,
if(a.STATUS='0','草稿',IF(a.PROJECT_STATUS=1,'已减项','已审核')) PROJECT_STATUS,
a.CREATE_NAME,
a.CREATE_NAME,
a.CREATE_TIME,
a.CREATE_TIME,
...
...
yifu-common/yifu-common-core/src/main/java/com/yifu/cloud/plus/v1/yifu/common/core/constant/ExcelAttributeConstants.java
View file @
29747df9
...
@@ -123,6 +123,8 @@ public class ExcelAttributeConstants {
...
@@ -123,6 +123,8 @@ public class ExcelAttributeConstants {
public
static
final
String
WORKINFO_TYPE
=
"workinfo_type"
;
public
static
final
String
WORKINFO_TYPE
=
"workinfo_type"
;
// 项目档案来源
// 项目档案来源
public
static
final
String
PROJECT_EMP_SOURCE
=
"project_emp_source"
;
public
static
final
String
PROJECT_EMP_SOURCE
=
"project_emp_source"
;
// 人员档案来源
public
static
final
String
EMP_SOURCE
=
"EMP_SOURCE"
;
//区域字段组合
//区域字段组合
public
static
final
String
DEPARTID_PROVINCE_CITY_TOWN
=
"departId_province_city_town"
;
public
static
final
String
DEPARTID_PROVINCE_CITY_TOWN
=
"departId_province_city_town"
;
...
@@ -211,4 +213,6 @@ public class ExcelAttributeConstants {
...
@@ -211,4 +213,6 @@ public class ExcelAttributeConstants {
public
static
final
String
GZ_ADDRESS_TYPE
=
"gz_address_type"
;
public
static
final
String
GZ_ADDRESS_TYPE
=
"gz_address_type"
;
// 瓜子的是否新参社保
// 瓜子的是否新参社保
public
static
final
String
GZ_INSURANCE_STA
=
"gz_insurance_sta"
;
public
static
final
String
GZ_INSURANCE_STA
=
"gz_insurance_sta"
;
// 瓜子的试用期
public
static
final
String
GZ_PROBATION
=
"gz_probation"
;
}
}
yifu-upms/yifu-upms-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/admin/service/impl/SysOutRelDictItemServiceImpl.java
View file @
29747df9
...
@@ -17,10 +17,14 @@
...
@@ -17,10 +17,14 @@
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
admin
.
service
.
impl
;
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
admin
.
service
.
impl
;
import
com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
;
import
com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
;
import
com.yifu.cloud.plus.v1.yifu.admin.api.entity.SysDictItem
;
import
com.yifu.cloud.plus.v1.yifu.admin.api.entity.SysOutRelDictItem
;
import
com.yifu.cloud.plus.v1.yifu.admin.api.entity.SysOutRelDictItem
;
import
com.yifu.cloud.plus.v1.yifu.admin.mapper.SysDictItemMapper
;
import
com.yifu.cloud.plus.v1.yifu.admin.mapper.SysOutRelDictItemMapper
;
import
com.yifu.cloud.plus.v1.yifu.admin.mapper.SysOutRelDictItemMapper
;
import
com.yifu.cloud.plus.v1.yifu.admin.service.SysOutRelDictItemService
;
import
com.yifu.cloud.plus.v1.yifu.admin.service.SysOutRelDictItemService
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.ClientNameConstants
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.ClientNameConstants
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants
;
import
lombok.RequiredArgsConstructor
;
import
lombok.extern.log4j.Log4j2
;
import
lombok.extern.log4j.Log4j2
;
import
org.springframework.stereotype.Service
;
import
org.springframework.stereotype.Service
;
...
@@ -40,8 +44,11 @@ import com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity;
...
@@ -40,8 +44,11 @@ import com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity;
*/
*/
@Log4j2
@Log4j2
@Service
@Service
@RequiredArgsConstructor
public
class
SysOutRelDictItemServiceImpl
extends
ServiceImpl
<
SysOutRelDictItemMapper
,
SysOutRelDictItem
>
implements
SysOutRelDictItemService
{
public
class
SysOutRelDictItemServiceImpl
extends
ServiceImpl
<
SysOutRelDictItemMapper
,
SysOutRelDictItem
>
implements
SysOutRelDictItemService
{
private
final
SysDictItemMapper
dictItemMapper
;
@Override
@Override
public
List
<
SysOutRelDictItem
>
noPageDiy
(
SysOutRelDictItem
searchVo
)
{
public
List
<
SysOutRelDictItem
>
noPageDiy
(
SysOutRelDictItem
searchVo
)
{
...
@@ -65,6 +72,24 @@ public class SysOutRelDictItemServiceImpl extends ServiceImpl<SysOutRelDictItemM
...
@@ -65,6 +72,24 @@ public class SysOutRelDictItemServiceImpl extends ServiceImpl<SysOutRelDictItemM
}
}
}
}
// 获取瓜子紧急联系人
LambdaQueryWrapper
<
SysDictItem
>
emergRelationItemQuery
=
Wrappers
.<
SysDictItem
>
lambdaQuery
()
.
eq
(
SysDictItem:
:
getDelFlag
,
CommonConstants
.
ZERO_STRING
)
.
eq
(
SysDictItem:
:
getDisable
,
CommonConstants
.
ZERO_STRING
)
.
in
(
SysDictItem:
:
getType
,
"gz_emerg_relation"
)
.
eq
(
SysDictItem:
:
getClientId
,
ClientNameConstants
.
CLIENT_GZ
);
List
<
SysDictItem
>
emergRelationItemList
=
dictItemMapper
.
selectList
(
emergRelationItemQuery
);
if
(
Common
.
isNotNull
(
emergRelationItemList
)){
for
(
SysDictItem
emergRelationItem
:
emergRelationItemList
){
Map
<
String
,
String
>
relDictItemMap
=
resMap
.
get
(
"gz_emerg_relation"
);
if
(
Common
.
isEmpty
(
relDictItemMap
)){
relDictItemMap
=
new
HashMap
<>();
}
relDictItemMap
.
put
(
emergRelationItem
.
getValue
(),
emergRelationItem
.
getLabel
());
resMap
.
put
(
"gz_emerg_relation"
,
relDictItemMap
);
}
}
return
resMap
;
return
resMap
;
}
}
}
}
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