From 7327c2b113573bccaeef5b3fc5c82011abc00cd8 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Sat, 28 Aug 2021 15:58:03 +0800
Subject: [PATCH] 设备，车辆接口修改
---
src/main/java/org/springblade/modules/equipage/service/impl/EquipageServiceImpl.java | 14 +++++++-------
src/main/java/org/springblade/modules/equipage/mapper/EquipageMapper.xml | 3 +++
src/main/java/org/springblade/modules/equipage/excel/EquipageExcel.java | 26 +++++++++++++-------------
src/main/java/org/springblade/modules/equipage/mapper/CarMapper.xml | 6 ++++++
4 files changed, 29 insertions(+), 20 deletions(-)
diff --git a/src/main/java/org/springblade/modules/equipage/excel/EquipageExcel.java b/src/main/java/org/springblade/modules/equipage/excel/EquipageExcel.java
index edd295e..e7995ce 100644
--- a/src/main/java/org/springblade/modules/equipage/excel/EquipageExcel.java
+++ b/src/main/java/org/springblade/modules/equipage/excel/EquipageExcel.java
@@ -49,19 +49,19 @@
@ExcelProperty("装备名称")
private String name;
- /**
- * 编号
- */
- @ColumnWidth(20)
- @ExcelProperty("编号")
- private String number;
-
- /**
- * 规格
- */
- @ColumnWidth(20)
- @ExcelProperty("规格")
- private String specifications;
+// /**
+// * 编号
+// */
+// @ColumnWidth(20)
+// @ExcelProperty("编号")
+// private String number;
+//
+// /**
+// * 规格
+// */
+// @ColumnWidth(20)
+// @ExcelProperty("规格")
+// private String specifications;
/**
* 型号
diff --git a/src/main/java/org/springblade/modules/equipage/mapper/CarMapper.xml b/src/main/java/org/springblade/modules/equipage/mapper/CarMapper.xml
index 7b70ea2..feba11b 100644
--- a/src/main/java/org/springblade/modules/equipage/mapper/CarMapper.xml
+++ b/src/main/java/org/springblade/modules/equipage/mapper/CarMapper.xml
@@ -29,6 +29,12 @@
<if test="car.carType!=null and car.carType!=''">
and sc.car_type like concat('%', #{car.carType},'%')
</if>
+ <if test="car.brand!=null and car.brand!=''">
+ and sc.brand like concat('%', #{car.brand},'%')
+ </if>
+ <if test="car.mode!=null and car.mode!=''">
+ and sc.mode like concat('%', #{car.mode},'%')
+ </if>
<if test="car.personInCharge!=null and car.personInCharge!=''">
and sc.person_in_charge like concat('%', #{car.personInCharge},'%')
</if>
diff --git a/src/main/java/org/springblade/modules/equipage/mapper/EquipageMapper.xml b/src/main/java/org/springblade/modules/equipage/mapper/EquipageMapper.xml
index a5c88ab..4ee877b 100644
--- a/src/main/java/org/springblade/modules/equipage/mapper/EquipageMapper.xml
+++ b/src/main/java/org/springblade/modules/equipage/mapper/EquipageMapper.xml
@@ -26,6 +26,9 @@
<if test="equipage.name!=null and equipage.name!=''">
and se.name like concat('%', #{equipage.name},'%')
</if>
+ <if test="equipage.brand!=null and equipage.brand!=''">
+ and se.brand like concat('%', #{equipage.brand},'%')
+ </if>
<if test="equipage.personInCharge!=null and equipage.personInCharge!=''">
and se.person_in_charge like concat('%', #{equipage.personInCharge},'%')
</if>
diff --git a/src/main/java/org/springblade/modules/equipage/service/impl/EquipageServiceImpl.java b/src/main/java/org/springblade/modules/equipage/service/impl/EquipageServiceImpl.java
index 3a849d4..450230d 100644
--- a/src/main/java/org/springblade/modules/equipage/service/impl/EquipageServiceImpl.java
+++ b/src/main/java/org/springblade/modules/equipage/service/impl/EquipageServiceImpl.java
@@ -77,13 +77,13 @@
equipage.setName(equipageExcel.getName());
}
- if (null!=equipageExcel.getNumber() && equipageExcel.getNumber()!="") {
- equipage.setNumber(equipageExcel.getNumber());
- }
-
- if (null!=equipageExcel.getSpecifications() && equipageExcel.getSpecifications()!="") {
- equipage.setSpecifications(equipageExcel.getSpecifications());
- }
+// if (null!=equipageExcel.getNumber() && equipageExcel.getNumber()!="") {
+// equipage.setNumber(equipageExcel.getNumber());
+// }
+//
+// if (null!=equipageExcel.getSpecifications() && equipageExcel.getSpecifications()!="") {
+// equipage.setSpecifications(equipageExcel.getSpecifications());
+// }
//插入数据
this.save(equipage);
--
Gitblit v1.9.3