diff --git a/coolstore-partner-common/pom.xml b/coolstore-partner-common/pom.xml index 988014f8a..f8d5208ab 100644 --- a/coolstore-partner-common/pom.xml +++ b/coolstore-partner-common/pom.xml @@ -102,7 +102,7 @@ org.icepdf.os icepdf-core - 6.1.2 + 6.2.2 javax.media diff --git a/coolstore-partner-common/src/main/java/com/cool/store/utils/PDFUtils.java b/coolstore-partner-common/src/main/java/com/cool/store/utils/PDFUtils.java index f7ee13f9d..0bb7375f2 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/utils/PDFUtils.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/utils/PDFUtils.java @@ -155,7 +155,7 @@ public class PDFUtils { document.dispose(); return outputStream; } - } catch (PDFException | IOException | PDFSecurityException e) { + } catch (PDFException | IOException | InterruptedException | PDFSecurityException e) { log.error("PDF转图片异常, e{}", e.getMessage()); } finally { try { diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyContentInfoMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyContentInfoMapper.java index dad67e4e1..74d727768 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyContentInfoMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyContentInfoMapper.java @@ -41,9 +41,9 @@ public interface HyContentInfoMapper { /** - * B 端使用的动态查询 + * C 端使用的动态查询 */ - List queryContentListForB(ContentQueryListDto dto); + List queryContentListForC(ContentQueryListDto dto); /** * 根据contentId查询动态详情 diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyContentInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyContentInfoMapper.xml index 4fdbe7136..79d4650d9 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyContentInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyContentInfoMapper.xml @@ -24,7 +24,7 @@ - id, content_title, subject, content_type, cover, content, status, deleted, create_time, update_time, + id, content_title, `subject`, content_type, cover, content, `status`, deleted, create_time, update_time, create_user_id, update_user_id @@ -165,6 +165,7 @@ and update_time <= #{endTime} + order by update_time desc - - select from hy_content_info where deleted = 0 - and status = 1 + and status = 0 and content_title like concat('%', #{contentTitle}, '%') @@ -200,6 +201,7 @@ and update_time <= #{endTime} + order by update_time desc diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewPlanMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewPlanMapper.xml index f776eadab..0ea3b747f 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewPlanMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewPlanMapper.xml @@ -357,13 +357,13 @@ and hpui.mobile like concat('%',#{record.partnerMobile},'%') - and hpip.room_id = #{record.roomId} + and hpip.room_id like concat('%', #{record.roomId}, '%') - and hpui.username like concat('%',#{record.interviewerName},'%') + and eu.name like concat('%',#{record.interviewerName},'%') - and hpui.mobile like concat('%',#{record.interviewerMobile},'%') + and eu.mobile like concat('%',#{record.interviewerMobile},'%') and hpip.room_status = #{record.roomStatus} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/content/ContentQueryTitlesDto.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/content/ContentQueryTitlesDto.java index 90520f6b0..f0d085ade 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/content/ContentQueryTitlesDto.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/dto/content/ContentQueryTitlesDto.java @@ -7,6 +7,6 @@ import lombok.Data; public class ContentQueryTitlesDto { @ApiModelProperty("用户输入标题") - private String tittle; + private String title; } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/job/JobHandler.java b/coolstore-partner-service/src/main/java/com/cool/store/job/JobHandler.java index 1780a81e2..183974e29 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/job/JobHandler.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/job/JobHandler.java @@ -63,18 +63,18 @@ public class JobHandler { } } - @XxlJob("updateAbsentInterview") - public void updateAbsentInterview(){ - try { - log.info("面试缺席定时任务开始"); - hyPartnerInterviewPlanService.updateAbsentInterview(); - log.info("面试缺席定时任务结束"); - XxlJobHelper.handleSuccess(); - }catch (Exception e){ - log.error("面试缺席定时任务异常",e); - XxlJobHelper.log("面试缺席定时任务异常"+e.getMessage()); - } - } +// @XxlJob("updateAbsentInterview") +// public void updateAbsentInterview(){ +// try { +// log.info("面试缺席定时任务开始"); +// hyPartnerInterviewPlanService.updateAbsentInterview(); +// log.info("面试缺席定时任务结束"); +// XxlJobHelper.handleSuccess(); +// }catch (Exception e){ +// log.error("面试缺席定时任务异常",e); +// XxlJobHelper.log("面试缺席定时任务异常"+e.getMessage()); +// } +// } @XxlJob("approvalReminder") public void approvalReminder(){ diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/ContentService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/ContentService.java index 07dc89a78..99ad039cf 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/ContentService.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/ContentService.java @@ -35,6 +35,11 @@ public interface ContentService { */ List queryContentList(ContentQueryListDto dto); + /** + * 查询动态列表 C 端用 + */ + List queryContentListToC(ContentQueryListDto dto); + /** * 查询动态详情 * @param contentId diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ContentServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ContentServiceImpl.java index 844163244..ce827f359 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ContentServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ContentServiceImpl.java @@ -75,7 +75,15 @@ public class ContentServiceImpl implements ContentService { */ @Override public List queryContentList(ContentQueryListDto dto) { - return contentInfoMapper.queryContentListForB(dto); + return contentInfoMapper.queryContentList(dto); + } + + /** + * 查询动态列表 C 端用 + */ + @Override + public List queryContentListToC(ContentQueryListDto dto) { + return contentInfoMapper.queryContentListForC(dto); } /** 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 26a15a63b..706447114 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 @@ -146,7 +146,7 @@ public class FlowServiceImpl implements FlowService { String jobNumber = investmentManager.getJobnumber(); String mobile = investmentManager.getMobile(); DingdingUserDO dingdingUserDO = dingdingUserMapper.selectDingDingUserByMobile(mobile); - if (Objects.isNull(dingdingUserDO) || Objects.isNull(dingdingUserDO.getUserid())) { + if (Objects.isNull(dingdingUserDO) || StringUtils.isEmpty(dingdingUserDO.getUserid())) { throw new ServiceException(ErrorCodeEnum.DINGDING_USER_NOT_EXIST); } rpcRequest.setDingUserId(dingdingUserDO.getUserid()); @@ -158,7 +158,7 @@ public class FlowServiceImpl implements FlowService { if (!Objects.isNull(developmentDirector)) { String mobile = developmentDirector.getMobile(); DingdingUserDO dingdingUserDO = dingdingUserMapper.selectDingDingUserByMobile(mobile); - if (Objects.isNull(dingdingUserDO) || Objects.isNull(dingdingUserDO.getUserid())) { + if (Objects.isNull(dingdingUserDO) || StringUtils.isEmpty(dingdingUserDO.getUserid())) { throw new ServiceException(ErrorCodeEnum.DINGDING_USER_NOT_EXIST); } rpcRequest.getData().setUserSiteDevDingUserId(dingdingUserDO.getUserid()); @@ -217,7 +217,6 @@ public class FlowServiceImpl implements FlowService { } @Override - @Transactional public void qualificationCallback(QualificationCallbackReq request) { log.info("MDM800审批成功回调，request{}", JSONObject.toJSONString(request)); //1. 信息是否完整 @@ -252,6 +251,7 @@ public class FlowServiceImpl implements FlowService { // TODO pass_reason 暂无 Date passDate = new Date(request.getModifiedTime()); //3. 生成通过函并修改数据库相关信息 + //TODO 问题：如果因为 pdf 生成失败或者其他原因导致异常，但是由于 MDM 只是做回调，不对回调是否成功负责，会导致流程信息缺失 genPassLetterAndUpdateDB(partnerName, verifyCity, passDate, interviewId); // TODO 4. 修改流程状态到下一阶段 4 分配选址开发经理 //审核未通过 diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerInterviewPlanServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerInterviewPlanServiceImpl.java index 31c0d1b37..f4aae65c8 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerInterviewPlanServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerInterviewPlanServiceImpl.java @@ -179,11 +179,14 @@ public class HyPartnerInterviewPlanServiceImpl implements HyPartnerInterviewPlan return; } List lineIds = overTimeReserveLineList.stream().map(o -> o.getId()).collect(Collectors.toList()); - List interviewBaseInfoList = hyPartnerInterviewMapper.getInterviewBaseInfoListByLineIds(lineIds); - if(CollectionUtils.isEmpty(interviewBaseInfoList)){ - return; + for (Long lineId : lineIds) { + CloseFollowRequest closeFollowRequest = new CloseFollowRequest(); + closeFollowRequest.setRejectPublicReason("超时未预约"); + closeFollowRequest.setRejectRealReason("超时未预约"); + closeFollowRequest.setLineId(lineId); + closeFollowRequest.setType("overtime_interview"); + hyPartnerLineInfoService.closeOrPassFollow(null,closeFollowRequest); } - handleOverTimeInterview(interviewBaseInfoList,"超时未预约"); } @Override @@ -192,7 +195,7 @@ public class HyPartnerInterviewPlanServiceImpl implements HyPartnerInterviewPlan //更新会议开始时间为5分钟之内的房间状态为开启,会议状态变为已开始 Date startTime = new Date(); - List waitForOpenInterviewLineList = hyPartnerLineInfoMapper.getWaitForOpenInterviewLineList(startTime, DateUtil.offsetMinute(startTime, 5)); + List waitForOpenInterviewLineList = hyPartnerLineInfoMapper.getWaitForOpenInterviewLineList(DateUtil.offsetDay(startTime,-2), DateUtil.offsetMinute(startTime, 5)); if(CollectionUtils.isEmpty(waitForOpenInterviewLineList)){ return; } @@ -248,6 +251,7 @@ public class HyPartnerInterviewPlanServiceImpl implements HyPartnerInterviewPlan for (Long lineId : lineIds) { CloseFollowRequest closeFollowRequest = new CloseFollowRequest(); closeFollowRequest.setRejectPublicReason(rejectPublicReason); + closeFollowRequest.setRejectRealReason(rejectPublicReason); closeFollowRequest.setLineId(lineId); closeFollowRequest.setType("overtime_interview"); hyPartnerLineInfoService.closeOrPassFollow(null,closeFollowRequest); 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 0724c00dd..ee6018f7c 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 @@ -258,6 +258,7 @@ public class InterviewServiceImpl implements InterviewService { record.setId(Long.valueOf(request.getInterviewPlanId())); record.setStartTime(Convert.toDate(request.getNewStartBookingTime())); + record.setInterviewDate(Convert.toDate(request.getNewStartBookingTime())); record.setEndTime(Convert.toDate(request.getNewEndBookingTime())); record.setUpdateTime(new Date()); hyPartnerInterviewPlanMapper.updateByPrimaryKeySelective(record); diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PartnerInterviewServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PartnerInterviewServiceImpl.java index d41148052..0ed14ebcd 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PartnerInterviewServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PartnerInterviewServiceImpl.java @@ -187,6 +187,7 @@ public class PartnerInterviewServiceImpl implements PartnerInterviewService { HyPartnerInterviewPlanDO record = new HyPartnerInterviewPlanDO(); record.setId(Long.valueOf(request.getInterviewPlanId())); record.setStartTime(Convert.toDate(request.getNewStartBookingTime())); + record.setInterviewDate(Convert.toDate(request.getNewStartBookingTime())); record.setEndTime(Convert.toDate(request.getNewEndBookingTime())); record.setUpdateTime(new Date()); interviewPlanMapper.updateByPrimaryKeySelective(record); diff --git a/coolstore-partner-webb/src/main/java/com/cool/store/controller/ContentController.java b/coolstore-partner-webb/src/main/java/com/cool/store/controller/ContentController.java index 39bc4c38a..feaba9dcf 100644 --- a/coolstore-partner-webb/src/main/java/com/cool/store/controller/ContentController.java +++ b/coolstore-partner-webb/src/main/java/com/cool/store/controller/ContentController.java @@ -30,7 +30,7 @@ public class ContentController { @PostMapping("/queryTitles") @ApiOperation("搜索标题是否重复") public ResponseResult queryTitles(@RequestBody ContentQueryTitlesDto title) { - return ResponseResult.success(contentService.queryTitles(title.getTittle())); + return ResponseResult.success(contentService.queryTitles(title.getTitle())); } @PostMapping("/add") diff --git a/coolstore-partner-webc/src/main/java/com/cool/store/controller/ContentController.java b/coolstore-partner-webc/src/main/java/com/cool/store/controller/ContentController.java index 8f4f03976..77e9cd611 100644 --- a/coolstore-partner-webc/src/main/java/com/cool/store/controller/ContentController.java +++ b/coolstore-partner-webc/src/main/java/com/cool/store/controller/ContentController.java @@ -29,7 +29,7 @@ public class ContentController { @ApiOperation("查询动态列表") public ResponseResult> queryContentList(@RequestBody ContentQueryListDto dto) { PageHelper.startPage(dto.getPageNum(), dto.getPageSize()); - List list = contentService.queryContentList(dto); + List list = contentService.queryContentListToC(dto); PageInfo page = new PageInfo<>(list); return ResponseResult.success(page); }