Commit 06398a3f authored by hongguangwu's avatar hongguangwu

1.7.19-税友相关

parent 7a7bead6
...@@ -93,5 +93,13 @@ public class TSocialFriendReduceSet { ...@@ -93,5 +93,13 @@ public class TSocialFriendReduceSet {
@ExcelProperty("类型") @ExcelProperty("类型")
@Schema(description = "类型1:社保;2:医保;3池州特殊减员映射") @Schema(description = "类型1:社保;2:医保;3池州特殊减员映射")
private String mvpType; private String mvpType;
/**
* 户名称(可以为空)
*/
@ExcelAttribute(name = "户名称", maxLength = 50)
@Length(max = 50, message = "户名称")
@ExcelProperty("户名称")
@Schema(description = "户名称")
private String huName;
} }
...@@ -250,7 +250,10 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe ...@@ -250,7 +250,10 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe
vo.setChiZhouTbyy(reduceSet.getTbyy()); vo.setChiZhouTbyy(reduceSet.getTbyy());
vo.setChiZhouZzyy(reduceSet.getZzyy()); 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) { if (reduceSet != null) {
vo.setTbyy(reduceSet.getTbyy()); vo.setTbyy(reduceSet.getTbyy());
vo.setZzyy(reduceSet.getZzyy()); vo.setZzyy(reduceSet.getZzyy());
...@@ -562,7 +565,10 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe ...@@ -562,7 +565,10 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe
vo.setChiZhouTbyy(reduceSet.getTbyy()); vo.setChiZhouTbyy(reduceSet.getTbyy());
vo.setChiZhouZzyy(reduceSet.getZzyy()); 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) { if (reduceSet != null) {
vo.setTbyy(reduceSet.getTbyy()); vo.setTbyy(reduceSet.getTbyy());
vo.setZzyy(reduceSet.getZzyy()); vo.setZzyy(reduceSet.getZzyy());
......
...@@ -18,6 +18,8 @@ package com.yifu.cloud.plus.v1.yifu.social.service.impl; ...@@ -18,6 +18,8 @@ package com.yifu.cloud.plus.v1.yifu.social.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.google.common.collect.Maps; 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.entity.TSocialFriendReduceSet;
import com.yifu.cloud.plus.v1.yifu.social.mapper.TSocialFriendReduceSetMapper; import com.yifu.cloud.plus.v1.yifu.social.mapper.TSocialFriendReduceSetMapper;
import com.yifu.cloud.plus.v1.yifu.social.service.TSocialFriendReduceSetService; import com.yifu.cloud.plus.v1.yifu.social.service.TSocialFriendReduceSetService;
...@@ -44,7 +46,11 @@ public class TSocialFriendReduceSetServiceImpl extends ServiceImpl<TSocialFriend ...@@ -44,7 +46,11 @@ public class TSocialFriendReduceSetServiceImpl extends ServiceImpl<TSocialFriend
if (list != null && !list.isEmpty()) { if (list != null && !list.isEmpty()) {
Map<String, TSocialFriendReduceSet> map = Maps.newHashMap(); Map<String, TSocialFriendReduceSet> map = Maps.newHashMap();
for (TSocialFriendReduceSet reduceSet : list) { 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; return map;
} }
......
...@@ -31,6 +31,7 @@ ...@@ -31,6 +31,7 @@
<result property="bajcejyy" column="BAJCEJYY"/> <result property="bajcejyy" column="BAJCEJYY"/>
<result property="mvpKey" column="MVP_KEY"/> <result property="mvpKey" column="MVP_KEY"/>
<result property="mvpType" column="MVP_TYPE"/> <result property="mvpType" column="MVP_TYPE"/>
<result property="huName" column="HU_NAME"/>
</resultMap> </resultMap>
<sql id="Base_Column_List"> <sql id="Base_Column_List">
a.ID, a.ID,
...@@ -38,7 +39,8 @@ ...@@ -38,7 +39,8 @@
a.ZZYY, a.ZZYY,
a.BAJCEJYY, a.BAJCEJYY,
a.MVP_KEY, a.MVP_KEY,
a.MVP_TYPE a.MVP_TYPE,
a.HU_NAME
</sql> </sql>
<!--tSocialFriendReduceSet简单分页查询--> <!--tSocialFriendReduceSet简单分页查询-->
<select id="getTSocialFriendReduceSetList" resultMap="tSocialFriendReduceSetMap"> <select id="getTSocialFriendReduceSetList" resultMap="tSocialFriendReduceSetMap">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment