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

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

Browse Source 
# Conflicts:
#	coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerInterviewMapper.java
#	coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewMapper.xml
This commit is contained in:
pserimal
2023-06-09 17:56:39 +08:00
parent 803625b20a 7fe6a15cb6
commit 94a7dfda58
4 changed files with 275 additions and 234 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerInterviewMapper.java
View File

@@ -6,22 +6,23 @@ import org.apache.ibatis.annotations.Param;
/**
* @author zhangchenbiao
* @date 2023-05-29 03:52
* @date 2023-06-09 05:51
*/
public interface HyPartnerInterviewMapper {
/**
*
* 默认插入方法，只会给有值的字段赋值
* 会对传进来的字段做判空处理，如果字段为空，则使用数据库默认字段或者null
* dateTime:2023-05-29 03:52
* dateTime:2023-06-09 05:51
*/
int insertSelective(@Param("record") HyPartnerInterviewDO record);
int insertSelective(HyPartnerInterviewDO record);
/**
*
* 默认更新方法，根据主键更新，不会把null值更新到数据库，避免覆盖之前有值的
* dateTime:2023-05-29 03:52
* dateTime:2023-06-09 05:51
*/
int updateByPrimaryKeySelective(HyPartnerInterviewDO record);
int updateByPrimaryKeySelective(@Param("record") HyPartnerInterviewDO record);
/**

483
coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewMapper.xml
View File

@@ -1,233 +1,264 @@
<?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.HyPartnerInterviewMapper">
<resultMap id="BaseResultMap" type="com.cool.store.entity.HyPartnerInterviewDO">
<id column="id" jdbcType="BIGINT" property="id" />
<result column="status" jdbcType="TINYINT" property="status" />
<result column="partner_line_id" jdbcType="BIGINT" property="partnerLineId" />
<result column="interview_arrangement_id" jdbcType="BIGINT" property="interviewArrangementId" />
<result column="partner_id" jdbcType="VARCHAR" property="partnerId" />
<result column="deadline" jdbcType="TIMESTAMP" property="deadline" />
<result column="interviewer" jdbcType="VARCHAR" property="interviewer" />
<result column="recorder" jdbcType="VARCHAR" property="recorder" />
<result column="process_info" jdbcType="VARCHAR" property="processInfo" />
<result column="record_time" jdbcType="TIMESTAMP" property="recordTime" />
<result column="summary" jdbcType="VARCHAR" property="summary" />
<result column="auth_code" jdbcType="VARCHAR" property="authCode" />
<result column="pass_file_url" jdbcType="VARCHAR" property="passFileUrl" />
<result column="expiry_date" jdbcType="TIMESTAMP" property="expiryDate" />
<result column="latest_log_message" jdbcType="VARCHAR" property="latestLogMessage" />
<result column="pass_reason" jdbcType="VARCHAR" property="passReason" />
<result column="certify_file" jdbcType="VARCHAR" property="certifyFile" />
<result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
<result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
</resultMap>
<resultMap id="BaseResultMap" type="com.cool.store.entity.HyPartnerInterviewDO">
<id column="id" jdbcType="BIGINT" property="id" />
<result column="status" jdbcType="TINYINT" property="status" />
<result column="partner_line_id" jdbcType="BIGINT" property="partnerLineId" />
<result column="interview_plan_id" jdbcType="BIGINT" property="interviewPlanId" />
<result column="partner_id" jdbcType="VARCHAR" property="partnerId" />
<result column="deadline" jdbcType="TIMESTAMP" property="deadline" />
<result column="interviewer" jdbcType="VARCHAR" property="interviewer" />
<result column="recorder" jdbcType="VARCHAR" property="recorder" />
<result column="process_info" jdbcType="VARCHAR" property="processInfo" />
<result column="record_time" jdbcType="TIMESTAMP" property="recordTime" />
<result column="summary" jdbcType="VARCHAR" property="summary" />
<result column="auth_code" jdbcType="VARCHAR" property="authCode" />
<result column="pass_file_url" jdbcType="VARCHAR" property="passFileUrl" />
<result column="expiry_date" jdbcType="TIMESTAMP" property="expiryDate" />
<result column="latest_log_message" jdbcType="VARCHAR" property="latestLogMessage" />
<result column="pass_reason" jdbcType="VARCHAR" property="passReason" />
<result column="certify_file" jdbcType="VARCHAR" property="certifyFile" />
<result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
<result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
<result column="approve_time" jdbcType="TIMESTAMP" property="approveTime" />
<result column="partner_enter_time" jdbcType="TIMESTAMP" property="partnerEnterTime" />
<result column="interviewer_enter_time" jdbcType="TIMESTAMP" property="interviewerEnterTime" />
</resultMap>
<resultMap id="PartnerInterviewInfoVO" type="com.cool.store.vo.PartnerInterviewInfoVO">
<id column="interviewId" property="interviewId"/>
<result column="partnerId" property="partnerId"/>
<result column="interviewerId" property="interviewerId"/>
<association property="partnerName" column="partnerId" select="queryPartnerName" javaType="string"/>
<association property="interviewerName" column="interviewerId" select="queryInterviewerName" javaType="string"/>
</resultMap>
<resultMap id="PartnerInterviewInfoVO" type="com.cool.store.vo.PartnerInterviewInfoVO">
<id column="interviewId" property="interviewId"/>
<result column="partnerId" property="partnerId"/>
<result column="interviewerId" property="interviewerId"/>
<association property="partnerName" column="partnerId" select="queryPartnerName" javaType="string"/>
<association property="interviewerName" column="interviewerId" select="queryInterviewerName" javaType="string"/>
</resultMap>
<sql id="Base_Column_List">
id, status, partner_line_id, interview_arrangement_id, partner_id, deadline, interviewer,
recorder, process_info, record_time, summary, auth_code, pass_file_url, expiry_date,
latest_log_message, pass_reason, certify_file, create_time, update_time
</sql>
<insert id="insertSelective" keyColumn="id" keyProperty="record.id" useGeneratedKeys="true">
insert into hy_partner_interview
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="record.status != null">
status,
</if>
<if test="record.partnerLineId != null">
partner_line_id,
</if>
<if test="record.interviewArrangementId != null">
interview_arrangement_id,
</if>
<if test="record.partnerId != null">
partner_id,
</if>
<if test="record.deadline != null">
deadline,
</if>
<if test="record.interviewer != null">
interviewer,
</if>
<if test="record.recorder != null">
recorder,
</if>
<if test="record.processInfo != null">
process_info,
</if>
<if test="record.recordTime != null">
record_time,
</if>
<if test="record.summary != null">
summary,
</if>
<if test="record.authCode != null">
auth_code,
</if>
<if test="record.passFileUrl != null">
pass_file_url,
</if>
<if test="record.expiryDate != null">
expiry_date,
</if>
<if test="record.latestLogMessage != null">
latest_log_message,
</if>
<if test="record.passReason != null">
pass_reason,
</if>
<if test="record.certifyFile != null">
certify_file,
</if>
<if test="record.createTime != null">
create_time,
</if>
<if test="record.updateTime != null">
update_time,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="record.status != null">
#{record.status},
</if>
<if test="record.partnerLineId != null">
#{record.partnerLineId},
</if>
<if test="record.interviewArrangementId != null">
#{record.interviewArrangementId},
</if>
<if test="record.partnerId != null">
#{record.partnerId},
</if>
<if test="record.deadline != null">
#{record.deadline},
</if>
<if test="record.interviewer != null">
#{record.interviewer},
</if>
<if test="record.recorder != null">
#{record.recorder},
</if>
<if test="record.processInfo != null">
#{record.processInfo},
</if>
<if test="record.recordTime != null">
#{record.recordTime},
</if>
<if test="record.summary != null">
#{record.summary},
</if>
<if test="record.authCode != null">
#{record.authCode},
</if>
<if test="record.passFileUrl != null">
#{record.passFileUrl},
</if>
<if test="record.expiryDate != null">
#{record.expiryDate},
</if>
<if test="record.latestLogMessage != null">
#{record.latestLogMessage},
</if>
<if test="record.passReason != null">
#{record.passReason},
</if>
<if test="record.certifyFile != null">
#{record.certifyFile},
</if>
<if test="record.createTime != null">
#{record.createTime},
</if>
<if test="record.updateTime != null">
#{record.updateTime},
</if>
</trim>
</insert>
<update id="updateByPrimaryKeySelective">
update hy_partner_interview
<set>
<if test="record.status != null">
status = #{record.status},
</if>
<if test="record.partnerLineId != null">
partner_line_id = #{record.partnerLineId},
</if>
<if test="record.interviewArrangementId != null">
interview_arrangement_id = #{record.interviewArrangementId},
</if>
<if test="record.partnerId != null">
partner_id = #{record.partnerId},
</if>
<if test="record.deadline != null">
deadline = #{record.deadline},
</if>
<if test="record.interviewer != null">
interviewer = #{record.interviewer},
</if>
<if test="record.recorder != null">
recorder = #{record.recorder},
</if>
<if test="record.processInfo != null">
process_info = #{record.processInfo},
</if>
<if test="record.recordTime != null">
record_time = #{record.recordTime},
</if>
<if test="record.summary != null">
summary = #{record.summary},
</if>
<if test="record.authCode != null">
auth_code = #{record.authCode},
</if>
<if test="record.passFileUrl != null">
pass_file_url = #{record.passFileUrl},
</if>
<if test="record.expiryDate != null">
expiry_date = #{record.expiryDate},
</if>
<if test="record.latestLogMessage != null">
latest_log_message = #{record.latestLogMessage},
</if>
<if test="record.passReason != null">
pass_reason = #{record.passReason},
</if>
<if test="record.certifyFile != null">
certify_file = #{record.certifyFile},
</if>
<if test="record.createTime != null">
create_time = #{record.createTime},
</if>
<if test="record.updateTime != null">
update_time = #{record.updateTime},
</if>
</set>
where id = #{record.id}
</update>
<sql id="Base_Column_List">
id, status, partner_line_id, interview_plan_id, partner_id, deadline, interviewer,
recorder, process_info, record_time, summary, auth_code, pass_file_url, expiry_date,
latest_log_message, pass_reason, certify_file, create_time, update_time, approve_time,
partner_enter_time, interviewer_enter_time
</sql>
<insert id="insertSelective" keyColumn="id" keyProperty="record.id" useGeneratedKeys="true">
insert into hy_partner_interview
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="status != null">
status,
</if>
<if test="partnerLineId != null">
partner_line_id,
</if>
<if test="interviewPlanId != null">
interview_plan_id,
</if>
<if test="partnerId != null">
partner_id,
</if>
<if test="deadline != null">
deadline,
</if>
<if test="interviewer != null">
interviewer,
</if>
<if test="recorder != null">
recorder,
</if>
<if test="processInfo != null">
process_info,
</if>
<if test="recordTime != null">
record_time,
</if>
<if test="summary != null">
summary,
</if>
<if test="authCode != null">
auth_code,
</if>
<if test="passFileUrl != null">
pass_file_url,
</if>
<if test="expiryDate != null">
expiry_date,
</if>
<if test="latestLogMessage != null">
latest_log_message,
</if>
<if test="passReason != null">
pass_reason,
</if>
<if test="certifyFile != null">
certify_file,
</if>
<if test="createTime != null">
create_time,
</if>
<if test="updateTime != null">
update_time,
</if>
<if test="approveTime != null">
approve_time,
</if>
<if test="partnerEnterTime != null">
partner_enter_time,
</if>
<if test="interviewerEnterTime != null">
interviewer_enter_time,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="status != null">
#{status},
</if>
<if test="partnerLineId != null">
#{partnerLineId},
</if>
<if test="interviewPlanId != null">
#{interviewPlanId},
</if>
<if test="partnerId != null">
#{partnerId},
</if>
<if test="deadline != null">
#{deadline},
</if>
<if test="interviewer != null">
#{interviewer},
</if>
<if test="recorder != null">
#{recorder},
</if>
<if test="processInfo != null">
#{processInfo},
</if>
<if test="recordTime != null">
#{recordTime},
</if>
<if test="summary != null">
#{summary},
</if>
<if test="authCode != null">
#{authCode},
</if>
<if test="passFileUrl != null">
#{passFileUrl},
</if>
<if test="expiryDate != null">
#{expiryDate},
</if>
<if test="latestLogMessage != null">
#{latestLogMessage},
</if>
<if test="passReason != null">
#{passReason},
</if>
<if test="certifyFile != null">
#{certifyFile},
</if>
<if test="createTime != null">
#{createTime},
</if>
<if test="updateTime != null">
#{updateTime},
</if>
<if test="approveTime != null">
#{approveTime},
</if>
<if test="partnerEnterTime != null">
#{partnerEnterTime},
</if>
<if test="interviewerEnterTime != null">
#{interviewerEnterTime},
</if>
</trim>
</insert>
<update id="updateByPrimaryKeySelective">
update hy_partner_interview
<set>
<if test="status != null">
status = #{status},
</if>
<if test="partnerLineId != null">
partner_line_id = #{partnerLineId},
</if>
<if test="interviewPlanId != null">
interview_plan_id = #{interviewPlanId},
</if>
<if test="partnerId != null">
partner_id = #{partnerId},
</if>
<if test="deadline != null">
deadline = #{deadline},
</if>
<if test="interviewer != null">
interviewer = #{interviewer},
</if>
<if test="recorder != null">
recorder = #{recorder},
</if>
<if test="processInfo != null">
process_info = #{processInfo},
</if>
<if test="recordTime != null">
record_time = #{recordTime},
</if>
<if test="summary != null">
summary = #{summary},
</if>
<if test="authCode != null">
auth_code = #{authCode},
</if>
<if test="passFileUrl != null">
pass_file_url = #{passFileUrl},
</if>
<if test="expiryDate != null">
expiry_date = #{expiryDate},
</if>
<if test="latestLogMessage != null">
latest_log_message = #{latestLogMessage},
</if>
<if test="passReason != null">
pass_reason = #{passReason},
</if>
<if test="certifyFile != null">
certify_file = #{certifyFile},
</if>
<if test="createTime != null">
create_time = #{createTime},
</if>
<if test="updateTime != null">
update_time = #{updateTime},
</if>
<if test="approveTime != null">
approve_time = #{approveTime},
</if>
<if test="partnerEnterTime != null">
partner_enter_time = #{partnerEnterTime},
</if>
<if test="interviewerEnterTime != null">
interviewer_enter_time = #{interviewerEnterTime},
</if>
</set>
where id = #{id}
</update>
<!-- 根据加盟商id查询面试信息 -->
<select id="queryByPartnerId" resultMap="PartnerInterviewInfoVO">
SELECT t1.id interviewId, `status`, start_time, end_time, room_id, t1.partner_id partnerId, t1.interviewer interviewerId
FROM hy_partner_interview t1
LEFT JOIN hy_partner_interview_plan t2 ON t1.interview_arrangement_id = t2.id
WHERE t1.partner_id = #{partnerId}
</select>
<select id="queryPartnerName" resultType="string">
SELECT username
FROM hy_partner_user_info
WHERE partner_id = #{partnerId}
</select>
<select id="queryInterviewerName" resultType="string">
SELECT name
FROM enterprise_user
WHERE deleted = 0
AND user_id = #{interview}
</select>
<!-- 根据加盟商id查询面试信息 -->
<select id="queryByPartnerId" resultMap="PartnerInterviewInfoVO">
SELECT t1.id interviewId, `status`, start_time, end_time, room_id, t1.partner_id partnerId, t1.interviewer interviewerId
FROM hy_partner_interview t1
LEFT JOIN hy_partner_interview_plan t2 ON t1.interview_arrangement_id = t2.id
WHERE t1.partner_id = #{partnerId}
</select>
<select id="queryPartnerName" resultType="string">
SELECT username
FROM hy_partner_user_info
WHERE partner_id = #{partnerId}
</select>
<select id="queryInterviewerName" resultType="string">
SELECT name
FROM enterprise_user
WHERE deleted = 0
AND user_id = #{interview}
</select>
</mapper>

15
coolstore-partner-model/src/main/java/com/cool/store/entity/HyPartnerInterviewDO.java
View File

@@ -11,7 +11,7 @@ import lombok.NoArgsConstructor;
/**
*
* @author zhangchenbiao
* @date 2023-05-29 03:52
* @date 2023-06-09 05:51
*/
@Data
@Builder
@@ -27,8 +27,8 @@ public class HyPartnerInterviewDO implements Serializable {
@ApiModelProperty("hy_partner_line_info.id")
private Long partnerLineId;
@ApiModelProperty("hy_partner_interview_arrangement.id")
private Long interviewArrangementId;
@ApiModelProperty("hy_partner_interview_plan.id")
private Long interviewPlanId;
@ApiModelProperty("hy_partner_user_info.partner_id")
private String partnerId;
@@ -74,4 +74,13 @@ public class HyPartnerInterviewDO implements Serializable {
@ApiModelProperty("更新时间")
private Date updateTime;
@ApiModelProperty("审批发起时间")
private Date approveTime;
@ApiModelProperty("加盟商进入面试时间")
private Date partnerEnterTime;
@ApiModelProperty("面试官进入面试时间")
private Date interviewerEnterTime;
}

2
coolstore-partner-webb/src/main/resources/application-ab.properties
View File

@@ -46,5 +46,5 @@ rocketmq.orderTopic=order_message
oss.accessKeyId=LTAI5tKSnAbkEbmT6CeBwNN3
oss.accessKeySecret=PbXOzUFwAvZ2K5zIawwa7NAJE2pFXS
oss.endpoint=oss-cn-shanghai.aliyuncs.com
oss.bucket=vec-coolstore
oss.bucket=cool-store
corp.id = 171cddee76471740