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:
pserimal
2023-06-19 16:39:59 +08:00
parent 459436512c b5b8d05303
commit 0323e5fe25
3 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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

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

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