Merge branch 'maintenance_feature' into test

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

@@ -34,6 +34,9 @@ public class RepairStudentQueryInfo extends QueryInfo {
     @ApiModelProperty(value = "特权减免金额",required = false)
     private BigDecimal exemptionAmount;
 
+    @ApiModelProperty(value = "是否有减免金额0-否 1-是",required = false)
+    private Integer hasExemptionAmount;
+
 
     public Integer getSubjectId() {
         return subjectId;
@@ -122,4 +125,12 @@ public class RepairStudentQueryInfo extends QueryInfo {
     public void setExemptionAmount(BigDecimal exemptionAmount) {
         this.exemptionAmount = exemptionAmount;
     }
+
+    public Integer getHasExemptionAmount() {
+        return hasExemptionAmount;
+    }
+
+    public void setHasExemptionAmount(Integer hasExemptionAmount) {
+        this.hasExemptionAmount = hasExemptionAmount;
+    }
 }

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

@@ -209,9 +209,12 @@
             <if test="studentInstrumentId != null">
                 AND sr.student_instrument_id_ = #{studentInstrumentId}
             </if>
-            <if test="exemptionAmount != null">
+            <if test="hasExemptionAmount != null and hasExemptionAmount ==1">
                 AND sr.exemption_amount_ > #{exemptionAmount}
             </if>
+            <if test="hasExemptionAmount != null and hasExemptionAmount ==0">
+                AND sr.exemption_amount_ = 0
+            </if>
         </where>
     </sql>
     <select id="queryCount" resultType="int">