suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev/feat/partner1.6_20231226' into pre

Browse Source
This commit is contained in:
苏竹红
2023-12-27 14:03:04 +08:00
parent 600eb9e724 53f04491b4
commit 1f3a2e26e9
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
coolstore-partner-dao/src/main/java/com/cool/store/dao/HyExhibitionDAO.java
View File

@@ -91,7 +91,7 @@ public class HyExhibitionDAO {
}
public Map<String,ExhibitionStatisticsDTO> exhibitionStatisticsMap(List<Integer> list) {
public Map<Integer,ExhibitionStatisticsDTO> exhibitionStatisticsMap(List<Integer> list) {
if (CollectionUtils.isEmpty(list)) {
return new HashMap<>(4);
}

2
coolstore-partner-model/src/main/java/com/cool/store/dto/exhibition/ExhibitionStatisticsDTO.java
View File

@@ -13,7 +13,7 @@ public class ExhibitionStatisticsDTO {
/**
* 展会code
*/
private String exhibitionId;
private Integer exhibitionId;
/**
* 报名人数

2
coolstore-partner-service/src/main/java/com/cool/store/service/impl/exhibition/ExhibitionServiceImpl.java
View File

@@ -277,7 +277,7 @@ public class ExhibitionServiceImpl implements ExhibitionService {
.collect(Collectors.toMap(EnterpriseUserDO::getUserId,
u -> new CollaboratorVO(u.getUserId(), u.getName())));
Map<String, ExhibitionStatisticsDTO> StatisticsMap = hyExhibitionDAO.exhibitionStatisticsMap(codeList);
Map<Integer, ExhibitionStatisticsDTO> StatisticsMap = hyExhibitionDAO.exhibitionStatisticsMap(codeList);
exhibitionList.forEach(x->{
MyExhibitionVO myExhibitionVO = new MyExhibitionVO();