fix

zlpt-api/zlpt-api-equip/src/main/java/com/bonus/zlpt/equip/api/domain/DevInfo.java

@@ -78,7 +78,7 @@ public class DevInfo extends BaseEntity
     /** 设备月租价 */
     @Excel(name = "设备月租价")
     @ApiModelProperty(value = "设备月租价")
-    private String monthLeasePrice;
+    private Float monthLeasePrice;
 
     /** 设备天租价 */
     @Excel(name = "设备天租价")

zlpt-api/zlpt-api-equip/src/main/java/com/bonus/zlpt/equip/api/domain/vo/DevInfoVo.java

@@ -69,4 +69,5 @@ public class DevInfoVo extends DevInfo {
     private String monthLeasePriceOrderBy;  // ASC or DESC
     @ApiModelProperty(value = "搜索装备更新时间排序 ASC or DESC")
     private String updateTimeOrderBy;   // ASC or DESC
+    private Integer level;  //ma_type_level 级别: 1,2,3
 }

zlpt-common/zlpt-common-core/src/main/java/com/bonus/zlpt/common/core/domain/order/OrderInfo.java

@@ -70,6 +70,10 @@ public class OrderInfo extends BaseEntity
     @ApiModelProperty(value = "订单状态, 参考数据字典")
     private String orderStatus;
 
+    @Excel(name = "驳回原因")
+    @ApiModelProperty(value = "驳回原因")
+    private String rejectReason;
+
     /** 下单用户id */
     @Excel(name = "下单用户id")
     @ApiModelProperty(value = "下单用户id")

zlpt-modules/zlpt-equip/src/main/resources/mapper/DevInfoMapper.xml

@@ -59,7 +59,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>  
             <if test="maId != null "> and d.ma_id = #{maId}</if>
             <if test="code != null  and code != ''"> and d.code = #{code}</if>
-            <if test="typeId != null "> and d.type_id = #{typeId}</if>
+            <if test="typeId != null and level != null and level != '1'">
+                and d.type_id = #{typeId} or t.parent_id = #{typeId}
+            </if>
             <if test="maStatus != null  and maStatus != ''"> and d.ma_status = #{maStatus}</if>
             <if test="leaseScope != null "> and d.lease_scope = #{leaseScope}</if>
             <if test="location != null  and location != ''"> and d.location = #{location}</if>
@@ -73,7 +75,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 and d.working_hours &gt;= #{workingHoursMin} and d.working_hours &lt;= #{workingHoursMax}
             </if>
             <if test="serialNumber != null  and serialNumber != ''"> and d.serial_number = #{serialNumber}</if>
-            <if test="monthLeasePriceMin != null  and monthLeasePriceMin != '' and monthLeasePriceMax != null  and monthLeasePriceMax != ''">
+            <if test="monthLeasePriceMin != null  and monthLeasePriceMax != null">
                 and d.month_lease_price &gt;= #{monthLeasePriceMin} and d.month_lease_price &lt;= #{monthLeasePriceMax}
             </if>
             <if test="dayLeasePrice != null  and dayLeasePrice != ''"> and d.day_lease_price = #{dayLeasePrice}</if>

zlpt-modules/zlpt-order/src/main/resources/mapper/OrderInfoMapper.xml

@@ -20,7 +20,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectOrderInfoVo">
-        select order_id, p_id, code, time, end_time, deposit, cost, pay_type, supplier, order_status, order_user, order_company from ma_order_info
+        select order_id, p_id, code, time, end_time, deposit, cost, pay_type, supplier, order_status, reject_reason, order_user, order_company from ma_order_info
     </sql>
 
     <select id="selectOrderInfoList" parameterType="com.bonus.zlpt.common.core.domain.order.vo.OrderInfoVo" resultType="com.bonus.zlpt.common.core.domain.order.vo.OrderInfoVo">
@@ -44,7 +44,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
     
     <select id="selectOrderInfoByOrderId" parameterType="Long" resultType="com.bonus.zlpt.common.core.domain.order.vo.OrderInfoVo">
-        select d.*,o.code,o.time,o.order_status
+        select d.*,o.code,o.time,o.order_status,o.reject_reason
         from ma_order_info o
         left join ma_order_details d on d.order_id = o.order_id
         where o.order_id = #{orderId}
@@ -68,6 +68,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="payType != null">pay_type,</if>
             <if test="supplier != null">supplier,</if>
             <if test="orderStatus != null">order_status,</if>
+            <if test="rejectReason != null">reject_reason,</if>
             <if test="orderUser != null">order_user,</if>
             <if test="orderCompany != null">order_company,</if>
          </trim>
@@ -82,6 +83,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="payType != null">#{payType},</if>
             <if test="supplier != null">#{supplier},</if>
             <if test="orderStatus != null">#{orderStatus},</if>
+            <if test="rejectReason != null">#{rejectReason},</if>
             <if test="orderUser != null">#{orderUser},</if>
             <if test="orderCompany != null">#{orderCompany},</if>
          </trim>
@@ -150,6 +152,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="payType != null">pay_type = #{payType},</if>
             <if test="supplier != null">supplier = #{supplier},</if>
             <if test="orderStatus != null">order_status = #{orderStatus},</if>
+            <if test="rejectReason != null">reject_reason = #{rejectReason},</if>
             <if test="orderUser != null">order_user = #{orderUser},</if>
             <if test="orderCompany != null">order_company = #{orderCompany},</if>
         </trim>