diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyExhibitionDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyExhibitionDAO.java index 39dee36fb..e95517010 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyExhibitionDAO.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyExhibitionDAO.java @@ -91,12 +91,12 @@ public class HyExhibitionDAO { } - public Map exhibitionStatisticsMap(List list) { + public Map exhibitionStatisticsMap(List list) { if (CollectionUtils.isEmpty(list)) { return new HashMap<>(4); } List result = hyExhibitionMapper.exhibitionStatistic(list); - return result.stream().collect(Collectors.toMap(ExhibitionStatisticsDTO::getExhibitionCode, date -> date)); + return result.stream().collect(Collectors.toMap(ExhibitionStatisticsDTO::getExhibitionId, date -> date)); } public List listByExhibitionGroupIds(List exhibitionGroupIdList,Boolean filterCloseExhibition){ diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyExhibitionMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyExhibitionMapper.java index 6b2224af5..80697fb72 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyExhibitionMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyExhibitionMapper.java @@ -52,7 +52,7 @@ public interface HyExhibitionMapper { @Param("closedType") Integer closedType); - List exhibitionStatistic(@Param("list") List exhibitionCodeList); + List exhibitionStatistic(@Param("list") List exhibitionIdList); List listByExhibitionGroupIds(@Param("list") List exhibitionGroupIdList, @Param("filterCloseExhibition") Boolean filterCloseExhibition); diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyExhibitionMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyExhibitionMapper.xml index d7dfe0cff..aff427604 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyExhibitionMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyExhibitionMapper.xml @@ -363,18 +363,18 @@ diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/exhibition/ExhibitionStatisticsDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/exhibition/ExhibitionStatisticsDTO.java index e437ba7a5..f43a5bf5f 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/exhibition/ExhibitionStatisticsDTO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/dto/exhibition/ExhibitionStatisticsDTO.java @@ -13,7 +13,7 @@ public class ExhibitionStatisticsDTO { /** * 展会code */ - private String exhibitionCode; + private String exhibitionId; /** * 报名人数 diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/exhibition/ExhibitionServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/exhibition/ExhibitionServiceImpl.java index 6beb0c7b0..e22e21099 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/exhibition/ExhibitionServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/exhibition/ExhibitionServiceImpl.java @@ -259,9 +259,9 @@ public class ExhibitionServiceImpl implements ExhibitionService { List list = new ArrayList<>(); //查询协作人 Set collaboratorsSet = new HashSet(); - List codeList = new ArrayList<>(); + List codeList = new ArrayList<>(); exhibitionList.forEach(x->{ - codeList.add(x.getExhibitionCode()); + codeList.add(x.getId()); if (StringUtils.isNotEmpty(x.getCollaborators())){ List userIdList = Arrays.asList(x.getCollaborators().substring(1).split(Constants.COMMA)); collaboratorsSet.addAll(userIdList); @@ -289,7 +289,7 @@ public class ExhibitionServiceImpl implements ExhibitionService { }); myExhibitionVO.setCollaborators(coll); } - ExhibitionStatisticsDTO statistics = StatisticsMap.getOrDefault(x.getExhibitionCode(), new ExhibitionStatisticsDTO()); + ExhibitionStatisticsDTO statistics = StatisticsMap.getOrDefault(x.getId(), new ExhibitionStatisticsDTO()); myExhibitionVO.setSignUpCount(statistics.getSignUpCount()); myExhibitionVO.setCheckInCount(statistics.getCheckInCount()); myExhibitionVO.setFormFillCount(statistics.getFormFillCount());