From 0dd290a1d4d1872ff08bfa5877f59c5581914f90 Mon Sep 17 00:00:00 2001
From: zhangzeli <123456>
Date: 星期五, 29 十月 2021 15:47:37 +0800
Subject: [PATCH] 车辆表后台
---
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/AddOilController.java | 8 ++-
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/serviceimpl/IAccidentServiceImpl.java | 8 ++++
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/AccidentController.java | 8 ++-
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/service/IAddOilService.java | 4 ++
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/entity/Accident.java | 17 ++------
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/mapper/AccidentMapper.java | 12 ++++++
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/service/IAccidentService.java | 4 ++
xboot-admin/src/main/resources/application.yml | 2
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/mapper/AddOilMapper.java | 13 ++++++
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/entity/AddOil.java | 17 +++++++-
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/serviceimpl/IAddOilServiceImpl.java | 8 ++++
11 files changed, 79 insertions(+), 22 deletions(-)
diff --git a/xboot-admin/src/main/resources/application.yml b/xboot-admin/src/main/resources/application.yml
index b4df8b1..e3efed9 100644
--- a/xboot-admin/src/main/resources/application.yml
+++ b/xboot-admin/src/main/resources/application.yml
@@ -26,7 +26,7 @@
url: jdbc:mysql://127.0.0.1:3306/tobacco?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2B8
username: root
# Jasypt鍔犲瘑 鍙埌common-utils涓壘鍒癑asyptUtil鍔犺В瀵嗗伐鍏风被鐢熸垚鍔犲瘑缁撴灉 鏍煎紡涓篍NC(鍔犲瘑缁撴灉) 浠ヤ笅瑙ｅ瘑缁撴灉涓�123456
- password: ENC(/1qjpLsQSzc4KM+2VhqLecwQu3npNYZo/zclpH/VR34dMdLeW2IVin6V1vH1Xug4)
+ password: ENC(BM0tNVy9I6d8RXo2G/TS8ItskvLDlA5UwAaqExN5zun31YUmmULLPNrKCg26Ood1)
type: com.alibaba.druid.pool.DruidDataSource
driverClassName: com.mysql.jdbc.Driver
# Druid StatViewServlet閰嶇疆
diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/AccidentController.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/AccidentController.java
index bf4b0da..ef3f81d 100644
--- a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/AccidentController.java
+++ b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/AccidentController.java
@@ -49,9 +49,11 @@
@RequestMapping(value = "/getByPage", method = RequestMethod.GET)
@ApiOperation(value = "鍒嗛〉鑾峰彇")
- public Result<IPage<Accident>> getByPage(PageVo page) {
-
- IPage<Accident> data = iAccidentService.page(PageUtil.initMpPage(page));
+ public Result<IPage<Accident>> getByPage(PageVo page,String carNo) {
+ QueryWrapper<Accident> wrapper = new QueryWrapper<>();
+ if(!StrUtil.isEmpty(carNo))
+ wrapper.like("b.car_no","%"+carNo+"%");
+ IPage<Accident> data = iAccidentService.page2(PageUtil.initMpPage(page),wrapper);
return new ResultUtil<IPage<Accident>>().setData(data);
}
diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/AddOilController.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/AddOilController.java
index 9ce646c..19a72f2 100644
--- a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/AddOilController.java
+++ b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/AddOilController.java
@@ -49,9 +49,11 @@
@RequestMapping(value = "/getByPage", method = RequestMethod.GET)
@ApiOperation(value = "鍒嗛〉鑾峰彇")
- public Result<IPage<AddOil>> getByPage(PageVo page) {
-
- IPage<AddOil> data = iAddOilService.page(PageUtil.initMpPage(page));
+ public Result<IPage<AddOil>> getByPage(PageVo page,String carNo) {
+ QueryWrapper<AddOil> wrapper = new QueryWrapper<>();
+ if(!StrUtil.isEmpty(carNo))
+ wrapper.like("b.car_no","%"+carNo+"%");
+ IPage<AddOil> data = iAddOilService.page2(PageUtil.initMpPage(page),wrapper);
return new ResultUtil<IPage<AddOil>>().setData(data);
}
diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/entity/Accident.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/entity/Accident.java
index bd0af87..b311382 100644
--- a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/entity/Accident.java
+++ b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/entity/Accident.java
@@ -1,6 +1,7 @@
package cn.exrick.xboot.your.entity;
import cn.exrick.xboot.core.base.XbootBaseEntity;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
@@ -12,6 +13,7 @@
import javax.persistence.Entity;
import javax.persistence.Table;
+import javax.persistence.Transient;
import java.util.Date;
/**
@@ -34,9 +36,6 @@
@ApiModelProperty(value = "浜嬫晠鏃ユ湡")
private Date accidentDate;
- @ApiModelProperty(value = "澶勭悊鏂瑰紡")
- private String dealMethod;
-
@ApiModelProperty(value = "瀵规柟鑱旂郴浜�")
private String linker;
@@ -46,22 +45,16 @@
@ApiModelProperty(value = "璐ｄ换璁ゅ畾")
private String dutySure;
- @ApiModelProperty(value = "澶勭悊鎰忚")
- private String result;
-
@ApiModelProperty(value = "瑙ｅ喅鏂规")
private String solve;
@ApiModelProperty(value = "鐜板満鐓х墖")
private String imgs;
- @ApiModelProperty(value = "淇濊垂璧斿伩")
- private double payFor;
-
- @ApiModelProperty(value = "缁翠慨璁板綍id")
- private String repairId;
-
@ApiModelProperty(value = "杞﹁締id")
private String carId;
+ @Transient
+ @TableField(exist = false)
+ private String carNo;
}
\ No newline at end of file
diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/entity/AddOil.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/entity/AddOil.java
index f53fa5c..576a281 100644
--- a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/entity/AddOil.java
+++ b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/entity/AddOil.java
@@ -1,6 +1,7 @@
package cn.exrick.xboot.your.entity;
import cn.exrick.xboot.core.base.XbootBaseEntity;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
@@ -12,6 +13,7 @@
import javax.persistence.Entity;
import javax.persistence.Table;
+import javax.persistence.Transient;
import java.util.Date;
/**
@@ -36,13 +38,22 @@
@ApiModelProperty(value = "鍔犳补鏃ユ湡")
private Date addDate;
- @ApiModelProperty(value = "鍔犳补绔�")
- private String gasStation;
-
@ApiModelProperty(value = "鍔犳补閲�")
private double amount;
+
+ @ApiModelProperty(value = "鍗曚环")
+ private double unitPrice;
@ApiModelProperty(value = "鍔犳补閲戦")
private double money;
+ @ApiModelProperty(value = "鍔犳补鏃堕噷绋�")
+ private int mileage;
+
+ @ApiModelProperty(value = "澶囨敞")
+ private String remarks;
+
+ @Transient
+ @TableField(exist = false)
+ private String carNo;
}
\ No newline at end of file
diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/mapper/AccidentMapper.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/mapper/AccidentMapper.java
index 2742089..198f95c 100644
--- a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/mapper/AccidentMapper.java
+++ b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/mapper/AccidentMapper.java
@@ -1,7 +1,16 @@
package cn.exrick.xboot.your.mapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import cn.exrick.xboot.your.entity.Accident;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Result;
+import org.apache.ibatis.annotations.Results;
+import org.apache.ibatis.annotations.Select;
+import org.apache.ibatis.type.JdbcType;
import java.util.List;
@@ -11,4 +20,7 @@
*/
public interface AccidentMapper extends BaseMapper<Accident> {
+ @Select("SELECT a.*,b.car_no as temp FROM t_accident a LEFT JOIN t_car b ON a.car_id=b.id ${ew.customSqlSegment} ")
+ @Results({@Result(column="temp", property="carNo", jdbcType = JdbcType.VARCHAR)})
+ IPage<Accident> page2(Page initMpPage, @Param(Constants.WRAPPER) QueryWrapper<Accident> wrapper);
}
\ No newline at end of file
diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/mapper/AddOilMapper.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/mapper/AddOilMapper.java
index d092519..680884b 100644
--- a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/mapper/AddOilMapper.java
+++ b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/mapper/AddOilMapper.java
@@ -1,7 +1,17 @@
package cn.exrick.xboot.your.mapper;
+import cn.exrick.xboot.your.entity.Violation;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import cn.exrick.xboot.your.entity.AddOil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Result;
+import org.apache.ibatis.annotations.Results;
+import org.apache.ibatis.annotations.Select;
+import org.apache.ibatis.type.JdbcType;
import java.util.List;
@@ -11,4 +21,7 @@
*/
public interface AddOilMapper extends BaseMapper<AddOil> {
+ @Select("SELECT a.*,b.car_no as temp FROM t_add_oil a LEFT JOIN t_car b ON a.car_id=b.id ${ew.customSqlSegment} ")
+ @Results({@Result(column="temp", property="carNo", jdbcType = JdbcType.VARCHAR)})
+ IPage<AddOil> page2(Page initMpPage, @Param(Constants.WRAPPER) QueryWrapper<AddOil> wrapper);
}
\ No newline at end of file
diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/service/IAccidentService.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/service/IAccidentService.java
index 9b72b00..c687554 100644
--- a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/service/IAccidentService.java
+++ b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/service/IAccidentService.java
@@ -1,5 +1,8 @@
package cn.exrick.xboot.your.service;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import cn.exrick.xboot.your.entity.Accident;
@@ -11,4 +14,5 @@
*/
public interface IAccidentService extends IService<Accident> {
+ IPage<Accident> page2(Page initMpPage, QueryWrapper<Accident> wrapper);
}
\ No newline at end of file
diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/service/IAddOilService.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/service/IAddOilService.java
index 90af56a..9bb5043 100644
--- a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/service/IAddOilService.java
+++ b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/service/IAddOilService.java
@@ -1,5 +1,8 @@
package cn.exrick.xboot.your.service;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import cn.exrick.xboot.your.entity.AddOil;
@@ -11,4 +14,5 @@
*/
public interface IAddOilService extends IService<AddOil> {
+ IPage<AddOil> page2(Page initMpPage, QueryWrapper<AddOil> wrapper);
}
\ No newline at end of file
diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/serviceimpl/IAccidentServiceImpl.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/serviceimpl/IAccidentServiceImpl.java
index fa88894..7c7288a 100644
--- a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/serviceimpl/IAccidentServiceImpl.java
+++ b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/serviceimpl/IAccidentServiceImpl.java
@@ -3,6 +3,9 @@
import cn.exrick.xboot.your.mapper.AccidentMapper;
import cn.exrick.xboot.your.entity.Accident;
import cn.exrick.xboot.your.service.IAccidentService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -23,4 +26,9 @@
@Autowired
private AccidentMapper accidentMapper;
+
+ @Override
+ public IPage<Accident> page2(Page initMpPage, QueryWrapper<Accident> wrapper) {
+ return accidentMapper.page2(initMpPage,wrapper);
+ }
}
\ No newline at end of file
diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/serviceimpl/IAddOilServiceImpl.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/serviceimpl/IAddOilServiceImpl.java
index 00fee7b..195831d 100644
--- a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/serviceimpl/IAddOilServiceImpl.java
+++ b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/serviceimpl/IAddOilServiceImpl.java
@@ -3,6 +3,9 @@
import cn.exrick.xboot.your.mapper.AddOilMapper;
import cn.exrick.xboot.your.entity.AddOil;
import cn.exrick.xboot.your.service.IAddOilService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -23,4 +26,9 @@
@Autowired
private AddOilMapper addOilMapper;
+
+ @Override
+ public IPage<AddOil> page2(Page initMpPage, QueryWrapper<AddOil> wrapper) {
+ return addOilMapper.page2(initMpPage,wrapper);
+ }
}
\ No newline at end of file
--
Gitblit v1.9.1