修复 编程竞赛案例管理课程搜索条件；

修复 编程实训案例管理课程搜索条件

web/src/main/java/com/ibeetl/jlw/web/query/ResourcesCompetitionQuery.java

@@ -1,14 +1,8 @@
 package com.ibeetl.jlw.web.query;
 
-import com.ibeetl.jlw.entity.ResourcesCompetition;
-import org.apache.commons.lang3.StringUtils;
 import com.ibeetl.admin.core.annotation.Query;
-import com.ibeetl.admin.core.util.Tool;
-import com.ibeetl.admin.core.util.enums.CoreDictType;
 import com.ibeetl.admin.core.web.query.PageParam;
-
-import java.math.BigDecimal;
-import java.util.Date;
+import com.ibeetl.jlw.entity.ResourcesCompetition;
 
 /**
  *ResourcesCompetition查询
@@ -36,6 +30,9 @@ public class ResourcesCompetitionQuery extends PageParam {
 
     private String courseInfoIds;
 
+    private Long courseInfoId_0;
+    private Long courseInfoId_1;
+
     private Integer resourcesCompetitionStatus;
 
     public Integer getResourcesCompetitionStatus() {
@@ -127,4 +124,20 @@ public class ResourcesCompetitionQuery extends PageParam {
     public void setResourcesCompetitionIds(String resourcesCompetitionIds) {
         this.resourcesCompetitionIds = resourcesCompetitionIds;
     }
+
+    public Long getCourseInfoId_0() {
+        return courseInfoId_0;
+    }
+
+    public void setCourseInfoId_0(Long courseInfoId_0) {
+        this.courseInfoId_0 = courseInfoId_0;
+    }
+
+    public Long getCourseInfoId_1() {
+        return courseInfoId_1;
+    }
+
+    public void setCourseInfoId_1(Long courseInfoId_1) {
+        this.courseInfoId_1 = courseInfoId_1;
+    }
 }

web/src/main/java/com/ibeetl/jlw/web/query/ResourcesTrainingQuery.java

@@ -28,6 +28,8 @@ public class ResourcesTrainingQuery extends PageParam {
     private String resourcesTrainingIds;
 
     private String courseInfoIds;
+    private Long courseInfoId_0;
+    private Long courseInfoId_1;
 
     private Long studentId;
 
@@ -129,4 +131,20 @@ public class ResourcesTrainingQuery extends PageParam {
     public void setStudentId(Long studentId) {
         this.studentId = studentId;
     }
+
+    public Long getCourseInfoId_0() {
+        return courseInfoId_0;
+    }
+
+    public void setCourseInfoId_0(Long courseInfoId_0) {
+        this.courseInfoId_0 = courseInfoId_0;
+    }
+
+    public Long getCourseInfoId_1() {
+        return courseInfoId_1;
+    }
+
+    public void setCourseInfoId_1(Long courseInfoId_1) {
+        this.courseInfoId_1 = courseInfoId_1;
+    }
 }

web/src/main/resources/sql/jlw/resourcesCompetition.md

@@ -46,6 +46,12 @@ queryByCondition
       @if(!isEmpty(courseInfoId)){
         and t.course_info_id =#courseInfoId#
       @}
+      @if(!isEmpty(courseInfoId_0)){
+      and a.course_info_full_id like #'%\\_'+courseInfoId_0+'\\_%'#
+      @}
+      @if(!isEmpty(courseInfoId_1)){
+      and a.course_info_full_id  like #'%\\_'+courseInfoId_1+'\\_%'#
+      @}
       @if(!isEmpty(resourcesCompetitionName)){
         and t.resources_competition_name like #'%'+resourcesCompetitionName+'%'#
       @}

web/src/main/resources/sql/jlw/resourcesTraining.md

@@ -45,6 +45,12 @@ queryByCondition
       @if(!isEmpty(courseInfoId)){
         and t.course_info_id =#courseInfoId#
       @}
+      @if(!isEmpty(courseInfoId_0)){
+      and a.course_info_full_id like #'%\\_'+courseInfoId_0+'\\_%'#
+      @}
+      @if(!isEmpty(courseInfoId_1)){
+      and a.course_info_full_id  like #'%\\_'+courseInfoId_1+'\\_%'#
+      @}
       @if(!isEmpty(resourcesTrainingName)){
         and t.resources_training_name like #'%'+resourcesTrainingName+'%'#
       @}