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

exhibitionCode 去掉

Browse Source
This commit is contained in:
苏竹红
2023-12-19 16:36:00 +08:00
parent 4a115ba80f
commit 8050c8bc67
5 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -91,12 +91,12 @@ public class HyExhibitionDAO {
} }
public Map<String,ExhibitionStatisticsDTO> exhibitionStatisticsMap(List<String> list) { public Map<String,ExhibitionStatisticsDTO> exhibitionStatisticsMap(List<Integer> list) {
if (CollectionUtils.isEmpty(list)) { if (CollectionUtils.isEmpty(list)) {
return new HashMap<>(4); return new HashMap<>(4);
} }
List<ExhibitionStatisticsDTO> result = hyExhibitionMapper.exhibitionStatistic(list); List<ExhibitionStatisticsDTO> 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<ExhibitionDTO> listByExhibitionGroupIds(List<Integer> exhibitionGroupIdList,Boolean filterCloseExhibition){ public List<ExhibitionDTO> listByExhibitionGroupIds(List<Integer> exhibitionGroupIdList,Boolean filterCloseExhibition){

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

@@ -52,7 +52,7 @@ public interface HyExhibitionMapper {
@Param("closedType") Integer closedType); @Param("closedType") Integer closedType);
List<ExhibitionStatisticsDTO> exhibitionStatistic(@Param("list") List<String> exhibitionCodeList); List<ExhibitionStatisticsDTO> exhibitionStatistic(@Param("list") List<Integer> exhibitionIdList);
List<ExhibitionDTO> listByExhibitionGroupIds(@Param("list") List<Integer> exhibitionGroupIdList, @Param("filterCloseExhibition") Boolean filterCloseExhibition); List<ExhibitionDTO> listByExhibitionGroupIds(@Param("list") List<Integer> exhibitionGroupIdList, @Param("filterCloseExhibition") Boolean filterCloseExhibition);

8
coolstore-partner-dao/src/main/resources/mapper/HyExhibitionMapper.xml
View File

@@ -363,18 +363,18 @@
<select id="exhibitionStatistic" resultType="com.cool.store.dto.exhibition.ExhibitionStatisticsDTO"> <select id="exhibitionStatistic" resultType="com.cool.store.dto.exhibition.ExhibitionStatisticsDTO">
select select
exhibition_code as exhibitionCode, exhibition_id as exhibitionId,
COALESCE(count(1),0) as signUpCount, COALESCE(count(1),0) as signUpCount,
COALESCE(sum( CASE WHEN participation_status = 1 THEN 1 ELSE 0 END ),0) as checkInCount, COALESCE(sum( CASE WHEN participation_status = 1 THEN 1 ELSE 0 END ),0) as checkInCount,
COALESCE(sum( CASE WHEN participation_status = 2 THEN 1 ELSE 0 END ),0) as formFillCount, COALESCE(sum( CASE WHEN participation_status = 2 THEN 1 ELSE 0 END ),0) as formFillCount,
COALESCE(sum( CASE WHEN participation_status in (3,4,5,6) THEN 1 ELSE 0 END ),0) as interviewCount COALESCE(sum( CASE WHEN participation_status in (3,4,5,6) THEN 1 ELSE 0 END ),0) as interviewCount
from hy_partner_exhibition from hy_partner_exhibition
<where> <where>
<foreach collection="list" item="code" open="and exhibition_code in (" separator="," close=")"> <foreach collection="list" item="id" open="and exhibition_id in (" separator="," close=")">
#{code} #{id}
</foreach> </foreach>
</where> </where>
group by exhibition_code group by exhibition_id
</select> </select>

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

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

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

@@ -259,9 +259,9 @@ public class ExhibitionServiceImpl implements ExhibitionService {
List<MyExhibitionVO> list = new ArrayList<>(); List<MyExhibitionVO> list = new ArrayList<>();
//查询协作人 //查询协作人
Set<String> collaboratorsSet = new HashSet(); Set<String> collaboratorsSet = new HashSet();
List<String> codeList = new ArrayList<>(); List<Integer> codeList = new ArrayList<>();
exhibitionList.forEach(x->{ exhibitionList.forEach(x->{
codeList.add(x.getExhibitionCode()); codeList.add(x.getId());
if (StringUtils.isNotEmpty(x.getCollaborators())){ if (StringUtils.isNotEmpty(x.getCollaborators())){
List<String> userIdList = Arrays.asList(x.getCollaborators().substring(1).split(Constants.COMMA)); List<String> userIdList = Arrays.asList(x.getCollaborators().substring(1).split(Constants.COMMA));
collaboratorsSet.addAll(userIdList); collaboratorsSet.addAll(userIdList);
@@ -289,7 +289,7 @@ public class ExhibitionServiceImpl implements ExhibitionService {
}); });
myExhibitionVO.setCollaborators(coll); myExhibitionVO.setCollaborators(coll);
} }
ExhibitionStatisticsDTO statistics = StatisticsMap.getOrDefault(x.getExhibitionCode(), new ExhibitionStatisticsDTO()); ExhibitionStatisticsDTO statistics = StatisticsMap.getOrDefault(x.getId(), new ExhibitionStatisticsDTO());
myExhibitionVO.setSignUpCount(statistics.getSignUpCount()); myExhibitionVO.setSignUpCount(statistics.getSignUpCount());
myExhibitionVO.setCheckInCount(statistics.getCheckInCount()); myExhibitionVO.setCheckInCount(statistics.getCheckInCount());
myExhibitionVO.setFormFillCount(statistics.getFormFillCount()); myExhibitionVO.setFormFillCount(statistics.getFormFillCount());