From 04b45b8c22594cc5535b164380738a80b0e8cbe2 Mon Sep 17 00:00:00 2001 From: zxl <763096477@qq.com> Date: 星期一, 26 五月 2025 15:27:57 +0800 Subject: [PATCH] 修改大屏录像可用率指标 --- ycl-server/src/main/java/com/ycl/platform/service/impl/ReportServiceImpl.java | 36 ++++++++++++++++++++++++++++-------- 1 files changed, 28 insertions(+), 8 deletions(-) diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/ReportServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/ReportServiceImpl.java index 62fb564..4b06f6c 100644 --- a/ycl-server/src/main/java/com/ycl/platform/service/impl/ReportServiceImpl.java +++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/ReportServiceImpl.java @@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper; import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ycl.platform.domain.dto.ReportImportDTO; import com.ycl.platform.domain.entity.*; @@ -68,10 +69,13 @@ if (Objects.isNull(form.getPointId())) { throw new RuntimeException("鐐逛綅涓嶈兘涓虹┖"); } - Long userId = SecurityUtils.getUserId(); - YwPeople people = new LambdaQueryChainWrapper<>(peopleMapper).eq(YwPeople::getUserId, userId).one(); - form.setPeopleId(people.getId()); - form.setUnitId(people.getBelongUnit()); + Integer unitId = SecurityUtils.getUnitId(); + if (Objects.isNull(unitId)) { + throw new RuntimeException("闈炶繍缁村崟浣嶆殏鏃舵棤娉曟姤澶�"); + } + form.setUnitId(unitId); + Long userId = SecurityUtils.getLoginUser().getUserId(); + form.setPeopleId(Integer.parseInt(userId+"")); if ("浜嬪墠鎶ュ".equals(form.getReportType())) { // 濡傛灉鏄簨鍓嶆姤澶囬渶瑕佹楠屾槸鍚﹀凡缁忕敓鎴愪笅鍙戝伐鍗� YwPointVO point = ywpointMapper.countNotFinishedWorkOrderByGb(form.getPointId()); @@ -116,10 +120,11 @@ @SneakyThrows @Transactional public Result importData(ReportForm form) { - Long userId = SecurityUtils.getUserId(); - YwPeople people = new LambdaQueryChainWrapper<>(peopleMapper).eq(YwPeople::getUserId, userId).one(); - form.setPeopleId(people.getId()); - form.setUnitId(people.getBelongUnit()); + Integer unitId = SecurityUtils.getUnitId(); + if (Objects.isNull(unitId)) { + throw new RuntimeException("闈炶繍缁村崟浣嶆殏鏃舵棤娉曟姤澶�"); + } + form.setUnitId(unitId); form.setBeginCreateTime(DateUtils.parseDate(form.getBeginCreateTimeStr())); form.setEndCreateTime(DateUtils.parseDate(form.getEndCreateTimeStr())); // 璇诲彇excel鏁版嵁 @@ -337,6 +342,7 @@ item.setResultStr(records.get(0).getResult() ? "閫氳繃" : "鏈�氳繃"); item.setResultRemark(records.get(0).getResultRemark()); item.setAuditingTime(records.get(0).getCreateTime()); + } else { item.setResultStr("瀹℃牳涓�"); } @@ -384,4 +390,18 @@ } return Result.ok("鎿嶄綔鎴愬姛"); } + + @Override + public Result getListByGb(String gb) { + List<ReportVO> list = baseMapper.getListByGb(gb); + for (ReportVO report : list) { + List<ReportErrorType> errors = new LambdaQueryChainWrapper<>(reportErrorTypeService.getBaseMapper()) + .eq(ReportErrorType::getReportId, report.getId()) + .orderByDesc(ReportErrorType::getCreateTime) + .list(); + String err = errors.stream().map(ReportErrorType::getErrorType).collect(Collectors.joining(",")); + report.setErrorType(err); + } + return Result.ok().data(list); + } } -- Gitblit v1.8.0