Merge branch '20210406-maqv2' into 20210412-youhua

linzhijie

2021-04-12 3a8e1524dcf0eeb610d38123d5f0a3ef838379cd

 src/main/java/com/ots/project/exam/service/impl/CountCalculateServiceImpl.java

@@ -9,6 +9,8 @@
import org.springframework.stereotype.Component;
import java.util.*;
import java.util.stream.Collectors;
import static com.ots.common.enums.TestMemberStatusEnum.answering;
import static com.ots.common.enums.TestMemberStatusEnum.timeOut;

@Component
public class CountCalculateServiceImpl implements CountCalculateService {
@@ -66,7 +68,7 @@
            if (Objects.nonNull(testMembers)) {
                total = Long.valueOf(testMembers.size());
                finishNum = testMembers.stream().filter(testMember -> TestMemberStatusEnum.completed.getCode().equals(testMember.getStatus())).mapToLong(x -> 1).sum();
                testIngNum = testMembers.stream().filter(testMember -> TestMemberStatusEnum.answering.getCode().equals(testMember.getStatus())).mapToLong(x -> 1).sum();
                testIngNum = testMembers.stream().filter(testMember -> answering.getCode().equals(testMember.getStatus())).mapToLong(x -> 1).sum();
                unTestNum = total - testIngNum - finishNum;
            }
            numberOfUsersByPackage.setTestNum(total);
@@ -84,7 +86,7 @@
        Map map = new HashMap();
        map.put("testIds", collect);
        
        List<String> recyclingStatus = Arrays.asList(TestMemberStatusEnum.unprocessed.getCode(), TestMemberStatusEnum.completed.getCode(), TestMemberStatusEnum.answering.getCode());
        List<String> recyclingStatus = Arrays.asList(TestMemberStatusEnum.unprocessed.getCode(), TestMemberStatusEnum.completed.getCode(), answering.getCode(), timeOut.getCode());
        map.put("status", recyclingStatus);
        return entTestMemberMapper.selectEntTestMemberListByMap(map);
    }