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/TTaxiCardController.java | 50 ++++++++++++++++++++++++++------------------------
1 files changed, 26 insertions(+), 24 deletions(-)
diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TTaxiCardController.java b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TTaxiCardController.java
index a575a87..01e75b0 100644
--- a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TTaxiCardController.java
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TTaxiCardController.java
@@ -6,9 +6,8 @@
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
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.util.DateUtil;
import com.stylefeng.guns.core.util.ExcelUtil;
import com.stylefeng.guns.core.util.ToolUtil;
@@ -24,6 +23,7 @@
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
+import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import java.io.OutputStream;
import java.text.DateFormat;
@@ -47,23 +47,25 @@
@Autowired
private ITRegionService regionService;
-
+
@Autowired
private ITCompanyService companyService;
-
+
@Autowired
private IUserService userService;
-
+
@Autowired
private ITTaxiCardPaymentService taxiCardPaymentService;
-
+ @Resource
+ private ShiroExtUtil shiroExtUtil;
+
@RequestMapping("")
- public String index(){
+ public String index() {
return PREFIX + "tTaxiCard.html";
}
-
+
@RequestMapping("/audit")
- public String audit(){
+ public String audit() {
return PREFIX + "tTaxiCardAudit.html";
}
@@ -175,7 +177,7 @@
@RequestMapping("/tTaxiCard_add")
public String tTaxiCardAdd(Model model){
- model.addAttribute("roleType",ShiroKit.getUser().getRoleType());
+ model.addAttribute("roleType", shiroExtUtil.getUser().getRoleType());
return PREFIX + "tTaxiCard_add.html";
}
@@ -191,9 +193,9 @@
public String tTaxiCardEdit(@PathVariable Integer id, Model model){
TTaxiCard tTaxiCard = taxiCardService.selectById(id);
model.addAttribute("viewIdentity","myself"); /// 查看角色--自己
-
- model.addAttribute("item",tTaxiCard);
- model.addAttribute("roleType",ShiroKit.getUser().getRoleType());
+
+ model.addAttribute("item", tTaxiCard);
+ model.addAttribute("roleType", shiroExtUtil.getUser().getRoleType());
return PREFIX + "tTaxiCard_edit.html";
}
@@ -210,8 +212,8 @@
@ResponseBody
public Object ttaxiCardList(String startTime, String endTime, Integer type, String nameStr){
Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
- Wrapper wrapper = new EntityWrapper<TTaxiCard>().eq("auditStatus",2)
- .eq("companyId",ShiroKit.getUser().getObjectId()).orderBy("id",false);
+ Wrapper wrapper = new EntityWrapper<TTaxiCard>().eq("auditStatus", 2)
+ .eq("companyId", shiroExtUtil.getUser().getObjectId()).orderBy("id", false);
if (ToolUtil.isNotEmpty(startTime) && ToolUtil.isNotEmpty(endTime)){
wrapper.between("createTime",startTime + " 00:00:00",endTime + " 23:59:59");
@@ -290,7 +292,7 @@
@ResponseBody
public Object tTaxiCardAuditList(String startTime, String endTime, Integer type, String nameStr){
Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
- Wrapper wrapper = new EntityWrapper<TTaxiCard>().ne("companyId",ShiroKit.getUser().getObjectId()).orderBy("id",false);
+ Wrapper wrapper = new EntityWrapper<TTaxiCard>().ne("companyId", shiroExtUtil.getUser().getObjectId()).orderBy("id", false);
if (ToolUtil.isNotEmpty(startTime) && ToolUtil.isNotEmpty(endTime)){
wrapper.between("createTime",startTime + " 00:00:00",endTime + " 23:59:59");
@@ -374,7 +376,7 @@
@RequestMapping("/initSuitCity")
@ResponseBody
public Object initSuitCity(){
- List<TCompanyCity> list = companyCityService.selectList(new EntityWrapper<TCompanyCity>().eq("companyId",ShiroKit.getUser().getObjectId()));
+ List<TCompanyCity> list = companyCityService.selectList(new EntityWrapper<TCompanyCity>().eq("companyId", shiroExtUtil.getUser().getObjectId()));
List<String> stringList = new ArrayList<>();
for (TCompanyCity tCompanyCity : list) {
String area = "";
@@ -422,19 +424,19 @@
@RequestMapping("/add")
@ResponseBody
- public Object add(TTaxiCard taxiCard){
- Integer companyId = ShiroKit.getUser().getObjectId();
- Integer createUserId = ShiroKit.getUser().getId();
+ public Object add(TTaxiCard taxiCard) {
+ Integer companyId = shiroExtUtil.getUser().getObjectId();
+ Integer createUserId = shiroExtUtil.getUser().getId();
taxiCard.setCompanyId(companyId);
taxiCard.setCreateUserId(createUserId);
taxiCard.setState(2);
- if (ShiroKit.getUser().getRoleType() == 1){
+ if (shiroExtUtil.getUser().getRoleType() == 1) {
taxiCard.setAuditStatus(2);
- }else {
+ } else {
taxiCard.setAuditStatus(1);
}
taxiCard.setCreateTime(DateUtil.parseTime(DateUtil.getTime()));
-
+
String note = taxiCard.getNote();
note = note.replaceAll("& lt;", "<").replaceAll("& gt;", ">");
@@ -507,7 +509,7 @@
@RequestMapping("/searchCoupons")
@ResponseBody
public Object searchCoupons(){
- Integer companyId = ShiroKit.getUser().getObjectId();
+ Integer companyId = shiroExtUtil.getUser().getObjectId();
return couponRecordService.selectList(new EntityWrapper<SysCouponRecord>().eq("companyId",companyId));
}
--
Gitblit v1.7.1