Просмотр исходного кода

[招商][预约提醒]查询时间

release_toaliyun_real
Burce 6 лет назад
Родитель
Сommit
d394283c05
3 измененных файлов: 16 добавлений и 6 удалений
  1. +2
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestBaseController.java
  2. +3
    -2
      mallinkService/src/main/java/com/iformall/domain/po/invest/InvestRemindEntity.java
  3. +11
    -4
      mallinkService/src/main/java/com/iformall/service/invest/impl/InvestBizServiceImpl.java

+ 2
- 0
mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestBaseController.java Просмотреть файл

@@ -92,6 +92,8 @@ public class InvestBaseController extends BaseController {
try { try {
if (StringUtils.isBlank(text)) { if (StringUtils.isBlank(text)) {
setValue(null); setValue(null);
} else if (StringUtils.equals("undefined", text)) {
InvestHelper.throwException(ErrorCode.SYS_PARAMETER_ERROR, text);
} else { } else {
setValue(InvestHelper.codeOf(clz, text)); setValue(InvestHelper.codeOf(clz, text));
} }


+ 3
- 2
mallinkService/src/main/java/com/iformall/domain/po/invest/InvestRemindEntity.java Просмотреть файл

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.TableName;


import java.util.Date; import java.util.Date;


import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;


@@ -49,11 +50,11 @@ public class InvestRemindEntity extends InvestBaseEntity {
/** /**
* 开始时间 * 开始时间
*/ */
@io.swagger.annotations.ApiModelProperty(value = "开始时间", name = "beginDate" ,example = "2018-10-01 12:18:48")
@io.swagger.annotations.ApiModelProperty(value = "开始时间", name = "beginDate" ,example = "2018-10-01")
private Date beginDate; private Date beginDate;
/** /**
* 结束时间 * 结束时间
*/ */
@io.swagger.annotations.ApiModelProperty(value = "结束时间", name = "endDate" ,example = "2018-10-01 12:18:48")
@io.swagger.annotations.ApiModelProperty(value = "结束时间", name = "endDate" ,example = "2018-10-01")
private Date endDate; private Date endDate;
} }

+ 11
- 4
mallinkService/src/main/java/com/iformall/service/invest/impl/InvestBizServiceImpl.java Просмотреть файл

@@ -38,6 +38,7 @@ import org.springframework.web.multipart.MultipartFile;


import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.io.*; import java.io.*;
import java.time.temporal.TemporalAmount;
import java.util.*; import java.util.*;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import java.util.function.Function; import java.util.function.Function;
@@ -595,8 +596,11 @@ public class InvestBizServiceImpl implements InvestBizService {
} }
remindPageQuery.setQueryData(remindQuery); remindPageQuery.setQueryData(remindQuery);
LambdaQueryWrapper<InvestRemindEntity> queryWrapper = new LambdaQueryWrapper<>(); 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); queryWrapper.orderByDesc(InvestRemindEntity::getCreateDate);
InvestPageResult<InvestRemindEntity> recordPage = remindService.queryPage(remindPageQuery, queryWrapper); InvestPageResult<InvestRemindEntity> recordPage = remindService.queryPage(remindPageQuery, queryWrapper);
if (CollectionUtils.isEmpty(recordPage.getRecords())) { if (CollectionUtils.isEmpty(recordPage.getRecords())) {
@@ -633,11 +637,14 @@ public class InvestBizServiceImpl implements InvestBizService {
} }


private String getDayEnd(Date date) { 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) { private String getDayStart(Date date) {
return DateUtils.format(date) + " 00:00:00";
return DateUtils.format(date);
} }


@Override @Override


Загрузка…
Отмена
Сохранить