经营报表修改

mec-biz/src/main/java/com/ym/mec/biz/dal/page/StudentPaymentOrderQueryInfo.java

@@ -44,6 +44,12 @@ public class StudentPaymentOrderQueryInfo extends QueryInfo {
     @ApiModelProperty(value = "余额支付金额",required = false)
     private BigDecimal balancePaymentAmount;
 
+    @ApiModelProperty(value = "现金支付金额(小于等于)",required = false)
+    private BigDecimal lessActualAmount;
+
+    @ApiModelProperty(value = "余额支付金额(小于等于)",required = false)
+    private BigDecimal lessBalancePaymentAmount;
+
     @ApiModelProperty(value = "订单号",required = false)
     private String orderNo;
 
@@ -192,4 +198,20 @@ public class StudentPaymentOrderQueryInfo extends QueryInfo {
     public void setUserIds(List<Integer> userIds) {
         this.userIds = userIds;
     }
+
+    public BigDecimal getLessActualAmount() {
+        return lessActualAmount;
+    }
+
+    public void setLessActualAmount(BigDecimal lessActualAmount) {
+        this.lessActualAmount = lessActualAmount;
+    }
+
+    public BigDecimal getLessBalancePaymentAmount() {
+        return lessBalancePaymentAmount;
+    }
+
+    public void setLessBalancePaymentAmount(BigDecimal lessBalancePaymentAmount) {
+        this.lessBalancePaymentAmount = lessBalancePaymentAmount;
+    }
 }

mec-biz/src/main/resources/config/mybatis/StudentPaymentOrderMapper.xml

@@ -205,6 +205,7 @@
     </select>
 
     <sql id="queryPaymentOrder">
+        <![CDATA[
         <where>
             <if test="userIds != null">
                 AND spo.user_id_ IN
@@ -252,6 +253,12 @@
             <if test="balancePaymentAmount != null">
                 AND spo.balance_payment_amount_ >= #{balancePaymentAmount}
             </if>
+            <if test="lessActualAmount != null">
+                AND spo.actual_amount_ <= #{lessActualAmount}
+           </if>
+            <if test="lessBalancePaymentAmount != null">
+                AND spo.balance_payment_amount_ <= #{lessBalancePaymentAmount}
+            </if>
             <if test="orderNo != null">
                 AND spo.order_no_ = #{orderNo}
             </if>
@@ -266,6 +273,7 @@
                 AND sci.charge_type_ = #{chargeType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
             </if>
         </where>
+         ]]>
     </sql>
 
     <select id="queryApplyGoodsList" resultMap="Goods" parameterType="map">

mec-biz/src/main/resources/config/mybatis/StudentPaymentRouteOrderMapper.xml

@@ -109,6 +109,7 @@
     </select>
 
     <sql id="queryPaymentOrder">
+        <![CDATA[
         <where>
             <if test="userIds != null">
                 AND spo.user_id_ IN
@@ -156,6 +157,12 @@
             <if test="balancePaymentAmount != null">
                 AND spo.balance_payment_amount_ >= #{balancePaymentAmount}
             </if>
+            <if test="lessActualAmount != null">
+                AND spo.actual_amount_ <= #{lessActualAmount}
+            </if>
+            <if test="lessBalancePaymentAmount != null">
+                AND spo.balance_payment_amount_ <= #{lessBalancePaymentAmount}
+            </if>
             <if test="orderNo != null">
                 AND spo.order_no_ = #{orderNo}
             </if>
@@ -170,6 +177,7 @@
                 AND sci.charge_type_ = #{chargeType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
             </if>
         </where>
+        ]]>
     </sql>
     <select id="getRouteOrders" resultMap="StudentPaymentRouteOrder">
         SELECT *