From c3cca6f27a02ffd0ea4e9d5842512d686cf9f13b Mon Sep 17 00:00:00 2001 From: pserimal Date: Tue, 20 Jun 2023 19:14:34 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E9=9D=A2=E8=AF=95=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E5=A2=9E=E5=8A=A0=E5=BC=80=E5=8F=91=E4=B8=BB=E7=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cool/store/mapper/HyPartnerLineInfoMapper.java | 7 +++++++ .../store/request/QueryByInterviewPlanIdReq.java | 5 ++++- .../cool/store/service/impl/FlowServiceImpl.java | 5 +++-- .../store/service/impl/InterviewServiceImpl.java | 13 +++++++++++++ 4 files changed, 27 insertions(+), 3 deletions(-) diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerLineInfoMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerLineInfoMapper.java index e5211aff6..dd6d151dd 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerLineInfoMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerLineInfoMapper.java @@ -205,4 +205,11 @@ public interface HyPartnerLineInfoMapper { * @return */ List getLineFollowHistoryList(String partnerId); + + /** + * 根据面试计划 id 查询战区 id + * @param interviewPlanId + * @return + */ + String getAffiliationZoneIdByInterviewPlanId(String interviewPlanId); } \ No newline at end of file diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/QueryByInterviewPlanIdReq.java b/coolstore-partner-model/src/main/java/com/cool/store/request/QueryByInterviewPlanIdReq.java index d07045f40..08be52e8c 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/QueryByInterviewPlanIdReq.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/QueryByInterviewPlanIdReq.java @@ -12,6 +12,9 @@ import lombok.Data; @Data @ApiModel public class QueryByInterviewPlanIdReq { - @ApiModelProperty("会议编号") + @ApiModelProperty("会议计划编号") private String interviewPlanId; + + @ApiModelProperty(value = "是否是需要查询战区主管的页面", required = true) + private Boolean needDevelopmentDirector; } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FlowServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FlowServiceImpl.java index 7b2c13f50..1e0574756 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FlowServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FlowServiceImpl.java @@ -277,12 +277,13 @@ public class FlowServiceImpl implements FlowService { //上传 OSS String passImageUrl = ossServer.uploadFileServer(inputStream, "passLetter/" + passCode + ".png"); //计算有效期截止日期 - DateTime expiryDate = DateUtil.offsetDay(passTime, 60); + Date expiryDate = DateUtil.offsetDay(passTime, 60); + expiryDate = DateUtil.endOfDay(expiryDate); HyPartnerInterviewDO interviewDO = new HyPartnerInterviewDO(); interviewDO.setId(Long.parseLong(interviewId)); interviewDO.setPassCode(passCode); interviewDO.setPassTime(passTime); - interviewDO.setExpiryDate(expiryDate); + interviewDO.setExpiryDate(DateUtil.formatDateTime(expiryDate)); interviewDO.setPassPdfUrl(passPdfUrl); interviewDO.setPassImageUrl(passImageUrl); hyPartnerInterviewMapper.updateByPrimaryKeySelective(interviewDO); diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/InterviewServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/InterviewServiceImpl.java index 5fd2779d8..d8f9abed6 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/InterviewServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/InterviewServiceImpl.java @@ -8,6 +8,7 @@ import com.cool.store.dto.calendar.UpdateCalendarEventDTO; import com.cool.store.dto.calendar.UserCalendarsEventDTO; import com.cool.store.dto.message.SendCardMessageDTO; import com.cool.store.dto.partner.EnterInterviewDto; +import com.cool.store.entity.EnterpriseUserDO; import com.cool.store.entity.HyPartnerInterviewDO; import com.cool.store.entity.HyPartnerInterviewPlanDO; import com.cool.store.entity.HyPartnerLineInfoDO; @@ -18,10 +19,12 @@ import com.cool.store.enums.WorkflowStatusEnum; import com.cool.store.exception.ApiException; import com.cool.store.exception.ServiceException; import com.cool.store.http.ISVHttpRequest; +import com.cool.store.mapper.EnterpriseUserMapper; import com.cool.store.mapper.HyPartnerInterviewMapper; import com.cool.store.mapper.HyPartnerInterviewPlanMapper; import com.cool.store.mapper.HyPartnerLineInfoMapper; import com.cool.store.request.*; +import com.cool.store.service.EnterpriseUserService; import com.cool.store.service.HyPartnerInterviewPlanService; import com.cool.store.service.InterviewService; import com.cool.store.utils.StringUtil; @@ -68,6 +71,10 @@ public class InterviewServiceImpl implements InterviewService { @Autowired private HyPartnerLineInfoMapper hyPartnerLineInfoMapper; + + @Autowired + private EnterpriseUserService enterpriseUserService; + @Override public List getInterviewList(GetInterviewListReq request) { List interviewList = hyPartnerInterviewPlanMapper.getInterviewList(request); @@ -95,6 +102,12 @@ public class InterviewServiceImpl implements InterviewService { if (request.getNeedDevelopmentDirector() != null && request.getNeedDevelopmentDirector()) { //查询所属战区 String affiliationZoneId = hyPartnerLineInfoMapper.getAffiliationZoneIdByInterviewPlanId(interviewPlanId); + if (affiliationZoneId == null) { + return vo; + } + //查询开发主管 + EnterpriseUserDO development = enterpriseUserService.getDevelopmentByZoneId(Long.parseLong(affiliationZoneId)); + vo.setDevelopmentDirector(development); } return vo; }