diff --git a/web/src/main/java/com/ibeetl/jlw/web/query/HandsOnQuery.java b/web/src/main/java/com/ibeetl/jlw/web/query/HandsOnQuery.java index de8e3439..77bc243a 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/query/HandsOnQuery.java +++ b/web/src/main/java/com/ibeetl/jlw/web/query/HandsOnQuery.java @@ -48,7 +48,7 @@ public class HandsOnQuery extends PageParam { private String orgIdText; private String CourseInfoFullIdStr; - private String handsOnFrom; + private String dataType; public Long getCourseInfoId_0() { return courseInfoId_0; @@ -206,14 +206,6 @@ public class HandsOnQuery extends PageParam { CourseInfoFullIdStr = courseInfoFullIdStr; } - public String getHandsOnFrom() { - return handsOnFrom; - } - - public void setHandsOnFrom(String handsOnFrom) { - this.handsOnFrom = handsOnFrom; - } - public String getOrgIdText() { return orgIdText; } @@ -221,4 +213,12 @@ public class HandsOnQuery extends PageParam { public void setOrgIdText(String orgIdText) { this.orgIdText = orgIdText; } + + public String getDataType() { + return dataType; + } + + public void setDataType(String dataType) { + this.dataType = dataType; + } } diff --git a/web/src/main/resources/sql/jlw/handsOn.md b/web/src/main/resources/sql/jlw/handsOn.md index b6afbef2..abe80d00 100644 --- a/web/src/main/resources/sql/jlw/handsOn.md +++ b/web/src/main/resources/sql/jlw/handsOn.md @@ -150,8 +150,8 @@ queryByConditionMergeOpenCourseHandsOn @if(!isEmpty(orgIdPlural)){ and find_in_set(t.org_id,#orgIdPlural#) @} - @if(!isEmpty(handsOnFrom)){ - and t.data_type = #handsOnFrom# + @if(!isEmpty(dataType)){ + and t.data_type = #dataType# @} @if(!isEmpty(orgIdText)){ @if(orgIdText == '超级管理员' || orgIdText == '管理员') {