From 4e6c2d6d39609ba2288c28c1d017e4f4e000375e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Wed, 28 Jun 2023 11:12:58 +0800 Subject: [PATCH] idCard --- .../java/com/cool/store/utils/CoolDateUtils.java | 14 ++++++++++++-- .../resources/mapper/HyPartnerLineInfoMapper.xml | 5 ++++- .../dto/partner/PartnerLineInfoAndBaseInfoDTO.java | 4 ++++ .../cool/store/service/impl/DeskServiceImpl.java | 2 +- .../service/impl/HyPartnerLineInfoServiceImpl.java | 3 ++- 5 files changed, 23 insertions(+), 5 deletions(-) diff --git a/coolstore-partner-common/src/main/java/com/cool/store/utils/CoolDateUtils.java b/coolstore-partner-common/src/main/java/com/cool/store/utils/CoolDateUtils.java index 1d98c27ac..4aecc64d6 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/utils/CoolDateUtils.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/utils/CoolDateUtils.java @@ -46,8 +46,8 @@ public class CoolDateUtils { * @param day * @return */ - public static Date getDateFormatDayMinTime(int day){ - LocalDate today = LocalDate.now(); + public static Date getDateFormatDayMinTime(Date date,int day){ + LocalDate today = date.toInstant().atZone(ZoneId.systemDefault()).toLocalDate(); LocalDate thirdDay = today.plusDays(day); LocalDateTime thirdDayMidnight = LocalDateTime.of(thirdDay, LocalTime.MIDNIGHT); LocalDateTime thirdDay235959 = thirdDayMidnight.with(LocalTime.MIN); @@ -55,6 +55,16 @@ public class CoolDateUtils { return Date.from(zonedDateTime.toInstant()); } + public static void main(String[] args) { + // 创建一个Date对象 + Date date = new Date(); + + // 将Date对象转换为LocalDate对象 + LocalDate today = date.toInstant().atZone(ZoneId.systemDefault()).toLocalDate(); + + System.out.println("LocalDate: " + today); + } + /** diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml index 9b6b25876..1aa1949a7 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml @@ -300,6 +300,7 @@ b.user_portrait as user_portrait, b.id as partnerBaseInfoId, b.pass_reason as passCause, + b.id_card as idCard, b.certify_file as certifyFile, b.pass_time as passTime, b.pass_user_id as passUserId, @@ -308,9 +309,11 @@ hpuinfo.accept_adjust_type as acceptAdjustType, hpuinfo.mobile as partnerUserPhone, hpuinfo.username as partnerUserName, - hpuc.channel_name as channelName + hpuc.channel_name as channelName, + hpii.education as education from hy_partner_line_info a left join hy_partner_base_info b on a.id = b.partner_line_id + LEFT JOIN hy_partner_intent_info hpii ON a.id = hpii.partner_line_id LEFT JOIN hy_partner_user_info hpuinfo ON a.partner_id = hpuinfo.partner_id LEFT JOIN hy_partner_user_channel hpuc ON a.user_channel_id = hpuc.channel_id diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/partner/PartnerLineInfoAndBaseInfoDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/partner/PartnerLineInfoAndBaseInfoDTO.java index 804717a70..bb9c5bd3b 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/partner/PartnerLineInfoAndBaseInfoDTO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/dto/partner/PartnerLineInfoAndBaseInfoDTO.java @@ -78,4 +78,8 @@ public class PartnerLineInfoAndBaseInfoDTO { private Integer acceptAdjustType; private String channelName; + + private String idCard; + + private String education; } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java index 4d67d15dd..5efb7d1bb 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java @@ -65,7 +65,7 @@ public class DeskServiceImpl implements DeskService { //查询面试数量 String currentDate = DateUtil.format(dateTime, CoolDateUtils.DATE_FORMAT_DAY); - String startTime = DateUtil.format(CoolDateUtils.getDateFormatDayMinTime(1), CoolDateUtils.DATE_FORMAT_SEC); + String startTime = DateUtil.format(CoolDateUtils.getDateFormatDayMinTime(dateTime,1), CoolDateUtils.DATE_FORMAT_SEC); String endTime = DateUtil.format(CoolDateUtils.getDateFormatDay(7), CoolDateUtils.DATE_FORMAT_SEC); SpecialDateRangeInterviewCountDTO interviewCount = hyPartnerInterviewPlanDAO.getInterviewCount(userId, currentDate, startTime, endTime); diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java index ca6c2236f..47d948af6 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java @@ -99,7 +99,6 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService { throw new ServiceException(ErrorCodeEnum.LINE_ID_IS_NOT_EXIST); } PartnerLineInfoAndBaseInfoVO partnerLineInfoAndBaseInfoVO = convertPartnerLineInfoAndBaseInfoDTOToVo(partnerLineInfoAndBaseInfoDTO); - EnterpriseUserDO userInfo = enterpriseUserDAO.getUserInfoById(partnerLineInfoAndBaseInfoDTO.getPassUserId()); if (userInfo!=null){ partnerLineInfoAndBaseInfoVO.setPassUserName(userInfo.getName()); @@ -716,11 +715,13 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService { partnerLineInfoAndBaseInfoVO.setAcceptAdjustType(partnerLineInfoAndBaseInfoDTO.getAcceptAdjustType()); partnerLineInfoAndBaseInfoVO.setWantShopArea(partnerLineInfoAndBaseInfoDTO.getWantShopArea()); partnerLineInfoAndBaseInfoVO.setLiveArea(partnerLineInfoAndBaseInfoDTO.getLiveArea()); + partnerLineInfoAndBaseInfoVO.setIdCard(partnerLineInfoAndBaseInfoDTO.getIdCard()); partnerLineInfoAndBaseInfoVO.setChannelName(partnerLineInfoAndBaseInfoDTO.getChannelName()); if (StringUtil.isNotEmpty(partnerLineInfoAndBaseInfoDTO.getCertifyFile())){ partnerLineInfoAndBaseInfoVO.setPassCertifyFile(JSONObject.parseArray(partnerLineInfoAndBaseInfoDTO.getCertifyFile(), String.class)); } partnerLineInfoAndBaseInfoVO.setPassUserId(partnerLineInfoAndBaseInfoDTO.getPassUserId()); + partnerLineInfoAndBaseInfoVO.setEducation(partnerLineInfoAndBaseInfoDTO.getEducation()); partnerLineInfoAndBaseInfoVO.setPassTime(DateUtil.format(partnerLineInfoAndBaseInfoDTO.getPassTime(),CoolDateUtils.DATE_FORMAT_SEC)); return partnerLineInfoAndBaseInfoVO; }