angelo
/
java-store-retail-app
forked from angelo/java-retail-app
3
0
Fork 0
Code Pull Requests Activity

## bug371 业绩汇总页，选了隶属体系搜索后点导出，导出的excel是所有的，应该只导出当前搜索的体系的

This commit is contained in:
zhangheng 2025-09-09 14:52:03 +08:00
parent 35fad81f03
commit 71612289ab
3 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberServiceImpl.java
View File

@ -3303,6 +3303,12 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
List<CensusSummaryVo> censusSummaryList = new ArrayList<>();
for (String day : days) {
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);
Map<Integer, MemberMeritsSummaryVo> memberMeritsSummaryMap = memberMeritsSummaryVoList.stream().collect(Collectors.toMap(MemberMeritsSummaryVo::getOrderType, Function.identity()));

4
bd-business/bd-business-member/src/main/java/com/hzs/member/census/param/CensusSummaryParam.java
View File

@ -51,5 +51,9 @@ public class CensusSummaryParam {
* 体系
*/
private String pkBdVertexStr;
/**
* 体系集合
*/
private List<Integer> pkBdVertexStrList;
}

4
bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberMapper.xml
View File

@ -2510,9 +2510,9 @@
and sa.del_flag = 0
and to_char(sa.pay_time, 'yyyy-mm-dd') = #{time}
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
<foreach collection="pkVertex" item="item" open="(" close=")" separator=",">
<foreach collection="pkBdVertexStrList" item="item" open="(" close=")" separator=",">
#{item}
</foreach>
</if>