Browse Source

fix:修復曲目審核查詢

liujunchi 3 years ago
parent
commit
d96ccc2db0

+ 4 - 4
cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/search/TeacherMusicSheetAuditSearch.java

@@ -1,7 +1,7 @@
 package com.yonge.cooleshow.biz.dal.dto.search;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.yonge.cooleshow.biz.dal.enums.StateEnum;
+import com.yonge.cooleshow.biz.dal.enums.AuditEnum;
 import com.yonge.cooleshow.biz.dal.support.Query;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -37,7 +37,7 @@ public class TeacherMusicSheetAuditSearch extends Query {
 
 
     @ApiModelProperty("审核状态(0:审核中,1:已通过,2:已拒绝)")
-    private StateEnum state;
+    private AuditEnum state;
 
     public String getIdAndName() {
         return idAndName;
@@ -71,11 +71,11 @@ public class TeacherMusicSheetAuditSearch extends Query {
         this.endTime = endTime;
     }
 
-    public StateEnum getState() {
+    public AuditEnum getState() {
         return state;
     }
 
-    public void setState(StateEnum state) {
+    public void setState(AuditEnum state) {
         this.state = state;
     }
 }

+ 7 - 4
cooleshow-user/user-biz/src/main/resources/config/mybatis/MusicSheetMapper.xml

@@ -336,10 +336,10 @@
                 and ms.create_by_ = #{param.teacherId}
             </if>
             <if test="param.startTime != null">
-                and ms.create_by_ &gt; #{param.startTime}
+                and ms.create_time_ &gt; #{param.startTime}
             </if>
             <if test="param.endTime != null">
-                and ms.create_by_ &lt; #{param.endTime}
+                and ms.create_time_ &lt; #{param.endTime}
             </if>
         </where>
     </select>
@@ -374,11 +374,14 @@
             <if test="param.auditName != null and param.auditName != ''">
                 and su2.username_ like concat('%',#{param.auditName},'%')
             </if>
+            <if test="param.state != null">
+                and ms.audit_status_ = #{param.state}
+            </if>
             <if test="param.startTime != null">
-                and ms.create_by_ &gt; #{param.startTime}
+                and ms.create_time_ &gt; #{param.startTime}
             </if>
             <if test="param.endTime != null">
-                and ms.create_by_ &lt; #{param.endTime}
+                and ms.create_time_ &lt; #{param.endTime}
             </if>
         </where>
     </select>