diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyExhibitionGroupMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyExhibitionGroupMapper.java
new file mode 100644
index 000000000..d9206bc04
--- /dev/null
+++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyExhibitionGroupMapper.java
@@ -0,0 +1,40 @@
+package com.cool.store.mapper;
+
+import com.cool.store.entity.HyExhibitionGroupDO;
+import org.apache.ibatis.annotations.Param;
+import tk.mybatis.mapper.common.Mapper;
+
+/**
+ * @author zhangchenbiao
+ * @date 2023-11-30 11:55
+ */
+public interface HyExhibitionGroupMapper {
+ /**
+ *
+ * 默认插入方法,只会给有值的字段赋值
+ * 会对传进来的字段做判空处理,如果字段为空,则使用数据库默认字段或者null
+ * dateTime:2023-11-30 01:36
+ */
+ int insertSelective( HyExhibitionGroupDO record);
+
+ /**
+ *
+ * 默认查询方法,通过主键获取所有字段的值
+ * dateTime:2023-11-30 01:36
+ */
+ HyExhibitionGroupDO selectByPrimaryKey(Integer id);
+
+ /**
+ *
+ * 默认更新方法,根据主键更新,不会把null值更新到数据库,避免覆盖之前有值的
+ * dateTime:2023-11-30 01:36
+ */
+ int updateByPrimaryKeySelective(HyExhibitionGroupDO record);
+
+ /**
+ *
+ * 默认更新方法,根据主键物理删除
+ * dateTime:2023-11-30 01:36
+ */
+ int deleteByPrimaryKey(Integer id);
+}
\ No newline at end of file
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
new file mode 100644
index 000000000..0331e61d6
--- /dev/null
+++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyExhibitionMapper.java
@@ -0,0 +1,40 @@
+package com.cool.store.mapper;
+
+import com.cool.store.entity.HyExhibitionDO;
+import org.apache.ibatis.annotations.Param;
+import tk.mybatis.mapper.common.Mapper;
+
+/**
+ * @author zhangchenbiao
+ * @date 2023-11-30 11:47
+ */
+public interface HyExhibitionMapper {
+ /**
+ *
+ * 默认插入方法,只会给有值的字段赋值
+ * 会对传进来的字段做判空处理,如果字段为空,则使用数据库默认字段或者null
+ * dateTime:2023-11-30 01:38
+ */
+ int insertSelective(HyExhibitionDO record);
+
+ /**
+ *
+ * 默认查询方法,通过主键获取所有字段的值
+ * dateTime:2023-11-30 01:38
+ */
+ HyExhibitionDO selectByPrimaryKey(Integer id);
+
+ /**
+ *
+ * 默认更新方法,根据主键更新,不会把null值更新到数据库,避免覆盖之前有值的
+ * dateTime:2023-11-30 01:38
+ */
+ int updateByPrimaryKeySelective(HyExhibitionDO record);
+
+ /**
+ *
+ * 默认更新方法,根据主键物理删除
+ * dateTime:2023-11-30 01:38
+ */
+ int deleteByPrimaryKey(Integer id);
+}
\ No newline at end of file
diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerExhibitionMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerExhibitionMapper.java
new file mode 100644
index 000000000..9c5bcf350
--- /dev/null
+++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerExhibitionMapper.java
@@ -0,0 +1,39 @@
+package com.cool.store.mapper;
+
+import com.cool.store.entity.HyPartnerExhibitionDO;
+import tk.mybatis.mapper.common.Mapper;
+
+/**
+ * @author zhangchenbiao
+ * @date 2023-11-30 11:55
+ */
+public interface HyPartnerExhibitionMapper {
+ /**
+ *
+ * 默认插入方法,只会给有值的字段赋值
+ * 会对传进来的字段做判空处理,如果字段为空,则使用数据库默认字段或者null
+ * dateTime:2023-11-30 01:39
+ */
+ int insertSelective(HyPartnerExhibitionDO record);
+
+ /**
+ *
+ * 默认查询方法,通过主键获取所有字段的值
+ * dateTime:2023-11-30 01:39
+ */
+ HyPartnerExhibitionDO selectByPrimaryKey(Long id);
+
+ /**
+ *
+ * 默认更新方法,根据主键更新,不会把null值更新到数据库,避免覆盖之前有值的
+ * dateTime:2023-11-30 01:39
+ */
+ int updateByPrimaryKeySelective(HyPartnerExhibitionDO record);
+
+ /**
+ *
+ * 默认更新方法,根据主键物理删除
+ * dateTime:2023-11-30 01:39
+ */
+ int deleteByPrimaryKey(Long id);
+}
\ No newline at end of file
diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyExhibitionGroupMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyExhibitionGroupMapper.xml
new file mode 100644
index 000000000..84213ab2a
--- /dev/null
+++ b/coolstore-partner-dao/src/main/resources/mapper/HyExhibitionGroupMapper.xml
@@ -0,0 +1,135 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ id, exhibition_group_name, closed, create_time, update_time, creator, updater, deleted
+
+
+
+
+ delete from hy_exhibition_group
+ where id = #{id,jdbcType=INTEGER}
+
+
+
+ SELECT LAST_INSERT_ID()
+
+ insert into hy_exhibition_group
+
+
+ exhibition_group_name,
+
+
+ closed,
+
+
+ create_time,
+
+
+ update_time,
+
+
+ creator,
+
+
+ updater,
+
+
+ deleted,
+
+
+
+
+ #{exhibitionGroupName,jdbcType=VARCHAR},
+
+
+ #{closed,jdbcType=BIT},
+
+
+ #{createTime,jdbcType=TIMESTAMP},
+
+
+ #{updateTime,jdbcType=TIMESTAMP},
+
+
+ #{creator,jdbcType=VARCHAR},
+
+
+ #{updater,jdbcType=VARCHAR},
+
+
+ #{deleted,jdbcType=BIT},
+
+
+
+
+ update hy_exhibition_group
+
+
+ exhibition_group_name = #{exhibitionGroupName,jdbcType=VARCHAR},
+
+
+ closed = #{closed,jdbcType=BIT},
+
+
+ create_time = #{createTime,jdbcType=TIMESTAMP},
+
+
+ update_time = #{updateTime,jdbcType=TIMESTAMP},
+
+
+ creator = #{creator,jdbcType=VARCHAR},
+
+
+ updater = #{updater,jdbcType=VARCHAR},
+
+
+ deleted = #{deleted,jdbcType=BIT},
+
+
+ where id = #{id,jdbcType=INTEGER}
+
+
+
+
+ and t.id = #{id,jdbcType=INTEGER}
+
+
+ and t.exhibition_group_name = #{exhibitionGroupName,jdbcType=VARCHAR}
+
+
+ and t.closed = #{closed,jdbcType=BIT}
+
+
+ and t.create_time = #{createTime,jdbcType=TIMESTAMP}
+
+
+ and t.update_time = #{updateTime,jdbcType=TIMESTAMP}
+
+
+ and t.creator = #{creator,jdbcType=VARCHAR}
+
+
+ and t.updater = #{updater,jdbcType=VARCHAR}
+
+
+ and t.deleted = #{deleted,jdbcType=BIT}
+
+
+
+
\ No newline at end of file
diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyExhibitionMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyExhibitionMapper.xml
new file mode 100644
index 000000000..0387afbdd
--- /dev/null
+++ b/coolstore-partner-dao/src/main/resources/mapper/HyExhibitionMapper.xml
@@ -0,0 +1,220 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ id, exhibition_group_id, exhibition_code, exhibition_name, start_date, location,
+ closed_type, create_time, update_time, creator, updater, deleted, close_time
+
+
+ collaborators
+
+
+
+ delete from hy_exhibition
+ where id = #{id,jdbcType=INTEGER}
+
+
+
+ SELECT LAST_INSERT_ID()
+
+ insert into hy_exhibition
+
+
+ exhibition_group_id,
+
+
+ exhibition_code,
+
+
+ exhibition_name,
+
+
+ start_date,
+
+
+ location,
+
+
+ closed_type,
+
+
+ create_time,
+
+
+ update_time,
+
+
+ creator,
+
+
+ updater,
+
+
+ deleted,
+
+
+ close_time,
+
+
+ collaborators,
+
+
+
+
+ #{exhibitionGroupId,jdbcType=INTEGER},
+
+
+ #{exhibitionCode,jdbcType=VARCHAR},
+
+
+ #{exhibitionName,jdbcType=VARCHAR},
+
+
+ #{startDate,jdbcType=DATE},
+
+
+ #{location,jdbcType=VARCHAR},
+
+
+ #{closedType,jdbcType=TINYINT},
+
+
+ #{createTime,jdbcType=TIMESTAMP},
+
+
+ #{updateTime,jdbcType=TIMESTAMP},
+
+
+ #{creator,jdbcType=VARCHAR},
+
+
+ #{updater,jdbcType=VARCHAR},
+
+
+ #{deleted,jdbcType=BIT},
+
+
+ #{closeTime,jdbcType=TIMESTAMP},
+
+
+ #{collaborators,jdbcType=LONGVARCHAR},
+
+
+
+
+ update hy_exhibition
+
+
+ exhibition_group_id = #{exhibitionGroupId,jdbcType=INTEGER},
+
+
+ exhibition_code = #{exhibitionCode,jdbcType=VARCHAR},
+
+
+ exhibition_name = #{exhibitionName,jdbcType=VARCHAR},
+
+
+ start_date = #{startDate,jdbcType=DATE},
+
+
+ location = #{location,jdbcType=VARCHAR},
+
+
+ closed_type = #{closedType,jdbcType=TINYINT},
+
+
+ create_time = #{createTime,jdbcType=TIMESTAMP},
+
+
+ update_time = #{updateTime,jdbcType=TIMESTAMP},
+
+
+ creator = #{creator,jdbcType=VARCHAR},
+
+
+ updater = #{updater,jdbcType=VARCHAR},
+
+
+ deleted = #{deleted,jdbcType=BIT},
+
+
+ close_time = #{closeTime,jdbcType=TIMESTAMP},
+
+
+ collaborators = #{collaborators,jdbcType=LONGVARCHAR},
+
+
+ where id = #{id,jdbcType=INTEGER}
+
+
+
+
+ and t.id = #{id,jdbcType=INTEGER}
+
+
+ and t.exhibition_group_id = #{exhibitionGroupId,jdbcType=INTEGER}
+
+
+ and t.exhibition_code = #{exhibitionCode,jdbcType=VARCHAR}
+
+
+ and t.exhibition_name = #{exhibitionName,jdbcType=VARCHAR}
+
+
+ and t.start_date = #{startDate,jdbcType=DATE}
+
+
+ and t.location = #{location,jdbcType=VARCHAR}
+
+
+ and t.closed_type = #{closedType,jdbcType=TINYINT}
+
+
+ and t.create_time = #{createTime,jdbcType=TIMESTAMP}
+
+
+ and t.update_time = #{updateTime,jdbcType=TIMESTAMP}
+
+
+ and t.creator = #{creator,jdbcType=VARCHAR}
+
+
+ and t.updater = #{updater,jdbcType=VARCHAR}
+
+
+ and t.deleted = #{deleted,jdbcType=BIT}
+
+
+ and t.close_time = #{closeTime,jdbcType=TIMESTAMP}
+
+
+ and t.collaborators = #{collaborators,jdbcType=LONGVARCHAR}
+
+
+
+
\ No newline at end of file
diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerExhibitionMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerExhibitionMapper.xml
new file mode 100644
index 000000000..ac9abd246
--- /dev/null
+++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerExhibitionMapper.xml
@@ -0,0 +1,227 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ id, exhibition_code, partner_line_id, partner_id, want_shop_area, investment_manager_name,
+ expected_visitors_count, expected_information, participation_status, interview_plan_id,
+ create_time, update_time, creator, updater, deleted
+
+
+
+ delete from hy_partner_exhibition
+ where id = #{id,jdbcType=BIGINT}
+
+
+
+ SELECT LAST_INSERT_ID()
+
+ insert into hy_partner_exhibition
+
+
+ exhibition_code,
+
+
+ partner_line_id,
+
+
+ partner_id,
+
+
+ want_shop_area,
+
+
+ investment_manager_name,
+
+
+ expected_visitors_count,
+
+
+ expected_information,
+
+
+ participation_status,
+
+
+ interview_plan_id,
+
+
+ create_time,
+
+
+ update_time,
+
+
+ creator,
+
+
+ updater,
+
+
+ deleted,
+
+
+
+
+ #{exhibitionCode,jdbcType=VARCHAR},
+
+
+ #{partnerLineId,jdbcType=BIGINT},
+
+
+ #{partnerId,jdbcType=VARCHAR},
+
+
+ #{wantShopArea,jdbcType=VARCHAR},
+
+
+ #{investmentManagerName,jdbcType=VARCHAR},
+
+
+ #{expectedVisitorsCount,jdbcType=INTEGER},
+
+
+ #{expectedInformation,jdbcType=VARCHAR},
+
+
+ #{participationStatus,jdbcType=TINYINT},
+
+
+ #{interviewPlanId,jdbcType=BIGINT},
+
+
+ #{createTime,jdbcType=TIMESTAMP},
+
+
+ #{updateTime,jdbcType=TIMESTAMP},
+
+
+ #{creator,jdbcType=VARCHAR},
+
+
+ #{updater,jdbcType=VARCHAR},
+
+
+ #{deleted,jdbcType=BIT},
+
+
+
+
+ update hy_partner_exhibition
+
+
+ exhibition_code = #{exhibitionCode,jdbcType=VARCHAR},
+
+
+ partner_line_id = #{partnerLineId,jdbcType=BIGINT},
+
+
+ partner_id = #{partnerId,jdbcType=VARCHAR},
+
+
+ want_shop_area = #{wantShopArea,jdbcType=VARCHAR},
+
+
+ investment_manager_name = #{investmentManagerName,jdbcType=VARCHAR},
+
+
+ expected_visitors_count = #{expectedVisitorsCount,jdbcType=INTEGER},
+
+
+ expected_information = #{expectedInformation,jdbcType=VARCHAR},
+
+
+ participation_status = #{participationStatus,jdbcType=TINYINT},
+
+
+ interview_plan_id = #{interviewPlanId,jdbcType=BIGINT},
+
+
+ create_time = #{createTime,jdbcType=TIMESTAMP},
+
+
+ update_time = #{updateTime,jdbcType=TIMESTAMP},
+
+
+ creator = #{creator,jdbcType=VARCHAR},
+
+
+ updater = #{updater,jdbcType=VARCHAR},
+
+
+ deleted = #{deleted,jdbcType=BIT},
+
+
+ where id = #{id,jdbcType=BIGINT}
+
+
+
+
+ and t.id = #{id,jdbcType=BIGINT}
+
+
+ and t.exhibition_code = #{exhibitionCode,jdbcType=VARCHAR}
+
+
+ and t.partner_line_id = #{partnerLineId,jdbcType=BIGINT}
+
+
+ and t.partner_id = #{partnerId,jdbcType=VARCHAR}
+
+
+ and t.want_shop_area = #{wantShopArea,jdbcType=VARCHAR}
+
+
+ and t.investment_manager_name = #{investmentManagerName,jdbcType=VARCHAR}
+
+
+ and t.expected_visitors_count = #{expectedVisitorsCount,jdbcType=INTEGER}
+
+
+ and t.expected_information = #{expectedInformation,jdbcType=VARCHAR}
+
+
+ and t.participation_status = #{participationStatus,jdbcType=TINYINT}
+
+
+ and t.interview_plan_id = #{interviewPlanId,jdbcType=BIGINT}
+
+
+ and t.create_time = #{createTime,jdbcType=TIMESTAMP}
+
+
+ and t.update_time = #{updateTime,jdbcType=TIMESTAMP}
+
+
+ and t.creator = #{creator,jdbcType=VARCHAR}
+
+
+ and t.updater = #{updater,jdbcType=VARCHAR}
+
+
+ and t.deleted = #{deleted,jdbcType=BIT}
+
+
+
+
\ No newline at end of file
diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/HyExhibitionDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/HyExhibitionDO.java
new file mode 100644
index 000000000..8a3181f6e
--- /dev/null
+++ b/coolstore-partner-model/src/main/java/com/cool/store/entity/HyExhibitionDO.java
@@ -0,0 +1,64 @@
+package com.cool.store.entity;
+
+import io.swagger.annotations.ApiModelProperty;
+import java.io.Serializable;
+import java.util.Date;
+import javax.persistence.Table;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ *
+ * @author zhangchenbiao
+ * @date 2023-11-30 11:47
+ */
+@Table(name = "hy_exhibition")
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class HyExhibitionDO implements Serializable {
+ @ApiModelProperty("")
+ private Integer id;
+
+ @ApiModelProperty("关联会销组id,hy_exhibition_group.id")
+ private Integer exhibitionGroupId;
+
+ @ApiModelProperty("会销编号")
+ private String exhibitionCode;
+
+ @ApiModelProperty("会销名称")
+ private String exhibitionName;
+
+ @ApiModelProperty("举办日期")
+ private Date startDate;
+
+ @ApiModelProperty("举办地点")
+ private String location;
+
+ @ApiModelProperty("0表示未结束,1表示自动结束,2表示手动结束")
+ private Integer closedType;
+
+ @ApiModelProperty("创建时间")
+ private Date createTime;
+
+ @ApiModelProperty("更新时间")
+ private Date updateTime;
+
+ @ApiModelProperty("创建人user_id,enterprise_user.user_id")
+ private String creator;
+
+ @ApiModelProperty("更新人user_id,enterprise_user.user_id")
+ private String updater;
+
+ @ApiModelProperty("删除标志,0表示未删除")
+ private Boolean deleted;
+
+ @ApiModelProperty("结束时间")
+ private Date closeTime;
+
+ @ApiModelProperty("协作人user_id,enterprise_user.user_id,以英文逗号分隔")
+ private String collaborators;
+}
\ No newline at end of file
diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/HyExhibitionGroupDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/HyExhibitionGroupDO.java
new file mode 100644
index 000000000..6acd5cc6c
--- /dev/null
+++ b/coolstore-partner-model/src/main/java/com/cool/store/entity/HyExhibitionGroupDO.java
@@ -0,0 +1,46 @@
+package com.cool.store.entity;
+
+import io.swagger.annotations.ApiModelProperty;
+import java.io.Serializable;
+import java.util.Date;
+import javax.persistence.Table;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ *
+ * @author zhangchenbiao
+ * @date 2023-11-30 11:55
+ */
+@Table(name = "hy_exhibition_group")
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class HyExhibitionGroupDO implements Serializable {
+ @ApiModelProperty("")
+ private Integer id;
+
+ @ApiModelProperty("会销组名称,20个字")
+ private String exhibitionGroupName;
+
+ @ApiModelProperty("0表示未结束,1表示结束")
+ private Boolean closed;
+
+ @ApiModelProperty("创建时间")
+ private Date createTime;
+
+ @ApiModelProperty("更新时间")
+ private Date updateTime;
+
+ @ApiModelProperty("创建人user_id,enterprise_user.user_id")
+ private String creator;
+
+ @ApiModelProperty("更新人user_id,enterprise_user.user_id")
+ private String updater;
+
+ @ApiModelProperty("删除标志,0表示未删除")
+ private Boolean deleted;
+}
\ No newline at end of file
diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/HyPartnerExhibitionDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/HyPartnerExhibitionDO.java
new file mode 100644
index 000000000..7aa561146
--- /dev/null
+++ b/coolstore-partner-model/src/main/java/com/cool/store/entity/HyPartnerExhibitionDO.java
@@ -0,0 +1,67 @@
+package com.cool.store.entity;
+
+import io.swagger.annotations.ApiModelProperty;
+import java.io.Serializable;
+import java.util.Date;
+import javax.persistence.Table;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ *
+ * @author zhangchenbiao
+ * @date 2023-11-30 11:55
+ */
+@Table(name = "hy_partner_exhibition")
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class HyPartnerExhibitionDO implements Serializable {
+ @ApiModelProperty("")
+ private Long id;
+
+ @ApiModelProperty("报名的展会编号,hy_exhibition.exhibition_code")
+ private String exhibitionCode;
+
+ @ApiModelProperty("线索id,hy_partner_line_info.id")
+ private Long partnerLineId;
+
+ @ApiModelProperty("hy_partner_user_info.partner_id")
+ private String partnerId;
+
+ @ApiModelProperty("意向开店区域")
+ private String wantShopArea;
+
+ @ApiModelProperty("客户经理名字")
+ private String investmentManagerName;
+
+ @ApiModelProperty("预计到访人数")
+ private Integer expectedVisitorsCount;
+
+ @ApiModelProperty("期望了解的信息")
+ private String expectedInformation;
+
+ @ApiModelProperty("参加会销状态,0为已报名,1为已签到,2为已提交申请,3为面试中,4为面试完成,5为通过,6为不通过,7为取消报名")
+ private Integer participationStatus;
+
+ @ApiModelProperty("线索参加的面试计划id,hy_partner_interview_plan.id")
+ private Long interviewPlanId;
+
+ @ApiModelProperty("创建时间")
+ private Date createTime;
+
+ @ApiModelProperty("更新时间")
+ private Date updateTime;
+
+ @ApiModelProperty("创建人user_id,enterprise_user.user_id")
+ private String creator;
+
+ @ApiModelProperty("更新人user_id,enterprise_user.user_id")
+ private String updater;
+
+ @ApiModelProperty("删除标识,0标识未删除")
+ private Boolean deleted;
+}
\ No newline at end of file