suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'xfsg/cc_partner_init' into cc_partner_init

Browse Source
This commit is contained in:
苏竹红
2024-03-29 09:55:52 +08:00
parent be799d8082 5e5199f246
commit b10b4e00c0
5 changed files with 38 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
coolstore-partner-dao/src/main/resources/mapper/TrainingExperienceMapper.xml
View File

@@ -51,6 +51,16 @@
<if test="entity.experienceStatus != null">#{entity.experienceStatus},</if>
<if test="entity.abandonCause != null">#{entity.abandonCause},</if>
</trim>
ON DUPLICATE KEY UPDATE
<trim suffixOverrides=",">
<if test="entity.partnerId != null">partner_id = #{entity.partnerId},</if>
<if test="entity.storeName != null">store_name = #{entity.storeName},</if>
<if test="entity.storeId != null">store_id = #{entity.storeId},</if>
<if test="entity.experienceStartTime != null">experience_start_time = #{entity.experienceStartTime},</if>
<if test="entity.experienceEndTime != null">experience_end_time = #{entity.experienceEndTime},</if>
<if test="entity.experienceStatus != null">experience_status = #{entity.experienceStatus},</if>
<if test="entity.abandonCause != null">abandon_cause = #{entity.abandonCause},</if>
</trim>
</insert>
<update id="updateStatus">
update

2
coolstore-partner-service/src/main/java/com/cool/store/service/impl/IntentAgreementServiceImpl.java
View File

@@ -55,7 +55,7 @@ public class IntentAgreementServiceImpl implements IntentAgreementService {
if (Objects.isNull(lineInfoDO)){
throw new ServiceException(ErrorCodeEnum.INTERVIEW_PARTNER_NOT_EXIST);
}
lineInfoDO.setWorkflowSubStageStatus(WorkflowSubStageStatusEnum.SIGN_INTENT_AGREEMENT_60.getCode());
lineInfoDO.setWorkflowSubStageStatus(WorkflowSubStageStatusEnum.SIGN_INTENT_AGREEMENT_63.getCode());
lineInfoMapper.updateByPrimaryKeySelective(lineInfoDO);
return Boolean.TRUE;

9
coolstore-partner-service/src/main/java/com/cool/store/service/impl/TrainingExperienceServiceImpl.java
View File

@@ -4,6 +4,7 @@ import com.cool.store.entity.LeaseBaseInfoDO;
import com.cool.store.entity.LineInfoDO;
import com.cool.store.enums.ErrorCodeEnum;
import com.cool.store.enums.ExperienceStatusEnum;
import com.cool.store.enums.WorkflowSubStageEnum;
import com.cool.store.enums.WorkflowSubStageStatusEnum;
import com.cool.store.exception.ServiceException;
import com.cool.store.mapper.LineInfoMapper;
@@ -31,6 +32,7 @@ public class TrainingExperienceServiceImpl implements TrainingExperienceService
LineInfoMapper lineInfoMapper;
@Override
@Transactional(rollbackFor = Exception.class)
public boolean distribution(TrainingExperienceDistributionRequest request) {
if (Objects.isNull(request)) {
return Boolean.FALSE;
@@ -38,7 +40,12 @@ public class TrainingExperienceServiceImpl implements TrainingExperienceService
if (Objects.isNull(request.getLineId())) {
throw new ServiceException(INTERVIEW_LINE_ID_IS_NULL);
}
trainingExperienceMapper.insert(request.toLeaseBaseInfoDO());
LeaseBaseInfoDO leaseBaseInfoDO = request.toLeaseBaseInfoDO();
trainingExperienceMapper.insert(leaseBaseInfoDO);
LineInfoDO lineInfoDO = new LineInfoDO();
lineInfoDO.setWorkflowSubStage(WorkflowSubStageEnum.SIGN_INTENT_AGREEMENT.getCode());
lineInfoDO.setId(request.getLineId());
lineInfoMapper.updateByPrimaryKey(lineInfoDO);
return true;
}

18
coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCLineInterviewController.java
View File

@@ -8,17 +8,22 @@ import com.cool.store.request.LineInterviewPageRequest;
import com.cool.store.request.ModifyInterviewerRequest;
import com.cool.store.response.ResponseResult;
import com.cool.store.service.LineInterviewService;
import com.cool.store.vo.interview.AppointmentTimeVO;
import com.cool.store.vo.interview.EnterInterviewVO;
import com.cool.store.vo.interview.InterviewDetailVO;
import com.cool.store.vo.interview.LineInterviewPageVO;
import com.github.pagehelper.PageInfo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.format.annotation.DateTimeFormat;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.time.LocalDate;
import java.util.List;
/**
@@ -36,6 +41,19 @@ public class PCLineInterviewController {
@Resource
private LineInterviewService lineInterviewService;
@ApiOperation("获取面试/面谈 预约时间")
@GetMapping("/appointment/time")
@ApiImplicitParams({
@ApiImplicitParam(name = "lineId", value = "线索id", required = true),
@ApiImplicitParam(name = "interviewType", value = "面试类型:0面谈;1面试", required = true),
@ApiImplicitParam(name = "appointmentDate", value = "预约日期 yyyy-MM-dd", required = true)
})
public ResponseResult<List<AppointmentTimeVO>> getAppointmentTime(@RequestParam("lineId")Long lineId,
@RequestParam("interviewType")Integer interviewType,
@RequestParam("appointmentDate") @DateTimeFormat(pattern = "yyyy-MM-dd") LocalDate appointmentDate) {
return ResponseResult.success(lineInterviewService.getAppointmentTime(lineId, interviewType, appointmentDate));
}
@ApiOperation("修改面审时间")
@PostMapping("/appointment/time/modify")
public ResponseResult<Boolean> modifyAppointmentTime(@RequestBody @Validated AppointmentTimeRequest request) {

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

@@ -23,7 +23,7 @@ public class PCTrainingExperienceController {
@Resource
TrainingExperienceService trainingExperienceService;
@ApiOperation("实训体验分配")
@ApiOperation("实训体验分配或更新")
@PostMapping("/distribution")
public ResponseResult<Boolean> distribution(@RequestBody TrainingExperienceDistributionRequest request) {
return ResponseResult.success(trainingExperienceService.distribution(request));