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
06398a3f
Commit
06398a3f
authored
Jan 21, 2026
by
hongguangwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1.7.19-税友相关
parent
7a7bead6
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
26 additions
and
4 deletions
+26
-4
TSocialFriendReduceSet.java
...ud/plus/v1/yifu/social/entity/TSocialFriendReduceSet.java
+8
-0
TSocialFriendPushServiceImpl.java
...ifu/social/service/impl/TSocialFriendPushServiceImpl.java
+8
-2
TSocialFriendReduceSetServiceImpl.java
...ocial/service/impl/TSocialFriendReduceSetServiceImpl.java
+7
-1
TSocialFriendReduceSetMapper.xml
...rc/main/resources/mapper/TSocialFriendReduceSetMapper.xml
+3
-1
No files found.
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/entity/TSocialFriendReduceSet.java
View file @
06398a3f
...
...
@@ -93,5 +93,13 @@ public class TSocialFriendReduceSet {
@ExcelProperty
(
"类型"
)
@Schema
(
description
=
"类型1:社保;2:医保;3池州特殊减员映射"
)
private
String
mvpType
;
/**
* 户名称(可以为空)
*/
@ExcelAttribute
(
name
=
"户名称"
,
maxLength
=
50
)
@Length
(
max
=
50
,
message
=
"户名称"
)
@ExcelProperty
(
"户名称"
)
@Schema
(
description
=
"户名称"
)
private
String
huName
;
}
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TSocialFriendPushServiceImpl.java
View file @
06398a3f
...
...
@@ -250,7 +250,10 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe
vo
.
setChiZhouTbyy
(
reduceSet
.
getTbyy
());
vo
.
setChiZhouZzyy
(
reduceSet
.
getZzyy
());
}
reduceSet
=
reduceMap
.
get
(
vo
.
getTbyy
());
reduceSet
=
reduceMap
.
get
(
vo
.
getSocialHouseholdName
()
+
CommonConstants
.
DOWN_LINE_STRING
+
vo
.
getTbyy
());
if
(
reduceSet
==
null
)
{
reduceSet
=
reduceMap
.
get
(
vo
.
getTbyy
());
}
if
(
reduceSet
!=
null
)
{
vo
.
setTbyy
(
reduceSet
.
getTbyy
());
vo
.
setZzyy
(
reduceSet
.
getZzyy
());
...
...
@@ -562,7 +565,10 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe
vo
.
setChiZhouTbyy
(
reduceSet
.
getTbyy
());
vo
.
setChiZhouZzyy
(
reduceSet
.
getZzyy
());
}
reduceSet
=
reduceMap
.
get
(
vo
.
getTbyy
());
reduceSet
=
reduceMap
.
get
(
vo
.
getSocialHouseholdName
()
+
CommonConstants
.
DOWN_LINE_STRING
+
vo
.
getTbyy
());
if
(
reduceSet
==
null
)
{
reduceSet
=
reduceMap
.
get
(
vo
.
getTbyy
());
}
if
(
reduceSet
!=
null
)
{
vo
.
setTbyy
(
reduceSet
.
getTbyy
());
vo
.
setZzyy
(
reduceSet
.
getZzyy
());
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TSocialFriendReduceSetServiceImpl.java
View file @
06398a3f
...
...
@@ -18,6 +18,8 @@ package com.yifu.cloud.plus.v1.yifu.social.service.impl;
import
com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
;
import
com.google.common.collect.Maps
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.Common
;
import
com.yifu.cloud.plus.v1.yifu.social.entity.TSocialFriendReduceSet
;
import
com.yifu.cloud.plus.v1.yifu.social.mapper.TSocialFriendReduceSetMapper
;
import
com.yifu.cloud.plus.v1.yifu.social.service.TSocialFriendReduceSetService
;
...
...
@@ -44,7 +46,11 @@ public class TSocialFriendReduceSetServiceImpl extends ServiceImpl<TSocialFriend
if
(
list
!=
null
&&
!
list
.
isEmpty
())
{
Map
<
String
,
TSocialFriendReduceSet
>
map
=
Maps
.
newHashMap
();
for
(
TSocialFriendReduceSet
reduceSet
:
list
)
{
map
.
put
(
reduceSet
.
getMvpKey
(),
reduceSet
);
if
(
Common
.
isEmpty
(
reduceSet
.
getHuName
()))
{
map
.
put
(
reduceSet
.
getMvpKey
(),
reduceSet
);
}
else
{
map
.
put
(
reduceSet
.
getHuName
()
+
CommonConstants
.
DOWN_LINE_STRING
+
reduceSet
.
getMvpKey
(),
reduceSet
);
}
}
return
map
;
}
...
...
yifu-social/yifu-social-biz/src/main/resources/mapper/TSocialFriendReduceSetMapper.xml
View file @
06398a3f
...
...
@@ -31,6 +31,7 @@
<result
property=
"bajcejyy"
column=
"BAJCEJYY"
/>
<result
property=
"mvpKey"
column=
"MVP_KEY"
/>
<result
property=
"mvpType"
column=
"MVP_TYPE"
/>
<result
property=
"huName"
column=
"HU_NAME"
/>
</resultMap>
<sql
id=
"Base_Column_List"
>
a.ID,
...
...
@@ -38,7 +39,8 @@
a.ZZYY,
a.BAJCEJYY,
a.MVP_KEY,
a.MVP_TYPE
a.MVP_TYPE,
a.HU_NAME
</sql>
<!--tSocialFriendReduceSet简单分页查询-->
<select
id=
"getTSocialFriendReduceSetList"
resultMap=
"tSocialFriendReduceSetMap"
>
...
...
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