Merge remote-tracking branch 'origin/cc_20230520_partner' into cc_20230520_partner

coolstore-partner-model/src/main/java/com/cool/store/request/CreateQualifyVerifyReq.java

@@ -15,12 +15,18 @@ public class CreateQualifyVerifyReq {
     @ApiModelProperty(value = "线索id", required = true)
     private String lineId;
 
+    @ApiModelProperty(value = "会议安排id", required = true)
+    private String interviewPlanId;
+
     @ApiModelProperty(value = "会议id", required = true)
     private String interviewId;
 
     @ApiModelProperty(value = "加盟商id", required = true)
     private String partnerId;
 
+    @ApiModelProperty(value = "开发主管用户id", required = true)
+    private String devtDirectorId;
+
     @ApiModelProperty(value = "面试表现记录", required = true)
     private String summary;
 

coolstore-partner-service/src/main/java/com/cool/store/service/impl/FeiShuServiceImpl.java

@@ -100,6 +100,7 @@ public class FeiShuServiceImpl implements FeiShuService {
                         if (( userFreeBusyInfoDTO.getStartTime()>startTimeLong && userFreeBusyInfoDTO.getStartTime() < endTimeLong)
                                 || (userFreeBusyInfoDTO.getEndTime() > startTimeLong && userFreeBusyInfoDTO.getEndTime() < endTimeLong)) {
                             freeBusyInfo.setFree(false);
+                            break;
                         }
                     }
 

coolstore-partner-webb/src/main/java/com/cool/store/controller/FlowController.java

@@ -5,6 +5,7 @@ import com.cool.store.request.CreateQualifyVerifyReq;
 import com.cool.store.request.FinishInterviewReq;
 import com.cool.store.response.ResponseResult;
 import com.cool.store.service.FlowService;
+import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -17,6 +18,7 @@ import org.springframework.web.bind.annotation.RestController;
  * @Date: 2023-06-14  13:47
  * @Description: 流程相关
  */
+@Api(tags = "流程相关接口")
 @RestController
 @RequestMapping({"/flow"})
 public class FlowController {