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
44ab3643
Commit
44ab3643
authored
Jun 27, 2025
by
fangxinjiang
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.7.12' into MVP1.7.12
parents
a1c0d086
a1b4c755
Hide whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
124 additions
and
69 deletions
+124
-69
TGzEmpInfo.java
...m/yifu/cloud/plus/v1/yifu/archives/entity/TGzEmpInfo.java
+9
-0
TEmployeeContractPreVo.java
...loud/plus/v1/yifu/archives/vo/TEmployeeContractPreVo.java
+2
-2
TGzEmpInfoExportMain.java
.../cloud/plus/v1/yifu/archives/vo/TGzEmpInfoExportMain.java
+2
-0
TGzEmpInfoSearchVo.java
...fu/cloud/plus/v1/yifu/archives/vo/TGzEmpInfoSearchVo.java
+1
-0
TGzOfferInfoImportVo.java
.../cloud/plus/v1/yifu/archives/vo/TGzOfferInfoImportVo.java
+31
-59
TGzContractService.java
...oud/plus/v1/yifu/archives/service/TGzContractService.java
+1
-1
TEmployeeContractInfoServiceImpl.java
...chives/service/impl/TEmployeeContractInfoServiceImpl.java
+1
-1
TEmployeeInfoServiceImpl.java
.../yifu/archives/service/impl/TEmployeeInfoServiceImpl.java
+1
-1
TGzContractServiceImpl.java
...v1/yifu/archives/service/impl/TGzContractServiceImpl.java
+2
-1
TGzEmpInfoServiceImpl.java
.../v1/yifu/archives/service/impl/TGzEmpInfoServiceImpl.java
+1
-0
TGzOfferInfoServiceImpl.java
...1/yifu/archives/service/impl/TGzOfferInfoServiceImpl.java
+70
-4
TGzEmpInfoMapper.xml
...chives-biz/src/main/resources/mapper/TGzEmpInfoMapper.xml
+3
-0
No files found.
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/TGzEmpInfo.java
View file @
44ab3643
...
@@ -418,6 +418,15 @@ public class TGzEmpInfo extends BaseEntity {
...
@@ -418,6 +418,15 @@ public class TGzEmpInfo extends BaseEntity {
@ExcelProperty
(
"合同工作地"
)
@ExcelProperty
(
"合同工作地"
)
@Schema
(
description
=
"合同工作地"
)
@Schema
(
description
=
"合同工作地"
)
private
String
workLocation
;
private
String
workLocation
;
/**
* 合同工作地描述
*/
@ExcelAttribute
(
name
=
"合同工作地描述"
,
maxLength
=
200
)
@Length
(
max
=
200
,
message
=
"合同工作地描述不能超过200个字符"
)
@ExcelProperty
(
"合同工作地描述"
)
@Schema
(
description
=
"合同工作地描述"
)
private
String
workLocationDescr
;
/**
/**
* 状态
* 状态
*/
*/
...
...
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/TEmployeeContractPreVo.java
View file @
44ab3643
...
@@ -384,8 +384,8 @@ public class TEmployeeContractPreVo extends RowIndex implements Serializable {
...
@@ -384,8 +384,8 @@ public class TEmployeeContractPreVo extends RowIndex implements Serializable {
/**
/**
* 其他 (工资形式其他时的工资)
* 其他 (工资形式其他时的工资)
*/
*/
@Length
(
max
=
20
,
message
=
"其他 (工资形式其他时的工资) 不能超过2
0 个字符"
)
@Length
(
max
=
50
,
message
=
"其他 (工资形式其他时的工资) 不能超过5
0 个字符"
)
@ExcelAttribute
(
name
=
"其他 (工资形式其他时的工资)"
,
maxLength
=
2
0
)
@ExcelAttribute
(
name
=
"其他 (工资形式其他时的工资)"
,
maxLength
=
5
0
)
@Schema
(
description
=
"其他 (工资形式其他时的工资)"
)
@Schema
(
description
=
"其他 (工资形式其他时的工资)"
)
@ExcelProperty
(
"其他 (工资形式其他时的工资)"
)
@ExcelProperty
(
"其他 (工资形式其他时的工资)"
)
private
String
otherWage
;
private
String
otherWage
;
...
...
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/TGzEmpInfoExportMain.java
View file @
44ab3643
...
@@ -230,6 +230,8 @@ public class TGzEmpInfoExportMain implements Serializable {
...
@@ -230,6 +230,8 @@ public class TGzEmpInfoExportMain implements Serializable {
private
String
neeProviderId
;
private
String
neeProviderId
;
@ExcelProperty
(
"合同工作地"
)
@ExcelProperty
(
"合同工作地"
)
private
String
workLocation
;
private
String
workLocation
;
@ExcelProperty
(
"合同工作地描述"
)
private
String
workLocationDescr
;
@ExcelAttribute
(
name
=
"合同状态"
,
isDataId
=
true
,
readConverterExp
=
"A=有效"
)
@ExcelAttribute
(
name
=
"合同状态"
,
isDataId
=
true
,
readConverterExp
=
"A=有效"
)
@ExcelProperty
(
"合同状态"
)
@ExcelProperty
(
"合同状态"
)
private
String
contractState
;
private
String
contractState
;
...
...
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/TGzEmpInfoSearchVo.java
View file @
44ab3643
...
@@ -103,4 +103,5 @@ public class TGzEmpInfoSearchVo extends TGzEmpInfo {
...
@@ -103,4 +103,5 @@ public class TGzEmpInfoSearchVo extends TGzEmpInfo {
@TableField
(
exist
=
false
)
@TableField
(
exist
=
false
)
private
TPreEmpDeclaration
tPreEmpDeclaration
;
private
TPreEmpDeclaration
tPreEmpDeclaration
;
}
}
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/TGzOfferInfoImportVo.java
View file @
44ab3643
...
@@ -22,8 +22,6 @@ import com.yifu.cloud.plus.v1.yifu.common.core.vo.RowIndex;
...
@@ -22,8 +22,6 @@ import com.yifu.cloud.plus.v1.yifu.common.core.vo.RowIndex;
import
lombok.Data
;
import
lombok.Data
;
import
java.io.Serializable
;
import
java.io.Serializable
;
import
java.math.BigDecimal
;
import
java.util.Date
;
/**
/**
* 导入-瓜子offer信息接收表
* 导入-瓜子offer信息接收表
...
@@ -34,92 +32,66 @@ import java.util.Date;
...
@@ -34,92 +32,66 @@ import java.util.Date;
@Data
@Data
public
class
TGzOfferInfoImportVo
extends
RowIndex
implements
Serializable
{
public
class
TGzOfferInfoImportVo
extends
RowIndex
implements
Serializable
{
// 序号 offer发放人 录入时间 姓名 姓名拼音 证件类型描述 证件号码 性别 个人手机号 个人邮箱
@ExcelAttribute
(
name
=
"人员类别编码"
,
maxLength
=
2
)
// 无用的3个字段
private
String
emplType
;
@ExcelAttribute
(
name
=
"序号"
)
private
String
noUse1
;
@ExcelAttribute
(
name
=
"人员类别名称"
,
maxLength
=
32
)
@ExcelAttribute
(
name
=
"offer发放人"
)
private
String
emplTypeDescr
;
private
String
noUse2
;
@ExcelAttribute
(
name
=
"录入时间"
)
/**
private
String
noUse3
;
* 外签类型:A: 洼地外签/ B:属地外签
*/
@ExcelAttribute
(
name
=
"外签类型"
,
maxLength
=
2
)
private
String
outSginType
;
/**
* 合同公司主体:公司信息表
*/
@ExcelAttribute
(
name
=
"合同公司主体"
,
maxLength
=
20
)
private
String
company
;
@ExcelAttribute
(
name
=
"姓名"
,
maxLength
=
50
)
@ExcelAttribute
(
name
=
"姓名"
,
maxLength
=
50
)
private
String
name
;
private
String
name
;
@ExcelAttribute
(
name
=
"姓名拼音"
,
maxLength
=
100
)
@ExcelAttribute
(
name
=
"姓名拼音"
,
maxLength
=
100
)
private
String
nameAc
;
private
String
nameAc
;
@ExcelAttribute
(
name
=
"姓氏拼音"
,
maxLength
=
50
)
private
String
lastNameAc
;
@ExcelAttribute
(
name
=
"名字拼音"
,
maxLength
=
50
)
private
String
firstNameAc
;
@ExcelAttribute
(
name
=
"国籍编码"
,
maxLength
=
10
)
// 1A ——不导入 证件类型编码
private
String
country
;
// 居民身份证
@ExcelAttribute
(
name
=
"国籍描述"
,
maxLength
=
30
)
private
String
countryDescr
;
@ExcelAttribute
(
name
=
"证件类型编码"
,
maxLength
=
6
)
private
String
nationalIdType
;
@ExcelAttribute
(
name
=
"证件类型描述"
,
maxLength
=
30
)
@ExcelAttribute
(
name
=
"证件类型描述"
,
maxLength
=
30
)
private
String
nationalIdTypeDescr
;
private
String
nationalIdTypeDescr
;
@ExcelAttribute
(
name
=
"证件号码"
,
maxLength
=
50
)
@ExcelAttribute
(
name
=
"证件号码"
,
maxLength
=
50
)
private
String
nationalId
;
private
String
nationalId
;
// F(女)
// M(男)
@ExcelAttribute
(
name
=
"性别"
,
maxLength
=
10
)
@ExcelAttribute
(
name
=
"性别"
,
maxLength
=
10
)
private
String
sex
;
private
String
sex
;
@ExcelAttribute
(
name
=
"个人手机号"
,
maxLength
=
30
)
@ExcelAttribute
(
name
=
"个人手机号"
,
maxLength
=
30
)
private
String
phone
;
private
String
phone
;
@ExcelAttribute
(
name
=
"个人邮箱"
,
maxLength
=
100
)
@ExcelAttribute
(
name
=
"个人邮箱"
,
maxLength
=
100
)
private
String
email
;
private
String
email
;
@ExcelAttribute
(
name
=
"直接上级姓名"
,
maxLength
=
200
)
private
String
supervisorName
;
// 预计入职日期 部门名称 职务描述 直接上级姓名 工作地点描述 社保缴纳地 基本工资 绩效工资 年终奖月数
// 要翻译为这个
@ExcelAttribute
(
name
=
"预计入职日期"
)
private
String
expEntry
;
@ExcelAttribute
(
name
=
"部门名称"
,
maxLength
=
200
)
private
String
deptName
;
@ExcelAttribute
(
name
=
"职务描述"
,
maxLength
=
50
)
@ExcelAttribute
(
name
=
"职务描述"
,
maxLength
=
50
)
private
String
jobcodeDescr
;
private
String
jobcodeDescr
;
@ExcelAttribute
(
name
=
"工作地点"
,
maxLength
=
12
)
@ExcelAttribute
(
name
=
"直接上级姓名"
,
maxLength
=
200
)
private
String
workLocation
;
private
String
supervisorName
;
// 要翻译工作地点描述——34010001 安徽省合肥市电销中心——34010002 安徽省合肥市区域
@ExcelAttribute
(
name
=
"工作地点描述"
,
maxLength
=
12
)
@ExcelAttribute
(
name
=
"工作地点描述"
,
maxLength
=
12
)
private
String
workLocationDescr
;
private
String
workLocationDescr
;
/**
* 预计入职日期:yyyy-MM-dd
@ExcelAttribute
(
name
=
"社保缴纳地"
,
maxLength
=
30
)
*/
private
String
socialInsuranceLocationDescr
;
@ExcelAttribute
(
name
=
"预计入职日期"
,
isDate
=
true
)
private
Date
expEntryDate
;
@ExcelAttribute
(
name
=
"部门名称"
,
maxLength
=
200
)
private
String
deptName
;
/**
/**
* 基本工资,两位小数
* 基本工资,两位小数
*/
*/
@ExcelAttribute
(
name
=
"基本工资"
)
@ExcelAttribute
(
name
=
"基本工资"
)
private
BigDecimal
basePay
;
private
String
basePay
;
/**
/**
* 绩效工资,两位小数
* 绩效工资,两位小数
*/
*/
@ExcelAttribute
(
name
=
"绩效工资"
)
@ExcelAttribute
(
name
=
"绩效工资"
)
private
BigDecimal
perfomPay
;
private
String
perfomPay
;
// 年终奖月数数字——去除“个月”
@ExcelAttribute
(
name
=
"年终奖月数"
)
@ExcelAttribute
(
name
=
"年终奖月数"
)
private
Integer
yearBonusMonth
;
private
String
yearBonus
;
@ExcelAttribute
(
name
=
"社保缴纳地编码"
,
maxLength
=
12
)
private
String
socialInsuranceLocation
;
@ExcelAttribute
(
name
=
"社保缴纳地"
,
maxLength
=
30
)
private
String
socialInsuranceLocationDescr
;
@ExcelAttribute
(
name
=
"社保基数"
)
private
BigDecimal
socialInsuranceBase
;
@ExcelAttribute
(
name
=
"公积金基数"
)
private
BigDecimal
houseAccFundBaseMax
;
/**
* 是否转正后缴纳公积金(Y:是 N:否)
*/
@ExcelAttribute
(
name
=
"是否转正后缴纳公积金"
,
maxLength
=
1
)
private
String
beRegularEmpPay
;
@ExcelAttribute
(
name
=
"申请人邮箱"
,
maxLength
=
60
)
private
String
applyUserEmail
;
}
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/TGzContractService.java
View file @
44ab3643
...
@@ -35,6 +35,6 @@ public interface TGzContractService {
...
@@ -35,6 +35,6 @@ public interface TGzContractService {
* @param offerId offerId
* @param offerId offerId
* @param workLocation 工作地点
* @param workLocation 工作地点
*/
*/
void
saveContractInfoToGzEmpInfo
(
TEmployeeContractInfo
contractInfo
,
Integer
offerId
,
String
workLocation
);
void
saveContractInfoToGzEmpInfo
(
TEmployeeContractInfo
contractInfo
,
Integer
offerId
,
String
workLocation
,
String
workLocationDescr
);
}
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeContractInfoServiceImpl.java
View file @
44ab3643
...
@@ -2284,7 +2284,7 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
...
@@ -2284,7 +2284,7 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
// updStatus == 8:合同审核通过 生成瓜子档案里的合同信息
// updStatus == 8:合同审核通过 生成瓜子档案里的合同信息
if
(
CommonConstants
.
EIGHT_STRING
.
equals
(
updStatus
)){
if
(
CommonConstants
.
EIGHT_STRING
.
equals
(
updStatus
)){
tGzContractService
.
saveContractInfoToGzEmpInfo
(
contractInfo
,
gzOfferInfo
.
getId
(),
gzOfferInfo
.
getWorkLocation
());
tGzContractService
.
saveContractInfoToGzEmpInfo
(
contractInfo
,
gzOfferInfo
.
getId
(),
gzOfferInfo
.
getWorkLocation
()
,
gzOfferInfo
.
getWorkLocationDescr
()
);
}
}
// 瓜子状态变更增加操作日志
// 瓜子状态变更增加操作日志
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeInfoServiceImpl.java
View file @
44ab3643
...
@@ -2634,7 +2634,7 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
...
@@ -2634,7 +2634,7 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
gzOfferInfoMapper
.
updateById
(
gzOfferInfo
);
gzOfferInfoMapper
.
updateById
(
gzOfferInfo
);
// 合同审核通过 生成瓜子档案里的合同信息
// 合同审核通过 生成瓜子档案里的合同信息
tGzContractService
.
saveContractInfoToGzEmpInfo
(
c
,
gzOfferInfo
.
getId
(),
gzOfferInfo
.
getWorkLocation
());
tGzContractService
.
saveContractInfoToGzEmpInfo
(
c
,
gzOfferInfo
.
getId
(),
gzOfferInfo
.
getWorkLocation
()
,
gzOfferInfo
.
getWorkLocationDescr
()
);
// 瓜子状态变更增加操作日志
// 瓜子状态变更增加操作日志
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TGzContractServiceImpl.java
View file @
44ab3643
...
@@ -52,7 +52,7 @@ public class TGzContractServiceImpl implements TGzContractService {
...
@@ -52,7 +52,7 @@ public class TGzContractServiceImpl implements TGzContractService {
* @param workLocation 工作地点
* @param workLocation 工作地点
*/
*/
@Override
@Override
public
void
saveContractInfoToGzEmpInfo
(
TEmployeeContractInfo
contractInfo
,
Integer
offerId
,
String
workLocation
)
{
public
void
saveContractInfoToGzEmpInfo
(
TEmployeeContractInfo
contractInfo
,
Integer
offerId
,
String
workLocation
,
String
workLocationDescr
)
{
// 获取档案信息
// 获取档案信息
TGzEmpInfo
gzEmpInfo
=
tGzEmpInfoMapper
.
getInfoByOfferId
(
offerId
);
TGzEmpInfo
gzEmpInfo
=
tGzEmpInfoMapper
.
getInfoByOfferId
(
offerId
);
if
(
Common
.
isNotNull
(
gzEmpInfo
))
{
if
(
Common
.
isNotNull
(
gzEmpInfo
))
{
...
@@ -99,6 +99,7 @@ public class TGzContractServiceImpl implements TGzContractService {
...
@@ -99,6 +99,7 @@ public class TGzContractServiceImpl implements TGzContractService {
gzEmpInfo
.
setNeeProviderId
(
CommonConstants
.
GZ_NEE_PROVIDER_ID
);
gzEmpInfo
.
setNeeProviderId
(
CommonConstants
.
GZ_NEE_PROVIDER_ID
);
gzEmpInfo
.
setWorkLocation
(
workLocation
);
gzEmpInfo
.
setWorkLocation
(
workLocation
);
gzEmpInfo
.
setWorkLocationDescr
(
workLocationDescr
);
gzEmpInfo
.
setContractState
(
"A"
);
gzEmpInfo
.
setContractState
(
"A"
);
// 存合同信息
// 存合同信息
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TGzEmpInfoServiceImpl.java
View file @
44ab3643
...
@@ -253,6 +253,7 @@ public class TGzEmpInfoServiceImpl extends ServiceImpl<TGzEmpInfoMapper, TGzEmpI
...
@@ -253,6 +253,7 @@ public class TGzEmpInfoServiceImpl extends ServiceImpl<TGzEmpInfoMapper, TGzEmpI
}
}
}
}
gzEmpInfoVo
.
setAttaList
(
attaInfos
);
gzEmpInfoVo
.
setAttaList
(
attaInfos
);
}
}
TPreEmpDeclaration
declaration
=
tPreEmpDeclarationService
.
getTPreEmpDeclarationList
();
TPreEmpDeclaration
declaration
=
tPreEmpDeclarationService
.
getTPreEmpDeclarationList
();
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TGzOfferInfoServiceImpl.java
View file @
44ab3643
...
@@ -59,6 +59,7 @@ import javax.servlet.ServletOutputStream;
...
@@ -59,6 +59,7 @@ import javax.servlet.ServletOutputStream;
import
javax.servlet.http.HttpServletResponse
;
import
javax.servlet.http.HttpServletResponse
;
import
java.io.IOException
;
import
java.io.IOException
;
import
java.io.InputStream
;
import
java.io.InputStream
;
import
java.math.BigDecimal
;
import
java.net.URLEncoder
;
import
java.net.URLEncoder
;
import
java.time.LocalDate
;
import
java.time.LocalDate
;
import
java.time.LocalDateTime
;
import
java.time.LocalDateTime
;
...
@@ -290,7 +291,7 @@ public class TGzOfferInfoServiceImpl extends ServiceImpl<TGzOfferInfoMapper, TGz
...
@@ -290,7 +291,7 @@ public class TGzOfferInfoServiceImpl extends ServiceImpl<TGzOfferInfoMapper, TGz
// 2、检查 该项目该人员是否有在途或审核通过或已归档的状态为“可用”的合同,
// 2、检查 该项目该人员是否有在途或审核通过或已归档的状态为“可用”的合同,
// 若有则根据当前状态更新Offer状态,合同未审核通过:存【13:待签署】;合同审核通过:存【8:合同审核通过】;合同已归档:存【99:已归档】,
// 若有则根据当前状态更新Offer状态,合同未审核通过:存【13:待签署】;合同审核通过:存【8:合同审核通过】;合同已归档:存【99:已归档】,
// 存合同信息;
// 存合同信息;
String
changeStatus
=
this
.
checkSaveContract
(
findInfo
.
getNationalId
(),
findInfo
.
getId
(),
findInfo
.
getWorkLocation
());
String
changeStatus
=
this
.
checkSaveContract
(
findInfo
.
getNationalId
(),
findInfo
.
getId
(),
findInfo
.
getWorkLocation
()
,
findInfo
.
getWorkLocationDescr
()
);
tGzOfferInfo
.
setOfferStatus
(
changeStatus
);
tGzOfferInfo
.
setOfferStatus
(
changeStatus
);
}
}
...
@@ -318,7 +319,7 @@ public class TGzOfferInfoServiceImpl extends ServiceImpl<TGzOfferInfoMapper, TGz
...
@@ -318,7 +319,7 @@ public class TGzOfferInfoServiceImpl extends ServiceImpl<TGzOfferInfoMapper, TGz
* @param workLocation 工作地点
* @param workLocation 工作地点
* @return String 后续offer要更新的状态
* @return String 后续offer要更新的状态
*/
*/
private
String
checkSaveContract
(
String
nationalId
,
Integer
offerId
,
String
workLocation
){
private
String
checkSaveContract
(
String
nationalId
,
Integer
offerId
,
String
workLocation
,
String
workLocationDescr
){
// 默认是档案审核通过
// 默认是档案审核通过
String
changeStatus
=
"97"
;
String
changeStatus
=
"97"
;
TEmployeeContractInfo
contractInfo
=
employeeContractInfoMapper
.
selectOne
(
Wrappers
.<
TEmployeeContractInfo
>
query
().
lambda
()
TEmployeeContractInfo
contractInfo
=
employeeContractInfoMapper
.
selectOne
(
Wrappers
.<
TEmployeeContractInfo
>
query
().
lambda
()
...
@@ -330,14 +331,14 @@ public class TGzOfferInfoServiceImpl extends ServiceImpl<TGzOfferInfoMapper, TGz
...
@@ -330,14 +331,14 @@ public class TGzOfferInfoServiceImpl extends ServiceImpl<TGzOfferInfoMapper, TGz
if
(
CommonConstants
.
ZERO_STRING
.
equals
(
contractInfo
.
getIsFile
())
if
(
CommonConstants
.
ZERO_STRING
.
equals
(
contractInfo
.
getIsFile
())
&&
CommonConstants
.
ZERO_STRING
.
equals
(
contractInfo
.
getInUse
())){
&&
CommonConstants
.
ZERO_STRING
.
equals
(
contractInfo
.
getInUse
())){
// 生成瓜子档案里的合同信息
// 生成瓜子档案里的合同信息
tGzContractService
.
saveContractInfoToGzEmpInfo
(
contractInfo
,
offerId
,
workLocation
);
tGzContractService
.
saveContractInfoToGzEmpInfo
(
contractInfo
,
offerId
,
workLocation
,
workLocationDescr
);
return
"99"
;
return
"99"
;
}
}
// 合同审核通过
// 合同审核通过
if
(
CommonConstants
.
TWO_INTEGER
.
equals
(
contractInfo
.
getAuditStatus
())
if
(
CommonConstants
.
TWO_INTEGER
.
equals
(
contractInfo
.
getAuditStatus
())
&&
CommonConstants
.
ZERO_STRING
.
equals
(
contractInfo
.
getInUse
())){
&&
CommonConstants
.
ZERO_STRING
.
equals
(
contractInfo
.
getInUse
())){
// 生成瓜子档案里的合同信息
// 生成瓜子档案里的合同信息
tGzContractService
.
saveContractInfoToGzEmpInfo
(
contractInfo
,
offerId
,
workLocation
);
tGzContractService
.
saveContractInfoToGzEmpInfo
(
contractInfo
,
offerId
,
workLocation
,
workLocationDescr
);
return
CommonConstants
.
EIGHT_STRING
;
return
CommonConstants
.
EIGHT_STRING
;
}
}
// 合同已提交待审核
// 合同已提交待审核
...
@@ -748,12 +749,77 @@ public class TGzOfferInfoServiceImpl extends ServiceImpl<TGzOfferInfoMapper, TGz
...
@@ -748,12 +749,77 @@ public class TGzOfferInfoServiceImpl extends ServiceImpl<TGzOfferInfoMapper, TGz
}
}
}
}
private
static
final
String
SFZ_TYPE
=
"1A"
;
private
static
final
String
SFZ
=
"居民身份证"
;
private
static
final
String
SEX_M
=
"M"
;
private
static
final
String
SEX_F
=
"F"
;
private
static
final
String
SEX_NAN
=
"男"
;
private
static
final
String
SEX_NV
=
"女"
;
private
static
final
String
WORK_LOCATION1_CODE
=
"34010001"
;
private
static
final
String
WORK_LOCATION2_CODE
=
"34010002"
;
private
static
final
String
WORK_LOCATION1
=
"安徽省合肥市电销中心"
;
private
static
final
String
WORK_LOCATION2
=
"安徽省合肥市区域"
;
private
static
final
String
YEAR_BONUS
=
"个月"
;
private
static
final
String
KONG_STR
=
""
;
private
static
final
String
EXP_ENTRY_DATE
=
"yyyy年M月d日"
;
/**
/**
* 插入excel bad record
* 插入excel bad record
*/
*/
private
void
insertExcel
(
TGzOfferInfoImportVo
excel
)
{
private
void
insertExcel
(
TGzOfferInfoImportVo
excel
)
{
TGzOfferInfo
insert
=
new
TGzOfferInfo
();
TGzOfferInfo
insert
=
new
TGzOfferInfo
();
BeanUtil
.
copyProperties
(
excel
,
insert
);
BeanUtil
.
copyProperties
(
excel
,
insert
);
insert
.
setNationalIdType
(
SFZ_TYPE
);
insert
.
setNationalIdTypeDescr
(
SFZ
);
if
(
Common
.
isNotNull
(
insert
.
getSex
()))
{
if
(
SEX_NAN
.
equals
(
insert
.
getSex
()))
{
insert
.
setSex
(
SEX_M
);
}
else
if
(
SEX_NV
.
equals
(
insert
.
getSex
()))
{
insert
.
setSex
(
SEX_F
);
}
}
if
(
Common
.
isNotNull
(
excel
.
getExpEntry
()))
{
Date
expEntryDate
;
try
{
// 将2025年6月3日 转化为date格式日期
expEntryDate
=
DateUtil
.
stringToDateByFormat
(
excel
.
getExpEntry
(),
EXP_ENTRY_DATE
);
if
(
expEntryDate
==
null
)
{
expEntryDate
=
DateUtil
.
stringToDate2
(
excel
.
getExpEntry
(),
KONG_STR
);
}
if
(
expEntryDate
!=
null
)
{
insert
.
setExpEntryDate
(
expEntryDate
);
}
}
catch
(
Exception
e
)
{
// 错误格式,不转化
}
}
if
(
Common
.
isNotNull
(
insert
.
getWorkLocationDescr
()))
{
if
(
WORK_LOCATION1
.
equals
(
insert
.
getWorkLocationDescr
()))
{
insert
.
setWorkLocation
(
WORK_LOCATION1_CODE
);
}
else
if
(
WORK_LOCATION2
.
equals
(
insert
.
getWorkLocationDescr
()))
{
insert
.
setWorkLocation
(
WORK_LOCATION2_CODE
);
}
}
if
(
Common
.
isNotNull
(
excel
.
getYearBonus
()))
{
try
{
insert
.
setYearBonusMonth
(
Integer
.
parseInt
(
excel
.
getYearBonus
().
replace
(
YEAR_BONUS
,
KONG_STR
)));
}
catch
(
Exception
e
)
{
// 错误月份,则不录入改字段
}
}
if
(
Common
.
isNotNull
(
excel
.
getBasePay
()))
{
try
{
insert
.
setBasePay
(
new
BigDecimal
(
excel
.
getBasePay
()));
}
catch
(
Exception
e
)
{
// 错误金额,则不录入改字段
}
}
if
(
Common
.
isNotNull
(
excel
.
getPerfomPay
()))
{
try
{
insert
.
setPerfomPay
(
new
BigDecimal
(
excel
.
getPerfomPay
()));
}
catch
(
Exception
e
)
{
// 错误金额,则不录入改字段
}
}
insert
.
setBizId
(
"0"
);
insert
.
setBizId
(
"0"
);
this
.
save
(
insert
);
this
.
save
(
insert
);
}
}
...
...
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TGzEmpInfoMapper.xml
View file @
44ab3643
...
@@ -76,6 +76,7 @@
...
@@ -76,6 +76,7 @@
<result
property=
"prcExpDt"
column=
"prc_exp_dt"
/>
<result
property=
"prcExpDt"
column=
"prc_exp_dt"
/>
<result
property=
"neeProviderId"
column=
"nee_provider_id"
/>
<result
property=
"neeProviderId"
column=
"nee_provider_id"
/>
<result
property=
"workLocation"
column=
"work_location"
/>
<result
property=
"workLocation"
column=
"work_location"
/>
<result
property=
"workLocationDescr"
column=
"work_location_descr"
/>
<result
property=
"contractState"
column=
"contract_state"
/>
<result
property=
"contractState"
column=
"contract_state"
/>
<result
property=
"hukouType"
column=
"hukou_type"
/>
<result
property=
"hukouType"
column=
"hukou_type"
/>
<result
property=
"hukouProvince"
column=
"hukou_province"
/>
<result
property=
"hukouProvince"
column=
"hukou_province"
/>
...
@@ -155,6 +156,7 @@
...
@@ -155,6 +156,7 @@
a.prc_exp_dt,
a.prc_exp_dt,
a.nee_provider_id,
a.nee_provider_id,
a.work_location,
a.work_location,
a.work_location_descr,
a.contract_state,
a.contract_state,
a.hukou_type,
a.hukou_type,
a.hukou_province,
a.hukou_province,
...
@@ -477,6 +479,7 @@
...
@@ -477,6 +479,7 @@
date_format(a.prc_exp_dt, '%Y-%m-%d') prc_exp_dt,
date_format(a.prc_exp_dt, '%Y-%m-%d') prc_exp_dt,
a.nee_provider_id,
a.nee_provider_id,
a.work_location,
a.work_location,
a.work_location_descr,
a.contract_state,
a.contract_state,
a.hukou_type,
a.hukou_type,
a.hukou_province,
a.hukou_province,
...
...
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