diff --git a/vetti-admin/src/main/java/com/vetti/web/controller/hotake/HotakeRolesInfoController.java b/vetti-admin/src/main/java/com/vetti/web/controller/hotake/HotakeRolesInfoController.java index 5b97676..00799cc 100644 --- a/vetti-admin/src/main/java/com/vetti/web/controller/hotake/HotakeRolesInfoController.java +++ b/vetti-admin/src/main/java/com/vetti/web/controller/hotake/HotakeRolesInfoController.java @@ -1,5 +1,6 @@ package com.vetti.web.controller.hotake; +import cn.hutool.core.collection.CollectionUtil; import com.vetti.common.annotation.Log; import com.vetti.common.core.controller.BaseController; import com.vetti.common.core.domain.AjaxResult; @@ -107,5 +108,21 @@ public class HotakeRolesInfoController extends BaseController return R.ok(hotakeRolesInfoService.saveHotakeRolesInfo(hotakeRolesInfo)); } + /** + * 获取岗位信息详细信息(UUID) + */ + @ApiOperation("获取岗位信息详细信息(UUID)") + @GetMapping(value = "/interview/{uuid}") + public R getInfoUuid(@PathVariable("uuid") String uuid) + { + HotakeRolesInfo query = new HotakeRolesInfo(); + query.setUuid(uuid); + List list = hotakeRolesInfoService.selectHotakeRolesInfoList(query); + Long id = 0L; + if(CollectionUtil.isNotEmpty(list)){ + id = list.get(0).getId(); + } + return R.ok(hotakeRolesInfoService.selectHotakeRolesInfoDtoById(id)); + } } diff --git a/vetti-hotakes/src/main/java/com/vetti/hotake/domain/dto/roleDto/RoleBenefitsDto.java b/vetti-hotakes/src/main/java/com/vetti/hotake/domain/dto/roleDto/RoleBenefitsDto.java index e3f5673..413a8be 100644 --- a/vetti-hotakes/src/main/java/com/vetti/hotake/domain/dto/roleDto/RoleBenefitsDto.java +++ b/vetti-hotakes/src/main/java/com/vetti/hotake/domain/dto/roleDto/RoleBenefitsDto.java @@ -14,6 +14,9 @@ import lombok.experimental.Accessors; @Accessors(chain = true) public class RoleBenefitsDto { - @ApiModelProperty("福利Key") + @ApiModelProperty("福利Key/自定义") private String keyValue; + + @ApiModelProperty("standard:标准福利,customize:自定义") + private String type; } diff --git a/vetti-hotakes/src/main/java/com/vetti/hotake/service/impl/HotakeRolesInfoServiceImpl.java b/vetti-hotakes/src/main/java/com/vetti/hotake/service/impl/HotakeRolesInfoServiceImpl.java index 408a5c7..6180f35 100644 --- a/vetti-hotakes/src/main/java/com/vetti/hotake/service/impl/HotakeRolesInfoServiceImpl.java +++ b/vetti-hotakes/src/main/java/com/vetti/hotake/service/impl/HotakeRolesInfoServiceImpl.java @@ -71,6 +71,9 @@ public class HotakeRolesInfoServiceImpl extends BaseServiceImpl implements IHota public HotakeRolesInfoDto selectHotakeRolesInfoDtoById(Long id) { HotakeRolesInfoDto dto = new HotakeRolesInfoDto(); HotakeRolesInfo hotakeRolesInfo = hotakeRolesInfoMapper.selectHotakeRolesInfoById(id); + if(hotakeRolesInfo == null){ + throw new ServiceException(MessageUtils.messageCustomize("HotakeRolesInfoServiceImpl10001")); + } BeanUtil.copyProperties(hotakeRolesInfo, dto); if(hotakeRolesInfo != null) { @@ -274,6 +277,7 @@ public class HotakeRolesInfoServiceImpl extends BaseServiceImpl implements IHota }else{ rolesInfo.setCertificationsLicensesJson(""); } + rolesInfo.setAcceptEquivalentWorkFlag(hotakeRolesInfo.getAcceptEquivalentWorkFlag()); } if(RoleOperStepsEnum.STEPS_3.getCode().equals(hotakeRolesInfo.getOperStep())){ rolesInfo.setDescriptionTone(hotakeRolesInfo.getDescriptionTone()); @@ -292,10 +296,11 @@ public class HotakeRolesInfoServiceImpl extends BaseServiceImpl implements IHota } if(RoleOperStepsEnum.STEPS_5.getCode().equals(hotakeRolesInfo.getOperStep())){ - + rolesInfo.setAiScreeningVideoFlag(hotakeRolesInfo.getAiScreeningVideoFlag()); + rolesInfo.setVideoId(hotakeRolesInfo.getVideoId()); + rolesInfo.setSpeechSpeed(hotakeRolesInfo.getSpeechSpeed()); } if(RoleOperStepsEnum.STEPS_6.getCode().equals(hotakeRolesInfo.getOperStep())){ - if (CollectionUtil.isNotEmpty(hotakeRolesInfo.getPublishingChannelsList())){ String publishingChannelsJson = JSONUtil.toJsonStr(hotakeRolesInfo.getPublishingChannelsList()); rolesInfo.setPublishingChannelsJson(publishingChannelsJson); @@ -309,10 +314,18 @@ public class HotakeRolesInfoServiceImpl extends BaseServiceImpl implements IHota //默认是编辑中状态 if(StrUtil.isEmpty(hotakeRolesInfo.getStatus())){ rolesInfo.setStatus(RoleStatusEnum.EDITING.getCode()); + }else{ + rolesInfo.setStatus(hotakeRolesInfo.getStatus()); + } + if(StrUtil.isNotEmpty(hotakeRolesInfo.getDataType())){ + rolesInfo.setDataType(hotakeRolesInfo.getDataType()); + } + if(StrUtil.isNotEmpty(hotakeRolesInfo.getLanguages())){ + rolesInfo.setLanguages(hotakeRolesInfo.getLanguages()); + } + if(StrUtil.isNotEmpty(hotakeRolesInfo.getOperStep())){ + rolesInfo.setOperStep(hotakeRolesInfo.getOperStep()); } - rolesInfo.setDataType(hotakeRolesInfo.getDataType()); - rolesInfo.setLanguages(hotakeRolesInfo.getLanguages()); - rolesInfo.setOperStep(hotakeRolesInfo.getOperStep()); rolesInfo.setRecruiterId(SecurityUtils.getUserId()); fill(FillTypeEnum.UPDATE.getCode(), rolesInfo); hotakeRolesInfoMapper.updateAllHotakeRolesInfo(rolesInfo); diff --git a/vetti-hotakes/src/main/resources/mapper/hotake/HotakeRolesInfoMapper.xml b/vetti-hotakes/src/main/resources/mapper/hotake/HotakeRolesInfoMapper.xml index 42ab9c8..73cab35 100644 --- a/vetti-hotakes/src/main/resources/mapper/hotake/HotakeRolesInfoMapper.xml +++ b/vetti-hotakes/src/main/resources/mapper/hotake/HotakeRolesInfoMapper.xml @@ -274,8 +274,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" application_deadline = #{applicationDeadline}, posted = #{posted}, - aiScreeningVideoFlag = #{ai_screening_video_flag}, - videoId = #{video_id}, + ai_screening_video_flag = #{aiScreeningVideoFlag}, + video_id = #{videoId}, speech_speed = #{speechSpeed}, languages = #{languages},