diff --git a/coolstore-partner-common/src/main/java/com/cool/store/utils/PassLetterUtils.java b/coolstore-partner-common/src/main/java/com/cool/store/utils/PassLetterUtils.java
index 264061202..dc60e93b1 100644
--- a/coolstore-partner-common/src/main/java/com/cool/store/utils/PassLetterUtils.java
+++ b/coolstore-partner-common/src/main/java/com/cool/store/utils/PassLetterUtils.java
@@ -2,7 +2,6 @@ package com.cool.store.utils;
import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.RandomUtil;
import com.lowagie.text.Document;
import com.lowagie.text.Image;
@@ -12,8 +11,7 @@ import com.lowagie.text.pdf.PdfWriter;
import java.awt.*;
import java.io.*;
-import java.nio.file.Files;
-import java.nio.file.Paths;
+import java.util.Date;
//生成资格面试通过函的工具
public class PassLetterUtils {
@@ -26,7 +24,7 @@ public class PassLetterUtils {
* @param passCode 通过函编码
* @param passTime 审批通过时间
*/
- public static ByteArrayOutputStream genPassLetter(String partnerName, String passCode, String verifyCity, DateTime passTime) {
+ public static ByteArrayOutputStream genPassLetter(String partnerName, String passCode, String verifyCity, Date passTime) {
String passTimeStr = DateUtil.format(passTime, "yyyy年MM月dd日");
Document document = new Document();
ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
@@ -65,7 +63,7 @@ public class PassLetterUtils {
* 生成 passCode 的方法,拆分出来方便单独获取 passCode
* @return
*/
- public static String genPassCode(DateTime passTime) {
+ public static String genPassCode(Date passTime) {
String randomNum = RandomUtil.randomNumbers(5);
String passCode = "HSAY" + DateUtil.format(passTime, "yyMMdd") + "-" + randomNum;
return passCode;
diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerCertificationInfoMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerCertificationInfoMapper.java
index 426e1a742..ae1c3a009 100644
--- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerCertificationInfoMapper.java
+++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerCertificationInfoMapper.java
@@ -22,4 +22,11 @@ public interface HyPartnerCertificationInfoMapper {
* dateTime:2023-05-29 03:51
*/
int updateByPrimaryKeySelective(@Param("record") HyPartnerCertificationInfoDO record);
+
+ /**
+ * 根据资质审核流程 id 获取面试会议 id
+ * @param qualifyVerifyId 资质审核流程 id
+ * @return 面试会议 id
+ */
+ String getInterviewIdByQualifyVerifyId(@Param("qualifyVerifyId") String qualifyVerifyId);
}
\ No newline at end of file
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 5b60798b3..3738bedd1 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
@@ -79,4 +79,11 @@ public interface HyPartnerInterviewMapper {
* 根据面试 id 查询面试信息
*/
HyPartnerInterviewDO selectByPrimaryKeySelective(String interviewId);
+
+ /**
+ * 根据面试 id 获取意向区域
+ * @param interviewId
+ * @return
+ */
+ String getVerifyCityByInterviewId(@Param("interviewId") String interviewId);
}
\ No newline at end of file
diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerInterviewPlanMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerInterviewPlanMapper.java
index 4e29260e9..bb5f45482 100644
--- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerInterviewPlanMapper.java
+++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerInterviewPlanMapper.java
@@ -84,7 +84,7 @@ public interface HyPartnerInterviewPlanMapper {
/**
* 查询面试详情
*
- * @param interviewId
+ * @param interviewPlanId
* @return
*/
InterviewVO getInterviewInfo(String interviewPlanId);
diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerCertificationInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerCertificationInfoMapper.xml
index 9d77fcaee..3e9bc528c 100644
--- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerCertificationInfoMapper.xml
+++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerCertificationInfoMapper.xml
@@ -169,6 +169,12 @@
partnership = #{record.partnership},
+
+ qualify_verify_id = #{record.qualifyVerifyId},
+
+
+ intention_contract_no = #{record.intentionContractNo},
+
want_sign_time = #{record.wantSignTime},
@@ -215,6 +221,21 @@
update_time = #{record.updateTime},
- where id = #{record.id}
+
+ 1 = 0
+
+ or id = #{record.id}
+
+
+ or partner_id_line_id = #{record.partnerLineId}
+
+
+
+
+
\ No newline at end of file
diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewMapper.xml
index 584bebc81..949f878b6 100644
--- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewMapper.xml
+++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewMapper.xml
@@ -220,8 +220,17 @@
auth_code = #{authCode},
-
- pass_file_url = #{passFileUrl},
+
+ pass_code = #{passCode},
+
+
+ pass_pdf_url = #{passPdfUrl},
+
+
+ pass_image_url = #{passImageUrl},
+
+
+ pass_time = #{passTime},
expiry_date = #{expiryDate},
@@ -250,11 +259,16 @@
interviewer_enter_time = #{interviewerEnterTime},
-
- qualify_verify_id = #{qualifyVerifyId},
-
- where id = #{id}
+
+ 1 = 0
+
+ or id = #{id}
+
+
+ or interview_plan_id = #{interviewPlanId}
+
+
@@ -338,7 +352,7 @@
select
from
- hy_partner_intent_info
+ hy_partner_interview
where
id = #{interviewId}
@@ -364,4 +378,19 @@
WHERE id = #{interviewId}
+
+
+
\ No newline at end of file
diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewPlanMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewPlanMapper.xml
index 64c657998..4f8569509 100644
--- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewPlanMapper.xml
+++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewPlanMapper.xml
@@ -247,41 +247,44 @@