bug 处理

wl

2022-10-01 4cdb5cec4d5c79aa662d73a86bb1dfcc9d73f1e2

 ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java

@@ -143,24 +143,27 @@
        Integer type = 01;
        Integer hours = 60;
        Page<CasePoolViolationDO> violationsPage = baseCaseMapper.listViolationsPage(page, state, type, resource);
        List<CasePoolViolationVO> violationVOList = violationsPage.getRecords().stream().map(item -> {
            CasePoolViolationVO casePoolViolationVO = new CasePoolViolationVO();
            BeanUtils.copyProperties(item, casePoolViolationVO);
            if (item.getCloseTime() == null) {
                Duration duration = Duration.between(item.getAlarmTime(), LocalDateTime.now());
                long minutes = duration.toMinutes() - (duration.toHours() * hours);
                String continueTime = duration.toHours() + "时" + minutes + "分钟";
                casePoolViolationVO.setContinueTime(continueTime);
            } else {
                Duration duration = Duration.between(item.getAlarmTime(), item.getCloseTime());
                long minutes = duration.toMinutes() - (duration.toHours() * hours);
                String continueTime = duration.toHours() + "时" + minutes + "分钟";
                casePoolViolationVO.setContinueTime(continueTime);
            }
            casePoolViolationVO.setCategory(dataDictionaryMapper.selectById(item.getCategoryId()).getName());
            casePoolViolationVO.setType(dataDictionaryMapper.selectById(item.getTypeId()).getName());
            return casePoolViolationVO;
        }).collect(Collectors.toList());
        List<CasePoolViolationVO> violationVOList = violationsPage
                .getRecords()
                .stream()
                .map(item -> {
                    CasePoolViolationVO casePoolViolationVO = new CasePoolViolationVO();
                    BeanUtils.copyProperties(item, casePoolViolationVO);
                    if (item.getCloseTime() == null) {
                        Duration duration = Duration.between(item.getAlarmTime(), LocalDateTime.now());
                        long minutes = duration.toMinutes() - (duration.toHours() * hours);
                        String continueTime = duration.toHours() + "时" + minutes + "分钟";
                        casePoolViolationVO.setContinueTime(continueTime);
                    } else {
                        Duration duration = Duration.between(item.getAlarmTime(), item.getCloseTime());
                        long minutes = duration.toMinutes() - (duration.toHours() * hours);
                        String continueTime = duration.toHours() + "时" + minutes + "分钟";
                        casePoolViolationVO.setContinueTime(continueTime);
                    }
                    casePoolViolationVO.setCategory(dataDictionaryMapper.selectById(item.getCategoryId()).getName());
                    casePoolViolationVO.setType(dataDictionaryMapper.selectById(item.getTypeId()).getName());
                    return casePoolViolationVO;
                }).collect(Collectors.toList());
        Page<CasePoolViolationVO> casePoolViolationVOPage = new Page<>();
        BeanUtils.copyProperties(violationsPage, casePoolViolationVOPage);
        casePoolViolationVOPage.setRecords(violationVOList);