Merge remote-tracking branch 'origin/master'

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

@@ -7,6 +7,8 @@ public class TeacherCourseRewardQueryInfo extends QueryInfo {
 
     private String organId;
 
+    private Integer settlementStatus;
+
     public Integer getTeacherId() {
         return teacherId;
     }
@@ -22,4 +24,12 @@ public class TeacherCourseRewardQueryInfo extends QueryInfo {
     public void setOrganId(String organId) {
         this.organId = organId;
     }
+
+    public Integer getSettlementStatus() {
+        return settlementStatus;
+    }
+
+    public void setSettlementStatus(Integer settlementStatus) {
+        this.settlementStatus = settlementStatus;
+    }
 }

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

@@ -144,6 +144,9 @@
             <if test="organId!=null">
                 AND FIND_IN_SET(tcr.organ_id_ ,#{organId})
             </if>
+            <if test="settlementStatus!=null">
+                AND tcr.settlement_status_ = #{settlementStatus}
+            </if>
         </where>
     </sql>