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 15:00:09 +08:00
parent 7bf743305f 58134dcce0
commit 5a7584f3e8
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
coolstore-partner-common/src/main/java/com/cool/store/enums/WorkflowStageEnum.java
View File

@@ -36,7 +36,7 @@ public enum WorkflowStageEnum {
public static final HashMap<String,String> getWorkflowStageMap(){
HashMap<String, String> result = new HashMap<>();
result.put(INTENT.getCode(),WorkflowStatusEnum.INTENT_3.getCode());
result.put(RESERVATION.getCode(),WorkflowStatusEnum.RESERVATION_8.getCode());
result.put(RESERVATION.getCode(),WorkflowStatusEnum.RESERVATION_7.getCode());
result.put(INTERVIEW.getCode(),WorkflowStatusEnum.INTERVIEW_7.getCode());
return result;
}

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

@@ -477,7 +477,7 @@
FROM hy_partner_interview
WHERE interview_plan_id = #{interviewPlanId}
</select>
<select id="queryByPartnerLineId" resultType="com.cool.store.vo.PartnerInterviewInfoVO">
<select id="queryByPartnerLineId" resultMap="PartnerInterviewInfoVO">
SELECT t1.id interviewId, t1.id interview_id, t2.id as interviewPlanId, `status`, start_time, end_time, room_id, t1.partner_id partnerId, t1.interviewer interviewerId
FROM hy_partner_interview_plan t2
LEFT JOIN hy_partner_interview t1 ON t1.interview_plan_id = t2.id

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

@@ -392,7 +392,7 @@
hpi.record_time as recordTime,
hpi.summary as summary,
hpi.process_info as processInfo,
hpi.auth_code as processInfo,
hpi.auth_code as authCode,
hpi.expiry_date as expiryDate,
hpi.pass_pdf_url as passPdfUrl,
hpi.pass_image_url as passImageUrl,