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
6f4e5f03
Commit
6f4e5f03
authored
Jun 26, 2025
by
chenyuxi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat: 瓜子档案里加合同工作地点描述
parent
4e2f6000
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
25 additions
and
8 deletions
+25
-8
TGzEmpInfo.java
...m/yifu/cloud/plus/v1/yifu/archives/entity/TGzEmpInfo.java
+9
-0
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
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
+4
-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 @
6f4e5f03
...
@@ -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/TGzEmpInfoExportMain.java
View file @
6f4e5f03
...
@@ -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 @
6f4e5f03
...
@@ -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-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/TGzContractService.java
View file @
6f4e5f03
...
@@ -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 @
6f4e5f03
...
@@ -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 @
6f4e5f03
...
@@ -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 @
6f4e5f03
...
@@ -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 @
6f4e5f03
...
@@ -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 @
6f4e5f03
...
@@ -290,7 +290,7 @@ public class TGzOfferInfoServiceImpl extends ServiceImpl<TGzOfferInfoMapper, TGz
...
@@ -290,7 +290,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 +318,7 @@ public class TGzOfferInfoServiceImpl extends ServiceImpl<TGzOfferInfoMapper, TGz
...
@@ -318,7 +318,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 +330,14 @@ public class TGzOfferInfoServiceImpl extends ServiceImpl<TGzOfferInfoMapper, TGz
...
@@ -330,14 +330,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
;
}
}
// 合同已提交待审核
// 合同已提交待审核
...
...
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TGzEmpInfoMapper.xml
View file @
6f4e5f03
...
@@ -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