diff --git a/web/src/main/java/com/ibeetl/jlw/service/StudentAccountAssetAllocationService.java b/web/src/main/java/com/ibeetl/jlw/service/StudentAccountAssetAllocationService.java index 02157804..b950d04c 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/StudentAccountAssetAllocationService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/StudentAccountAssetAllocationService.java @@ -193,7 +193,8 @@ public class StudentAccountAssetAllocationService extends CoreBaseService<Studen * @Author: 87966 * @Date: 2023/3/6 16:32 */ - public List<StudentAccountAssetAllocation> getByApplicationToken(@NotBlank(message = "applicationToken 传递的token不能为空!") String applicationToken, StudentAccountAssetAllocationQuery param) { + public List<StudentAccountAssetAllocation> getByApplicationToken( + @NotBlank(message = "applicationToken 传递的token不能为空!") String applicationToken, StudentAccountAssetAllocationQuery param) { LoginTodo loginTodo = validateAndGetLoginTodo(applicationToken); diff --git a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseQuestionLogService.java b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseQuestionLogService.java index 925fb34c..f5b14285 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseQuestionLogService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseQuestionLogService.java @@ -492,6 +492,7 @@ public class TeacherOpenCourseQuestionLogService extends CoreBaseService<Teacher // 学生提交的答案处理 String answersText = null; + // 填空题和分析题 if (questionType.contains(questionLog.getQuestionType())) { answersText = answer; diff --git a/web/src/main/java/com/ibeetl/jlw/web/query/StudentAccountTradingRecordSheetQuery.java b/web/src/main/java/com/ibeetl/jlw/web/query/StudentAccountTradingRecordSheetQuery.java index 2ce04334..5b44be8b 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/query/StudentAccountTradingRecordSheetQuery.java +++ b/web/src/main/java/com/ibeetl/jlw/web/query/StudentAccountTradingRecordSheetQuery.java @@ -1,15 +1,11 @@ package com.ibeetl.jlw.web.query; import cn.jlw.validate.ValidateConfig; -import com.ibeetl.jlw.entity.StudentAccountTradingRecordSheet; -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 com.ibeetl.jlw.entity.StudentAccountTradingRecordSheet; import javax.validation.constraints.NotNull; -import java.math.BigDecimal; import java.util.Date; /** @@ -37,6 +33,9 @@ public class StudentAccountTradingRecordSheetQuery extends PageParam { private String studentIdPlural; private String orgIdPlural; + private Date startTime; + private Date endTime; + private String studentAccountTradingRecordSheetJsonStr;//json格式 private String _given;//指定更新的特定字段,多个逗号隔开 @@ -127,4 +126,20 @@ public class StudentAccountTradingRecordSheetQuery extends PageParam { public void set_given(String _given) { this._given = _given; } + + public Date getStartTime() { + return startTime; + } + + public void setStartTime(Date startTime) { + this.startTime = startTime; + } + + public Date getEndTime() { + return endTime; + } + + public void setEndTime(Date endTime) { + this.endTime = endTime; + } } diff --git a/web/src/main/resources/sql/jlw/studentAccountTradingRecordSheet.md b/web/src/main/resources/sql/jlw/studentAccountTradingRecordSheet.md index f05b202b..7b675444 100644 --- a/web/src/main/resources/sql/jlw/studentAccountTradingRecordSheet.md +++ b/web/src/main/resources/sql/jlw/studentAccountTradingRecordSheet.md @@ -25,6 +25,12 @@ queryByCondition @if(!isEmpty(createTime)){ and t.create_time =#createTime# @} + @if(!isEmpty(startTime)){ + and t.create_time >= #startTime# + @} + @if(!isEmpty(endTime)){ + and t.create_time < #endTime# + @} @if(!isEmpty(studentId)){ and t.student_id =#studentId# @} @@ -67,6 +73,12 @@ queryByConditionQuery @if(!isEmpty(createTime)){ and t.create_time =#createTime# @} + @if(!isEmpty(startTime)){ + and t.create_time >= #startTime# + @} + @if(!isEmpty(endTime)){ + and t.create_time < #endTime# + @} @if(!isEmpty(studentId)){ and t.student_id =#studentId# @} @@ -219,6 +231,12 @@ getValuesByQuery @if(!isEmpty(createTime)){ and t.create_time =#createTime# @} + @if(!isEmpty(startTime)){ + and t.create_time >= #startTime# + @} + @if(!isEmpty(endTime)){ + and t.create_time < #endTime# + @} @if(!isEmpty(studentId)){ and t.student_id =#studentId# @} @@ -259,6 +277,12 @@ getValuesByQueryNotWithPermission @if(!isEmpty(createTime)){ and t.create_time =#createTime# @} + @if(!isEmpty(startTime)){ + and t.create_time >= #startTime# + @} + @if(!isEmpty(endTime)){ + and t.create_time < #endTime# + @} @if(!isEmpty(studentId)){ and t.student_id =#studentId# @}