From 3a8e1524dcf0eeb610d38123d5f0a3ef838379cd Mon Sep 17 00:00:00 2001
From: linzhijie <19970921lzj>
Date: 星期一, 12 四月 2021 15:44:53 +0800
Subject: [PATCH] Merge branch '20210406-maqv2' into 20210412-youhua
---
src/main/java/com/ots/project/exam/service/impl/TExamLevelServiceImpl.java | 69 ++++------------------------------
1 files changed, 8 insertions(+), 61 deletions(-)
diff --git a/src/main/java/com/ots/project/exam/service/impl/TExamLevelServiceImpl.java b/src/main/java/com/ots/project/exam/service/impl/TExamLevelServiceImpl.java
index fd0c6db..623f0cb 100644
--- a/src/main/java/com/ots/project/exam/service/impl/TExamLevelServiceImpl.java
+++ b/src/main/java/com/ots/project/exam/service/impl/TExamLevelServiceImpl.java
@@ -1,5 +1,4 @@
package com.ots.project.exam.service.impl;
-
import com.ots.common.utils.DateUtils;
import com.ots.common.utils.StringUtils;
import com.ots.common.utils.text.Convert;
@@ -10,64 +9,40 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.i18n.LocaleContextHolder;
import org.springframework.stereotype.Service;
-
import java.util.ArrayList;
import java.util.List;
import java.util.UUID;
-/**
- * 闂嵎绫诲瀷Service涓氬姟灞傚鐞�
- *
- * @author ots
- * @date 2019-12-15
- */
@Service("examLevel")
public class TExamLevelServiceImpl implements ITExamLevelService {
@Autowired
private TExamLevelMapper tExamLevelMapper;
-
@Autowired
private DictService dictService;
-
- /**
- * 鏌ヨ闂嵎绫诲瀷
- *
- * @param id 闂嵎绫诲瀷ID
- * @return 闂嵎绫诲瀷
- */
+
@Override
public TExamLevel selectTExamLevelById(Long id) {
return tExamLevelMapper.selectTExamLevelById(id);
}
-
@Override
public List<TExamLevel> selectTExamLevelByUuid(String uuid) {
return tExamLevelMapper.selectTExamLevelByUuid(uuid);
}
-
@Override
public TExamLevel selectTExamLevelByUuidLan(String uuid,String langType) {
return tExamLevelMapper.selectTExamLevelByUuidLan(uuid,langType);
}
-
@Override
public List<TExamLevel> selectTExamLevelAndTSubjectById(Long id) {
return tExamLevelMapper.selectTExamLevelAndTSubjectById(id);
}
-
- /**
- * 鏌ヨ闂嵎绫诲瀷鍒楄〃
- *
- * @param tExamLevel 闂嵎绫诲瀷
- * @return 闂嵎绫诲瀷
- */
+
@Override
public List<TExamLevel> selectTExamLevelList(TExamLevel tExamLevel) {
- //globalization(tExamLevel);
+
return tExamLevelMapper.selectTExamLevelList(tExamLevel);
}
-
- // 鍥介檯鍖�
+
private void globalization(TExamLevel tExamLevel) {
if(StringUtils.isNotBlank(tExamLevel.getUuid())){
/*List<DictData> lang_types = this.dictService.getType("lang_type");
@@ -91,13 +66,11 @@
tExamLevel.setLangType(this.dictService.getLangType(LocaleContextHolder.getLocale().toString()));
}
}
-
public List<TExamLevel> selectTExamLevelList() {
TExamLevel t = new TExamLevel();
t.setLangType(this.dictService.getLangType(LocaleContextHolder.getLocale().toString()));
return tExamLevelMapper.selectTExamLevelList(t);
}
-
@Override
public List<TExamLevel> selectTExamLevelListByType(String type) {
List<Integer> types = new ArrayList<>();
@@ -105,25 +78,17 @@
types.add(1);
types.add(3);
}
-
if (StringUtils.equals(type, "questionnaire")) {
types.add(1);
types.add(2);
}
return tExamLevelMapper.selectTExamLevelListByType(types.stream().toArray(Integer[]::new));
}
-
@Override
public List<TExamLevel> selectTExamLevelByquestionTemplateIdList(String questionTemplateId) {
return tExamLevelMapper.selectTExamLevelByquestionTemplateIdList(questionTemplateId);
}
-
- /**
- * 鏂板闂嵎绫诲瀷
- *
- * @param tExamLevel 闂嵎绫诲瀷
- * @return 缁撴灉
- */
+
@Override
public int insertTExamLevel(TExamLevel tExamLevel) {
tExamLevel.setCreateTime(DateUtils.getNowDate());
@@ -133,13 +98,7 @@
}
return tExamLevelMapper.insertTExamLevel(tExamLevel);
}
-
- /**
- * 淇敼闂嵎绫诲瀷
- *
- * @param tExamLevel 闂嵎绫诲瀷
- * @return 缁撴灉
- */
+
@Override
public int updateTExamLevel(TExamLevel tExamLevel) {
tExamLevel.setUpdateTime(DateUtils.getNowDate());
@@ -149,24 +108,12 @@
}
return tExamLevelMapper.updateTExamLevel(tExamLevel);
}
-
- /**
- * 鍒犻櫎闂嵎绫诲瀷瀵硅薄
- *
- * @param ids 闇�瑕佸垹闄ょ殑鏁版嵁ID
- * @return 缁撴灉
- */
+
@Override
public int deleteTExamLevelByIds(String ids) {
return tExamLevelMapper.deleteTExamLevelByIds(Convert.toStrArray(ids));
}
-
- /**
- * 鍒犻櫎闂嵎绫诲瀷淇℃伅
- *
- * @param id 闂嵎绫诲瀷ID
- * @return 缁撴灉
- */
+
public int deleteTExamLevelById(Long id) {
return tExamLevelMapper.deleteTExamLevelById(id);
}
--
Gitblit v1.9.1