add 结转状态查询

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

@@ -3,6 +3,8 @@ package com.ym.mec.biz.dal.page;
 import com.ym.mec.common.page.QueryInfo;
 import io.swagger.annotations.ApiModelProperty;
 
+import java.math.BigDecimal;
+
 public class StudentPaymentOrderQueryInfo extends QueryInfo {
 
     @ApiModelProperty(value = "开始时间",required = false)
@@ -35,6 +37,13 @@ public class StudentPaymentOrderQueryInfo extends QueryInfo {
     @ApiModelProperty(value = "分配分部",required = false)
     private String routingOrganId;
 
+    @ApiModelProperty(value = "现金支付金额",required = false)
+    private BigDecimal actualAmount;
+
+    @ApiModelProperty(value = "余额支付金额",required = false)
+    private BigDecimal balancePaymentAmount;
+
+
     private boolean isExport = false;
 
     public boolean getIsExport() {
@@ -124,4 +133,20 @@ public class StudentPaymentOrderQueryInfo extends QueryInfo {
     public void setRoutingOrganId(String routingOrganId) {
         this.routingOrganId = routingOrganId;
     }
+
+    public BigDecimal getActualAmount() {
+        return actualAmount;
+    }
+
+    public void setActualAmount(BigDecimal actualAmount) {
+        this.actualAmount = actualAmount;
+    }
+
+    public BigDecimal getBalancePaymentAmount() {
+        return balancePaymentAmount;
+    }
+
+    public void setBalancePaymentAmount(BigDecimal balancePaymentAmount) {
+        this.balancePaymentAmount = balancePaymentAmount;
+    }
 }

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

@@ -237,6 +237,13 @@
             <if test="routingOrganId != null">
                 AND FIND_IN_SET(spo.routing_organ_id_,#{routingOrganId})
             </if>
+            <if test="actualAmount != null">
+                AND spo.actual_amount_ >= #{actualAmount}
+            </if>
+
+            <if test="balancePaymentAmount != null">
+                AND spo.balance_payment_amount >= #{balancePaymentAmount}
+            </if>
         </where>
     </sql>