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/EntTestMemberServiceImpl.java | 95 +++++------------------------------------------
1 files changed, 11 insertions(+), 84 deletions(-)
diff --git a/src/main/java/com/ots/project/exam/service/impl/EntTestMemberServiceImpl.java b/src/main/java/com/ots/project/exam/service/impl/EntTestMemberServiceImpl.java
index 7c59115..e6014b0 100644
--- a/src/main/java/com/ots/project/exam/service/impl/EntTestMemberServiceImpl.java
+++ b/src/main/java/com/ots/project/exam/service/impl/EntTestMemberServiceImpl.java
@@ -1,5 +1,4 @@
package com.ots.project.exam.service.impl;
-
import com.ots.common.enums.TestMemberStatusEnum;
import com.ots.common.enums.UsageCountEnum;
import com.ots.common.exception.BusinessException;
@@ -20,65 +19,40 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-
import java.util.*;
import java.util.stream.Collectors;
-
import static com.ots.common.enums.ResponseCode.*;
import static com.ots.common.enums.TestMemberStatusEnum.*;
-/**
- * 娴嬭瘎浜哄憳鍚嶅崟Service涓氬姟灞傚鐞�
- *
- * @author ots
- * @date 2019-12-15
- */
@Service
@Slf4j
public class EntTestMemberServiceImpl implements IEntTestMemberService {
@Autowired
private EntTestMemberMapper entTestMemberMapper;
-
@Autowired
private EntTestPackageMapper entTestPackageMapper;
-
@Autowired
private SysUserExtendMapper sysUserExtendMapper;
@Autowired
private TExamReportMapper tReportTemplateMapper;
-
-
- /**
- * 鏌ヨ娴嬭瘎浜哄憳鍚嶅崟
- *
- * @param memberId 娴嬭瘎浜哄憳鍚嶅崟ID
- * @return 娴嬭瘎浜哄憳鍚嶅崟
- */
+
@Override
public EntTestMember selectEntTestMemberById(Long memberId) {
return entTestMemberMapper.selectEntTestMemberById(memberId);
}
-
- /**
- * 鏌ヨ娴嬭瘎浜哄憳鍚嶅崟鍒楄〃
- *
- * @param entTestMember 娴嬭瘎浜哄憳鍚嶅崟
- * @return 娴嬭瘎浜哄憳鍚嶅崟
- */
+
@Override
public List<EntTestMember> selectEntTestMemberList(EntTestMember entTestMember) {
return entTestMemberMapper.selectEntTestMemberList(entTestMember);
}
-
@Override
public List<EntTestMember> selectEntTestMemberTopList(EntTestMember entTestMember) {
return entTestMemberMapper.selectEntTestMemberTopList(entTestMember);
}
-
@Override
public List<EntTestMember> selectEntTestMemberQueryList(EntTestMember entTestMember) {
List<EntTestMember> entTestMembers = entTestMemberMapper.selectEntTestMemberQueryList(entTestMember);
- //鏌ヨ鎶ュ憡琛ㄦ槸鍚︾粰HR鍙戦�侀偖浠�
+
List<String> collect = entTestMembers.stream().map(p -> String.valueOf(p.getMemberId())).collect(Collectors.toList());
if (Objects.isNull(collect)) {
return new ArrayList<>();
@@ -87,10 +61,8 @@
if (Objects.isNull(memberIds) || memberIds.length == 0) {
return new ArrayList<>();
}
-
List<TExamReport> tExamReports = tReportTemplateMapper.selectTReportTemplatesByMemberId(memberIds);
-
- //琛ュ厖repor琛ㄧ殑HR閭鍙戦�佺姸鎬�
+
Map<String, EntTestMember> map = new HashMap();
for (EntTestMember testMember : entTestMembers) {
map.put(String.valueOf(testMember.getMemberId()), testMember);
@@ -106,18 +78,11 @@
}
return entTestMembers;
}
-
@Override
public List<EntTestMember> selectEntTestMemberList(Map params) {
return entTestMemberMapper.selectEntTestMemberListByMap(params);
}
-
- /**
- * 鏂板娴嬭瘎浜哄憳鍚嶅崟锛屽苟鍑忓幓鍙敤娆℃暟
- *
- * @param entTestMember 娴嬭瘎浜哄憳鍚嶅崟
- * @return 缁撴灉
- */
+
@Override
@Transactional
public int insertEntTestMember(EntTestMember entTestMember) {
@@ -127,78 +92,48 @@
usageCount(entTestMember, UsageCountEnum.reduce);
return result;
}
-
- /**
- * 浣跨敤娆℃暟锛堟牴鎹紶鍏ョ殑绫诲瀷 鍒ゆ柇娆℃暟鏄鍔犺繕鏄噺灏戯級
- * 璋冪敤锛屽鍔犳垨鑰呮墸鍑忎竴娆°��
- *
- * @param entTestMember
- */
+
private void usageCount(EntTestMember entTestMember, UsageCountEnum op) {
MISSING_PARAMETERS.assertNotNull(entTestMember.getTestId(), "娴嬭瘯鍖呯紪鐮�");
EntTestPackage entTestPackage = entTestPackageMapper.selectEntTestPackageById(entTestMember.getTestId());
-
ERROR_MESSAGE_CHECK.assertNotNull(entTestPackage, "娴嬭瘯鍖呬俊鎭笉瀛樺湪锛�");
SysUserExtend sysUserExtend = sysUserExtendMapper.selectSysUserExtendById(entTestPackage.getUserId());
-
ERROR_MESSAGE_CHECK.assertNotNull(sysUserExtend, "鏈厤缃彲浣跨敤娆℃暟锛�");
USR_TIME_ISOVER.assertIsTrue(sysUserExtend.getTestNum() > 0, entTestPackage.getUserId());
sysUserExtend.setTestNum(sysUserExtend.getTestNum() + op.getOp());
-
sysUserExtendMapper.updateSysUserExtend(sysUserExtend);
}
-
- /**
- * 淇敼娴嬭瘎浜哄憳鍚嶅崟
- *
- * @param entTestMember 娴嬭瘎浜哄憳鍚嶅崟
- * @return 缁撴灉
- */
+
@Override
@Transactional
public int updateEntTestMember(EntTestMember entTestMember) {
entTestMember.setUpdateTime(DateUtils.getNowDate());
int reslut = entTestMemberMapper.updateEntTestMember(entTestMember);
- //鍥炴敹鐘舵�侊紝闇�瑕佸洖鏀舵鏁�
+
List<String> status = Arrays.asList(TestMemberStatusEnum.recover.getCode(), TestMemberStatusEnum.expiryRecovery.getCode());
if (status.contains(entTestMember.getStatus())) {
usageCount(entTestMember, UsageCountEnum.add);
}
return reslut;
}
-
- /**
- * 鍒犻櫎娴嬭瘎浜哄憳鍚嶅崟瀵硅薄
- *
- * @param ids 闇�瑕佸垹闄ょ殑鏁版嵁ID
- * @return 缁撴灉
- */
+
@Override
public int deleteEntTestMemberByIds(String ids) {
return entTestMemberMapper.deleteEntTestMemberByIds(Convert.toStrArray(ids));
}
-
- /**
- * 鍒犻櫎娴嬭瘎浜哄憳鍚嶅崟淇℃伅
- *
- * @param memberId 娴嬭瘎浜哄憳鍚嶅崟ID
- * @return 缁撴灉
- */
+
public int deleteEntTestMemberById(Long memberId) {
return entTestMemberMapper.deleteEntTestMemberById(memberId);
}
-
@Override
public String importEntTestMember(List<EntTestMember> entTestMemberList, Boolean isUpdateSupport) {
if (StringUtils.isNull(entTestMemberList) || entTestMemberList.size() == 0) {
throw new BusinessException("Import user data cannot be empty锛�");
}
-
int successNum = 0;
int failureNum = 0;
StringBuilder successMsg = new StringBuilder();
StringBuilder failureMsg = new StringBuilder();
-
for (EntTestMember entTestMember : entTestMemberList) {
try {
insertEntTestMember(entTestMember);
@@ -213,26 +148,20 @@
successNum++;
successMsg.append("<br/>" + successNum + "銆�"+ MessageUtils.message("jsp.testPackage.name") +" " + entTestMember.getMemberName() + MessageUtils.message("imported.successfully"));
}
-
-
if (failureNum > 0) {
failureMsg.insert(0, MessageUtils.message("import.internationalization.001") + failureNum + MessageUtils.message("import.internationalization.002"));
-// throw new BusinessException(failureMsg.toString());
+
} else {
successMsg.insert(0, MessageUtils.message("import.internationalization.003") + successNum + MessageUtils.message("import.internationalization.004"));
}
-
return successMsg.toString();
}
-
-
public EntTestMember findEntTestMember(String token, List<String> status) {
Map paramMap = new HashMap();
paramMap.put("token", token);
paramMap.put("status", status);
return entTestMemberMapper.findEntTestMember(paramMap);
}
-
@Override
public int updateTestMemberStatus(TestMemberStatusEnum statusEnum, long memberId) {
EntTestMember member = selectEntTestMemberById(memberId);
@@ -242,11 +171,9 @@
} else if (completed == statusEnum || timeOut == statusEnum) {
member.setEndTime(new Date());
}
-
int result = updateEntTestMember(member);
return result;
}
-
@Override
public boolean checkMemberHasReport(List<String> asList, Long testId) {
return false;
--
Gitblit v1.9.1