diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerInterviewMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerInterviewMapper.java index ebc555b16..a70ea5029 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerInterviewMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerInterviewMapper.java @@ -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); /** diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewMapper.xml index 252f82ecc..f69958f16 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewMapper.xml @@ -1,233 +1,264 @@ - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - + + + + + + + - - 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 - - - insert into hy_partner_interview - - - 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, - - - - - #{record.status}, - - - #{record.partnerLineId}, - - - #{record.interviewArrangementId}, - - - #{record.partnerId}, - - - #{record.deadline}, - - - #{record.interviewer}, - - - #{record.recorder}, - - - #{record.processInfo}, - - - #{record.recordTime}, - - - #{record.summary}, - - - #{record.authCode}, - - - #{record.passFileUrl}, - - - #{record.expiryDate}, - - - #{record.latestLogMessage}, - - - #{record.passReason}, - - - #{record.certifyFile}, - - - #{record.createTime}, - - - #{record.updateTime}, - - - - - update hy_partner_interview - - - status = #{record.status}, - - - partner_line_id = #{record.partnerLineId}, - - - interview_arrangement_id = #{record.interviewArrangementId}, - - - partner_id = #{record.partnerId}, - - - deadline = #{record.deadline}, - - - interviewer = #{record.interviewer}, - - - recorder = #{record.recorder}, - - - process_info = #{record.processInfo}, - - - record_time = #{record.recordTime}, - - - summary = #{record.summary}, - - - auth_code = #{record.authCode}, - - - pass_file_url = #{record.passFileUrl}, - - - expiry_date = #{record.expiryDate}, - - - latest_log_message = #{record.latestLogMessage}, - - - pass_reason = #{record.passReason}, - - - certify_file = #{record.certifyFile}, - - - create_time = #{record.createTime}, - - - update_time = #{record.updateTime}, - - - where id = #{record.id} - + + 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 + + + insert into hy_partner_interview + + + 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, + + + + + #{status}, + + + #{partnerLineId}, + + + #{interviewPlanId}, + + + #{partnerId}, + + + #{deadline}, + + + #{interviewer}, + + + #{recorder}, + + + #{processInfo}, + + + #{recordTime}, + + + #{summary}, + + + #{authCode}, + + + #{passFileUrl}, + + + #{expiryDate}, + + + #{latestLogMessage}, + + + #{passReason}, + + + #{certifyFile}, + + + #{createTime}, + + + #{updateTime}, + + + #{approveTime}, + + + #{partnerEnterTime}, + + + #{interviewerEnterTime}, + + + + + update hy_partner_interview + + + status = #{status}, + + + partner_line_id = #{partnerLineId}, + + + interview_plan_id = #{interviewPlanId}, + + + partner_id = #{partnerId}, + + + deadline = #{deadline}, + + + interviewer = #{interviewer}, + + + recorder = #{recorder}, + + + process_info = #{processInfo}, + + + record_time = #{recordTime}, + + + summary = #{summary}, + + + auth_code = #{authCode}, + + + pass_file_url = #{passFileUrl}, + + + expiry_date = #{expiryDate}, + + + latest_log_message = #{latestLogMessage}, + + + pass_reason = #{passReason}, + + + certify_file = #{certifyFile}, + + + create_time = #{createTime}, + + + update_time = #{updateTime}, + + + approve_time = #{approveTime}, + + + partner_enter_time = #{partnerEnterTime}, + + + interviewer_enter_time = #{interviewerEnterTime}, + + + where id = #{id} + - - - - + + + + \ No newline at end of file diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/HyPartnerInterviewDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/HyPartnerInterviewDO.java index 12efe3d0b..2a13043ad 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/entity/HyPartnerInterviewDO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/entity/HyPartnerInterviewDO.java @@ -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; } \ No newline at end of file diff --git a/coolstore-partner-webb/src/main/resources/application-ab.properties b/coolstore-partner-webb/src/main/resources/application-ab.properties index e8951e019..800e1c2d7 100644 --- a/coolstore-partner-webb/src/main/resources/application-ab.properties +++ b/coolstore-partner-webb/src/main/resources/application-ab.properties @@ -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