diff --git a/admin-core/src/main/java/com/ibeetl/admin/core/service/CoreDictService.java b/admin-core/src/main/java/com/ibeetl/admin/core/service/CoreDictService.java index d1a607bc..0c60a989 100644 --- a/admin-core/src/main/java/com/ibeetl/admin/core/service/CoreDictService.java +++ b/admin-core/src/main/java/com/ibeetl/admin/core/service/CoreDictService.java @@ -1,9 +1,12 @@ package com.ibeetl.admin.core.service; +import cn.hutool.core.util.NumberUtil; +import cn.hutool.core.util.ObjectUtil; import com.ibeetl.admin.core.dao.CoreDictDao; import com.ibeetl.admin.core.entity.CoreDict; import com.ibeetl.admin.core.util.BeetlSqlKit; import com.ibeetl.admin.core.util.enums.DelFlagEnum; +import com.ibeetl.starter.ObjectMapperJsonUtil; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -12,6 +15,7 @@ import org.springframework.cache.annotation.Cacheable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.math.BigDecimal; import java.util.*; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -204,6 +208,25 @@ public class CoreDictService extends CoreBaseService { return dictDao.findTypeList(DelFlagEnum.NORMAL.getValue()); } + + /** + * 数据字典获取不到给默认值 + * 一般用于只有一个键值对的情况 + * @param type + * @param defaultValue + * @return + */ + public String getOrDefault(String type, String defaultValue) { + List passRateList = findAllByType(type); + if (ObjectUtil.isNotEmpty(passRateList)) { + String passRateValue = passRateList.stream().sorted(((o1, o2) -> o2.getSort() - o1.getSort())).findFirst().get().getValue(); + if (ObjectUtil.isNotEmpty(passRateValue)) { + return passRateValue; + } + } + return defaultValue; + } + diff --git a/web/src/main/java/com/ibeetl/jlw/service/GeneralQuestionLogService.java b/web/src/main/java/com/ibeetl/jlw/service/GeneralQuestionLogService.java index a89cfd95..c2663e1a 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/GeneralQuestionLogService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/GeneralQuestionLogService.java @@ -11,8 +11,10 @@ import cn.hutool.core.util.ReUtil; import cn.jlw.util.ToolUtils; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; +import com.ibeetl.admin.core.entity.CoreDict; import com.ibeetl.admin.core.entity.CoreUser; import com.ibeetl.admin.core.service.CoreBaseService; +import com.ibeetl.admin.core.service.CoreDictService; import com.ibeetl.admin.core.util.PlatformException; import com.ibeetl.admin.core.util.TimeTool; import com.ibeetl.admin.core.web.JsonResult; @@ -81,6 +83,7 @@ public class GeneralQuestionLogService extends CoreBaseServicequeryByCondition(PageQuery query){ PageQuery ret = teacherOpenCourseQuestionLogDao.queryByCondition(query); queryListAfter(ret.getList()); @@ -598,8 +600,13 @@ public class TeacherOpenCourseQuestionLogService extends CoreBaseService