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
3baf1f8a
Commit
3baf1f8a
authored
Aug 04, 2025
by
hongguangwu
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.7.14' into MVP1.7.14
parents
ed66d6b8
c2dde5b5
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
80 additions
and
35 deletions
+80
-35
TGzEmpInfo.java
...m/yifu/cloud/plus/v1/yifu/archives/entity/TGzEmpInfo.java
+3
-0
TGzEmpInfoExportMain.java
.../cloud/plus/v1/yifu/archives/vo/TGzEmpInfoExportMain.java
+4
-0
TGzEmpInfoServiceImpl.java
.../v1/yifu/archives/service/impl/TGzEmpInfoServiceImpl.java
+64
-32
TGzEmpInfoMapper.xml
...chives-biz/src/main/resources/mapper/TGzEmpInfoMapper.xml
+9
-3
No files found.
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/TGzEmpInfo.java
View file @
3baf1f8a
...
...
@@ -574,4 +574,7 @@ public class TGzEmpInfo extends BaseEntity {
@Schema
(
description
=
"持卡人姓名"
)
private
String
accountName
;
@Schema
(
description
=
"档案状态(0:已提交,1:暂存)"
)
private
String
empStatus
;
}
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/TGzEmpInfoExportMain.java
View file @
3baf1f8a
...
...
@@ -48,6 +48,10 @@ public class TGzEmpInfoExportMain implements Serializable {
@ExcelProperty
(
"员工档案提交时间"
)
private
String
createTime
;
@ExcelAttribute
(
name
=
"档案状态"
,
isDataId
=
true
,
readConverterExp
=
"0=已提交,1=暂存"
)
@ExcelProperty
(
"档案状态"
)
private
String
empStatus
;
@ExcelAttribute
(
name
=
"档案推送瓜子状态"
,
isDataId
=
true
,
readConverterExp
=
"0=待推送,1=已推送"
)
@ExcelProperty
(
"档案推送瓜子状态"
)
private
String
empPushStatus
;
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TGzEmpInfoServiceImpl.java
View file @
3baf1f8a
...
...
@@ -491,6 +491,10 @@ public class TGzEmpInfoServiceImpl extends ServiceImpl<TGzEmpInfoMapper, TGzEmpI
YifuUser
user
=
getNewYifuUser
();
TGzEmpInfo
tGzEmpInfo
=
tGzEmpInfoVo
;
Integer
offerId
=
tGzEmpInfoVo
.
getOfferId
();
// 1.7.14: 档案状态必传
if
(
Common
.
isEmpty
(
tGzEmpInfoVo
.
getEmpStatus
()))
{
return
R
.
failed
(
"档案状态必传!"
);
}
if
(
Common
.
isEmpty
(
offerId
))
{
return
R
.
failed
(
"请传参流程ID!"
);
}
else
{
...
...
@@ -504,30 +508,33 @@ public class TGzEmpInfoServiceImpl extends ServiceImpl<TGzEmpInfoMapper, TGzEmpI
// 测试 郭彤:这个提示改下吧,没必要吧ID还有状态枚举值列出来 2025-6-30 18:09:05
// return R.failed("瓜子Offer状态不对("+gzOfferInfo.getOfferStatus()+"),不可编辑,Offer的ID="+ offerId)
}
gzOfferInfo
.
setOfferStatus
(
"12"
);
gzOfferInfoMapper
.
updateById
(
gzOfferInfo
);
// 记录状态变更的offer操作日志 记录来源: 6:(系统触发)C端采集提交
this
.
saveOfferStatusRecord
(
gzOfferInfo
.
getId
(),
CommonConstants
.
SIX_STRING
,
CommonConstants
.
NINE_STRING
,
gzOfferInfo
.
getOfferStatus
(),
"0"
,
"系统触发"
);
// 1.7.13: 同一个流程ID推送过12:候选人信息审核,之前没推送过这个状态的,才触发推送
TGzPushEntry
findFailInfo
=
tGzPushEntryService
.
getOne
(
Wrappers
.<
TGzPushEntry
>
query
().
lambda
()
.
eq
(
TGzPushEntry:
:
getBizId
,
gzOfferInfo
.
getBizId
())
.
eq
(
TGzPushEntry:
:
getTaskType
,
"12"
)
.
eq
(
TGzPushEntry:
:
getDelFlag
,
CommonConstants
.
ZERO_STRING
)
.
last
(
CommonConstants
.
LAST_ONE_SQL
));
if
(
Common
.
isEmpty
(
findFailInfo
))
{
// 推送状态给瓜子
if
(!
CommonConstants
.
ZERO_STRING
.
equals
(
gzOfferInfo
.
getBizId
())){
TGzPushEntry
tGzPushEntry
=
new
TGzPushEntry
();
tGzPushEntry
.
setCreateBy
(
user
.
getId
());
tGzPushEntry
.
setCreateName
(
user
.
getNickname
());
tGzPushEntry
.
setBizId
(
gzOfferInfo
.
getBizId
());
tGzPushEntry
.
setTaskType
(
"12"
);
tGzPushEntry
.
setName
(
gzOfferInfo
.
getName
());
tGzPushEntry
.
setNationalId
(
gzOfferInfo
.
getNationalId
());
tGzPushEntryService
.
addPushEntry
(
tGzPushEntry
);
// 1.7.14: 档案状态是提交,才更新offer状态
if
(
CommonConstants
.
ZERO_STRING
.
equals
(
tGzEmpInfoVo
.
getEmpStatus
())){
gzOfferInfo
.
setOfferStatus
(
"12"
);
gzOfferInfoMapper
.
updateById
(
gzOfferInfo
);
// 记录状态变更的offer操作日志 记录来源: 6:(系统触发)C端采集提交
this
.
saveOfferStatusRecord
(
gzOfferInfo
.
getId
(),
CommonConstants
.
SIX_STRING
,
CommonConstants
.
NINE_STRING
,
gzOfferInfo
.
getOfferStatus
(),
"0"
,
"系统触发"
);
// 1.7.13: 同一个流程ID推送过12:候选人信息审核,之前没推送过这个状态的,才触发推送
TGzPushEntry
findFailInfo
=
tGzPushEntryService
.
getOne
(
Wrappers
.<
TGzPushEntry
>
query
().
lambda
()
.
eq
(
TGzPushEntry:
:
getBizId
,
gzOfferInfo
.
getBizId
())
.
eq
(
TGzPushEntry:
:
getTaskType
,
"12"
)
.
eq
(
TGzPushEntry:
:
getDelFlag
,
CommonConstants
.
ZERO_STRING
)
.
last
(
CommonConstants
.
LAST_ONE_SQL
));
if
(
Common
.
isEmpty
(
findFailInfo
))
{
// 推送状态给瓜子
if
(!
CommonConstants
.
ZERO_STRING
.
equals
(
gzOfferInfo
.
getBizId
())){
TGzPushEntry
tGzPushEntry
=
new
TGzPushEntry
();
tGzPushEntry
.
setCreateBy
(
user
.
getId
());
tGzPushEntry
.
setCreateName
(
user
.
getNickname
());
tGzPushEntry
.
setBizId
(
gzOfferInfo
.
getBizId
());
tGzPushEntry
.
setTaskType
(
"12"
);
tGzPushEntry
.
setName
(
gzOfferInfo
.
getName
());
tGzPushEntry
.
setNationalId
(
gzOfferInfo
.
getNationalId
());
tGzPushEntryService
.
addPushEntry
(
tGzPushEntry
);
}
}
}
}
...
...
@@ -536,12 +543,19 @@ public class TGzEmpInfoServiceImpl extends ServiceImpl<TGzEmpInfoMapper, TGzEmpI
if
(
Common
.
isEmpty
(
gzEmpId
))
{
tGzEmpInfo
.
setCreateBy
(
user
.
getId
());
tGzEmpInfo
.
setCreateName
(
user
.
getNickname
());
tGzEmpInfo
.
setCreateTime
(
LocalDateTime
.
now
());
// 1.7.14: 档案状态是提交,才存 创建时间(提交时间)
if
(
CommonConstants
.
ZERO_STRING
.
equals
(
tGzEmpInfoVo
.
getEmpStatus
())){
tGzEmpInfo
.
setCreateTime
(
LocalDateTime
.
now
());
}
this
.
save
(
tGzEmpInfo
);
gzEmpId
=
tGzEmpInfo
.
getId
();
}
else
{
tGzEmpInfo
.
setUpdateBy
(
user
.
getId
());
tGzEmpInfo
.
setUpdateTime
(
LocalDateTime
.
now
());
// 1.7.14: 档案状态是暂存,清除 创建时间(提交时间)
if
(
CommonConstants
.
ONE_STRING
.
equals
(
tGzEmpInfoVo
.
getEmpStatus
())){
tGzEmpInfo
.
setCreateTime
(
null
);
}
this
.
updateById
(
tGzEmpInfo
);
}
// 获取瓜子档案附属信息:先删除后增加:
...
...
@@ -843,6 +857,22 @@ public class TGzEmpInfoServiceImpl extends ServiceImpl<TGzEmpInfoMapper, TGzEmpI
if
(
Common
.
isEmpty
(
attaEmp
.
getAttaName
()))
{
attaEmp
.
setAttaName
(
CommonConstants
.
CENTER_SPLIT_LINE_STRING
);
}
// 1.7.14: 附件类型映射
// 41(瓜子申明签名)42(瓜子确认签名)NID_A(证件正面) NID_B(证件反面)
// 附件类型转化:声明签字:21;确认签字:22; 9身份证;24 身份证国徽
if
(
"41"
.
equals
(
atta
.
getRelationType
())){
atta
.
setRelationType
(
"21"
);
}
if
(
"42"
.
equals
(
atta
.
getRelationType
())){
atta
.
setRelationType
(
"22"
);
}
if
(
"NID_A"
.
equals
(
atta
.
getRelationType
())){
atta
.
setRelationType
(
"9"
);
}
if
(
"NID_B"
.
equals
(
atta
.
getRelationType
())){
atta
.
setRelationType
(
"24"
);
}
attaEmp
.
setDomainId
(
empId
);
attaEmp
.
setCreateBy
(
user
.
getId
());
attaEmp
.
setCreateName
(
user
.
getNickname
());
...
...
@@ -1020,9 +1050,11 @@ public class TGzEmpInfoServiceImpl extends ServiceImpl<TGzEmpInfoMapper, TGzEmpI
// 按gzEmpInfo实体类顺序转化:
emp
.
setEmpName
(
gzEmpInfo
.
getName
());
emp
.
setEmpIdcard
(
gzEmpInfo
.
getNationalId
());
emp
.
setIdProvince
(
gzEmpInfo
.
getNativePlaceAreaId
());
emp
.
setIdCity
(
null
);
emp
.
setIdTown
(
null
);
// 1.7.14: 户籍所在地取值调整
emp
.
setIdProvince
(
gzEmpInfo
.
getHukouProvinceAreaId
());
emp
.
setIdCity
(
gzEmpInfo
.
getHukouCityAreaId
());
emp
.
setIdTown
(
gzEmpInfo
.
getHukouCountyAreaId
());
// 民族
emp
.
setEmpNational
(
getDictValue
(
dictMap
,
gzEmpInfo
.
getEthnicGrpCd
(),
ExcelAttributeConstants
.
GZ_ETHNIC_GRP_CD
));
// 婚姻状态
...
...
@@ -1050,10 +1082,10 @@ public class TGzEmpInfoServiceImpl extends ServiceImpl<TGzEmpInfoMapper, TGzEmpI
emp
.
setContactAddress
(
gzEmpInfo
.
getAddress
());
// 户口性质
emp
.
setEmpRegisType
(
getDictValue
(
dictMap
,
gzEmpInfo
.
getHukouType
(),
ExcelAttributeConstants
.
GZ_HUKOU_TYPE
));
emp
.
setFileProvince
(
gzEmpInfo
.
getHukouProvinceAreaId
()
);
emp
.
setFileCity
(
gzEmpInfo
.
getHukouCityAreaId
()
);
emp
.
setFileTown
(
gzEmpInfo
.
getHukouCountyAreaId
()
);
// 1.7.14: 档案所在地取值调整: ”默认为“安徽省-合肥市-蜀山区”
emp
.
setFileProvince
(
12
);
emp
.
setFileCity
(
135
);
emp
.
setFileTown
(
1267
);
emp
.
setBankName
(
getDictValue
(
dictMap
,
gzEmpInfo
.
getBankCd
(),
ExcelAttributeConstants
.
GZ_BANK
));
emp
.
setBankSubName
(
gzEmpInfo
.
getBankName
());
if
(
Common
.
isNotNull
(
gzEmpInfo
.
getAccountProvinceAreaId
()))
{
...
...
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TGzEmpInfoMapper.xml
View file @
3baf1f8a
...
...
@@ -102,6 +102,7 @@
<result
property=
"hukouCountyAreaId"
column=
"hukou_county_area_id"
/>
<result
property=
"accountProvinceAreaId"
column=
"account_province_area_id"
/>
<result
property=
"accountCityAreaId"
column=
"account_city_area_id"
/>
<result
property=
"empStatus"
column=
"emp_status"
/>
</resultMap>
<sql
id=
"Base_Column_List"
>
a.id,
...
...
@@ -181,7 +182,8 @@
a.hukou_city_area_id,
a.hukou_county_area_id,
a.account_province_area_id,
a.account_city_area_id
a.account_city_area_id,
a.emp_status
</sql>
<sql
id=
"tGzEmpInfo_where"
>
<if
test=
"tGzEmpInfo != null"
>
...
...
@@ -194,6 +196,9 @@
<if
test=
"tGzEmpInfo.offerId != null "
>
AND a.offer_id = #{tGzEmpInfo.offerId}
</if>
<if
test=
"tGzEmpInfo.empStatus != null and tGzEmpInfo.empStatus.trim() != ''"
>
AND a.emp_status = #{tGzEmpInfo.empStatus}
</if>
<if
test=
"tGzEmpInfo.empPushStatus != null and tGzEmpInfo.empPushStatus.trim() != ''"
>
AND a.emp_push_status = #{tGzEmpInfo.empPushStatus}
</if>
...
...
@@ -411,7 +416,7 @@
a.del_flag = '0'
<include
refid=
"tGzEmpInfo_where"
/>
</where>
ORDER by a.create_time desc,a.id desc
ORDER by a.
emp_status,a.
create_time desc,a.id desc
</select>
<!--count-->
...
...
@@ -431,6 +436,7 @@
a.id,
a.biz_id,
a.offer_id,
a.emp_status,
a.emp_push_status,
a.contract_push_status,
a.contract_atta_push_status,
...
...
@@ -517,7 +523,7 @@
<include
refid=
"tGzEmpInfo_where"
/>
</where>
group by a.id
ORDER by a.create_time desc,a.id desc
ORDER by a.
emp_status,a.
create_time desc,a.id desc
<if
test=
"tGzEmpInfo.limitStart != null"
>
limit #{tGzEmpInfo.limitStart},#{tGzEmpInfo.limitEnd}
</if>
...
...
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