diff --git a/.gitignore b/.gitignore index 23fc194d35..b433ca7c08 100644 --- a/.gitignore +++ b/.gitignore @@ -55,3 +55,5 @@ application-my.yaml # Generated codegen files /codegen/ + +.omc/ diff --git a/yudao-module-prison/src/main/java/cn/iocoder/yudao/module/prison/controller/admin/evaluationreport/vo/EvaluationReportPageReqVO.java b/yudao-module-prison/src/main/java/cn/iocoder/yudao/module/prison/controller/admin/evaluationreport/vo/EvaluationReportPageReqVO.java index 2fbe0b23d5..950bc7391b 100644 --- a/yudao-module-prison/src/main/java/cn/iocoder/yudao/module/prison/controller/admin/evaluationreport/vo/EvaluationReportPageReqVO.java +++ b/yudao-module-prison/src/main/java/cn/iocoder/yudao/module/prison/controller/admin/evaluationreport/vo/EvaluationReportPageReqVO.java @@ -6,8 +6,10 @@ import io.swagger.v3.oas.annotations.media.Schema; import cn.iocoder.yudao.framework.common.pojo.PageParam; import org.springframework.format.annotation.DateTimeFormat; import java.math.BigDecimal; +import java.time.LocalDate; import java.time.LocalDateTime; +import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY; import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; @Schema(description = "管理后台 - 评估报告分页 Request VO") @@ -45,8 +47,8 @@ public class EvaluationReportPageReqVO extends PageParam { private Long areaId; @Schema(description = "评估日期") - @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) - private LocalDateTime[] evaluationDate; + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY) + private LocalDate[] evaluationDate; @Schema(description = "创建时间") @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) diff --git a/yudao-module-prison/src/main/java/cn/iocoder/yudao/module/prison/controller/admin/evaluationreport/vo/EvaluationReportRespVO.java b/yudao-module-prison/src/main/java/cn/iocoder/yudao/module/prison/controller/admin/evaluationreport/vo/EvaluationReportRespVO.java index 156a4599df..c8f51e0754 100644 --- a/yudao-module-prison/src/main/java/cn/iocoder/yudao/module/prison/controller/admin/evaluationreport/vo/EvaluationReportRespVO.java +++ b/yudao-module-prison/src/main/java/cn/iocoder/yudao/module/prison/controller/admin/evaluationreport/vo/EvaluationReportRespVO.java @@ -6,6 +6,7 @@ import lombok.*; import java.util.*; import org.springframework.format.annotation.DateTimeFormat; import java.math.BigDecimal; +import java.time.LocalDate; import java.time.LocalDateTime; import cn.idev.excel.annotation.*; @@ -52,8 +53,8 @@ public class EvaluationReportRespVO { @Schema(description = "评估日期") @ExcelProperty("评估日期") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private LocalDateTime evaluationDate; + @JsonFormat(pattern = "yyyy-MM-dd") + private LocalDate evaluationDate; @Schema(description = "评估人员ID") private Long evaluatorId; diff --git a/yudao-module-prison/src/main/java/cn/iocoder/yudao/module/prison/controller/admin/evaluationreport/vo/EvaluationReportSaveReqVO.java b/yudao-module-prison/src/main/java/cn/iocoder/yudao/module/prison/controller/admin/evaluationreport/vo/EvaluationReportSaveReqVO.java index 72dcb8ee2d..e469e8b3a1 100644 --- a/yudao-module-prison/src/main/java/cn/iocoder/yudao/module/prison/controller/admin/evaluationreport/vo/EvaluationReportSaveReqVO.java +++ b/yudao-module-prison/src/main/java/cn/iocoder/yudao/module/prison/controller/admin/evaluationreport/vo/EvaluationReportSaveReqVO.java @@ -5,7 +5,7 @@ import lombok.*; import java.util.*; import jakarta.validation.constraints.*; import java.math.BigDecimal; -import java.time.LocalDateTime; +import java.time.LocalDate; @Schema(description = "管理后台 - 评估报告新增/修改 Request VO") @Data @@ -41,7 +41,7 @@ public class EvaluationReportSaveReqVO { @Schema(description = "评估日期", requiredMode = Schema.RequiredMode.REQUIRED) @NotNull(message = "评估日期不能为空") - private LocalDateTime evaluationDate; + private LocalDate evaluationDate; @Schema(description = "评估人员ID") private Long evaluatorId; diff --git a/yudao-module-prison/src/main/java/cn/iocoder/yudao/module/prison/controller/admin/questionnairerecord/PrisonQuestionnaireRecordController.java b/yudao-module-prison/src/main/java/cn/iocoder/yudao/module/prison/controller/admin/questionnairerecord/PrisonQuestionnaireRecordController.java index c3c1092536..5dda436c21 100644 --- a/yudao-module-prison/src/main/java/cn/iocoder/yudao/module/prison/controller/admin/questionnairerecord/PrisonQuestionnaireRecordController.java +++ b/yudao-module-prison/src/main/java/cn/iocoder/yudao/module/prison/controller/admin/questionnairerecord/PrisonQuestionnaireRecordController.java @@ -104,10 +104,12 @@ public class PrisonQuestionnaireRecordController { return; } // 收集所有 taskId - Set taskIds = records.stream() - .map(QuestionnaireRecordRespVO::getTaskId) - .filter(Objects::nonNull) - .collect(Collectors.toSet()); + Set taskIds = new HashSet<>(); + for (QuestionnaireRecordRespVO record : records) { + if (record != null && record.getTaskId() != null) { + taskIds.add(record.getTaskId()); + } + } if (cn.hutool.core.collection.CollUtil.isEmpty(taskIds)) { return; } @@ -115,12 +117,14 @@ public class PrisonQuestionnaireRecordController { List tasks = questionnaireTaskMapper.selectList( new com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper() .in(cn.iocoder.yudao.module.prison.dal.dataobject.questionnaire_task.QuestionnaireTaskDO::getId, taskIds)); - // 构建 taskId -> remark 映射 - Map taskRemarkMap = tasks.stream() - .collect(Collectors.toMap( - cn.iocoder.yudao.module.prison.dal.dataobject.questionnaire_task.QuestionnaireTaskDO::getId, - cn.iocoder.yudao.module.prison.dal.dataobject.questionnaire_task.QuestionnaireTaskDO::getRemark, - (v1, v2) -> v1)); + // 构建 taskId -> remark 映射，避免 Collectors.toMap 在脏数据场景下抛出 NPE + Map taskRemarkMap = new HashMap<>(); + for (cn.iocoder.yudao.module.prison.dal.dataobject.questionnaire_task.QuestionnaireTaskDO task : tasks) { + if (task == null || task.getId() == null) { + continue; + } + taskRemarkMap.putIfAbsent(task.getId(), task.getRemark() == null ? "" : task.getRemark()); + } // 填充备注到 VO for (QuestionnaireRecordRespVO record : records) { String remark = taskRemarkMap.get(record.getTaskId()); diff --git a/yudao-module-prison/src/main/java/cn/iocoder/yudao/module/prison/controller/admin/questionnairerecord/vo/QuestionnaireRecordRespVO.java b/yudao-module-prison/src/main/java/cn/iocoder/yudao/module/prison/controller/admin/questionnairerecord/vo/QuestionnaireRecordRespVO.java index 87ec5014a3..e708063d6b 100644 --- a/yudao-module-prison/src/main/java/cn/iocoder/yudao/module/prison/controller/admin/questionnairerecord/vo/QuestionnaireRecordRespVO.java +++ b/yudao-module-prison/src/main/java/cn/iocoder/yudao/module/prison/controller/admin/questionnairerecord/vo/QuestionnaireRecordRespVO.java @@ -29,6 +29,10 @@ public class QuestionnaireRecordRespVO { @ExcelProperty("问卷ID") private Long questionnaireId; + @Schema(description = "任务ID", example = "1001") + @ExcelProperty("任务ID") + private Long taskId; + @Schema(description = "问卷名称") @ExcelProperty("问卷名称") private String questionnaireName; diff --git a/yudao-module-prison/src/main/java/cn/iocoder/yudao/module/prison/controller/admin/quickcomment/QuickCommentController.java b/yudao-module-prison/src/main/java/cn/iocoder/yudao/module/prison/controller/admin/quickcomment/QuickCommentController.java index 473e91fde2..c0110d0ba5 100644 --- a/yudao-module-prison/src/main/java/cn/iocoder/yudao/module/prison/controller/admin/quickcomment/QuickCommentController.java +++ b/yudao-module-prison/src/main/java/cn/iocoder/yudao/module/prison/controller/admin/quickcomment/QuickCommentController.java @@ -110,8 +110,12 @@ public class QuickCommentController { new LambdaQueryWrapper() .in(CommentCategoryDO::getId, categoryIds) ); - categoryNameMap = categories.stream() - .collect(Collectors.toMap(CommentCategoryDO::getId, CommentCategoryDO::getName)); + for (CommentCategoryDO category : categories) { + if (category == null || category.getId() == null) { + continue; + } + categoryNameMap.putIfAbsent(category.getId(), category.getName() == null ? "" : category.getName()); + } } // 填充分类名称 diff --git a/yudao-module-prison/src/main/java/cn/iocoder/yudao/module/prison/service/cell/CellServiceImpl.java b/yudao-module-prison/src/main/java/cn/iocoder/yudao/module/prison/service/cell/CellServiceImpl.java index db80b9a08e..2adb2fb0a1 100644 --- a/yudao-module-prison/src/main/java/cn/iocoder/yudao/module/prison/service/cell/CellServiceImpl.java +++ b/yudao-module-prison/src/main/java/cn/iocoder/yudao/module/prison/service/cell/CellServiceImpl.java @@ -108,8 +108,14 @@ public class CellServiceImpl implements CellService { if (CollUtil.isNotEmpty(areaIds)) { List areas = areaMapper.selectList(new LambdaQueryWrapperX() .inIfPresent(AreaDO::getId, new ArrayList<>(areaIds))); - areaMap = areas.stream() - .collect(Collectors.toMap(AreaDO::getId, Function.identity())); + Map tempAreaMap = new HashMap<>(); + for (AreaDO area : areas) { + if (area == null || area.getId() == null) { + continue; + } + tempAreaMap.putIfAbsent(area.getId(), area); + } + areaMap = tempAreaMap; } else { areaMap = new HashMap<>(); } diff --git a/yudao-module-prison/src/main/java/cn/iocoder/yudao/module/prison/service/dashboard/impl/PrisonDashboardServiceImpl.java b/yudao-module-prison/src/main/java/cn/iocoder/yudao/module/prison/service/dashboard/impl/PrisonDashboardServiceImpl.java index 369e2753ce..31ad650aca 100644 --- a/yudao-module-prison/src/main/java/cn/iocoder/yudao/module/prison/service/dashboard/impl/PrisonDashboardServiceImpl.java +++ b/yudao-module-prison/src/main/java/cn/iocoder/yudao/module/prison/service/dashboard/impl/PrisonDashboardServiceImpl.java @@ -33,8 +33,10 @@ import java.time.Period; import java.time.format.DateTimeFormatter; import java.time.temporal.ChronoUnit; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.stream.Collectors; /** @@ -627,12 +629,13 @@ public class PrisonDashboardServiceImpl implements PrisonDashboardService { .orderByDesc(EvaluationReportDO::getEvaluationDate)); // 按罪犯ID分组，取最新的评估记录 - Map latestReportMap = allReports.stream() - .collect(Collectors.toMap( - EvaluationReportDO::getPrisonerId, - r -> r, - (existing, replacement) -> existing // 保留第一个（最新的） - )); + Map latestReportMap = new HashMap<>(); + for (EvaluationReportDO report : allReports) { + if (report == null || report.getPrisonerId() == null) { + continue; + } + latestReportMap.putIfAbsent(report.getPrisonerId(), report); // 保留第一条（最新的） + } List latestReports = new ArrayList<>(latestReportMap.values()); // 统计各风险等级人数 @@ -662,14 +665,21 @@ public class PrisonDashboardServiceImpl implements PrisonDashboardService { .toList(); // 按罪犯ID分组，取本月第一次评估 - Map thisMonthNewMap = thisMonthReports.stream() - .filter(r -> !latestReportMap.containsKey(r.getPrisonerId()) || - latestReportMap.get(r.getPrisonerId()).getEvaluationDate().toLocalDate().isAfter(firstDayOfMonth.minusDays(1))) - .collect(Collectors.toMap( - EvaluationReportDO::getPrisonerId, - r -> r, - (existing, replacement) -> existing - )); + Map thisMonthNewMap = new HashMap<>(); + for (EvaluationReportDO report : thisMonthReports) { + if (report == null || report.getPrisonerId() == null) { + continue; + } + EvaluationReportDO latestReport = latestReportMap.get(report.getPrisonerId()); + if (latestReport == null) { + thisMonthNewMap.putIfAbsent(report.getPrisonerId(), report); + continue; + } + if (latestReport.getEvaluationDate() != null + && latestReport.getEvaluationDate().toLocalDate().isAfter(firstDayOfMonth.minusDays(1))) { + thisMonthNewMap.putIfAbsent(report.getPrisonerId(), report); + } + } int monthlyNewHighRisk = 0, monthlyNewWarning = 0, monthlyNewNormal = 0; for (EvaluationReportDO report : thisMonthNewMap.values()) { @@ -717,12 +727,13 @@ public class PrisonDashboardServiceImpl implements PrisonDashboardService { !r.getEvaluationDate().toLocalDate().isAfter(monthEnd)) .toList(); - Map monthEndLatestMap = monthEndReports.stream() - .collect(Collectors.toMap( - EvaluationReportDO::getPrisonerId, - r -> r, - (existing, replacement) -> existing - )); + Map monthEndLatestMap = new HashMap<>(); + for (EvaluationReportDO report : monthEndReports) { + if (report == null || report.getPrisonerId() == null) { + continue; + } + monthEndLatestMap.putIfAbsent(report.getPrisonerId(), report); + } int monthHigh = 0, monthWarning = 0, monthNormal = 0; for (EvaluationReportDO report : monthEndLatestMap.values()) { @@ -778,12 +789,13 @@ public class PrisonDashboardServiceImpl implements PrisonDashboardService { List allReports = evaluationReportMapper.selectList(wrapper); // 按罪犯ID去重，保留最新的评估记录 - Map latestReportMap = allReports.stream() - .collect(Collectors.toMap( - EvaluationReportDO::getPrisonerId, - r -> r, - (existing, replacement) -> existing - )); + Map latestReportMap = new HashMap<>(); + for (EvaluationReportDO report : allReports) { + if (report == null || report.getPrisonerId() == null) { + continue; + } + latestReportMap.putIfAbsent(report.getPrisonerId(), report); + } List uniqueReports = new ArrayList<>(latestReportMap.values()); // 手动分页 @@ -795,10 +807,22 @@ public class PrisonDashboardServiceImpl implements PrisonDashboardService { // 获取罪犯详细信息 List prisonerIds = pagedReports.stream() .map(EvaluationReportDO::getPrisonerId) + .filter(Objects::nonNull) + .distinct() .toList(); - Map prisonerMap = prisonerIds.isEmpty() ? Map.of() : - prisonerMapper.selectBatchIds(prisonerIds).stream() - .collect(Collectors.toMap(PrisonerDO::getId, p -> p)); + Map prisonerMap; + if (prisonerIds.isEmpty()) { + prisonerMap = Map.of(); + } else { + Map tempPrisonerMap = new HashMap<>(); + for (PrisonerDO prisoner : prisonerMapper.selectBatchIds(prisonerIds)) { + if (prisoner == null || prisoner.getId() == null) { + continue; + } + tempPrisonerMap.putIfAbsent(prisoner.getId(), prisoner); + } + prisonerMap = tempPrisonerMap; + } // 获取监区信息 List areaIds = pagedReports.stream() @@ -806,9 +830,19 @@ public class PrisonDashboardServiceImpl implements PrisonDashboardService { .filter(id -> id != null) .distinct() .toList(); - Map areaMap = areaIds.isEmpty() ? Map.of() : - areaMapper.selectBatchIds(areaIds).stream() - .collect(Collectors.toMap(AreaDO::getId, a -> a)); + Map areaMap; + if (areaIds.isEmpty()) { + areaMap = Map.of(); + } else { + Map tempAreaMap = new HashMap<>(); + for (AreaDO area : areaMapper.selectBatchIds(areaIds)) { + if (area == null || area.getId() == null) { + continue; + } + tempAreaMap.putIfAbsent(area.getId(), area); + } + areaMap = tempAreaMap; + } // 判断本月新增 LocalDate firstDayOfMonth = LocalDate.now().withDayOfMonth(1); diff --git a/yudao-module-prison/src/main/java/cn/iocoder/yudao/module/prison/service/evaluationreport/EvaluationReportServiceImpl.java b/yudao-module-prison/src/main/java/cn/iocoder/yudao/module/prison/service/evaluationreport/EvaluationReportServiceImpl.java index 3121327b11..3ceeedcce1 100644 --- a/yudao-module-prison/src/main/java/cn/iocoder/yudao/module/prison/service/evaluationreport/EvaluationReportServiceImpl.java +++ b/yudao-module-prison/src/main/java/cn/iocoder/yudao/module/prison/service/evaluationreport/EvaluationReportServiceImpl.java @@ -10,6 +10,7 @@ import org.springframework.transaction.annotation.Transactional; import java.util.*; import java.math.BigDecimal; import java.time.LocalDateTime; +import java.time.LocalTime; import java.time.format.DateTimeFormatter; import java.util.stream.Collectors; @@ -417,6 +418,9 @@ public class EvaluationReportServiceImpl implements EvaluationReportService { @Transactional(rollbackFor = Exception.class) public Long createReport(EvaluationReportSaveReqVO createReqVO) { EvaluationReportDO report = BeanUtils.toBean(createReqVO, EvaluationReportDO.class); + if (createReqVO.getEvaluationDate() != null) { + report.setEvaluationDate(createReqVO.getEvaluationDate().atStartOfDay()); + } // 生成报告编号 report.setReportNo(generateReportNo()); // 初始状态为草稿 @@ -436,6 +440,9 @@ public class EvaluationReportServiceImpl implements EvaluationReportService { public void updateReport(EvaluationReportSaveReqVO updateReqVO) { validateReportExists(updateReqVO.getId()); EvaluationReportDO updateObj = BeanUtils.toBean(updateReqVO, EvaluationReportDO.class); + if (updateReqVO.getEvaluationDate() != null) { + updateObj.setEvaluationDate(updateReqVO.getEvaluationDate().atStartOfDay()); + } evaluationReportMapper.updateById(updateObj); }