Compare commits

..

No commits in common. "a69c4e70c1c26dbb20f1446681223996e0ce2048" and "9bd687944c5914a08e8f418ad023e4f6df86419c" have entirely different histories.

3 changed files with 2 additions and 12 deletions

View File

@ -2468,12 +2468,6 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
for (String day : days) {
censusSummaryParam.setTime(day);
censusSummaryParam.setPkCountry(SecurityUtils.getPkCountry());
// 将体系转换成集合类型
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()));

View File

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

View File

@ -2567,9 +2567,9 @@
and sa.DEL_FLAG = 0
and to_char(sa.pay_time, 'yyyy-mm-dd') = #{time}
and sa.PK_COUNTRY = #{pkCountry}
<if test="pkBdVertexStrList!=null and pkBdVertexStrList.size> 0 ">
<if test="pkVertex!=null and pkVertex.size> 0 ">
and cm.PK_VERTEX in
<foreach collection="pkBdVertexStrList" item="item" open="(" close=")" separator=",">
<foreach collection="pkVertex" item="item" open="(" close=")" separator=",">
#{item}
</foreach>
</if>