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
35668e1b
Commit
35668e1b
authored
Jun 30, 2025
by
hongguangwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MVP1.7.12-导出
parent
18a60fa1
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
15 additions
and
6 deletions
+15
-6
TGzEmpInfoExportEducation.java
...d/plus/v1/yifu/archives/vo/TGzEmpInfoExportEducation.java
+3
-3
TGzEmpInfoExportFamily.java
...loud/plus/v1/yifu/archives/vo/TGzEmpInfoExportFamily.java
+1
-1
TGzEmpInfoExportMain.java
.../cloud/plus/v1/yifu/archives/vo/TGzEmpInfoExportMain.java
+4
-0
TGzEmpInfoServiceImpl.java
.../v1/yifu/archives/service/impl/TGzEmpInfoServiceImpl.java
+5
-2
ExcelAttributeConstants.java
...v1/yifu/common/core/constant/ExcelAttributeConstants.java
+2
-0
No files found.
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/TGzEmpInfoExportEducation.java
View file @
35668e1b
...
...
@@ -67,13 +67,13 @@ public class TGzEmpInfoExportEducation implements Serializable {
private
String
gradutionType
;
@ExcelProperty
(
"专业"
)
private
String
major
;
@ExcelAttribute
(
name
=
"是否最高学历"
,
isDataId
=
true
,
readConverterExp
=
"Y=是,N=
不是
"
)
@ExcelAttribute
(
name
=
"是否最高学历"
,
isDataId
=
true
,
readConverterExp
=
"Y=是,N=
否
"
)
@ExcelProperty
(
"是否最高学历"
)
private
String
highEduQualFlag
;
@ExcelAttribute
(
name
=
"是否最高学位"
,
isDataId
=
true
,
readConverterExp
=
"Y=是,N=
不是
"
)
@ExcelAttribute
(
name
=
"是否最高学位"
,
isDataId
=
true
,
readConverterExp
=
"Y=是,N=
否
"
)
@ExcelProperty
(
"是否最高学位"
)
private
String
highEduDegreeFlag
;
@ExcelAttribute
(
name
=
"是否第一学历"
,
isDataId
=
true
,
readConverterExp
=
"Y=是,N=
不是
"
)
@ExcelAttribute
(
name
=
"是否第一学历"
,
isDataId
=
true
,
readConverterExp
=
"Y=是,N=
否
"
)
@ExcelProperty
(
"是否第一学历"
)
private
String
firstDegreeFlag
;
...
...
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/TGzEmpInfoExportFamily.java
View file @
35668e1b
...
...
@@ -54,7 +54,7 @@ public class TGzEmpInfoExportFamily implements Serializable {
private
String
familyAddress
;
@ExcelProperty
(
"所在单位名称"
)
private
String
familyCompany
;
@ExcelAttribute
(
name
=
"是否客户单位任职"
,
isDataId
=
true
,
readConverterExp
=
"Y=是,N=
不是
"
)
@ExcelAttribute
(
name
=
"是否客户单位任职"
,
isDataId
=
true
,
readConverterExp
=
"Y=是,N=
否
"
)
@ExcelProperty
(
"是否客户单位任职"
)
private
String
gzEmeFlag
;
@ExcelProperty
(
"职务"
)
...
...
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/TGzEmpInfoExportMain.java
View file @
35668e1b
...
...
@@ -71,6 +71,8 @@ public class TGzEmpInfoExportMain implements Serializable {
@ExcelAttribute
(
name
=
"性别"
,
isDataId
=
true
,
dataType
=
ExcelAttributeConstants
.
GZ_SEX
)
@ExcelProperty
(
"性别"
)
private
String
sex
;
@ExcelAttribute
(
name
=
"星座"
,
isDataId
=
true
,
dataType
=
ExcelAttributeConstants
.
GZ_CONSTEL
)
@ExcelProperty
(
"星座"
)
private
String
constel
;
@ExcelProperty
(
"血型"
)
...
...
@@ -268,6 +270,8 @@ public class TGzEmpInfoExportMain implements Serializable {
@ExcelAttribute
(
name
=
"银行账户状态"
,
isDataId
=
true
,
readConverterExp
=
"A=有效"
)
@ExcelProperty
(
"银行账户状态"
)
private
String
accountStatus
;
@ExcelAttribute
(
name
=
"银行账户国家"
,
isDataId
=
true
,
dataType
=
ExcelAttributeConstants
.
GZ_COUNTRY
)
@ExcelProperty
(
"银行账户国家/地区"
)
private
String
accountCountry
;
@ExcelAttribute
(
name
=
"银行"
,
isDataId
=
true
,
dataType
=
ExcelAttributeConstants
.
GZ_BANK
)
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TGzEmpInfoServiceImpl.java
View file @
35668e1b
...
...
@@ -496,10 +496,13 @@ public class TGzEmpInfoServiceImpl extends ServiceImpl<TGzEmpInfoMapper, TGzEmpI
}
else
{
TGzOfferInfo
gzOfferInfo
=
gzOfferInfoMapper
.
getInfoById
(
offerId
);
if
(
gzOfferInfo
==
null
||
Common
.
isEmpty
(
gzOfferInfo
)
||
Common
.
isEmpty
(
gzOfferInfo
.
getBizId
())){
return
R
.
failed
(
"未找到瓜子Offer数据,Offer的ID="
+
offerId
);
return
R
.
failed
(
"未找到瓜子Offer数据"
);
// return R.failed("未找到瓜子Offer数据,Offer的ID="+ offerId)
}
if
(
Common
.
isEmpty
(
gzOfferInfo
.
getOfferStatus
())
||
!
"9"
.
equals
(
gzOfferInfo
.
getOfferStatus
()))
{
return
R
.
failed
(
"瓜子Offer状态不对("
+
gzOfferInfo
.
getOfferStatus
()+
"),不可编辑,Offer的ID="
+
offerId
);
return
R
.
failed
(
"瓜子offer状态不对,不可提交"
);
// 测试 郭彤:这个提示改下吧,没必要吧ID还有状态枚举值列出来 2025-6-30 18:09:05
// return R.failed("瓜子Offer状态不对("+gzOfferInfo.getOfferStatus()+"),不可编辑,Offer的ID="+ offerId)
}
gzOfferInfo
.
setOfferStatus
(
"12"
);
gzOfferInfoMapper
.
updateById
(
gzOfferInfo
);
...
...
yifu-common/yifu-common-core/src/main/java/com/yifu/cloud/plus/v1/yifu/common/core/constant/ExcelAttributeConstants.java
View file @
35668e1b
...
...
@@ -215,4 +215,6 @@ public class ExcelAttributeConstants {
public
static
final
String
GZ_INSURANCE_STA
=
"gz_insurance_sta"
;
// 瓜子的试用期
public
static
final
String
GZ_PROBATION
=
"gz_probation"
;
// 瓜子的星座
public
static
final
String
GZ_CONSTEL
=
"gz_constel"
;
}
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