From 92aa28af8da81d6e27993172a117187f85942bde Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Thu, 29 Jun 2023 09:47:28 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=84=8F=E5=90=91=E5=90=88=E5=90=8C?= =?UTF-8?q?=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/mapper/HyPartnerInterviewPlanMapper.xml | 4 +++- .../com/cool/store/dto/partner/PartnerInterviewInfoDTO.java | 2 +- .../store/service/impl/HyPartnerInterviewPlanServiceImpl.java | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewPlanMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewPlanMapper.xml index ad7094ddd..e9a28a598 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewPlanMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewPlanMapper.xml @@ -307,10 +307,12 @@ b.interviewer as interviewer, b.create_time as createTime, 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 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_certification_info hpci on hpci.partner_interview_id = a.id and hpli.deleted = 0 and hpli.line_status!=3 diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/partner/PartnerInterviewInfoDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/partner/PartnerInterviewInfoDTO.java index 43c933dd9..878979fab 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/partner/PartnerInterviewInfoDTO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/dto/partner/PartnerInterviewInfoDTO.java @@ -38,7 +38,7 @@ public class PartnerInterviewInfoDTO { private Date approveTime; @ApiModelProperty("意向合同号") - private String authCode; + private String intentionContractNo; @ApiModelProperty("面试开始时间") private Date startTime; diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerInterviewPlanServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerInterviewPlanServiceImpl.java index 26d4a5015..8caac2ed0 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerInterviewPlanServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerInterviewPlanServiceImpl.java @@ -276,7 +276,7 @@ public class HyPartnerInterviewPlanServiceImpl implements HyPartnerInterviewPlan partnerInterviewInfoVO.setDeadline(DateUtil.format(partnerInterviewInfoDTO.getDeadline(),CoolDateUtils.DATE_FORMAT_SEC_2)); partnerInterviewInfoVO.setStartTime(DateUtil.format(partnerInterviewInfoDTO.getStartTime(),CoolDateUtils.DATE_FORMAT_SEC_2)); partnerInterviewInfoVO.setStatus(partnerInterviewInfoDTO.getStatus()); - partnerInterviewInfoVO.setAuthCode(partnerInterviewInfoDTO.getAuthCode()); + partnerInterviewInfoVO.setAuthCode(partnerInterviewInfoDTO.getIntentionContractNo()); partnerInterviewInfoVO.setEndTime(DateUtil.format(partnerInterviewInfoDTO.getEndTime(),CoolDateUtils.DATE_FORMAT_SEC_2)); partnerInterviewInfoVO.setApproveTime(DateUtil.format(partnerInterviewInfoDTO.getApproveTime(),CoolDateUtils.DATE_FORMAT_SEC_2)); return partnerInterviewInfoVO; From 1d4c2f6255be3b958a2c7faa6cfb9db9e877974d Mon Sep 17 00:00:00 2001 From: pserimal Date: Thu, 29 Jun 2023 10:01:59 +0800 Subject: [PATCH 2/2] =?UTF-8?q?hy=5Fpartner=5Fcertification=5Finfo?= =?UTF-8?q?=E8=A1=A8=E4=BF=AE=E6=94=B9=E9=81=97=E6=BC=8FMapper?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/mapper/HyPartnerCertificationInfoMapper.xml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerCertificationInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerCertificationInfoMapper.xml index 23c2130af..22e42a816 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerCertificationInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerCertificationInfoMapper.xml @@ -10,11 +10,7 @@ - id, partner_id, partner_line_id, partner_interview_id, partnership, want_sign_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 + 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 insert into hy_partner_certification_info