From 6f5386cb0ba0bf5ba54ff180cb48368d30ea8c27 Mon Sep 17 00:00:00 2001 From: xuliangtong <1124839262@qq.com> Date: Sat, 18 Mar 2023 20:16:05 +0800 Subject: [PATCH] 1 --- .../java/com/ibeetl/jlw/web/HandsOnController.java | 4 +++- .../java/com/ibeetl/jlw/web/query/HandsOnQuery.java | 10 ++++++++++ web/src/main/resources/sql/jlw/handsOn.md | 8 +++++++- 3 files changed, 20 insertions(+), 2 deletions(-) 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 2f26cec1..e2bfd872 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/HandsOnController.java +++ b/web/src/main/java/com/ibeetl/jlw/web/HandsOnController.java @@ -153,7 +153,9 @@ public class HandsOnController{ condition.setCourseInfoIds(courseInfoIds); condition.setOrgId(coreUser.getOrgId()); } - + if ( condition.getHandsOnStatus() != null && 0 == condition.getHandsOnStatus()) { + condition.setHandsOnStatus(2); + } PageQuery page = condition.getPageQuery(); handsOnService.queryByCondition(page); return JsonResult.success(page); 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 fb0f7fed..2550a459 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 @@ -40,6 +40,16 @@ public class HandsOnQuery extends PageParam { private String courseInfoIds; + private Long courseInfoId_0; + + public Long getCourseInfoId_0() { + return courseInfoId_0; + } + + public void setCourseInfoId_0(Long courseInfoId_0) { + this.courseInfoId_0 = courseInfoId_0; + } + public String getCourseInfoIds() { return courseInfoIds; } diff --git a/web/src/main/resources/sql/jlw/handsOn.md b/web/src/main/resources/sql/jlw/handsOn.md index 14b6e92c..9f8c8844 100644 --- a/web/src/main/resources/sql/jlw/handsOn.md +++ b/web/src/main/resources/sql/jlw/handsOn.md @@ -37,6 +37,10 @@ queryByCondition @if(!isEmpty(courseInfoIds)){ and find_in_set(t.courseInfoId,#handsOnStatus#) @} + @if(!isEmpty(courseInfoId_0)){ + and t.course_info_id =#courseInfoId_0# + @} + queryByConditionQuery @@ -76,7 +80,9 @@ queryByConditionQuery @if(!isEmpty(courseInfoIds)){ and find_in_set(t.courseInfoId,#handsOnStatus#) @} - + @if(!isEmpty(courseInfoId_0)){ + and t.course_info_id =#courseInfoId_0# + @} deleteHandsOnByIds