From 871efa21e6c95520e9825ae1f2338c9a919fdd5d Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期日, 15 十月 2023 17:57:48 +0800
Subject: [PATCH] 用户端代码
---
src/main/java/com/stylefeng/guns/modular/system/controller/DriverController.java | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/stylefeng/guns/modular/system/controller/DriverController.java b/src/main/java/com/stylefeng/guns/modular/system/controller/DriverController.java
index 8d67c15..e52f8d2 100644
--- a/src/main/java/com/stylefeng/guns/modular/system/controller/DriverController.java
+++ b/src/main/java/com/stylefeng/guns/modular/system/controller/DriverController.java
@@ -53,17 +53,20 @@
@ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9....."),
@ApiImplicitParam(name = "time", value = "2000-01-01 - 2000-11-11", required = false, dataType = "String"),
@ApiImplicitParam(name = "name", value = "name", required = false, dataType = "String"),
+ @ApiImplicitParam(name = "id", value = "id", required = true, dataType = "int"),
@ApiImplicitParam(name = "pageNumber", value = "pageNumber", required = true, dataType = "int"),
@ApiImplicitParam(name = "pageSize", value = "pageSize", required = true, dataType = "int"),
})
@GetMapping(value = "/driverList")
@ResponseBody
- public Object driverList(String time, String name, int pageNumber, int pageSize) {
+ public Object driverList(String time, String name,int id, int pageNumber, int pageSize) {
String sTime = null;
String eTime = null;
EntityWrapper<TDriver> wrapper = new EntityWrapper<>();
Page<TDriver> tDriverPage = new Page<>(pageNumber, pageSize);
wrapper.eq("remove", 0);
+ wrapper.eq("is_carriers",1);
+ wrapper.eq("company_id",id);
if (ToolUtil.isNotEmpty(name)) {
wrapper.like("driver_name", name).or().like("account", name);
}
@@ -195,36 +198,42 @@
Cell cell2 = row.getCell(2);
String two = null;//Driver Number
if (ToolUtil.isNotEmpty(cell2)) {
+ cell2.setCellType(Cell.CELL_TYPE_STRING);
two = String.valueOf(cell2.getStringCellValue()).trim();
}
Cell cell3 = row.getCell(3);
String three = null;//Date of Birth
if (ToolUtil.isNotEmpty(cell3)) {
+ cell3.setCellType(Cell.CELL_TYPE_STRING);
three = String.valueOf(cell3.getStringCellValue()).trim();
}
Cell cell4 = row.getCell(4);
String four = null;//Address
if (ToolUtil.isNotEmpty(cell4)) {
+ cell4.setCellType(Cell.CELL_TYPE_STRING);
four = String.valueOf(cell4.getStringCellValue()).trim();
}
Cell cell5 = row.getCell(5);
String five = null;//Driver Type
if (ToolUtil.isNotEmpty(cell5)) {
+ cell5.setCellType(Cell.CELL_TYPE_STRING);
five = String.valueOf(cell5.getStringCellValue()).trim();
}
Cell cell6 = row.getCell(6);
String six = null;//Status
if (ToolUtil.isNotEmpty(cell6)) {
+ cell6.setCellType(Cell.CELL_TYPE_STRING);
six = String.valueOf(cell6.getStringCellValue()).trim();
}
Cell cell7 = row.getCell(7);
String seven = null;//StatusRemark
if (ToolUtil.isNotEmpty(cell7)) {
+ cell7.setCellType(Cell.CELL_TYPE_STRING);
seven = String.valueOf(cell7.getStringCellValue()).trim();
}
--
Gitblit v1.7.1