diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerExhibitionDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerExhibitionDAO.java index a14cfdb9b..b9eeb6cad 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerExhibitionDAO.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerExhibitionDAO.java @@ -83,11 +83,11 @@ public class HyPartnerExhibitionDAO { return hyPartnerExhibitionMapper.getExhibitionLine(exhibitionId); } - public List exhibitionLineList(Integer exhibitionId,Integer participationStatus, String partnerUserId,String userId){ + public List exhibitionLineList(Integer exhibitionId,Integer participationStatus, String partnerUserId,String userId,Integer id){ if (exhibitionId == null){ return new ArrayList<>(); } - return hyPartnerExhibitionMapper.exhibitionLineList(exhibitionId,participationStatus, partnerUserId,userId); + return hyPartnerExhibitionMapper.exhibitionLineList(exhibitionId,participationStatus, partnerUserId,userId,id); } public void rejectExhibitionInterview(String partnerLineId) { diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerExhibitionMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerExhibitionMapper.java index 23cc8d553..90810ac11 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerExhibitionMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerExhibitionMapper.java @@ -56,7 +56,7 @@ public interface HyPartnerExhibitionMapper { HyPartnerExhibitionDO querySelective(HyPartnerExhibitionDO record); - List exhibitionLineList(Integer exhibitionId,Integer participationStatus, String partnerUserId,String userId ); + List exhibitionLineList(Integer exhibitionId,Integer participationStatus, String partnerUserId,String userId,Integer id ); /** * 将线索参加的会销面试状态设为不通过 diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerExhibitionMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerExhibitionMapper.xml index 46eaed8e9..c145cbb3e 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerExhibitionMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerExhibitionMapper.xml @@ -119,6 +119,9 @@ and hpui.partner_id = #{partnerUserId,jdbcType=VARCHAR} + + and hpe.id = #{id} + ORDER BY CASE WHEN hpe.participation_status != 7 THEN 1 ELSE 2 END, hpe.create_time DESC diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/EnterInterviewVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/EnterInterviewVO.java index 76f42563d..f533bc6ac 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/EnterInterviewVO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/EnterInterviewVO.java @@ -18,4 +18,6 @@ public class EnterInterviewVO { @ApiModelProperty("加盟商姓名") private String partnerName; + private Long interviewPlanId; + } diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/exhibition/ExhibitionDetailVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/exhibition/ExhibitionDetailVO.java index 9fa5d0dcd..1e11d57fc 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/exhibition/ExhibitionDetailVO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/exhibition/ExhibitionDetailVO.java @@ -24,4 +24,6 @@ public class ExhibitionDetailVO extends ExhibitionVO{ private String exhibitionCode; + private Integer signUpCount; + } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/ExhibitionService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/ExhibitionService.java index 6d53d8762..d29ff05a4 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/ExhibitionService.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/ExhibitionService.java @@ -107,7 +107,7 @@ public interface ExhibitionService { * @param pageNum * @return */ - PageInfo getExhibitionLineList(Integer exhibitionId,Integer participationStatus, String PartnerUserId ,Integer pageSize,Integer pageNum,String userId); + PageInfo getExhibitionLineList(Integer exhibitionId,Integer participationStatus, String PartnerUserId ,Integer pageSize,Integer pageNum,String userId,Integer id); List exhibitionLineBaseList(Integer exhibitionId,String partnerName); diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/exhibition/ExhibitionServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/exhibition/ExhibitionServiceImpl.java index 3c869db91..6dd1a0976 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/exhibition/ExhibitionServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/exhibition/ExhibitionServiceImpl.java @@ -163,6 +163,7 @@ public class ExhibitionServiceImpl implements ExhibitionService { //5. 返回进入面试间所需信息 EnterInterviewVO enterInterviewVO = interviewMapper.getInterviewerByInterviewPlanId(interviewPlan.getId().toString()); enterInterviewVO.setUserSign(trtcUtils.genUserSig(CurrentUserHolder.getUserId())); + enterInterviewVO.setInterviewPlanId(interviewPlan.getId()); return enterInterviewVO; } @@ -289,7 +290,7 @@ public class ExhibitionServiceImpl implements ExhibitionService { .collect(Collectors.toMap(EnterpriseUserDO::getUserId, u -> new CollaboratorVO(u.getUserId(), u.getName()))); - Map StatisticsMap = hyExhibitionDAO.exhibitionStatisticsMap(codeList); + Map statisticsMap = hyExhibitionDAO.exhibitionStatisticsMap(codeList); exhibitionList.forEach(x->{ MyExhibitionVO myExhibitionVO = new MyExhibitionVO(); @@ -307,7 +308,7 @@ public class ExhibitionServiceImpl implements ExhibitionService { }); myExhibitionVO.setCollaborators(coll); } - ExhibitionStatisticsDTO statistics = StatisticsMap.getOrDefault(x.getId(), new ExhibitionStatisticsDTO()); + ExhibitionStatisticsDTO statistics = statisticsMap.getOrDefault(x.getId(), new ExhibitionStatisticsDTO()); myExhibitionVO.setSignUpCount(statistics.getSignUpCount()); myExhibitionVO.setCheckInCount(statistics.getCheckInCount()); myExhibitionVO.setFormFillCount(statistics.getFormFillCount()); @@ -423,6 +424,9 @@ public class ExhibitionServiceImpl implements ExhibitionService { exhibitionDetailVO.setClosedType(hyExhibitionDO.getClosedType()); exhibitionDetailVO.setCreateTime(DateUtil.format(hyExhibitionDO.getCreateTime(), CoolDateUtils.DATE_FORMAT_SEC_7)); exhibitionDetailVO.setCloseTime(DateUtil.format(hyExhibitionDO.getCloseTime(), CoolDateUtils.DATE_FORMAT_SEC_7)); + + Map statisticsMap = hyExhibitionDAO.exhibitionStatisticsMap(Arrays.asList(hyExhibitionDO.getId())); + exhibitionDetailVO.setSignUpCount(statisticsMap.getOrDefault(hyExhibitionDO.getId(), new ExhibitionStatisticsDTO()).getSignUpCount()); if (StringUtils.isNotEmpty(hyExhibitionDO.getCollaborators())) { List userIdList = Arrays.asList(hyExhibitionDO.getCollaborators().substring(1).split(Constants.COMMA)); List userInfoList = enterpriseUserDAO.getUserInfoByUserIds(userIdList); @@ -474,12 +478,12 @@ public class ExhibitionServiceImpl implements ExhibitionService { } @Override - public PageInfo getExhibitionLineList(Integer exhibitionId, Integer participationStatus, String partnerUserId, Integer pageSize, Integer pageNum,String userId) { + public PageInfo getExhibitionLineList(Integer exhibitionId, Integer participationStatus, String partnerUserId, Integer pageSize, Integer pageNum,String userId,Integer id) { if (exhibitionId==null){ throw new ServiceException(ErrorCodeEnum.PARAMS_REQUIRED); } PageHelper.startPage(pageNum, pageSize); - List exhibitionLineDTOS = hyPartnerExhibitionDAO.exhibitionLineList(exhibitionId, participationStatus, partnerUserId,userId); + List exhibitionLineDTOS = hyPartnerExhibitionDAO.exhibitionLineList(exhibitionId, participationStatus, partnerUserId,userId,id); PageInfo pageInfo = new PageInfo<>(exhibitionLineDTOS); if (CollectionUtils.isEmpty(exhibitionLineDTOS)){ return pageInfo; @@ -501,7 +505,6 @@ public class ExhibitionServiceImpl implements ExhibitionService { LineInterviewDTO investment = lineInvestmentMap.getOrDefault(x.getLineId(), new LineInterviewDTO()); BeanUtil.copyProperties(x,exhibitionLineVO); exhibitionLineVO.setChannelName(channelMap.get(x.getChannelId())); - exhibitionLineVO.setId(Integer.valueOf(x.getExhibitionId())); exhibitionLineVO.setWantShopAreaName(x.getWantShopAreaName().replace("/", " ")); exhibitionLineVO.setInvestmentManager(investment.getInvestmentManager()); exhibitionLineVO.setLineStatus(investment.getLineStatus()); diff --git a/coolstore-partner-webb/src/main/java/com/cool/store/controller/ExhibitionController.java b/coolstore-partner-webb/src/main/java/com/cool/store/controller/ExhibitionController.java index 309cf38f2..f1cb11d03 100644 --- a/coolstore-partner-webb/src/main/java/com/cool/store/controller/ExhibitionController.java +++ b/coolstore-partner-webb/src/main/java/com/cool/store/controller/ExhibitionController.java @@ -101,10 +101,11 @@ public class ExhibitionController { public ResponseResult getExhibitionLineList(@RequestParam(required = true,value = "exhibitionId") Integer exhibitionId, @RequestParam(required = false,value = "participationStatus") Integer participationStatus, @RequestParam(required = false,value = "partnerId") String partnerId, + @RequestParam(required = false,value = "id") Integer id, @RequestParam(required = false,value = "pageSize" ,defaultValue = "10") Integer pageSize, @RequestParam(required = false,value = "pageNum",defaultValue = "1") Integer pageNum) { LoginUserInfo user = CurrentUserHolder.getUser(); - return ResponseResult.success(exhibitionService.getExhibitionLineList(exhibitionId,participationStatus,partnerId,pageSize,pageNum,user.getUserId())); + return ResponseResult.success(exhibitionService.getExhibitionLineList(exhibitionId,participationStatus,partnerId,pageSize,pageNum,user.getUserId(),id)); } diff --git a/coolstore-partner-webb/src/test/java/com/cool/store/service/EventRequestTest.java b/coolstore-partner-webb/src/test/java/com/cool/store/service/EventRequestTest.java index 7faa80ef8..ed56d6852 100644 --- a/coolstore-partner-webb/src/test/java/com/cool/store/service/EventRequestTest.java +++ b/coolstore-partner-webb/src/test/java/com/cool/store/service/EventRequestTest.java @@ -99,7 +99,7 @@ class EventRequestTest extends AbstractJUnit4SpringContextTests { randomStr = RandomUtil.randomString(12); testWXUrl = wxUrlPrefix + randomStr; //8. 面试未通过结束 - eventCenterHttpRequest.sendSmsVariable(testPhone, SMSMsgEnum.INTERVIEW_REJECT, "不太行", testWXUrl); + eventCenterHttpRequest.sendSmsVariable(testPhone, SMSMsgEnum.EXHIBITION_CLOSE, "不太行", testWXUrl); } }