## bug371 业绩汇总页,选了隶属体系搜索后点导出,导出的excel是所有的,应该只导出当前搜索的体系的
This commit is contained in:
parent
e12edca3d9
commit
275e6c042c
|
@ -3247,6 +3247,12 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
|
||||||
List<CensusSummaryVo> censusSummaryList = new ArrayList<>();
|
List<CensusSummaryVo> censusSummaryList = new ArrayList<>();
|
||||||
for (String day : days) {
|
for (String day : days) {
|
||||||
censusSummaryParam.setTime(day);
|
censusSummaryParam.setTime(day);
|
||||||
|
// 将体系转换成集合类型
|
||||||
|
if (censusSummaryParam.getPkBdVertexStr() != null) {
|
||||||
|
censusSummaryParam.setPkBdVertexStrList(Arrays.stream(censusSummaryParam.getPkBdVertexStr().split(","))
|
||||||
|
.map(Integer::valueOf)
|
||||||
|
.collect(Collectors.toList()));
|
||||||
|
}
|
||||||
List<MemberMeritsSummaryVo> memberMeritsSummaryVoList = baseMapper.queryDateBySummary(censusSummaryParam);
|
List<MemberMeritsSummaryVo> memberMeritsSummaryVoList = baseMapper.queryDateBySummary(censusSummaryParam);
|
||||||
Map<Integer, MemberMeritsSummaryVo> memberMeritsSummaryMap = memberMeritsSummaryVoList.stream().collect(Collectors.toMap(MemberMeritsSummaryVo::getOrderType, Function.identity()));
|
Map<Integer, MemberMeritsSummaryVo> memberMeritsSummaryMap = memberMeritsSummaryVoList.stream().collect(Collectors.toMap(MemberMeritsSummaryVo::getOrderType, Function.identity()));
|
||||||
|
|
||||||
|
|
|
@ -51,5 +51,9 @@ public class CensusSummaryParam {
|
||||||
* 体系
|
* 体系
|
||||||
*/
|
*/
|
||||||
private String pkBdVertexStr;
|
private String pkBdVertexStr;
|
||||||
|
/**
|
||||||
|
* 体系集合
|
||||||
|
*/
|
||||||
|
private List<Integer> pkBdVertexStrList;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -2460,9 +2460,9 @@
|
||||||
and sa.del_flag = 0
|
and sa.del_flag = 0
|
||||||
and to_char(sa.pay_time, 'yyyy-mm-dd') = #{time}
|
and to_char(sa.pay_time, 'yyyy-mm-dd') = #{time}
|
||||||
and sa.pk_country = #{pkCountry}
|
and sa.pk_country = #{pkCountry}
|
||||||
<if test="pkVertex != null and pkVertex.size > 0 ">
|
<if test="pkBdVertexStrList != null and pkBdVertexStrList.size > 0 ">
|
||||||
and cm.pk_vertex in
|
and cm.pk_vertex in
|
||||||
<foreach collection="pkVertex" item="item" open="(" close=")" separator=",">
|
<foreach collection="pkBdVertexStrList" item="item" open="(" close=")" separator=",">
|
||||||
#{item}
|
#{item}
|
||||||
</foreach>
|
</foreach>
|
||||||
</if>
|
</if>
|
||||||
|
|
Loading…
Reference in New Issue