From 9d2babb8bb99d55d76eab0558fd9f510652b270c Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期二, 11 六月 2024 15:16:17 +0800
Subject: [PATCH] 6.11
---
ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/GeneralizationActivityController.java | 31 +++++++++++++++++++++++++++++--
1 files changed, 29 insertions(+), 2 deletions(-)
diff --git a/ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/GeneralizationActivityController.java b/ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/GeneralizationActivityController.java
index d0eded6..a248a86 100644
--- a/ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/GeneralizationActivityController.java
+++ b/ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/GeneralizationActivityController.java
@@ -36,7 +36,9 @@
import java.awt.image.BufferedImage;
import java.io.*;
import java.text.SimpleDateFormat;
+import java.time.LocalDate;
import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
@@ -121,7 +123,32 @@
endTime = timeArray[1];
}
Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
- page.setRecords(activityGeneralizationService.getList(page,beginTime,endTime,activityName,state));
+ List<Map<String, Object>> list = activityGeneralizationService.getList(page, beginTime, endTime, activityName, state);
+
+ DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+ LocalDate currentDate = LocalDate.now();
+ for (Map<String, Object> item : list) {
+ String timeRangeStr = (String) item.get("time");
+ if (timeRangeStr != null && !timeRangeStr.isEmpty()) {
+ String[] range = timeRangeStr.split(" — ");
+ LocalDate startDate = LocalDate.parse(range[0], formatter);
+ LocalDate endDate = LocalDate.parse(range[1], formatter);
+
+ // 判断当前日期是否在范围内
+ int newState;
+ if (currentDate.isBefore(startDate)) {
+ newState = 2;
+ } else if (currentDate.isAfter(endDate)) {
+ newState = 3;
+ } else {
+ newState = 1;
+ }
+
+ // 更新状态
+ item.put("state", newState);
+ }
+ }
+ page.setRecords(list);
return super.packForBT(page);
}
@@ -149,7 +176,7 @@
MyQrCodeUtil.createCodeToFile("https://weilaigo.cn/qrCodeShare?id=" + tActivityGeneralization.getId());
BufferedImage qrCodeImage = QRCodeUtil.createImage("https://weilaigo.cn/qrCodeShare?id=" + tActivityGeneralization.getId());
MultipartFile qrCodeFile = convert(qrCodeImage, new Date().getTime()+ UUIDUtil.getRandomCode(3)+".PNG");
- String picture = OssUploadUtil.ossUpload(qrCodeFile);
+ String picture = OssUploadUtil.ossUpload1(qrCodeFile);
System.err.println("二维码："+ picture);
tActivityGeneralization.setQrCode(picture);
activityGeneralizationService.updateById(tActivityGeneralization);
--
Gitblit v1.7.1