diff --git a/web/src/main/java/com/ibeetl/jlw/web/HandsOnController.java b/web/src/main/java/com/ibeetl/jlw/web/HandsOnController.java index 9433e90d..b7c81629 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/HandsOnController.java +++ b/web/src/main/java/com/ibeetl/jlw/web/HandsOnController.java @@ -336,6 +336,7 @@ public class HandsOnController{ query.setCourseInfoId(handsOn.getCourseInfoId()); query.setCourseChildNode(handsOn.getCourseChildNode()); query.setHandsOnName(handsOnName); + query.setHandsOnStatusPlural("1,2"); List valuesByQuery = handsOnService.getValuesByQuery(query); Assert.isTrue(CollectionUtil.isEmpty(valuesByQuery), "同一小节或者章节下,不允许重复的案例名称,请修改后再次提交!"); 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 77bc243a..4e1ef058 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 @@ -49,6 +49,7 @@ public class HandsOnQuery extends PageParam { private String CourseInfoFullIdStr; private String dataType; + private String handsOnStatusPlural; public Long getCourseInfoId_0() { return courseInfoId_0; @@ -221,4 +222,12 @@ public class HandsOnQuery extends PageParam { public void setDataType(String dataType) { this.dataType = dataType; } + + public String getHandsOnStatusPlural() { + return handsOnStatusPlural; + } + + public void setHandsOnStatusPlural(String handsOnStatusPlural) { + this.handsOnStatusPlural = handsOnStatusPlural; + } } diff --git a/web/src/main/resources/sql/jlw/handsOn.md b/web/src/main/resources/sql/jlw/handsOn.md index b4783db3..8c9a5b80 100644 --- a/web/src/main/resources/sql/jlw/handsOn.md +++ b/web/src/main/resources/sql/jlw/handsOn.md @@ -336,6 +336,9 @@ getValuesByQuery @if(!isEmpty(handsOnStatus)){ and t.hands_on_status =#handsOnStatus# @} + @if(!isEmpty(handsOnStatusPlural)){ + and find_in_set(t.hands_on_status,#handsOnStatusPlural#) + @} getValuesByQueryNotPermission