问题修改

bonus-modules/bonus-material-mall/src/main/resources/mapper/material/devchange/MaDevInfoMapper.xml

@@ -125,6 +125,49 @@
             or mtv.maxTypeId = #{typeId}
             )
         </if>
+        <if test="companyName != null and companyName !=''">
+            and c.company_name like concat('%',#{companyName},'%')
+        </if>
+        <if test="onProject != null and onProject !=''">
+            and mdi.on_project like concat('%',#{onProject},'%')
+        </if>
+
+        <if test="deviceName != null and deviceName !=''">
+            and mtv.devName like concat('%',#{deviceName},'%')
+        </if>
+
+        <if test="code != null and code !=''">
+            and mdi.`code` like concat('%',#{code},'%')
+        </if>
+
+        <if test="changeStatus != null and changeStatus !=''">
+            and mdi.ma_status like concat('%',#{changeStatus},'%')
+        </if>
+
+        <if test="brand != null and brand !=''">
+            and mdi.brand like concat('%',#{brand},'%')
+        </if>
+        <if test="productionDate != null and productionDate !=''">
+            and mdi.production_date like concat('%',#{brand},'%')
+        </if>
+
+        <if test="workingHours != null and workingHours !=''">
+            and mdi.working_hours like concat('%',#{workingHours},'%')
+        </if>
+        <if test="buyPrice != null and buyPrice !=''">
+            and mdi.buy_price like concat('%',#{buyPrice},'%')
+        </if>
+        <if test="nextCheckTime != null and nextCheckTime !=''">
+            and mdq.next_check_time like concat('%',#{nextCheckTime},'%')
+        </if>
+
+
+
+
+
+
+
+
     </select>
 
     <update id="updateDeviceStatus">
@@ -141,13 +184,11 @@
     </select>
 
     <select id="deviceTree" resultType="com.bonus.material.devchange.domain.DeviceTreeBean">
-    SELECT
+        SELECT mt.type_id   as id,
-      mt.type_id as id,
                mt.type_name as name,
                mt.level,
                mt.parent_id as pId
-    FROM
+        FROM ma_type mt
-      ma_type mt
     </select>
 
     <select id="deviceCount" resultType="com.bonus.material.devchange.domain.DeviceCountBean">
@@ -183,11 +224,9 @@
     </select>
 
     <select id="deviceLocationSel" resultType="com.bonus.material.devchange.domain.MapBean">
-      SELECT
+        SELECT '0'      as `key`,
-        '0' as `key`,
                location as `value`
-      FROM
+        FROM ma_dev_info
-        ma_dev_info
         WHERE is_active = 1
     </select>
 

bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/DevInfoMapper.xml

@@ -137,6 +137,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 )
             </if>
             and d.is_active='1'
+            and d.up_down_status ='1'
         </where>
         order by
         d.is_active