From 3a6fba176198e4565806b55d0bb245d002be41e6 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 07 二月 2024 15:39:03 +0800
Subject: [PATCH] 修改bug
---
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserActivityRegisteredServiceImpl.java | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserActivityRegisteredServiceImpl.java b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserActivityRegisteredServiceImpl.java
index ccc707a..448a51d 100644
--- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserActivityRegisteredServiceImpl.java
+++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserActivityRegisteredServiceImpl.java
@@ -4,6 +4,7 @@
import com.stylefeng.guns.modular.system.dao.UserActivityRegisteredMapper;
import com.stylefeng.guns.modular.system.model.UserActivityRegistered;
import com.stylefeng.guns.modular.system.service.IUserActivityRegisteredService;
+import com.stylefeng.guns.modular.system.util.DateUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -29,7 +30,18 @@
* @throws Exception
*/
@Override
- public List<Map<String, Object>> query(Integer companyId) throws Exception {
- return userActivityRegisteredMapper.query(companyId);
+ public List<Map<String, Object>> query(Integer language, Integer companyId) throws Exception {
+ List<Map<String, Object>> query = userActivityRegisteredMapper.query(companyId);
+ for (Map<String, Object> map : query) {
+ if(null != map.get("startTime")){
+ String startTime = map.get("startTime").toString();
+ map.put("startTime", DateUtil.conversionFormat(language, startTime));
+ }
+ if(null != map.get("endTime")){
+ String endTime = map.get("endTime").toString();
+ map.put("endTime", DateUtil.conversionFormat(language, endTime));
+ }
+ }
+ return query;
}
}
--
Gitblit v1.7.1