From 5746d9c43530d269aabe8047d7de7be28b7e51b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BF=9E=E6=89=AC?= Date: Thu, 29 Jun 2023 16:22:25 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BD=AC=E8=AE=A9=E6=8B=9B=E5=95=86=E7=BB=8F?= =?UTF-8?q?=E7=90=86=E9=80=BB=E8=BE=91=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/mapper/HyPartnerInterviewPlanMapper.xml | 1 + .../main/java/com/cool/store/vo/interview/InterviewVO.java | 5 ++++- .../service/impl/workflow/InterviewWorkFlowService.java | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewPlanMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewPlanMapper.xml index 5316b4a10..059f5fb93 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewPlanMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewPlanMapper.xml @@ -387,6 +387,7 @@ hpci.qualify_verify_id as qualifyVerifyId, hpci.intention_contract_no as intentionContractNo, hpll.workflow_stage as workflowStage, + hpll.line_status as lineStatus, hpi.pass_time as passTime, hpi.pass_reason as passReason, hpi.recorder as recorderId, diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/interview/InterviewVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/interview/InterviewVO.java index 3ac58a5eb..50e4ec652 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/interview/InterviewVO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/interview/InterviewVO.java @@ -25,9 +25,12 @@ public class InterviewVO { @ApiModelProperty(value = "线索id", required = true) private Long partnerLineId; - @ApiModelProperty(value = "线索状态") + @ApiModelProperty(value = "流程阶段") private Long workflowStage; + @ApiModelProperty(value = "线索状态") + private Long lineStatus; + @ApiModelProperty("资质审核流程id") private String qualifyVerifyId; diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/workflow/InterviewWorkFlowService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/workflow/InterviewWorkFlowService.java index 6c31f9d9b..1c46a2378 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/workflow/InterviewWorkFlowService.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/workflow/InterviewWorkFlowService.java @@ -109,7 +109,7 @@ public class InterviewWorkFlowService extends WorkFlowBaseService { } Integer status = interviewInfo.getStatus(); Date now = new Date(); - if (status == Integer.parseInt(WorkflowStatusEnum.INTERVIEW_2.getCode()) || + if (status == Integer.parseInt(WorkflowStatusEnum.INTERVIEW_3.getCode()) || (interviewInfo.getRoomStatus()!=null && String.valueOf(RoomStatus.OPEN.getCode()).equals(interviewInfo.getRoomStatus())) || (DateUtil.compare(DateUtil.parse(interviewInfo.getStartTime()), now) <= 0 && DateUtil.compare(DateUtil.parse(interviewInfo.getEndTime()), now) >= 0)) {