From c4664502dfdaffff555b532e65b51a57ac8b29c2 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 16 十月 2024 17:51:32 +0800
Subject: [PATCH] 合并代码
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TActivityServiceImpl.java | 26 +++++++++++++++++++++++++-
1 files changed, 25 insertions(+), 1 deletions(-)
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TActivityServiceImpl.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TActivityServiceImpl.java
index 619bf1e..d6de6b8 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TActivityServiceImpl.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TActivityServiceImpl.java
@@ -1,10 +1,16 @@
package com.ruoyi.other.service.impl;
-import com.ruoyi.other.model.TActivity;
+import com.ruoyi.common.core.web.page.PageInfo;
+import com.ruoyi.other.api.domain.TActivity;
+import com.ruoyi.other.api.domain.TAdvertising;
+import com.ruoyi.other.api.dto.AdvertisingDTO;
import com.ruoyi.other.mapper.TActivityMapper;
import com.ruoyi.other.service.TActivityService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
+
+import java.time.LocalDateTime;
+import java.util.List;
/**
* <p>
@@ -17,4 +23,22 @@
@Service
public class TActivityServiceImpl extends ServiceImpl<TActivityMapper, TActivity> implements TActivityService {
+ @Override
+ public PageInfo<TActivity> pageList(AdvertisingDTO dto) {
+
+ PageInfo<TActivity> pageInfo = new PageInfo<>(dto.getPageCurr(),dto.getPageSize());
+ List<TActivity> list = this.baseMapper.pageList(pageInfo,dto);
+ for (TActivity tAdvertising : list) {
+ // 如果开始时间大于当前时间 那么设置状态startState为1 未开始
+ if (tAdvertising.getStartTime().isAfter(LocalDateTime.now())) {
+ tAdvertising.setStartState(1);
+ } else if (tAdvertising.getEndTime().isBefore(LocalDateTime.now())) {
+ tAdvertising.setStartState(3);
+ } else {
+ tAdvertising.setStartState(2);
+ }
+ }
+ pageInfo.setRecords(list);
+ return pageInfo;
+ }
}
--
Gitblit v1.7.1