From c2c446581d33a2df67522fe5aa9f804ce9948a71 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=A2=81=E5=AD=90=E9=BE=99?=
 <14096380+qwe963852@user.noreply.gitee.com>
Date: Fri, 27 Sep 2024 12:19:30 +0800
Subject: [PATCH] =?UTF-8?q?test:=E6=95=85=E9=9A=9C=E7=A0=81=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E6=96=B0=E5=A2=9E=E5=AD=97=E6=AE=B5=EF=BC=88=E8=BD=A6?=
 =?UTF-8?q?=E8=BE=86=E7=B1=BB=E5=9E=8B=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/muyu/breakdown/domain/SysCarFault.java    | 4 ++++
 .../muyu/breakdown/service/impl/SysCarFaultServiceImpl.java | 6 ++++++
 .../main/resources/mapper/breakdown/SysCarFaultMapper.xml   | 6 +++++-
 .../com/muyu/system/service/impl/SysUserServiceImpl.java    | 2 +-
 4 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/domain/SysCarFault.java b/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/domain/SysCarFault.java
index f8fae99..4d2f4ad 100644
--- a/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/domain/SysCarFault.java
+++ b/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/domain/SysCarFault.java
@@ -83,6 +83,10 @@ public class SysCarFault extends BaseEntity{
     @Excel(name = "是否警告(0.开启 1.禁止)")
     private Integer warnStatus;
 
+    /**车辆类型 */
+    @Excel(name = "车辆类型")
+    private Integer carTypeId;
+
 
 
     @Override
diff --git a/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/service/impl/SysCarFaultServiceImpl.java b/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/service/impl/SysCarFaultServiceImpl.java
index e039170..eb6159e 100644
--- a/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/service/impl/SysCarFaultServiceImpl.java
+++ b/cloud-modules/cloud-modules-breakdown/src/main/java/com/muyu/breakdown/service/impl/SysCarFaultServiceImpl.java
@@ -58,12 +58,18 @@ public class SysCarFaultServiceImpl
         if (StringUtils.isNotEmpty(sysCarFault.getFaultBit())){
             queryWrapper.eq(SysCarFault::getFaultBit, sysCarFault.getFaultBit());
         }
+
         if (sysCarFault.getFaultRank()!=null){
             queryWrapper.eq(SysCarFault::getFaultRank, sysCarFault.getFaultRank());
         }
+        //故障码类型
         if (sysCarFault.getTypeId()!=null){
             queryWrapper.eq(SysCarFault::getTypeId,sysCarFault.getTypeId());
         }
+        //车辆类型查询
+        if (sysCarFault.getCarTypeId()!=null){
+            queryWrapper.eq(SysCarFault::getCarTypeId,sysCarFault.getTypeId());
+        }
         return this.list(queryWrapper);
     }
 
diff --git a/cloud-modules/cloud-modules-breakdown/src/main/resources/mapper/breakdown/SysCarFaultMapper.xml b/cloud-modules/cloud-modules-breakdown/src/main/resources/mapper/breakdown/SysCarFaultMapper.xml
index ce92f4c..ae33de2 100644
--- a/cloud-modules/cloud-modules-breakdown/src/main/resources/mapper/breakdown/SysCarFaultMapper.xml
+++ b/cloud-modules/cloud-modules-breakdown/src/main/resources/mapper/breakdown/SysCarFaultMapper.xml
@@ -23,10 +23,11 @@
         <result property="createTime"    column="create_time"    />
         <result property="updateBy"    column="update_by"    />
         <result property="updateTime"    column="update_time"    />
+        <result property="carTypeId" column="car_type_id"/>
     </resultMap>
 
     <sql id="selectSysCarFaultVo">
-        select id, fault_code, fault_name, type_id, fault_label, fault_bit, fault_value, fault_rank, fault_desc, fault_min_threshold, fault_max_threshold, status, warn_status, remark, create_by, create_time, update_by, update_time from sys_car_fault
+        select id, fault_code, fault_name, type_id, fault_label, fault_bit, fault_value, fault_rank, fault_desc, fault_min_threshold, fault_max_threshold, status, warn_status, remark, create_by, create_time, update_by, update_time,car_type_id from sys_car_fault
     </sql>
 
     <select id="selectSysCarFaultList" parameterType="com.muyu.breakdown.domain.SysCarFault" resultMap="SysCarFaultResult">
@@ -70,6 +71,7 @@
             <if test="createTime != null">create_time,</if>
             <if test="updateBy != null">update_by,</if>
             <if test="updateTime != null">update_time,</if>
+            <if test="carTypeId !=null">car_type_id</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="faultCode != null and faultCode != ''">#{faultCode},</if>
@@ -89,6 +91,7 @@
             <if test="createTime != null">#{createTime},</if>
             <if test="updateBy != null">#{updateBy},</if>
             <if test="updateTime != null">#{updateTime},</if>
+            <if test="carTypeId != null">#{catTypeId}</if>
         </trim>
     </insert>
 
@@ -112,6 +115,7 @@
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="updateBy != null">update_by = #{updateBy},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="carTypeId !=null">car_type_id=#{catTypeId}</if>
         </trim>
         where id = #{id}
     </update>
diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysUserServiceImpl.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysUserServiceImpl.java
index b111cf0..ffb4b20 100644
--- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysUserServiceImpl.java
+++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysUserServiceImpl.java
@@ -96,7 +96,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     /**
      * 通过用户名查询用户
      *
-     * @param userName 用户名
+     * @param firm 用户名
      *
      * @return 用户对象信息
      */