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

会销开始面试修改为使用ExhibitionId

Browse Source
This commit is contained in:
feng.li
2023-12-07 16:55:44 +08:00
parent 221f480cd2
commit d32004de02
5 changed files with 23 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
coolstore-partner-dao/src/main/resources/mapper/HyPartnerExhibitionMapper.xml
View File

@@ -3,7 +3,7 @@
<mapper namespace="com.cool.store.mapper.HyPartnerExhibitionMapper">
<resultMap id="BaseResultMap" type="com.cool.store.entity.HyPartnerExhibitionDO">
<id column="id" jdbcType="BIGINT" property="id" />
<result column="exhibition_code" jdbcType="VARCHAR" property="exhibitionCode" />
<result column="exhibition_id" jdbcType="INTEGER" property="exhibitionId" />
<result column="partner_line_id" jdbcType="BIGINT" property="partnerLineId" />
<result column="partner_id" jdbcType="VARCHAR" property="partnerId" />
<result column="want_shop_area" jdbcType="VARCHAR" property="wantShopArea" />
@@ -19,7 +19,7 @@
<result column="deleted" jdbcType="BIT" property="deleted" />
</resultMap>
<sql id="Base_Column_List">
id, exhibition_code, partner_line_id, partner_id, want_shop_area, investment_manager_name,
id, exhibition_id, 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
</sql>
@@ -35,8 +35,8 @@
<include refid="Base_Column_List" />
from hy_partner_exhibition
<where>
<if test="exhibitionCode != null">
and exhibition_code = #{exhibitionCode,jdbcType=VARCHAR}
<if test="exhibitionId != null">
and exhibition_id = #{exhibitionId,jdbcType=INTEGER}
</if>
<if test="partnerLineId != null">
and partner_line_id = #{partnerLineId,jdbcType=BIGINT}
@@ -88,13 +88,13 @@
<select id="getExhibitionLine" resultType="com.cool.store.dto.exhibition.ExhibitionLineDTO">
select
hpe.partner_id as partnerId,
hpe.exhibition_code as exhibitionCode,
hpe.exhibition_id as exhibitionId,
pu.username as partnerName,
pu.mobile as mobile
from hy_partner_exhibition hpe left join hy_partner_user_info pu on hpe.partner_id = pu.partner_id
where hpe.participation_status != 7
<if test="exhibitionCode != null and exhibitionCode!=''">
and hpe.exhibition_code = #{exhibitionCode}
<if test="exhibitionId != null and exhibitionId!=''">
and hpe.exhibition_id = #{exhibitionId}
</if>
</select>
@@ -104,8 +104,8 @@
</selectKey>
insert into hy_partner_exhibition
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="exhibitionCode != null">
exhibition_code,
<if test="exhibitionId != null">
exhibition_id,
</if>
<if test="partnerLineId != null">
partner_line_id,
@@ -148,8 +148,8 @@
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="exhibitionCode != null">
#{exhibitionCode,jdbcType=VARCHAR},
<if test="exhibitionId != null">
#{exhibitionId,jdbcType=INTEGER},
</if>
<if test="partnerLineId != null">
#{partnerLineId,jdbcType=BIGINT},
@@ -195,8 +195,8 @@
<update id="updateByPrimaryKeySelective" parameterType="com.cool.store.entity.HyPartnerExhibitionDO">
update hy_partner_exhibition
<set>
<if test="exhibitionCode != null">
exhibition_code = #{exhibitionCode,jdbcType=VARCHAR},
<if test="exhibitionId != null">
exhibition_id = #{exhibitionId,jdbcType=INTEGER},
</if>
<if test="partnerLineId != null">
partner_line_id = #{partnerLineId,jdbcType=BIGINT},
@@ -245,8 +245,8 @@
<if test="null != id">
and t.id = #{id,jdbcType=BIGINT}
</if>
<if test="null != exhibitionCode">
and t.exhibition_code = #{exhibitionCode,jdbcType=VARCHAR}
<if test="null != exhibitionId">
and t.exhibition_id = #{exhibitionId,jdbcType=INTEGER}
</if>
<if test="null != partnerLineId">
and t.partner_line_id = #{partnerLineId,jdbcType=BIGINT}

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

@@ -13,7 +13,7 @@ public class ExhibitionEnterInterviewDTO {
@ApiModelProperty("线索id")
private String partnerLineId;
@ApiModelProperty("会销编号")
private String exhibitionCode;
@ApiModelProperty("会销id")
private Integer exhibitionId;
}

4
coolstore-partner-model/src/main/java/com/cool/store/entity/HyPartnerExhibitionDO.java
View File

@@ -23,8 +23,8 @@ public class HyPartnerExhibitionDO implements Serializable {
@ApiModelProperty("")
private Long id;
@ApiModelProperty("报名的展会编号，hy_exhibition.exhibition_code")
private String exhibitionCode;
@ApiModelProperty("报名的展会id，hy_exhibition.id")
private Integer exhibitionId;
@ApiModelProperty("线索id，hy_partner_line_info.id")
private Long partnerLineId;

5
coolstore-partner-model/src/main/java/com/cool/store/vo/PrivateSeaLineListVo.java
View File

@@ -10,7 +10,6 @@ import lombok.Data;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.time.DateUtils;
import java.util.ArrayList;
import java.util.Date;
@@ -173,8 +172,8 @@ public class PrivateSeaLineListVo {
//在会销面试中的线索
privateSeaLineListVo.setWhetherExhibitionInterview(Boolean.FALSE);
if (privateSeaLineListVo.getWhetherInExhibition()
&& ObjectUtils.isNotEmpty(exhibitionInterviewLines)
&& exhibitionInterviewLines.contains(x.getLineId())) {
&& ObjectUtils.isNotEmpty(exhibitionInterviewLines)
&& exhibitionInterviewLines.contains(x.getLineId())) {
privateSeaLineListVo.setWhetherExhibitionInterview(Boolean.TRUE);
}
privateSeaLineListVo.setUserPortraitList(userPortraitList);

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

@@ -86,8 +86,8 @@ public class ExhibitionServiceImpl implements ExhibitionService {
//1.1 获取线索参加会销状态
HyPartnerExhibitionDO hyPartnerExhibitionDO = new HyPartnerExhibitionDO();
hyPartnerExhibitionDO.setDeleted(Boolean.FALSE);
hyPartnerExhibitionDO.setExhibitionCode(dto.getExhibitionCode());
hyPartnerExhibitionDO.setPartnerLineId(hyPartnerExhibitionDO.getPartnerLineId());
hyPartnerExhibitionDO.setExhibitionId(dto.getExhibitionId());
hyPartnerExhibitionDO.setPartnerLineId(Long.parseLong(dto.getPartnerLineId()));
hyPartnerExhibitionDO = hyPartnerExhibitionDAO.querySelective(hyPartnerExhibitionDO);
//1.2 核验会销签到状态
if (