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/MemberServiceImpl.java | 28 ++++------------------------
1 files changed, 4 insertions(+), 24 deletions(-)
diff --git a/src/main/java/com/ots/project/exam/service/impl/MemberServiceImpl.java b/src/main/java/com/ots/project/exam/service/impl/MemberServiceImpl.java
index a61960d..33cd92c 100644
--- a/src/main/java/com/ots/project/exam/service/impl/MemberServiceImpl.java
+++ b/src/main/java/com/ots/project/exam/service/impl/MemberServiceImpl.java
@@ -1,5 +1,4 @@
package com.ots.project.exam.service.impl;
-
import com.ots.common.utils.StringUtils;
import com.ots.framework.web.service.DictService;
import com.ots.project.exam.domain.EntDemographyInfo;
@@ -28,63 +27,48 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-
import java.util.Arrays;
import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;
-
import static com.ots.common.enums.ResponseCode.TEST_MEMBERINFO_EMPTY;
import static com.ots.common.enums.ResponseCode.TEST_URL_FAIL;
-
@Service
@Slf4j
public class MemberServiceImpl implements MemberService {
-
- //0鏈鐞� 1宸插畬鎴� 2绛旈涓� 3浣滃簾
+
private static final String UNTREATED_0 = "0";
private static final String DONE_1 = "1";
private static final String ANSWERING_2 = "2";
private static final String TIMEOUT_6 = "6";
-
private List<String> status = Arrays.asList(UNTREATED_0, DONE_1, ANSWERING_2, TIMEOUT_6);
-
@Autowired
private IEntTestMemberService entTestMemberService;
-
@Autowired
private IEntDemographyParamService entDemographyParamService;
-
@Autowired
private IEntTestPackageService entTestPackageService;
-
@Autowired
private IEntDemographyInfoService entDemographyInfoService;
-
@Autowired
private DictService dictService;
-
@Autowired
private ISysUserExtendService sysUserExtendService;
-
@Autowired
private ITExamPaperService itExamPaperService;
-
@Override
public List<ParamDefine> getParamDefines(String token, String lang) {
EntTestMember entTestMember = entTestMemberService.findEntTestMember(token, status);
TEST_URL_FAIL.assertNotNull(entTestMember);
Long testId = entTestMember.getTestId();
Long memberId = entTestMember.getMemberId();
-
- //鎵惧埌鎵�灞炰紒涓欼D
+
EntTestPackage entTestPackage = entTestPackageService.selectEntTestPackageById(testId);
String paramCodes = entTestPackage.getParamCodes();
if (Objects.isNull(paramCodes)) {
return null;
}
-
- //閫氳繃浼佷笟缂栫爜瀵绘壘浜哄彛瀛﹀畾涔�
+
List<EntDemographyParam> entDemographyParams = entDemographyParamService.selectEntDemographyParamListByParamIn(paramCodes);
if (Objects.isNull(entDemographyParams) || entDemographyParams.isEmpty()) {
return null;
@@ -111,10 +95,9 @@
paramDefine.setMemberId(memberId);
return paramDefine;
}).collect(Collectors.toList());
- //杩囨护绌哄璞�
+
return result.stream().filter(a -> Objects.nonNull(a)).collect(Collectors.toList());
}
-
@Override
public List<EntDemographyInfo> queryDemographyParamInfo(String token) {
EntTestMember entTestMember = entTestMemberService.findEntTestMember(token, status);
@@ -125,7 +108,6 @@
TEST_MEMBERINFO_EMPTY.assertNotEmpty(entDemographyInfos);
return entDemographyInfos;
}
-
@Override
@Transactional
public void saveDemographyParamInfo(String token, List<ParamsInfo> infos, String langType) {
@@ -141,7 +123,6 @@
}
});
}
-
@Override
public RelatedParty queryProdidByToken(String token) {
RelatedParty party = new RelatedParty();
@@ -178,7 +159,6 @@
}
return party;
}
-
@Override
public List<DictItemDto> queryLang(String token) {
EntTestMember entTestMember = entTestMemberService.findEntTestMember(token, status);
--
Gitblit v1.9.1