Merge remote-tracking branch 'origin/beetlsql3-dev' into beetlsql3-dev

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);

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;
     }

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