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
This commit is contained in:
zhangchenbiao
2023-06-29 10:27:42 +08:00
parent 573d60e97e 1c2cce32b3
commit 09329380b7
4 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
coolstore-partner-dao/src/main/resources/mapper/HyPartnerCertificationInfoMapper.xml
View File

@@ -10,11 +10,7 @@
<result column="update_time" jdbcType="TIMESTAMP" property="updateTime" /> <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
</resultMap> </resultMap>
<sql id="Base_Column_List"> <sql id="Base_Column_List">
id, partner_id, partner_line_id, partner_interview_id, partnership, want_sign_time, id, partner_id, partner_line_id, partner_interview_id, qualify_verify_id, intention_contract_no, data_source, certification_info_record_json, create_time, update_time
partner_fee, security_fund, technical_service_fee, intention_money,
intention_signer_username, intention_signer_mobile, intention_edu, real_control_username,
real_control_idcard, signer_real_control_relation, signer_other_real_control_relation,
signer_real_control_relation_cert, create_time, update_time
</sql> </sql>
<insert id="insertSelective" keyColumn="id" keyProperty="record.id" useGeneratedKeys="true"> <insert id="insertSelective" keyColumn="id" keyProperty="record.id" useGeneratedKeys="true">
insert into hy_partner_certification_info insert into hy_partner_certification_info

4
coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewPlanMapper.xml
View File

@@ -307,10 +307,12 @@
b.interviewer as interviewer, b.interviewer as interviewer,
b.create_time as createTime, b.create_time as createTime,
b.room_id as roomId, b.room_id as roomId,
b.id as id b.id as id,
hpci.intention_contract_no as intentionContractNo
from hy_partner_line_info hpli from hy_partner_line_info hpli
left join hy_partner_interview a on hpli.id = a.partner_line_id left join hy_partner_interview a on hpli.id = a.partner_line_id
left join hy_partner_interview_plan b on a.interview_plan_id = b.id left join hy_partner_interview_plan b on a.interview_plan_id = b.id
left join hy_partner_certification_info hpci on hpci.partner_interview_id = a.id
<where> <where>
and hpli.deleted = 0 and hpli.line_status!=3 and hpli.deleted = 0 and hpli.line_status!=3
<if test="filter"> <if test="filter">

2
coolstore-partner-model/src/main/java/com/cool/store/dto/partner/PartnerInterviewInfoDTO.java
View File

@@ -38,7 +38,7 @@ public class PartnerInterviewInfoDTO {
private Date approveTime; private Date approveTime;
@ApiModelProperty("意向合同号") @ApiModelProperty("意向合同号")
private String authCode; private String intentionContractNo;
@ApiModelProperty("面试开始时间") @ApiModelProperty("面试开始时间")
private Date startTime; private Date startTime;

2
coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerInterviewPlanServiceImpl.java
View File

@@ -276,7 +276,7 @@ public class HyPartnerInterviewPlanServiceImpl implements HyPartnerInterviewPlan
partnerInterviewInfoVO.setDeadline(DateUtil.format(partnerInterviewInfoDTO.getDeadline(),CoolDateUtils.DATE_FORMAT_SEC_2)); partnerInterviewInfoVO.setDeadline(DateUtil.format(partnerInterviewInfoDTO.getDeadline(),CoolDateUtils.DATE_FORMAT_SEC_2));
partnerInterviewInfoVO.setStartTime(DateUtil.format(partnerInterviewInfoDTO.getStartTime(),CoolDateUtils.DATE_FORMAT_SEC_2)); partnerInterviewInfoVO.setStartTime(DateUtil.format(partnerInterviewInfoDTO.getStartTime(),CoolDateUtils.DATE_FORMAT_SEC_2));
partnerInterviewInfoVO.setStatus(partnerInterviewInfoDTO.getStatus()); partnerInterviewInfoVO.setStatus(partnerInterviewInfoDTO.getStatus());
partnerInterviewInfoVO.setAuthCode(partnerInterviewInfoDTO.getAuthCode()); partnerInterviewInfoVO.setAuthCode(partnerInterviewInfoDTO.getIntentionContractNo());
partnerInterviewInfoVO.setEndTime(DateUtil.format(partnerInterviewInfoDTO.getEndTime(),CoolDateUtils.DATE_FORMAT_SEC_2)); partnerInterviewInfoVO.setEndTime(DateUtil.format(partnerInterviewInfoDTO.getEndTime(),CoolDateUtils.DATE_FORMAT_SEC_2));
partnerInterviewInfoVO.setApproveTime(DateUtil.format(partnerInterviewInfoDTO.getApproveTime(),CoolDateUtils.DATE_FORMAT_SEC_2)); partnerInterviewInfoVO.setApproveTime(DateUtil.format(partnerInterviewInfoDTO.getApproveTime(),CoolDateUtils.DATE_FORMAT_SEC_2));
return partnerInterviewInfoVO; return partnerInterviewInfoVO;