diff --git a/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/CsDevModelAddParm.java b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/CsDevModelAddParm.java
index 819163b20..000e18cba 100644
--- a/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/CsDevModelAddParm.java
+++ b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/CsDevModelAddParm.java
@@ -27,6 +27,10 @@ public class CsDevModelAddParm  {
     @ApiModelProperty(value = "装置型号")
     private String devType;
 
+
+    @ApiModelProperty(value = "模板名称")
+    private String name;
+
     /**
      * 版本号
      */
diff --git a/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/CsDevModelAuditParm.java b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/CsDevModelAuditParm.java
index 4039fcbc1..f85358e39 100644
--- a/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/CsDevModelAuditParm.java
+++ b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/CsDevModelAuditParm.java
@@ -28,7 +28,8 @@ public class CsDevModelAuditParm {
      */
     @ApiModelProperty(value = "装置型号")
     private String devType;
-
+    @ApiModelProperty(value = "模板名称")
+    private String name;
     /**
      * 版本号
      */
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 a049e5724..d97819dd4 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
@@ -23,11 +23,13 @@ public class CsDevModelQueryListParm {
     /**
      * 装置型号(字典数据)
      */
-    @ApiModelProperty(value = "装置型号")
+    @ApiModelProperty(value = "装置模板型号")
     private String devType;
 
-    @ApiModelProperty(value = "装置型号名称")
+    @ApiModelProperty(value = "装置模板型号名称")
     private String devName;
+    @ApiModelProperty(value = "模板名称")
+    private String name;
 
     @ApiModelProperty(value = "版本号")
     private String versionNo;
diff --git a/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/CsDevModelQueryParm.java b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/CsDevModelQueryParm.java
index d27a5e297..20a97734e 100644
--- a/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/CsDevModelQueryParm.java
+++ b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/CsDevModelQueryParm.java
@@ -33,11 +33,12 @@ public class CsDevModelQueryParm {
     /**
      * 装置型号(字典数据)
      */
-    @ApiModelProperty(value = "装置型号")
+    @ApiModelProperty(value = "装置模板型号")
     private String devType;
-    @ApiModelProperty(value = "装置名称")
+    @ApiModelProperty(value = "装置模板型号名称")
     private String devName;
-
+    @ApiModelProperty(value = "模板名称")
+    private String name;
 
     /**
      * 版本日期
diff --git a/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/po/CsDevModelPO.java b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/po/CsDevModelPO.java
index 7f68f925c..c6a190ffd 100644
--- a/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/po/CsDevModelPO.java
+++ b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/po/CsDevModelPO.java
@@ -36,6 +36,12 @@ public class CsDevModelPO extends BaseEntity {
     @TableField(value = "dev_type")
     private String devType;
 
+    /**
+     * 模板名称
+     */
+    @TableField(value = "模板名称")
+    private String name;
+
     /**
      * 版本号
      */
diff --git a/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/vo/CsDevModelPageVO.java b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/vo/CsDevModelPageVO.java
index 36af3db85..8b71e07cb 100644
--- a/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/vo/CsDevModelPageVO.java
+++ b/pqs-algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/vo/CsDevModelPageVO.java
@@ -29,11 +29,12 @@ public class CsDevModelPageVO extends BaseEntity {
     /**
      * 设备型号(字典数据)
      */
-    @ApiModelProperty(value = "设备型号")
+    @ApiModelProperty(value = "设备模板型号id")
     private String devType;
-    @ApiModelProperty(value = "设备名称")
+    @ApiModelProperty(value = "设备模板型号id名称")
     private String devName;
-
+    @TableField(value = "模板名称")
+    private String name;
 
     /**
      * 版本号
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 e9331ff45..f74fef4ec 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
@@ -39,6 +39,9 @@
         <if test="csDevModelQueryParm.devType != null and csDevModelQueryParm.devType != ''">
             AND a.dev_type = #{csDevModelQueryParm.devType}
         </if>
+         <if test="csDevModelQueryParm.name != null and csDevModelQueryParm.name != ''">
+            AND a.name = #{csDevModelQueryParm.name}
+        </if>
   </select><select id="queryList" resultType="com.njcn.algorithm.pojo.vo.CsDevModelPageVO">
    SELECT a.*,
                b.code as devName
@@ -63,8 +66,12 @@
         <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 test="csDevModelQueryListParm.devName != null and csDevModelQueryListParm.devName != ''">
+        AND b.code = #{csDevModelQueryListParm.devName}
+    </if>
+         <if test="csDevModelQueryListParm.name != null and csDevModelQueryListParm.name != ''">
+            AND a.name = #{csDevModelQueryListParm.name}
         </if>
+
    </select>
 </mapper>
\ No newline at end of file