From b1f2f102034b4433201225b67a9fc78c08e532f0 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 06 六月 2025 18:35:03 +0800
Subject: [PATCH] 修改bug和管理后台报表
---
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/TIncomeController.java | 27 +++++++++++++++------------
1 files changed, 15 insertions(+), 12 deletions(-)
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/TIncomeController.java b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/TIncomeController.java
index 32dcae3..b0654c8 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/TIncomeController.java
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/TIncomeController.java
@@ -4,20 +4,17 @@
import com.baomidou.mybatisplus.plugins.Page;
import com.stylefeng.guns.core.base.controller.BaseController;
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.ExcelExportUtil;
import com.stylefeng.guns.core.util.SinataUtil;
-import com.stylefeng.guns.modular.system.model.Income;
+import com.stylefeng.guns.modular.system.model.TCompany;
import com.stylefeng.guns.modular.system.service.IIncomeService;
+import com.stylefeng.guns.modular.system.service.ITCompanyService;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
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.RequestParam;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -40,6 +37,9 @@
@Autowired
private IIncomeService tIncomeService;
+
+ @Autowired
+ private ITCompanyService companyService;
/**
* 跳转到首页
@@ -52,30 +52,33 @@
@RequestMapping("driverWork")
public String driverWork(Model model) {
+ List<TCompany> tCompanies = companyService.selectList(new EntityWrapper<TCompany>().eq("state", 0).ne("flag", 3));
+ model.addAttribute("company", tCompanies);
return PREFIX + "driverWork.html";
}
@RequestMapping(value = "/driverWorkList")
@ResponseBody
- public Object driverWorkList() {
+ public Object driverWorkList(Integer company) {
Page<Map<String,Object>> page = new PageFactory<Map<String,Object>>().defaultPage();
- List<Map<String,Object>> list = tIncomeService.getList1(page);
+ List<Map<String,Object>> list = tIncomeService.getList1(page, company);
page.setRecords(list);
return super.packForBT(page);
}
@RequestMapping("driverWorkDetail")
- public String driverWorkDetail(String times, Model model) {
+ public String driverWorkDetail(String times, Integer company, Model model) {
model.addAttribute("times", times);
+ model.addAttribute("company", company);
return PREFIX + "driverWorkDetail.html";
}
@RequestMapping(value = "/driverWorkDetailList")
@ResponseBody
- public Object driverWorkDetailList(String times) {
+ public Object driverWorkDetailList(String times, Integer company) {
Page<Map<String,Object>> page = new PageFactory<Map<String,Object>>().defaultPage();
times = times.split(" ")[0];
- page.setRecords(tIncomeService.getList2(page,times));
+ page.setRecords(tIncomeService.getList2(page,times,company));
return super.packForBT(page);
}
/**
--
Gitblit v1.7.1