diff --git a/src/main/java/com/jwl/driver/server/constant/Constants.java b/src/main/java/com/jwl/driver/server/constant/Constants.java index 95215c5..e050280 100644 --- a/src/main/java/com/jwl/driver/server/constant/Constants.java +++ b/src/main/java/com/jwl/driver/server/constant/Constants.java @@ -6,6 +6,8 @@ package com.jwl.driver.server.constant; public class Constants { + public static Integer DEFAULT_CARTYPE_ID = -1; + //短信验证码redis存储的前缀 public static String MESSAGE_CODE_PREFIX = "code_"; @@ -39,4 +41,7 @@ public class Constants { //多选题 public static String QUESTION_TYPE_THREE = "3"; + //字典表题目分类标识 + public static String QUESTION_CATEGORY = "QusetionCategory"; + } diff --git a/src/main/java/com/jwl/driver/server/service/impl/TdQuestionServiceImpl.java b/src/main/java/com/jwl/driver/server/service/impl/TdQuestionServiceImpl.java index 298ce25..c6db098 100644 --- a/src/main/java/com/jwl/driver/server/service/impl/TdQuestionServiceImpl.java +++ b/src/main/java/com/jwl/driver/server/service/impl/TdQuestionServiceImpl.java @@ -1,21 +1,24 @@ package com.jwl.driver.server.service.impl; +import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.jwl.driver.server.constant.Constants; import com.jwl.driver.server.dto.QuestionQueryDto; import com.jwl.driver.server.entity.TdQuestion; +import com.jwl.driver.server.entity.TdSysConfigList; import com.jwl.driver.server.mapper.TdQuestionMapper; import com.jwl.driver.server.service.ITdQuestionService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.jwl.driver.server.service.ITdSysConfigListService; import com.jwl.driver.server.service.ITdSysConfigService; import com.jwl.driver.server.vo.QusetionCategoryVo; import com.jwl.driver.server.vo.QusetionVo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.ArrayList; -import java.util.List; +import java.util.*; +import java.util.stream.Collectors; /** *
@@ -31,6 +34,9 @@ public class TdQuestionServiceImpl extends ServiceImpl