diff --git a/web/src/main/java/com/ibeetl/jlw/entity/HandsOn.java b/web/src/main/java/com/ibeetl/jlw/entity/HandsOn.java index 1f861645..4a25dfa8 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/HandsOn.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/HandsOn.java @@ -83,7 +83,17 @@ public class HandsOn extends BaseEntity{ private Long userId; //附件 private String trainingData; - + + private int handsOnStatus; + + public int getHandsOnStatus() { + return handsOnStatus; + } + + public void setHandsOnStatus(int handsOnStatus) { + this.handsOnStatus = handsOnStatus; + } + public HandsOn(){ } diff --git a/web/src/main/java/com/ibeetl/jlw/entity/ResourcesCompetition.java b/web/src/main/java/com/ibeetl/jlw/entity/ResourcesCompetition.java index a2f79913..eb5f7060 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/ResourcesCompetition.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/ResourcesCompetition.java @@ -47,7 +47,17 @@ public class ResourcesCompetition extends BaseEntity{ //后台用户ID private Long userId ; - + + private Integer resourcesCompetitionStatus; + + public Integer getResourcesCompetitionStatus() { + return resourcesCompetitionStatus; + } + + public void setResourcesCompetitionStatus(Integer resourcesCompetitionStatus) { + this.resourcesCompetitionStatus = resourcesCompetitionStatus; + } + public ResourcesCompetition(){ } diff --git a/web/src/main/java/com/ibeetl/jlw/entity/ResourcesTraining.java b/web/src/main/java/com/ibeetl/jlw/entity/ResourcesTraining.java index 0814fd26..10800962 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/ResourcesTraining.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/ResourcesTraining.java @@ -47,7 +47,17 @@ public class ResourcesTraining extends BaseEntity{ //后台用户ID private Long userId ; - + + private Integer resourcesTrainingStatus; + + public Integer getResourcesTrainingStatus() { + return resourcesTrainingStatus; + } + + public void setResourcesTrainingStatus(Integer resourcesTrainingStatus) { + this.resourcesTrainingStatus = resourcesTrainingStatus; + } + public ResourcesTraining(){ } 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 9f3332c3..f40d013c 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 @@ -38,6 +38,16 @@ public class HandsOnQuery extends PageParam { @Query(name = "数据集", display = false) private String trainingData; + private int handsOnStatus; + + public int getHandsOnStatus() { + return handsOnStatus; + } + + public void setHandsOnStatus(int handsOnStatus) { + this.handsOnStatus = handsOnStatus; + } + public Date getAddTime() { return addTime; } @@ -74,6 +84,7 @@ public class HandsOnQuery extends PageParam { private String _given;//指定更新的特定字段,多个逗号隔开 + public Long getHandsOnId(){ return handsOnId; } @@ -125,6 +136,7 @@ public class HandsOnQuery extends PageParam { pojo.setUserId(this.getUserId()); pojo.setTrainingData(this.getTrainingData()); pojo.setTeacherOpenCourseId(this.getTeacherOpenCourseId()); + pojo.setHandsOnStatus(this.getHandsOnStatus()); return pojo; } diff --git a/web/src/main/java/com/ibeetl/jlw/web/query/ResourcesCompetitionQuery.java b/web/src/main/java/com/ibeetl/jlw/web/query/ResourcesCompetitionQuery.java index 6394fe23..e2d6556e 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/query/ResourcesCompetitionQuery.java +++ b/web/src/main/java/com/ibeetl/jlw/web/query/ResourcesCompetitionQuery.java @@ -36,6 +36,16 @@ public class ResourcesCompetitionQuery extends PageParam { private String courseInfoIds; + private Integer resourcesCompetitionStatus; + + public Integer getResourcesCompetitionStatus() { + return resourcesCompetitionStatus; + } + + public void setResourcesCompetitionStatus(Integer resourcesCompetitionStatus) { + this.resourcesCompetitionStatus = resourcesCompetitionStatus; + } + public Long getResourcesCompetitionId(){ return resourcesCompetitionId; @@ -97,6 +107,7 @@ public class ResourcesCompetitionQuery extends PageParam { pojo.setResourcesCompetitionData(this.getResourcesCompetitionData()); pojo.setOrgId(this.getOrgId()); pojo.setUserId(this.getUserId()); + pojo.setResourcesCompetitionStatus(this.getResourcesCompetitionStatus()); return pojo; } diff --git a/web/src/main/java/com/ibeetl/jlw/web/query/ResourcesTrainingQuery.java b/web/src/main/java/com/ibeetl/jlw/web/query/ResourcesTrainingQuery.java index 85f57b0e..58cbbfdd 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/query/ResourcesTrainingQuery.java +++ b/web/src/main/java/com/ibeetl/jlw/web/query/ResourcesTrainingQuery.java @@ -31,6 +31,16 @@ public class ResourcesTrainingQuery extends PageParam { private Long studentId; + private Integer resourcesTrainingStatus; + + public Integer getResourcesTrainingStatus() { + return resourcesTrainingStatus; + } + + public void setResourcesTrainingStatus(Integer resourcesTrainingStatus) { + this.resourcesTrainingStatus = resourcesTrainingStatus; + } + public Long getResourcesTrainingId(){ return resourcesTrainingId; } @@ -91,6 +101,7 @@ public class ResourcesTrainingQuery extends PageParam { pojo.setResourcesTrainingData(this.getResourcesTrainingData()); pojo.setOrgId(this.getOrgId()); pojo.setUserId(this.getUserId()); + pojo.setResourcesTrainingStatus(this.getResourcesTrainingStatus()); return pojo; } diff --git a/web/src/main/resources/sql/jlw/handsOn.md b/web/src/main/resources/sql/jlw/handsOn.md index 5fcb4727..4a57b31c 100644 --- a/web/src/main/resources/sql/jlw/handsOn.md +++ b/web/src/main/resources/sql/jlw/handsOn.md @@ -28,6 +28,9 @@ queryByCondition @if(!isEmpty(handsOnRecommend)){ and t.hands_on_recommend =#handsOnRecommend# @} + @if(!isEmpty(handsOnStatus)){ + and t.hands_on_status =#handsOnStatus# + @} queryByConditionQuery @@ -58,6 +61,9 @@ queryByConditionQuery @if(!isEmpty(teacherOpenCourseId)){ and t.teacher_open_course_id =#teacherOpenCourseId# @} + @if(!isEmpty(handsOnStatus)){ + and t.hands_on_status =#handsOnStatus# + @} @@ -143,6 +149,9 @@ getHandsOnValues @if(!isEmpty(teacherOpenCourseId)){ and t.teacher_open_course_id =#teacherOpenCourseId# @} + @if(!isEmpty(handsOnStatus)){ + and t.hands_on_status =#handsOnStatus# + @} getValuesByQuery @@ -171,7 +180,9 @@ getValuesByQuery @if(!isEmpty(teacherOpenCourseId)){ and t.teacher_open_course_id =#teacherOpenCourseId# @} - + @if(!isEmpty(handsOnStatus)){ + and t.hands_on_status =#handsOnStatus# + @} queryObjectByHandsOnIds diff --git a/web/src/main/resources/sql/jlw/resourcesCompetition.md b/web/src/main/resources/sql/jlw/resourcesCompetition.md index 20dfed68..7e983b65 100644 --- a/web/src/main/resources/sql/jlw/resourcesCompetition.md +++ b/web/src/main/resources/sql/jlw/resourcesCompetition.md @@ -61,6 +61,9 @@ queryByCondition @if(!isEmpty(userId)){ and t.user_id =#userId# @} + @if(!isEmpty(resourcesCompetitionStatus)){ + and t.resources_competition_status =#resourcesCompetitionStatus# + @} @if(!isEmpty(resourcesCompetitionIds)){ ORDER BY find_in_set(t.resources_competition_id,#resourcesCompetitionIds#) @}else{ @@ -107,6 +110,9 @@ queryByCondition2Student @if(!isEmpty(userId)){ and t.user_id =#userId# @} + @if(!isEmpty(resourcesCompetitionStatus)){ + and t.resources_competition_status =#resourcesCompetitionStatus# + @} @if(!isEmpty(resourcesCompetitionIds)){ ORDER BY find_in_set(t.resources_competition_id,#resourcesCompetitionIds#) @}else{ @@ -196,6 +202,9 @@ getValuesByQuery @if(!isEmpty(userId)){ and t.user_id =#userId# @} + @if(!isEmpty(resourcesCompetitionStatus)){ + and t.resources_competition_status =#resourcesCompetitionStatus# + @} getResourcesCompetitionValues @@ -227,6 +236,9 @@ getResourcesCompetitionValues @if(!isEmpty(userId)){ and t.user_id =#userId# @} + @if(!isEmpty(resourcesCompetitionStatus)){ + and t.resources_competition_status =#resourcesCompetitionStatus# + @} diff --git a/web/src/main/resources/sql/jlw/resourcesTraining.md b/web/src/main/resources/sql/jlw/resourcesTraining.md index 41818bc1..66f6428f 100644 --- a/web/src/main/resources/sql/jlw/resourcesTraining.md +++ b/web/src/main/resources/sql/jlw/resourcesTraining.md @@ -63,6 +63,9 @@ queryByCondition @if(!isEmpty(resourcesTrainingIds)){ and find_in_set(t.resources_training_id,#resourcesTrainingIds#) @} + @if(!isEmpty(resourcesTrainingStatus)){ + and t.resources_training_status =#resourcesTrainingStatus# + @} @if(!isEmpty(resourcesTrainingIds)){ ORDER BY find_in_set(t.resources_training_id,#resourcesTrainingIds#) @}else{ @@ -148,6 +151,9 @@ queryByCondition2Student @if(!isEmpty(userId)){ and t.user_id =#userId# @} + @if(!isEmpty(resourcesTrainingStatus)){ + and t.resources_training_status =#resourcesTrainingStatus# + @} @if(!isEmpty(resourcesTrainingIds)){ ORDER BY find_in_set(t.resources_training_id,#resourcesTrainingIds#) @}else{ @@ -222,7 +228,9 @@ getValuesByQuery @if(!isEmpty(userId)){ and t.user_id =#userId# @} - + @if(!isEmpty(resourcesTrainingStatus)){ + and t.resources_training_status =#resourcesTrainingStatus# + @} getResourcesTrainingValues === @@ -253,7 +261,9 @@ getResourcesTrainingValues @if(!isEmpty(userId)){ and t.user_id =#userId# @} - + @if(!isEmpty(resourcesTrainingStatus)){ + and t.resources_training_status =#resourcesTrainingStatus# + @} getValuesToCourseInfo ===