From de70f12c56cb0eaadde3c82d977a6ab65db108d4 Mon Sep 17 00:00:00 2001
From: wangh <9483>
Date: Fri, 17 Nov 2023 11:14:36 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B2=B9=E6=9E=AA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entity/OilGun.java                        |  1 +
 .../mapper/xml/OilGunMapper.xml               | 36 +++++--------------
 2 files changed, 9 insertions(+), 28 deletions(-)

diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/entity/OilGun.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/entity/OilGun.java
index 095e893e4..89470a599 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/entity/OilGun.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/entity/OilGun.java
@@ -48,6 +48,7 @@ public class OilGun extends BaseEntity {
      * 油罐名称
      */
     private String tankName;
+    private String oilNumber;
 
 
 
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/mapper/xml/OilGunMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/mapper/xml/OilGunMapper.xml
index 4ee4890da..a356a0662 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/mapper/xml/OilGunMapper.xml
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/mapper/xml/OilGunMapper.xml
@@ -14,6 +14,7 @@
         <result property="updateBy" column="update_by" jdbcType="INTEGER"/>
         <result property="numberId" column="number_id" jdbcType="INTEGER"/>
         <result property="tankName" column="tank_name" jdbcType="VARCHAR"/>
+        <result property="oilNumber" column="oil_number" jdbcType="VARCHAR"/>
         <result property="oilMachineGunNumber" column="oil_machine_gun_number" jdbcType="VARCHAR"/>
     </resultMap>
 
@@ -28,35 +29,14 @@
     <!--查询指定行数据-->
     <select id="queryAllByLimit" resultMap="OilGunMap">
         select
-          id, gun_name, tank_id, status, store_id, create_time, update_time, create_by, update_by
-        from oil_gun
+        og.id, og.gun_name, og.tank_id, og.status, og.store_id, og.create_time,og.update_time, og.create_by,  og.update_by, ot.oil_number, ot.number_id
+        from oil_gun og
+        left join oil_tank ot on og.tank_id = ot.id
         <where>
-            <if test="id != null">
-                and id = #{id}
-            </if>
-            <if test="gunName != null and gunName != ''">
-                and gun_name = #{gunName}
-            </if>
-            <if test="tankId != null">
-                and tank_id = #{tankId}
-            </if>
-            <if test="status != null and status != ''">
-                and status = #{status}
-            </if>
-            <if test="storeId != null">
-                and store_id = #{storeId}
-            </if>
-            <if test="createTime != null">
-                and create_time = #{createTime}
-            </if>
-            <if test="updateTime != null">
-                and update_time = #{updateTime}
-            </if>
-            <if test="createBy != null">
-                and create_by = #{createBy}
-            </if>
-            <if test="updateBy != null">
-                and update_by = #{updateBy}
+            og.store_id = #{oilGun.storeId}
+
+            <if test="oilGun.numberId != null">
+                and ot.number_id = #{oilGun.numberId}
             </if>
         </where>
     </select>