任务 13665

amos-boot-system-equip/src/main/resources/mapper/EquipmentManageMapper.xml

@@ -72,7 +72,12 @@
                 AND construction_unit = #{construction}
             </if>
             <if test="nameOrCode != null and nameOrCode != ''">
-                AND (CODE like CONCAT('%',#{nameOrCode},'%') or NAME like  CONCAT('%',#{equimentName},'%'))
+                AND (CODE like CONCAT('%',#{nameOrCode},'%') or NAME like  CONCAT('%',#{nameOrCode},'%'))
+            </if>
+            <if test="typeIds != null and  typeIds != ''">
+                AND system_type in
+                <foreach item="item" collection="typeIds" separator="," open="(" close=")" index="">  #{item}
+                </foreach>
             </if>
             <if test="controBoxBuildId != null ">
             AND contro_box_build = #{controBoxBuildId}
@@ -99,6 +104,25 @@
              wl_manufacturer_info
              order by id
     </select>
+    <select id="getSystemListNew" resultType="com.yeejoin.equipmanage.common.vo.EquipmentManageVo">
+        SELECT
+            id,
+            `name`,
+            `code`
+        FROM
+            wl_equipment_category
+        WHERE
+                parent_id = (
+                SELECT
+                    CONCAT(id, '')
+                FROM
+                    wl_equipment_category
+                WHERE
+                    `code` = '92000000'
+            ) AND name like CONCAT('%',#{nameOrCode},'%')
+        ORDER BY
+            `code`
+    </select>
     <select id="getSystemList" resultType="com.yeejoin.equipmanage.common.vo.EquipmentManageVo">
          SELECT
 			id,