|
|
|
@@ -38,6 +38,7 @@ import org.springframework.web.multipart.MultipartFile; |
|
|
|
|
|
|
|
import javax.servlet.http.HttpServletResponse; |
|
|
|
import java.io.*; |
|
|
|
import java.time.temporal.TemporalAmount; |
|
|
|
import java.util.*; |
|
|
|
import java.util.concurrent.TimeUnit; |
|
|
|
import java.util.function.Function; |
|
|
|
@@ -595,8 +596,11 @@ public class InvestBizServiceImpl implements InvestBizService { |
|
|
|
} |
|
|
|
remindPageQuery.setQueryData(remindQuery); |
|
|
|
LambdaQueryWrapper<InvestRemindEntity> queryWrapper = new LambdaQueryWrapper<>(); |
|
|
|
queryWrapper.ge(Objects.nonNull(params.getRemindDate()), InvestRemindEntity::getBeginDate, getDayStart(params.getRemindDate())); |
|
|
|
queryWrapper.ge(Objects.nonNull(params.getRemindDate()), InvestRemindEntity::getEndDate, getDayEnd(params.getRemindDate())); |
|
|
|
queryWrapper.eq(InvestRemindEntity::getTenantId,InvestUserContext.getUser().getTenantId()); |
|
|
|
queryWrapper.apply(Objects.nonNull(params.getRemindDate()), |
|
|
|
"date_format(begin_date,'%Y-%m-%d') >= {0} AND date_format(end_date,'%Y-%m-%d') <= {1}" |
|
|
|
, getDayStart(params.getRemindDate()) |
|
|
|
, getDayEnd(params.getRemindDate())); |
|
|
|
queryWrapper.orderByDesc(InvestRemindEntity::getCreateDate); |
|
|
|
InvestPageResult<InvestRemindEntity> recordPage = remindService.queryPage(remindPageQuery, queryWrapper); |
|
|
|
if (CollectionUtils.isEmpty(recordPage.getRecords())) { |
|
|
|
@@ -633,11 +637,14 @@ public class InvestBizServiceImpl implements InvestBizService { |
|
|
|
} |
|
|
|
|
|
|
|
private String getDayEnd(Date date) { |
|
|
|
return DateUtils.format(date) + " 23:59:59"; |
|
|
|
Calendar calendar = Calendar.getInstance(); |
|
|
|
calendar.setTime(date); |
|
|
|
calendar.add(Calendar.DAY_OF_YEAR, 1); |
|
|
|
return DateUtils.format(calendar.getTime()); |
|
|
|
} |
|
|
|
|
|
|
|
private String getDayStart(Date date) { |
|
|
|
return DateUtils.format(date) + " 00:00:00"; |
|
|
|
return DateUtils.format(date); |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
|