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
7948c4a0
Commit
7948c4a0
authored
Feb 04, 2026
by
fangxinjiang
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.7.20' into MVP1.7.20
parents
3d9f8652
40c180cd
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
88 additions
and
24 deletions
+88
-24
TGzAreaService.java
...u/cloud/plus/v1/yifu/archives/service/TGzAreaService.java
+4
-0
TGzAreaServiceImpl.java
...lus/v1/yifu/archives/service/impl/TGzAreaServiceImpl.java
+14
-0
TGzEmpInfoServiceImpl.java
.../v1/yifu/archives/service/impl/TGzEmpInfoServiceImpl.java
+70
-24
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/TGzAreaService.java
View file @
7948c4a0
...
...
@@ -25,6 +25,7 @@ import com.yifu.cloud.plus.v1.yifu.archives.vo.TGzAreaSearchVo;
import
javax.servlet.http.HttpServletResponse
;
import
java.util.List
;
import
java.util.Map
;
/**
* 瓜子特殊字典
...
...
@@ -50,4 +51,7 @@ public interface TGzAreaService extends IService<TGzArea> {
// 导出
void
listExport
(
HttpServletResponse
response
,
TGzAreaSearchVo
searchVo
);
// 获取瓜子特殊字典Map使用
Map
<
String
,
String
>
getGzAreaMap
();
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TGzAreaServiceImpl.java
View file @
7948c4a0
...
...
@@ -43,7 +43,9 @@ import javax.servlet.http.HttpServletResponse;
import
java.io.IOException
;
import
java.net.URLEncoder
;
import
java.util.ArrayList
;
import
java.util.HashMap
;
import
java.util.List
;
import
java.util.Map
;
/**
* 瓜子特殊字典
...
...
@@ -75,6 +77,18 @@ public class TGzAreaServiceImpl extends ServiceImpl<TGzAreaMapper, TGzArea> impl
return
baseMapper
.
getTGzAreaCountByCode
(
areaCode
,
id
);
}
@Override
public
Map
<
String
,
String
>
getGzAreaMap
()
{
List
<
TGzArea
>
list
=
baseMapper
.
getTGzAreaList
(
null
);
Map
<
String
,
String
>
map
=
new
HashMap
<>();
if
(
list
!=
null
&&
!
list
.
isEmpty
())
{
for
(
TGzArea
tGzArea
:
list
)
{
map
.
put
(
tGzArea
.
getAreaCode
(),
tGzArea
.
getGzCode
());
}
}
return
map
;
}
/**
* 瓜子地址映射表批量导出
* @return
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TGzEmpInfoServiceImpl.java
View file @
7948c4a0
...
...
@@ -116,6 +116,8 @@ public class TGzEmpInfoServiceImpl extends ServiceImpl<TGzEmpInfoMapper, TGzEmpI
private
final
TGzPushEntryService
tGzPushEntryService
;
private
final
TGzAreaService
tGzAreaService
;
/**
* 瓜子档案表简单分页查询
...
...
@@ -895,31 +897,75 @@ public class TGzEmpInfoServiceImpl extends ServiceImpl<TGzEmpInfoMapper, TGzEmpI
@Override
public
TGzEmpInfoPushGzVo
getGzEmpInfoToPushGzById
(
String
gzEmpId
)
{
TGzEmpInfoPushGzVo
vo
=
baseMapper
.
getGzEmpInfoToPushGzById
(
gzEmpId
);
TGzEmpInfoPushGzVoAdress
address
=
baseMapper
.
getGzEmpInfoToPushGzByIdAdress
(
gzEmpId
);
TGzEmpInfoPushGzVoBank
bank
=
baseMapper
.
getGzEmpInfoToPushGzByIdBank
(
gzEmpId
);
List
<
TGzEmpInfoPushGzVoFamily
>
family
=
baseMapper
.
getGzEmpInfoToPushGzByIdFamily
(
gzEmpId
);
List
<
TGzEmpInfoPushGzVoContact
>
contact
=
baseMapper
.
getGzEmpInfoToPushGzByIdContact
(
gzEmpId
);
List
<
TGzEmpInfoPushGzVoWork
>
work
=
baseMapper
.
getGzEmpInfoToPushGzByIdWork
(
gzEmpId
);
List
<
TGzEmpInfoPushGzVoEducation
>
education
=
baseMapper
.
getGzEmpInfoToPushGzByIdEducation
(
gzEmpId
);
List
<
TGzEmpInfoPushGzVoSkill
>
skill
=
baseMapper
.
getGzEmpInfoToPushGzByIdSkill
(
gzEmpId
);
String
[]
directlyCityArr
=
{
"110000"
,
"120000"
,
"310000"
,
"500000"
};
// 特殊处理: 是4个直辖市的,市编码和省编码一致
if
(
ArrayUtils
.
contains
(
directlyCityArr
,
vo
.
getHukouProvince
()))
{
vo
.
setHukouCity
(
vo
.
getHukouProvince
());
}
if
(
ArrayUtils
.
contains
(
directlyCityArr
,
address
.
getStateId
()))
{
address
.
setCityId
(
address
.
getStateId
());
if
(
vo
!=
null
)
{
TGzEmpInfoPushGzVoAdress
address
=
baseMapper
.
getGzEmpInfoToPushGzByIdAdress
(
gzEmpId
);
TGzEmpInfoPushGzVoBank
bank
=
baseMapper
.
getGzEmpInfoToPushGzByIdBank
(
gzEmpId
);
List
<
TGzEmpInfoPushGzVoFamily
>
family
=
baseMapper
.
getGzEmpInfoToPushGzByIdFamily
(
gzEmpId
);
List
<
TGzEmpInfoPushGzVoContact
>
contact
=
baseMapper
.
getGzEmpInfoToPushGzByIdContact
(
gzEmpId
);
List
<
TGzEmpInfoPushGzVoWork
>
work
=
baseMapper
.
getGzEmpInfoToPushGzByIdWork
(
gzEmpId
);
List
<
TGzEmpInfoPushGzVoEducation
>
education
=
baseMapper
.
getGzEmpInfoToPushGzByIdEducation
(
gzEmpId
);
List
<
TGzEmpInfoPushGzVoSkill
>
skill
=
baseMapper
.
getGzEmpInfoToPushGzByIdSkill
(
gzEmpId
);
// 特殊处理: 是4个直辖市的,市编码和省编码一致——2026-02-03与倩倩讨论,去除此逻辑,改为从新字典中取值变更。
Map
<
String
,
String
>
gzMap
=
tGzAreaService
.
getGzAreaMap
();
if
(
gzMap
!=
null
&&
!
gzMap
.
isEmpty
())
{
String
values
;
if
(
Common
.
isNotNull
(
vo
.
getHukouProvince
()))
{
values
=
gzMap
.
get
(
vo
.
getHukouProvince
());
if
(
Common
.
isNotNull
(
values
))
{
vo
.
setHukouProvince
(
values
);
}
}
if
(
Common
.
isNotNull
(
vo
.
getHukouCity
()))
{
values
=
gzMap
.
get
(
vo
.
getHukouCity
());
if
(
Common
.
isNotNull
(
values
))
{
vo
.
setHukouCity
(
values
);
}
}
if
(
Common
.
isNotNull
(
vo
.
getHukouCounty
()))
{
values
=
gzMap
.
get
(
vo
.
getHukouCounty
());
if
(
Common
.
isNotNull
(
values
))
{
vo
.
setHukouCounty
(
values
);
}
}
if
(
address
!=
null
)
{
if
(
Common
.
isNotNull
(
address
.
getStateId
()))
{
values
=
gzMap
.
get
(
address
.
getStateId
());
if
(
Common
.
isNotNull
(
values
))
{
address
.
setStateId
(
values
);
}
}
if
(
Common
.
isNotNull
(
address
.
getCityId
()))
{
values
=
gzMap
.
get
(
address
.
getCityId
());
if
(
Common
.
isNotNull
(
values
))
{
address
.
setCityId
(
values
);
}
}
if
(
Common
.
isNotNull
(
address
.
getCountyId
()))
{
values
=
gzMap
.
get
(
address
.
getCountyId
());
if
(
Common
.
isNotNull
(
values
))
{
address
.
setCountyId
(
values
);
}
}
}
}
/*String[] directlyCityArr = {"110000", "120000", "310000", "500000"};
// 特殊处理: 是4个直辖市的,市编码和省编码一致
if (ArrayUtils.contains(directlyCityArr, vo.getHukouProvince())) {
vo.setHukouCity(vo.getHukouProvince());
}
if (ArrayUtils.contains(directlyCityArr, address.getStateId())) {
address.setCityId(address.getStateId());
}*/
//List<TGzEmpInfoPushGzVoAtta> atta = baseMapper.getGzEmpInfoToPushGzByIdAtta(gzEmpId);
vo
.
setAddress
(
address
);
vo
.
setBankAccount
(
bank
);
vo
.
setFamily
(
family
);
vo
.
setEmergContact
(
contact
);
vo
.
setWorkExp
(
work
);
vo
.
setEduExp
(
education
);
vo
.
setSkill
(
skill
);
}
//List<TGzEmpInfoPushGzVoAtta> atta = baseMapper.getGzEmpInfoToPushGzByIdAtta(gzEmpId);
vo
.
setAddress
(
address
);
vo
.
setBankAccount
(
bank
);
vo
.
setFamily
(
family
);
vo
.
setEmergContact
(
contact
);
vo
.
setWorkExp
(
work
);
vo
.
setEduExp
(
education
);
vo
.
setSkill
(
skill
);
//vo.setAttach(atta);
return
vo
;
...
...
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