diff --git a/admin-core/src/main/java/com/ibeetl/admin/core/util/beetl/ContainFunction.java b/admin-core/src/main/java/com/ibeetl/admin/core/util/beetl/ContainFunction.java new file mode 100644 index 00000000..1c5ba331 --- /dev/null +++ b/admin-core/src/main/java/com/ibeetl/admin/core/util/beetl/ContainFunction.java @@ -0,0 +1,17 @@ +package com.ibeetl.admin.core.util.beetl; + +import org.beetl.core.Context; +import org.beetl.core.Function; + +/** + * 判断字符中中是否包含指定字段 + */ +public class ContainFunction implements Function { + + @Override + public Object call(Object[] paras, Context ctx) { + String fieldName = (String)paras[0]; + String fieldNames = (String)paras[1]; + return fieldNames.contains(fieldName); + } +} diff --git a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseStudentSigninSettingService.java b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseStudentSigninSettingService.java index 914b714b..220d71f7 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseStudentSigninSettingService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseStudentSigninSettingService.java @@ -1,5 +1,6 @@ package com.ibeetl.jlw.service; +import cn.hutool.core.bean.BeanUtil; import cn.jlw.util.ToolUtils; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; @@ -177,15 +178,26 @@ public class TeacherOpenCourseStudentSigninSettingService extends CoreBaseServic // 结束时间设置为空,代表只要大于开始时间,就一直可以进行签到 model.setTeacherOpenCourseStudentSigninSettingEndTime(null); model.setTeacherOpenCourseStudentSigninSettingStartStatus(StartStatusEnum.ING); + + TeacherOpenCourseStudentSigninSettingQuery settingQuery = new TeacherOpenCourseStudentSigninSettingQuery(); + BeanUtil.copyProperties(model, settingQuery); + settingQuery.setTeacherOpenCourseStudentSigninSettingIdPlural(id.toString()); + + settingQuery.set_given( + "teacherOpenCourseStudentSigninSettingAddTime," + + "teacherOpenCourseStudentSigninSettingEndTime," + + "teacherOpenCourseStudentSigninSettingStartStatus"); + updateGivenByIds(settingQuery); } break; case 2: { // 结束时间,赋值 model.setTeacherOpenCourseStudentSigninSettingEndTime(new Date()); model.setTeacherOpenCourseStudentSigninSettingStartStatus(StartStatusEnum.END); + updateTemplate(model); } break; } - updateTemplate(model); + } } diff --git a/web/src/main/resources/btsql-ext.properties b/web/src/main/resources/btsql-ext.properties index 6af67bba..707aab72 100644 --- a/web/src/main/resources/btsql-ext.properties +++ b/web/src/main/resources/btsql-ext.properties @@ -8,6 +8,7 @@ DELIMITER_PLACEHOLDER_END2=} #\u6839\u636E\u7C7B\u578B\u5224\u7A7A FN.isEmpty = org.beetl.ext.fn.EmptyExpressionFunction FN.isNotEmpty = org.beetl.ext.fn.IsNotEmptyExpressionFunction +FN.contain = com.ibeetl.admin.core.util.beetl.ContainFunction # sql\u8BED\u53E5\u91CC\u5E26\u6709\u6B64\u51FD\u6570\u6765\u5224\u65AD\u6570\u636E\u6743\u9650 FN.function= com.ibeetl.admin.core.util.beetl.DataAccessFunction #\u660E\u5929 diff --git a/web/src/main/resources/sql/jlw/teacherOpenCourseStudentSigninSetting.md b/web/src/main/resources/sql/jlw/teacherOpenCourseStudentSigninSetting.md index 2152e87e..8386bfbf 100644 --- a/web/src/main/resources/sql/jlw/teacherOpenCourseStudentSigninSetting.md +++ b/web/src/main/resources/sql/jlw/teacherOpenCourseStudentSigninSetting.md @@ -1,3 +1,4 @@ + queryByCondition === * 根据不为空的参数进行分页查询