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
44386555
Commit
44386555
authored
Jun 25, 2025
by
huyuchen
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.7.12' into MVP1.7.12
parents
2dbea99b
511656cc
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
1 deletion
+7
-1
TGzEmpInfoExportMain.java
.../cloud/plus/v1/yifu/archives/vo/TGzEmpInfoExportMain.java
+2
-1
TEmployeeInfoServiceImpl.java
.../yifu/archives/service/impl/TEmployeeInfoServiceImpl.java
+1
-0
ExcelAttributeConstants.java
...v1/yifu/common/core/constant/ExcelAttributeConstants.java
+4
-0
No files found.
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/TGzEmpInfoExportMain.java
View file @
44386555
...
@@ -116,7 +116,7 @@ public class TGzEmpInfoExportMain implements Serializable {
...
@@ -116,7 +116,7 @@ public class TGzEmpInfoExportMain implements Serializable {
@ExcelProperty
(
"驾照失效日期"
)
@ExcelProperty
(
"驾照失效日期"
)
private
String
driverLicenExp
;
private
String
driverLicenExp
;
@ExcelAttribute
(
name
=
"是否新参社保"
,
isDataId
=
true
,
readConverterExp
=
"Y=是,N=否"
)
@ExcelAttribute
(
name
=
"是否新参社保"
,
isDataId
=
true
,
dataType
=
ExcelAttributeConstants
.
GZ_INSURANCE_STA
)
@ExcelProperty
(
"是否新参社保"
)
@ExcelProperty
(
"是否新参社保"
)
private
String
insuranceSta
;
private
String
insuranceSta
;
...
@@ -146,6 +146,7 @@ public class TGzEmpInfoExportMain implements Serializable {
...
@@ -146,6 +146,7 @@ public class TGzEmpInfoExportMain implements Serializable {
@ExcelProperty
(
"个人邮箱"
)
@ExcelProperty
(
"个人邮箱"
)
private
String
mail
;
private
String
mail
;
@ExcelAttribute
(
name
=
"地址类型"
,
isDataId
=
true
,
dataType
=
ExcelAttributeConstants
.
GZ_ADDRESS_TYPE
)
@ExcelProperty
(
"地址类型"
)
@ExcelProperty
(
"地址类型"
)
private
String
addressType
;
private
String
addressType
;
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeInfoServiceImpl.java
View file @
44386555
...
@@ -3712,6 +3712,7 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
...
@@ -3712,6 +3712,7 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
if
(
Common
.
isNotNull
(
detail
.
getValidityStart
())
if
(
Common
.
isNotNull
(
detail
.
getValidityStart
())
&&
Common
.
isNotNull
(
detail
.
getValidityEnd
())
&&
Common
.
isNotNull
(
detail
.
getValidityEnd
())
&&
!
"长期"
.
equals
(
detail
.
getValidityEnd
())
&&
!
"长期"
.
equals
(
detail
.
getValidityEnd
())
&&
DateUtil
.
checkStringToDate
(
detail
.
getValidityEnd
(),
DateUtil
.
ISO_EXPANDED_DATE_FORMAT
)
&&
!
DateUtil
.
stringToDate
(
detail
.
getValidityEnd
(),
DateUtil
.
ISO_EXPANDED_DATE_FORMAT
)
&&
!
DateUtil
.
stringToDate
(
detail
.
getValidityEnd
(),
DateUtil
.
ISO_EXPANDED_DATE_FORMAT
)
.
after
(
DateUtil
.
stringToDate
(
detail
.
getValidityStart
(),
DateUtil
.
ISO_EXPANDED_DATE_FORMAT
))){
.
after
(
DateUtil
.
stringToDate
(
detail
.
getValidityStart
(),
DateUtil
.
ISO_EXPANDED_DATE_FORMAT
))){
detail
.
setErrorInfo
(
EmployeeConstants
.
EMP_VALIDITY_END_START_DATE
);
detail
.
setErrorInfo
(
EmployeeConstants
.
EMP_VALIDITY_END_START_DATE
);
...
...
yifu-common/yifu-common-core/src/main/java/com/yifu/cloud/plus/v1/yifu/common/core/constant/ExcelAttributeConstants.java
View file @
44386555
...
@@ -207,4 +207,8 @@ public class ExcelAttributeConstants {
...
@@ -207,4 +207,8 @@ public class ExcelAttributeConstants {
public
static
final
String
GZ_GRADUATE_TYPE
=
"gz_graduate_type"
;
public
static
final
String
GZ_GRADUATE_TYPE
=
"gz_graduate_type"
;
// 瓜子的家庭成员-与成员关系
// 瓜子的家庭成员-与成员关系
public
static
final
String
GZ_FAMILY_RELATION
=
"gz_family_relation"
;
public
static
final
String
GZ_FAMILY_RELATION
=
"gz_family_relation"
;
// 瓜子的地址类型
public
static
final
String
GZ_ADDRESS_TYPE
=
"gz_address_type"
;
// 瓜子的是否新参社保
public
static
final
String
GZ_INSURANCE_STA
=
"gz_insurance_sta"
;
}
}
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