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 69f8479..f4ec6f2 100644 --- a/src/main/java/com/jwl/driver/server/constant/Constants.java +++ b/src/main/java/com/jwl/driver/server/constant/Constants.java @@ -45,8 +45,11 @@ public class Constants { //多选题 public static String QUESTION_TYPE_THREE = "3"; - //字典表题目分类标识 - public static String QUESTION_CATEGORY = "QusetionCategory"; + //字典表题目科一分类标识 + public static String QUESTION_CATEGORY_OF_SUBJECT_ONE = "QusetionCategoryOfSubjectOne"; + + //字典表题目科四分类标识 + public static String QUESTION_CATEGORY_OF_SUBJECT_FOUR = "QusetionCategoryOfSubjectFour"; //微信支付 public static String WECHAT_PAY = "weChatPay"; 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 ede2516..ca93024 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 @@ -183,8 +183,17 @@ public class TdQuestionServiceImpl extends ServiceImpl categoryList = configListService.querySysConfigList(Constants.QUESTION_CATEGORY, Constants.DEFAULT_CARTYPE_ID); + List categoryList = new ArrayList<>(); + if (StrUtil.equals(Constants.SUBJECT_ONE,subject)){ + categoryList = configListService.querySysConfigList(Constants.QUESTION_CATEGORY_OF_SUBJECT_ONE, carTypeId); + } else if (StrUtil.equals(Constants.SUBJECT_FOUR,subject)){ + categoryList = configListService.querySysConfigList(Constants.QUESTION_CATEGORY_OF_SUBJECT_FOUR, carTypeId); + } + Map categoryMap = categoryList.stream().collect(Collectors.toMap(TdSysConfigList::getConfigItemCode, TdSysConfigList::getConfigItemName, (v1, v2) -> v1)); Map totalMap = new HashMap<>(); Map> errorQuestionIdMap = new HashMap<>();