Merge branch 'dev/lanpingxiong' into 'master'

Dev/lanpingxiong

See merge request hewei/Jumeirah!75

common/src/main/java/com/jumeirah/common/param/McStrokePageParam.java

@@ -40,4 +40,7 @@ public class McStrokePageParam extends BasePageOrderParam {
     @ApiModelProperty("申请人")
     @ApiModelProperty("申请人")
     private String applicant;
     private String applicant;
 
 
+    @ApiModelProperty("是否是优惠调机，0-否，1-是")
+    private Boolean isDiscount = false;
+
 }
 }

common/src/main/resources/mapper/StrokeMapper.xml

@@ -192,6 +192,7 @@
             INNER JOIN city_three_code ctca ON ctca.id = s.city_arrive_id
             INNER JOIN city_three_code ctca ON ctca.id = s.city_arrive_id
             <where>
             <where>
                 s.mc_id = #{mcId}
                 s.mc_id = #{mcId}
+                s.is_discount = #{mcStrokePageParam.isDiscount}
                 <if test="mcStrokePageParam.status != null and mcStrokePageParam.status != -1">
                 <if test="mcStrokePageParam.status != null and mcStrokePageParam.status != -1">
                     AND s.status = #{mcStrokePageParam.status}
                     AND s.status = #{mcStrokePageParam.status}
                 </if>
                 </if>