From 5c90d14d74ca23deb06735d6bcab8d6fa8551cf3 Mon Sep 17 00:00:00 2001
From: huangzj <826100833@qq.com>
Date: Mon, 17 Apr 2023 10:12:42 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=8F=92=E5=8F=99=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../njcn/algorithm/pojo/param/CsDevModelQueryListParm.java    | 4 ++++
 .../com/njcn/algorithm/mapper/mapping/CsDevModelMapper.xml    | 3 +++
 2 files changed, 7 insertions(+)

diff --git a/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/CsDevModelQueryListParm.java b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/CsDevModelQueryListParm.java
index c99e33785..a049e5724 100644
--- a/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/CsDevModelQueryListParm.java
+++ b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/CsDevModelQueryListParm.java
@@ -25,6 +25,10 @@ public class CsDevModelQueryListParm {
      */
     @ApiModelProperty(value = "装置型号")
     private String devType;
+
+    @ApiModelProperty(value = "装置型号名称")
+    private String devName;
+
     @ApiModelProperty(value = "版本号")
     private String versionNo;
     /**
diff --git a/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/mapper/mapping/CsDevModelMapper.xml b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/mapper/mapping/CsDevModelMapper.xml
index f0455fb44..e9331ff45 100644
--- a/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/mapper/mapping/CsDevModelMapper.xml
+++ b/pqs-algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/mapper/mapping/CsDevModelMapper.xml
@@ -62,6 +62,9 @@
         </if>
         <if test="csDevModelQueryListParm.devType != null and csDevModelQueryListParm.devType != ''">
             AND a.dev_type = #{csDevModelQueryListParm.devType}
+        </if>
+                <if test="csDevModelQueryListParm.devName != null and csDevModelQueryListParm.devName != ''">
+            AND b.code = #{csDevModelQueryListParm.devName}
         </if>
    </select>
 </mapper>
\ No newline at end of file