From 275317afd500da9588f7e60d8c13a253c4e9a12c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= <zhuhong.su@coolcollege.cn>
Date: Mon, 25 Dec 2023 10:18:27 +0800
Subject: [PATCH] exhibitionCode

---
 .../src/main/resources/mapper/HyPartnerExhibitionMapper.xml    | 3 +++
 .../java/com/cool/store/vo/exhibition/ExhibitionDetailVO.java  | 2 ++
 .../store/service/impl/exhibition/ExhibitionServiceImpl.java   | 1 +
 3 files changed, 6 insertions(+)

diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerExhibitionMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerExhibitionMapper.xml
index ad319443a..a44474187 100644
--- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerExhibitionMapper.xml
+++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerExhibitionMapper.xml
@@ -103,6 +103,9 @@
       <if test="exhibitionId != null">
         and hpe.exhibition_id = #{exhibitionId,jdbcType=BIGINT}
       </if>
+      <if test="participationStatus == null">
+        and hpe.participation_status in (0,7)
+      </if>
       <if test="participationStatus != null">
         <if test="participationStatus==4">
           and hpe.participation_status in (4,5,6)
diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/exhibition/ExhibitionDetailVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/exhibition/ExhibitionDetailVO.java
index 9c782f4fc..9fa5d0dcd 100644
--- a/coolstore-partner-model/src/main/java/com/cool/store/vo/exhibition/ExhibitionDetailVO.java
+++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/exhibition/ExhibitionDetailVO.java
@@ -22,4 +22,6 @@ public class ExhibitionDetailVO extends ExhibitionVO{
 
     private Integer closedType;
 
+    private String exhibitionCode;
+
 }
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 cf8cd153e..df8415f8f 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
@@ -399,6 +399,7 @@ public class ExhibitionServiceImpl implements ExhibitionService {
         ExhibitionDetailVO exhibitionDetailVO = new ExhibitionDetailVO();
         exhibitionDetailVO.setExhibitionName(hyExhibitionDO.getExhibitionName());
         exhibitionDetailVO.setId(hyExhibitionDO.getId());
+        exhibitionDetailVO.setExhibitionCode(hyExhibitionDO.getExhibitionCode());
         exhibitionDetailVO.setLocation(hyExhibitionDO.getLocation());
         exhibitionDetailVO.setStartDate(DateUtil.format(hyExhibitionDO.getStartDate(), CoolDateUtils.DATE_FORMAT_DAY_2));
         exhibitionDetailVO.setClosedType(hyExhibitionDO.getClosedType());