diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestBaseController.java b/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestBaseController.java index ee2e2ac17..d3abfb8de 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestBaseController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestBaseController.java @@ -92,6 +92,8 @@ public class InvestBaseController extends BaseController { try { if (StringUtils.isBlank(text)) { setValue(null); + } else if (StringUtils.equals("undefined", text)) { + InvestHelper.throwException(ErrorCode.SYS_PARAMETER_ERROR, text); } else { setValue(InvestHelper.codeOf(clz, text)); } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/invest/InvestRemindEntity.java b/mallinkService/src/main/java/com/iformall/domain/po/invest/InvestRemindEntity.java index 28dc0cbe3..ca8462c27 100755 --- a/mallinkService/src/main/java/com/iformall/domain/po/invest/InvestRemindEntity.java +++ b/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 com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; 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; /** * 结束时间 */ - @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; } diff --git a/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestBizServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestBizServiceImpl.java index 73162dc1f..a07f85d16 100644 --- a/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestBizServiceImpl.java +++ b/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 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 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 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