Commit 13de239b by 王祖波

toJDKDate

parent b098c00e
...@@ -179,7 +179,7 @@ public class ContactFollowServiceImpl implements ContactFollowService { ...@@ -179,7 +179,7 @@ public class ContactFollowServiceImpl implements ContactFollowService {
Page<MemberSmsLogDTO> smsPage = new Page<>(); Page<MemberSmsLogDTO> smsPage = new Page<>();
smsPage.setCurrentPage(1); smsPage.setCurrentPage(1);
smsPage.setPageSize(sizeTotal); smsPage.setPageSize(sizeTotal);
Page<MemberSmsLogDTO> smsRes = smsService.memberSmsLogPage(enterpriseId, memberId, null, DateUtil.beginOfDay(startTime), DateUtil.endOfDay(date), smsPage); Page<MemberSmsLogDTO> smsRes = smsService.memberSmsLogPage(enterpriseId, memberId, null, DateUtil.beginOfDay(startTime).toJdkDate(), DateUtil.endOfDay(date).toJdkDate(), smsPage);
if (smsRes != null && CollectionUtils.isNotEmpty(smsRes.getResult())) { if (smsRes != null && CollectionUtils.isNotEmpty(smsRes.getResult())) {
convertSmsFollow(enterpriseId, smsRes.getResult(), list); convertSmsFollow(enterpriseId, smsRes.getResult(), list);
} }
...@@ -247,7 +247,7 @@ public class ContactFollowServiceImpl implements ContactFollowService { ...@@ -247,7 +247,7 @@ public class ContactFollowServiceImpl implements ContactFollowService {
convertAiFollow(enterpriseId, aiRes.getResult(), followDTOList); convertAiFollow(enterpriseId, aiRes.getResult(), followDTOList);
} }
List<MemberSmsLogDTO> smsList = smsService.lastMemberSmsLog(enterpriseId, memberIdList, null, DateUtil.beginOfDay(startTime), DateUtil.endOfDay(date), new HashMap<>()); List<MemberSmsLogDTO> smsList = smsService.lastMemberSmsLog(enterpriseId, memberIdList, null, DateUtil.beginOfDay(startTime).toJdkDate(), DateUtil.endOfDay(date).toJdkDate(), new HashMap<>());
convertSmsFollow(enterpriseId, smsList, followDTOList); convertSmsFollow(enterpriseId, smsList, followDTOList);
Map<String, ContactFollowDTO> map = followDTOList.stream() Map<String, ContactFollowDTO> map = followDTOList.stream()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment