From 5dacdee9b54c78372b68140e2b068d03a620eab9 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 02 七月 2025 19:00:52 +0800
Subject: [PATCH] 修改bug
---
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/DriverActivityController.java | 30 ++++++++++++++++--------------
1 files changed, 16 insertions(+), 14 deletions(-)
diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/DriverActivityController.java b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/DriverActivityController.java
index ce56ae3..29d2958 100644
--- a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/DriverActivityController.java
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/DriverActivityController.java
@@ -5,22 +5,21 @@
import com.stylefeng.guns.core.base.controller.BaseController;
import com.stylefeng.guns.core.beetl.ShiroExtUtil;
import com.stylefeng.guns.core.common.constant.factory.PageFactory;
-import com.stylefeng.guns.core.shiro.ShiroKit;
+import com.stylefeng.guns.core.log.LogObjectHolder;
import com.stylefeng.guns.core.shiro.ShiroUser;
import com.stylefeng.guns.core.util.SinataUtil;
import com.stylefeng.guns.modular.system.model.*;
import com.stylefeng.guns.modular.system.service.*;
import com.stylefeng.guns.modular.system.util.DateUtil;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.beans.factory.annotation.Autowired;
-import com.stylefeng.guns.core.log.LogObjectHolder;
+import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
-import java.math.BigDecimal;
+import javax.annotation.Resource;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.HashMap;
@@ -44,16 +43,19 @@
@Autowired
private IDriverActivityOnlineService driverActivityOnlineService;
-
+
@Autowired
private IDriverActivityOrderService driverActivityOrderService;
-
+
@Autowired
private IDriverActivityRegisteredService driverActivityRegisteredService;
-
+
@Autowired
private IDriverActivityHistoryService driverActivityHistoryService;
-
+
+ @Resource
+ private ShiroExtUtil shiroExtUtil;
+
/**
* 跳转到首页
*/
@@ -61,7 +63,7 @@
public String index() {
return PREFIX + "driverActivity.html";
}
-
+
/**
* 跳转到添加
*/
@@ -230,16 +232,16 @@
@RequestMapping(value = "/list")
@ResponseBody
public Object list(String createTime,String name) {
- ShiroUser user = ShiroExtUtil.getUser();
+ ShiroUser user = shiroExtUtil.getUser();
String beginTime = null;
String endTime = null;
- if (SinataUtil.isNotEmpty(createTime)){
+ if (SinataUtil.isNotEmpty(createTime)) {
String[] timeArray = createTime.split(" - ");
beginTime = timeArray[0];
endTime = timeArray[1];
}
Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
- page.setRecords(driverActivityService.getList(page,beginTime,endTime,name,user.getRoleType(),user.getObjectId()));
+ page.setRecords(driverActivityService.getList(page, beginTime, endTime, name, user.getRoleType(), user.getObjectId()));
return super.packForBT(page);
}
--
Gitblit v1.7.1