Commit fdccfbcc by songyinghui

feat: 统计活码分组sql修复

parent 16c3d05f
......@@ -6,7 +6,7 @@ public class HmQrcodeGroupNumBO implements Serializable {
private static final long serialVersionUID = -7006820026168431701L;
private Integer num;
private Integer hmGroupId;
private Long hmGroupId;
private String hmGroupName;
public Integer getNum() {
......@@ -17,11 +17,11 @@ public class HmQrcodeGroupNumBO implements Serializable {
this.num = num;
}
public Integer getHmGroupId() {
public Long getHmGroupId() {
return hmGroupId;
}
public void setHmGroupId(Integer hmGroupId) {
public void setHmGroupId(Long hmGroupId) {
this.hmGroupId = hmGroupId;
}
......
......@@ -116,13 +116,13 @@ public class HmGroupApiServiceImpl implements HmGroupApiService {
result.addAll(groupDtoPage.getResult());
List<Long> groupIds = result.stream().map(HmGroupDTO::getGroupId).collect(Collectors.toList());
List<HmQrcodeGroupNumBO> qrcodeGroupNumBoList = qrcodeService.getGroupIdNumByEnterpriseId(groupQueryDTO.getEnterpriseId(), groupIds);
Map<Integer, Integer> qrcodeGroupNumMap = Collections.emptyMap();
Map<Long, Integer> qrcodeGroupNumMap = Collections.emptyMap();
if (CollectionUtils.isNotEmpty(qrcodeGroupNumBoList)) {
qrcodeGroupNumMap = qrcodeGroupNumBoList.stream()
.collect(Collectors.toMap(HmQrcodeGroupNumBO::getHmGroupId, HmQrcodeGroupNumBO::getNum, (v1, v2) -> v1));
}
for (HmGroupDTO groupDTO : result) {
Integer referNum = Optional.ofNullable(qrcodeGroupNumMap.get(groupDTO.getGroupId().intValue())).orElse(0);
Integer referNum = Optional.ofNullable(qrcodeGroupNumMap.get(groupDTO.getGroupId())).orElse(0);
groupDTO.setReferNum(referNum);
if (!DEFAULT_GROUP_ID.equals(groupDTO.getGroupId())) {
groupDTO.setDefaultFlag(0);
......
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