zouxuan 5 年 前
コミット
c1d22fb5cd

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

@@ -9,7 +9,7 @@ public class TeacherCourseRewardQueryInfo extends QueryInfo {
 
     private String organId;
 
-    private Integer settlementStatus;
+    private String settlementStatus;
 
     private Date startTime;
 
@@ -47,11 +47,11 @@ public class TeacherCourseRewardQueryInfo extends QueryInfo {
         this.organId = organId;
     }
 
-    public Integer getSettlementStatus() {
+    public String getSettlementStatus() {
         return settlementStatus;
     }
 
-    public void setSettlementStatus(Integer settlementStatus) {
+    public void setSettlementStatus(String settlementStatus) {
         this.settlementStatus = settlementStatus;
     }
 }

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

@@ -144,7 +144,7 @@
             <if test="organId != null and organId != ''">
                 AND FIND_IN_SET(tcr.organ_id_ ,#{organId})
             </if>
-            <if test="settlementStatus != null">
+            <if test="settlementStatus != null and settlementStatus != ''">
                 AND tcr.settlement_status_ = #{settlementStatus}
             </if>
             <if test="startTime != null">