From c7cfbb102a5b0a004ea39891fc79b7a65bb9d2a0 Mon Sep 17 00:00:00 2001
From: Mlxa0324 <mlx950324@163.com>
Date: Thu, 13 Oct 2022 14:02:11 +0800
Subject: [PATCH] =?UTF-8?q?Beetl=E5=B7=A5=E5=85=B7=E5=8C=85=E6=89=A9?=
 =?UTF-8?q?=E5=B1=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../util/beetl/EqualsIgnoreCaseFunction.java  | 52 +++++++++----------
 .../TeacherOpenCourseQuestionSetting.java     |  4 +-
 ...TeacherOpenCourseStudentSigninSetting.java |  2 +-
 web/src/main/resources/btsql-ext.properties   | 12 ++++-
 4 files changed, 39 insertions(+), 31 deletions(-)

diff --git a/admin-core/src/main/java/com/ibeetl/admin/core/util/beetl/EqualsIgnoreCaseFunction.java b/admin-core/src/main/java/com/ibeetl/admin/core/util/beetl/EqualsIgnoreCaseFunction.java
index 553c4153..a9fe0d15 100644
--- a/admin-core/src/main/java/com/ibeetl/admin/core/util/beetl/EqualsIgnoreCaseFunction.java
+++ b/admin-core/src/main/java/com/ibeetl/admin/core/util/beetl/EqualsIgnoreCaseFunction.java
@@ -1,26 +1,26 @@
-package com.ibeetl.admin.core.util.beetl;
-
-import org.beetl.core.Context;
-import org.beetl.core.Function;
-import org.springframework.stereotype.Component;
-
-/**
- * 忽略大小写的比较
- */
-@Component
-public class EqualsIgnoreCaseFunction implements Function {
-
-    @Override
-    public Object call(Object[] objects, Context context) {
-        try{
-            if(objects != null && objects.length == 2){
-                String left = objects[0].toString();
-                String right = objects[1].toString();
-                return left.equalsIgnoreCase(right);
-            }
-        }catch (Exception e){
-            e.printStackTrace();
-        }
-        return false;
-    }
-}
+//package com.ibeetl.admin.core.util.beetl;
+//
+//import org.beetl.core.Context;
+//import org.beetl.core.Function;
+//import org.springframework.stereotype.Component;
+//
+///**
+// * 忽略大小写的比较
+// */
+//@Component
+//public class EqualsIgnoreCaseFunction implements Function {
+//
+//    @Override
+//    public Object call(Object[] objects, Context context) {
+//        try{
+//            if(objects != null && objects.length == 2){
+//                String left = objects[0].toString();
+//                String right = objects[1].toString();
+//                return left.equalsIgnoreCase(right);
+//            }
+//        }catch (Exception e){
+//            e.printStackTrace();
+//        }
+//        return false;
+//    }
+//}
diff --git a/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseQuestionSetting.java b/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseQuestionSetting.java
index 41ae6ca5..9ea947a2 100644
--- a/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseQuestionSetting.java
+++ b/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseQuestionSetting.java
@@ -137,7 +137,7 @@ public class TeacherOpenCourseQuestionSetting extends BaseEntity {
 
     // 关联的班级列表
     @FetchSql("select  \n" +
-            "@if(equalsIgnoreCase(teacherOpenCourseQuestionSettingId, 'ALL')) { \n" +
+            "@if(strUtil.equalsIgnoreCase(teacherOpenCourseQuestionSettingId, 'ALL')) { \n" +
             "'所有班级' \n" +
             "@} else { \n" +
             "group_concat(t.class_name) \n" +
@@ -145,7 +145,7 @@ public class TeacherOpenCourseQuestionSetting extends BaseEntity {
             "from school_class t where find_in_set(t.class_id, #teacherOpenCourseQuestionSettingSchoolClassIds#) \n" +
             "and t.class_status = 1 \n" +
             // 像章节练习这块，是不关联班级的，可以理解只要是学生身份，且加入这个课程，就可以做题。这个时候，给默认的占位符 'ALL' 或者 'all'
-            "@if(equalsIgnoreCase(teacherOpenCourseQuestionSettingId, 'ALL')) { \n" +
+            "@if(strUtil.equalsIgnoreCase(teacherOpenCourseQuestionSettingId, 'ALL')) { \n" +
             "and 1 != 1 \n" +
             "@} \n")
     private String teacherOpenCourseQuestionSettingSchoolClassNames;
diff --git a/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseStudentSigninSetting.java b/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseStudentSigninSetting.java
index c8e98265..9b3e1724 100644
--- a/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseStudentSigninSetting.java
+++ b/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseStudentSigninSetting.java
@@ -43,7 +43,7 @@ public class TeacherOpenCourseStudentSigninSetting extends BaseEntity{
     }
 
     @FetchSql(
-            "@if(equalsIgnoreCase(schoolClassIds, 'ALL')) { \n" +
+            "@if(strUtil.equalsIgnoreCase(schoolClassIds, 'ALL')) { \n" +
             "select '所有班级'  \n" +
             "@} else { \n" +
             " select group_concat(class_name) " +
diff --git a/web/src/main/resources/btsql-ext.properties b/web/src/main/resources/btsql-ext.properties
index a3821048..9d50660f 100644
--- a/web/src/main/resources/btsql-ext.properties
+++ b/web/src/main/resources/btsql-ext.properties
@@ -26,6 +26,14 @@ FN.getCommentLimit= com.ibeetl.admin.core.util.beetl.CommentTimeLimit
 FN.split= com.ibeetl.admin.core.util.beetl.SplitFunction
 #\u6839\u636E\u64CD\u4F5C\u4EBA\u5458\u7684\u96C6\u56E2\u663E\u793A\u76F8\u5E94\u7684\u4F1A\u5458\u7B49\u7EA7
 FN.rankJurisdiction= com.ibeetl.admin.core.util.beetl.RankJurisdictionFunction
-#\u5FFD\u7565\u5927\u5C0F\u5199\u7684\u6BD4\u5BF9
-FN.equalsIgnoreCase= com.ibeetl.admin.core.util.beetl.EqualsIgnoreCaseFunction
+#\u5FFD\u7565\u5927\u5C0F\u5199\u7684\u6BD4\u5BF9\uFF08\u4EA4\u7ED9strUtil\u5DE5\u5177\u5305\u5904\u7406\uFF09
+#FN.equalsIgnoreCase= com.ibeetl.admin.core.util.beetl.EqualsIgnoreCaseFunction
 
+##\u6269\u5C55\u7684\u529F\u80FD\u5305
+#\u5B57\u7B26\u4E32\u5DE5\u5177\u7C7B
+FNP.strUtil = cn.hutool.core.text.CharSequenceUtil
+#\u5BF9\u8C61\u5DE5\u5177\u7C7B
+FNP.objUtil = cn.hutool.core.util.ObjectUtil
+#\u6B63\u5219\u5DE5\u5177\u7C7B
+FNP.reUtil = cn.hutool.core.util.ReUtil
+FNP.dateUtil =cn.hutool.core.date.DateUtil
\ No newline at end of file