Merge remote-tracking branch 'origin/cc_partner_init' into cc_partner_init

This commit is contained in:
zhangchenbiao
2024-03-27 15:52:33 +08:00
12 changed files with 622 additions and 86 deletions

View File

@@ -1,11 +1,14 @@
package com.cool.store.mapper;
import com.cool.store.request.JoinIntentionRequest;
import com.cool.store.entity.MemberQuestionDO;
import com.cool.store.vo.PartnerBaseInfoVO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@Mapper
public interface JoinIntentionMapper {
boolean insert(@Param("request") JoinIntentionRequest request);
boolean insertOrUpdate(@Param("request") MemberQuestionDO request);
MemberQuestionDO getByLineId(@Param("lineId") Long lineId);
}

View File

@@ -8,4 +8,6 @@ public interface LineInfoMapper extends Mapper<LineInfoDO> {
LineInfoDO getByPartnerId(@Param("partnerId") String partnerId);
LineInfoDO getByLineId(@Param("lineId") Long lineId);
void insertOrUpdate(@Param("param") LineInfoDO lineInfoParam);
}

View File

@@ -1,69 +1,117 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.cool.store.mapper.JoinIntentionMapper">
<resultMap id="BaseResultMap" type="com.cool.store.entity.PartnerBaseInfoDO">
<id column="id" jdbcType="BIGINT" property="id" />
<result column="partner_id" jdbcType="VARCHAR" property="partnerId" />
<result column="line_id" jdbcType="BIGINT" property="lineId"/>
<result column="join_type" jdbcType="TINYINT" property="joinType"/>
<result column="mobile" jdbcType="VARCHAR" property="mobile" />
<result column="sex" jdbcType="TINYINT" property="sex" />
<result column="username" jdbcType="VARCHAR" property="username" />
<result column="want_shop_area" jdbcType="VARCHAR" property="wantShopArea" />
<result column="area_code" jdbcType="VARCHAR" property="areaCode" />
<result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
<result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
<result column="live_area" jdbcType="VARCHAR" property="liveArea"/>
<result column="live_address" jdbcType="VARCHAR" property="liveAddress"/>
<result column="joining_questionnaire" jdbcType="VARCHAR" property="joiningQuestionnaire"/>
<result column="deleted" jdbcType="TINYINT" property="deleted"/>
<resultMap id="BaseResultMap" type="com.cool.store.entity.MemberQuestionDO">
<id column="id" property="id" jdbcType="BIGINT"/>
<result column="audit_id" property="auditId" jdbcType="BIGINT"/>
<result column="partner_id" property="partnerId" jdbcType="VARCHAR"/>
<result column="line_id" property="lineId" jdbcType="BIGINT"/>
<result column="create_time" property="createTime" jdbcType="TIMESTAMP"/>
<result column="update_time" property="updateTime" jdbcType="TIMESTAMP"/>
<result column="career_status" property="careerStatus" jdbcType="TINYINT"/>
<result column="education_level" property="educationLevel" jdbcType="TINYINT"/>
<result column="annual_income" property="annualIncome" jdbcType="VARCHAR"/>
<result column="has_partner" property="hasPartner" jdbcType="TINYINT"/>
<result column="join_type" property="joinType" jdbcType="TINYINT"/>
<result column="capital_source" property="capitalSource" jdbcType="TINYINT"/>
<result column="business_mode" property="businessMode" jdbcType="TINYINT"/>
<result column="join_experience" property="joinExperience" jdbcType="TINYINT"/>
<result column="fruit_industry_experience" property="fruitIndustryExperience" jdbcType="TINYINT"/>
<result column="store_condition" property="storeCondition" jdbcType="VARCHAR"/>
<result column="payback_period" property="paybackPeriod" jdbcType="VARCHAR"/>
<result column="follows_management_standard" property="followsManagementStandard" jdbcType="TINYINT"/>
<result column="can_training" property="canTraining" jdbcType="TINYINT"/>
<result column="deleted" property="deleted" jdbcType="TINYINT"/>
</resultMap>
<sql id="Base_Column_List">
id,
audit_id,
partner_id,
line_id,
join_type,
mobile,
sex,
username,
want_shop_area,
area_code,
create_time,
update_time,
live_area,
live_address,
joining_questionnaire,
career_status,
education_level,
annual_income,
has_partner,
capital_source,
business_mode,
join_experience,
fruit_industry_experience,
store_condition,
payback_period,
follows_management_standard,
can_training,
deleted
</sql>
<insert id="insert" parameterType="com.cool.store.request.JoinIntentionRequest" useGeneratedKeys="true" keyProperty="id">
insert into xfsg_partner_base_info
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="request.lineId != null">line_id,</if>
<if test="request.partnerId != null">partner_id,</if>
<if test="request.joinType != null">join_type,</if>
<if test="request.userName != null">username,</if>
<if test="request.mobile != null">mobile,</if>
<if test="request.sex != null">sex,</if>
<if test="request.wantShopArea != null">want_shop_area,</if>
<if test="request.areaCode != null">area_code,</if>
<if test="request.liveArea != null">live_area,</if>
<if test="request.liveAddress != null">live_address,</if>
<if test="request.joiningQuestionnaire != null">joining_questionnaire,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="request.lineId != null">#{request.lineId},</if>
<if test="request.partnerId != null">#{request.partnerId},</if>
<if test="request.joinType != null">#{request.joinType},</if>
<if test="request.userName != null">#{request.userName},</if>
<if test="request.mobile != null">#{request.mobile},</if>
<if test="request.sex != null">#{request.sex},</if>
<if test="request.wantShopArea != null">#{request.wantShopArea},</if>
<if test="request.areaCode != null">#{request.areaCode},</if>
<if test="request.liveArea != null">#{request.liveArea},</if>
<if test="request.liveAddress != null">#{request.liveAddress},</if>
<if test="request.joiningQuestionnaire != null">#{request.joiningQuestionnaire},</if>
</trim>
</insert>
<insert id="insertOrUpdate" parameterType="com.cool.store.entity.MemberQuestionDO" useGeneratedKeys="true"
keyProperty="id">
INSERT INTO xfsg_member_question_info
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="request.auditId != null">audit_id,</if>
<if test="request.partnerId != null">partner_id,</if>
<if test="request.lineId != null">line_id,</if>
<if test="request.careerStatus != null">career_status,</if>
<if test="request.joinType != null">join_type,</if>
<if test="request.educationLevel != null">education_level,</if>
<if test="request.annualIncome != null">annual_income,</if>
<if test="request.hasPartner != null">has_partner,</if>
<if test="request.capitalSource != null">capital_source,</if>
<if test="request.businessMode != null">business_mode,</if>
<if test="request.joinExperience != null">join_experience,</if>
<if test="request.fruitIndustryExperience != null">fruit_industry_experience,</if>
<if test="request.storeCondition != null">store_condition,</if>
<if test="request.paybackPeriod != null">payback_period,</if>
<if test="request.followsManagementStandard != null">follows_management_standard,</if>
<if test="request.canTraining != null">can_training,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="request.auditId != null">#{request.auditId},</if>
<if test="request.partnerId != null">#{request.partnerId},</if>
<if test="request.lineId != null">#{request.lineId},</if>
<if test="request.careerStatus != null">#{request.careerStatus},</if>
<if test="request.joinType != null">#{request.joinType},</if>
<if test="request.educationLevel != null">#{request.educationLevel},</if>
<if test="request.annualIncome != null">#{request.annualIncome},</if>
<if test="request.hasPartner != null">#{request.hasPartner},</if>
<if test="request.capitalSource != null">#{request.capitalSource},</if>
<if test="request.businessMode != null">#{request.businessMode},</if>
<if test="request.joinExperience != null">#{request.joinExperience},</if>
<if test="request.fruitIndustryExperience != null">#{request.fruitIndustryExperience},</if>
<if test="request.storeCondition != null">#{request.storeCondition},</if>
<if test="request.paybackPeriod != null">#{request.paybackPeriod},</if>
<if test="request.followsManagementStandard != null">#{request.followsManagementStandard},</if>
<if test="request.canTraining != null">#{request.canTraining},</if>
</trim>
ON DUPLICATE KEY UPDATE
<trim suffixOverrides=",">
<if test="request.auditId != null">audit_id = #{request.auditId},</if>
<if test="request.partnerId != null">partner_id = #{request.partnerId},</if>
<if test="request.careerStatus != null">career_status = #{request.careerStatus},</if>
<if test="request.joinType != null">join_type = #{request.joinType},</if>
<if test="request.educationLevel != null">education_level = #{request.educationLevel},</if>
<if test="request.annualIncome != null">annual_income = #{request.annualIncome},</if>
<if test="request.hasPartner != null">has_partner = #{request.hasPartner},</if>
<if test="request.capitalSource != null">capital_source = #{request.capitalSource},</if>
<if test="request.businessMode != null">business_mode = #{request.businessMode},</if>
<if test="request.joinExperience != null">join_experience = #{request.joinExperience},</if>
<if test="request.fruitIndustryExperience != null">fruit_industry_experience = #{request.fruitIndustryExperience},</if>
<if test="request.storeCondition != null">store_condition = #{request.storeCondition},</if>
<if test="request.paybackPeriod != null">payback_period = #{request.paybackPeriod},</if>
<if test="request.followsManagementStandard != null">follows_management_standard = #{request.followsManagementStandard},</if>
<if test="request.canTraining != null">can_training = #{request.canTraining},</if>
</trim>
</insert>
<select id="getByLineId" resultType="com.cool.store.entity.MemberQuestionDO">
select
<include refid="Base_Column_List"/>
from xfsg_member_question_info
where line_id = #{lineId}
and deleted = 0
</select>
</mapper>

View File

@@ -30,8 +30,207 @@
<result column="update_user_id" jdbcType="VARCHAR" property="updateUserId" />
<result column="deleted" jdbcType="BIT" property="deleted" />
</resultMap>
<insert id="insertOrUpdate" parameterType="com.cool.store.entity.LineInfoDO" useGeneratedKeys="true" keyProperty="id">
INSERT INTO xfsg_line_info
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="param.id != null and param.id != ''">
id,
</if>
<if test="param.partnerId != null and param.partnerId != ''">
partner_id,
</if>
<if test="param.regionId != null">
region_id,
</if>
<if test="param.mobile != null and param.mobile != ''">
mobile,
</if>
<if test="param.username != null and param.username != ''">
username,
</if>
<if test="param.sex != null and param.sex != ''">
sex,
</if>
<if test="param.wantShopAreaId != null">
want_shop_area_id,
</if>
<if test="param.liveAddress != null and param.liveAddress != ''">
live_address,
</if>
<if test="param.workflowStage != null">
workflow_stage,
</if>
<if test="param.workflowSubStage != null">
workflow_sub_stage,
</if>
<if test="param.workflowSubStageStatus != null">
workflow_sub_stage_status,
</if>
<if test="param.selectSiteNum != null">
select_site_num,
</if>
<if test="param.prepareShopNum != null">
prepare_shop_num,
</if>
<if test="param.openShopNum != null">
open_shop_num,
</if>
<if test="param.lineSource != null">
line_source,
</if>
<if test="param.investmentManager != null and param.investmentManager != ''">
investment_manager,
</if>
<if test="param.developmentManager != null and param.developmentManager != ''">
development_manager,
</if>
<if test="param.firstInterviewer != null and param.firstInterviewer != ''">
first_interviewer,
</if>
<if test="param.secondInterviewer != null and param.secondInterviewer != ''">
second_interviewer,
</if>
<if test="param.userPortrait != null and param.userPortrait != ''">
user_portrait,
</if>
<if test="param.isJoin != null">
is_join,
</if>
<if test="param.lineStatus != null">
line_status,
</if>
<if test="param.createTime != null">
create_time,
</if>
<if test="param.updateTime != null">
update_time,
</if>
<if test="param.createUserId != null and param.createUserId != ''">
create_user_id,
</if>
<if test="param.updateUserId != null and param.updateUserId != ''">
update_user_id,
</if>
<if test="param.deleted != null">
deleted
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="param.id != null and param.id != ''">
#{param.id},
</if>
<if test="param.partnerId != null and param.partnerId != ''">
#{param.partnerId},
</if>
<if test="param.regionId != null">
#{param.regionId},
</if>
<if test="param.mobile != null and param.mobile != ''">
#{param.mobile},
</if>
<if test="param.username != null and param.username != ''">
#{param.username},
</if>
<if test="param.sex != null and param.sex != ''">
#{param.sex},
</if>
<if test="param.wantShopAreaId != null">
#{param.wantShopAreaId},
</if>
<if test="param.liveAddress != null and param.liveAddress != ''">
#{param.liveAddress},
</if>
<if test="param.workflowStage != null">
#{param.workflowStage},
</if>
<if test="param.workflowSubStage != null">
#{param.workflowSubStage},
</if>
<if test="param.workflowSubStageStatus != null">
#{param.workflowSubStageStatus},
</if>
<if test="param.selectSiteNum != null">
#{param.selectSiteNum},
</if>
<if test="param.prepareShopNum != null">
#{param.prepareShopNum},
</if>
<if test="param.openShopNum != null">
#{param.openShopNum},
</if>
<if test="param.lineSource != null">
#{param.lineSource},
</if>
<if test="param.investmentManager != null and param.investmentManager != ''">
#{param.investmentManager},
</if>
<if test="param.developmentManager != null and param.developmentManager != ''">
#{param.developmentManager},
</if>
<if test="param.firstInterviewer != null and param.firstInterviewer != ''">
#{param.firstInterviewer},
</if>
<if test="param.secondInterviewer != null and param.secondInterviewer != ''">
#{param.secondInterviewer},
</if>
<if test="param.userPortrait != null and param.userPortrait != ''">
#{param.userPortrait},
</if>
<if test="param.isJoin != null">
#{param.isJoin},
</if>
<if test="param.lineStatus != null">
#{param.lineStatus},
</if>
<if test="param.createTime != null">
#{param.createTime},
</if>
<if test="param.updateTime != null">
#{param.updateTime},
</if>
<if test="param.createUserId != null and param.createUserId != ''">
#{param.createUserId},
</if>
<if test="param.updateUserId != null and param.updateUserId != ''">
#{param.updateUserId},
</if>
<if test="param.deleted != null">
#{param.deleted}
</if>
</trim>
ON DUPLICATE KEY UPDATE
<trim suffixOverrides=",">
<if test="param.partnerId != null and param.partnerId != ''">
partner_id = #{param.partnerId},
</if>
<if test="param.regionId != null">
region_id = #{param.regionId},
</if>
<if test="param.mobile != null and param.mobile != ''">
mobile = #{param.mobile},
</if>
<if test="param.username != null and param.username != ''">
username = #{param.username},
</if>
<if test="param.sex != null and param.sex != ''">
sex = #{param.sex},
</if>
<if test="param.wantShopAreaId != null">
want_shop_area_id = #{param.wantShopAreaId},
</if>
<if test="param.liveAddress != null and param.liveAddress != ''">
live_address = #{param.liveAddress},
</if>
<if test="param.workflowStage != null">
workflow_stage = #{param.workflowStage},
</if>
<if test="param.workflowSubStage != null">
workflow_sub_stage = #{param.workflowSubStage}
</if>
</trim>
</insert>
<select id="getByPartnerId" resultMap="BaseResultMap">
<select id="getByPartnerId" resultMap="BaseResultMap">
select * from xfsg_line_info where partner_id = #{partnerId} and deleted = 0
</select>
<select id="getByLineId" resultType="com.cool.store.entity.LineInfoDO">