|
@@ -3,6 +3,7 @@ package com.simuwang.manage.service.impl;
|
|
|
import com.simuwang.base.common.enums.ParseStatus;
|
|
|
import com.simuwang.base.common.support.MybatisPage;
|
|
|
import com.simuwang.base.common.util.DateUtils;
|
|
|
+import com.simuwang.base.common.util.StringUtil;
|
|
|
import com.simuwang.base.mapper.EmailFileInfoMapper;
|
|
|
import com.simuwang.base.mapper.EmailParseInfoMapper;
|
|
|
import com.simuwang.base.mapper.EmailTypeRuleMapper;
|
|
@@ -76,7 +77,10 @@ public class ParseEmailServiceImpl implements ParseEmailService {
|
|
|
|
|
|
@Override
|
|
|
public MybatisPage<EmailParseInfoVO> searchEmailList(EmailParseQuery emailParseQuery){
|
|
|
- if(!emailParseQuery.getTimeRange().equals(TimeRange.Custom)){
|
|
|
+ if(emailParseQuery.getTimeRange().equals(TimeRange.FromSetup)){
|
|
|
+ emailParseQuery.setEndDate(DateUtils.getAroundToday(1));
|
|
|
+ }
|
|
|
+ if(!emailParseQuery.getTimeRange().equals(TimeRange.Custom) && !emailParseQuery.getTimeRange().equals(TimeRange.FromSetup)){
|
|
|
emailParseQuery.setEndDate(DateUtils.getAroundToday(1));
|
|
|
emailParseQuery.setStartDate( DateUtil.RangeTime(emailParseQuery.getTimeRange().getFloatDateSymbel(),DateUtil.getTodayDate()));
|
|
|
}else{
|
|
@@ -84,7 +88,8 @@ public class ParseEmailServiceImpl implements ParseEmailService {
|
|
|
emailParseQuery.setEndDate(DateUtil.getAroundDate(DateUtils.parse(emailParseQuery.getEndDate(),DateUtils.YYYY_MM_DD),1));
|
|
|
}
|
|
|
List<EmailParseInfoDO> emailParseInfoDOList = emailParseInfoMapper.searchEmailList(emailParseQuery);
|
|
|
- List<EmailParseInfoVO> emailParseInfoVOList = emailParseInfoDOList.stream().map(EmailParseInfoDO::toVO).collect(Collectors.toList());
|
|
|
+ List<EmailParseInfoVO> emailParseInfoVOList = emailParseInfoDOList.stream()
|
|
|
+ .map(EmailParseInfoDO::toVO).collect(Collectors.toList());
|
|
|
for(EmailParseInfoVO vo : emailParseInfoVOList){
|
|
|
List<EmailFileInfoDO> emailFileInfoList = emailFileInfoMapper.queryByEmailId(vo.getId());
|
|
|
List<EmailFileInfoVO> emailFileInfoVOList = emailFileInfoList.stream().map(EmailFileInfoDO::toVO).collect(Collectors.toList());
|