设备新增修改

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

@@ -146,18 +146,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         d.person as person,
         d.person_phone as personPhone,
         c.company_name as companyName,
-        h.search_num as searchNum
+        h.search_num as searchNum,
+        d.create_time as createTime
         FROM
-        ma_hot_search h
-        LEFT JOIN ma_dev_info d ON d.ma_id = h.ma_id
+        ma_dev_info d
+        LEFT JOIN ma_hot_search h ON d.ma_id = h.ma_id
         LEFT JOIN bm_company_info c ON d.own_co = c.company_id
         where
             d.is_active='1'
             and d.ma_status = '2'
-        <if test="maId != null">
-            and d.ma_id = #{maId}
-        </if>
-        order by h.search_num desc
+        order by d.create_time desc
     </select>
 
     <select id="selectDevInfoByMaId" parameterType="Long" resultType="com.bonus.material.device.domain.vo.DevInfoVo">
@@ -174,6 +172,31 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                  left join ma_type mt2 on mt1.parent_id = mt2.type_id
                  left join ma_type mt3 on mt2.parent_id = mt3.type_id
         where d.ma_id = #{maId} and  d.is_active='1'
+        SELECT
+        d.ma_id as maId,
+        d.code as code,
+        d.device_name as deviceName,
+        d.device_weight as deviceWeight,
+        d.type_id as typeId,
+        d.ma_status as maStatus,
+        d.brand as brand,
+        d.model_name as modelName,
+        d.production_date as productionDate,
+        d.working_hours as workingHours,
+        d.serial_number as serialNumber,
+        d.month_lease_price as monthLeasePrice,
+        d.day_lease_price as dayLeasePrice,
+        d.person as person,
+        d.person_phone as personPhone,
+        c.company_name as companyName,
+        h.search_num as searchNum
+        FROM
+        ma_dev_info d
+        LEFT JOIN ma_hot_search h ON d.ma_id = h.ma_id
+        LEFT JOIN bm_company_info c ON d.own_co = c.company_id
+        where
+            d.is_active='1' and d.ma_id = #{maId}
+>>>>>>> origin/master
     </select>
 
     <select id="getFilesByMaId" parameterType="Long" resultType="com.bonus.common.biz.domain.SysFile">