From eeb8d7faa8d25b3ca9fe75ef28f035c49af5b06d Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 11 三月 2025 11:05:38 +0800
Subject: [PATCH] Merge branch 'dev' into dev_zj
---
cnas-process/src/main/java/com/ruoyi/process/service/impl/QualitySuperviseServiceImpl.java | 19 ++++++++++++-------
1 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/cnas-process/src/main/java/com/ruoyi/process/service/impl/QualitySuperviseServiceImpl.java b/cnas-process/src/main/java/com/ruoyi/process/service/impl/QualitySuperviseServiceImpl.java
index ee4dbe2..26ef65e 100644
--- a/cnas-process/src/main/java/com/ruoyi/process/service/impl/QualitySuperviseServiceImpl.java
+++ b/cnas-process/src/main/java/com/ruoyi/process/service/impl/QualitySuperviseServiceImpl.java
@@ -18,8 +18,8 @@
import com.ruoyi.common.utils.QueryWrappers;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.framework.exception.ErrorException;
-import com.ruoyi.basic.util.HackLoopTableRenderPolicy;
-import com.ruoyi.basic.util.XWPFDocumentUtils;
+import com.ruoyi.framework.util.HackLoopTableRenderPolicy;
+import com.ruoyi.framework.util.XWPFDocumentUtils;
import com.ruoyi.system.mapper.UserMapper;
import com.ruoyi.process.dto.QualitySuperviseDetailsAccordingDto;
import com.ruoyi.process.dto.QualitySuperviseDetailsCorrectDto;
@@ -45,10 +45,7 @@
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.stream.Collectors;
@@ -327,7 +324,9 @@
@Override
public void exportSuperviseDetailRecord(Integer superviseDetailsId, HttpServletResponse response) {
QualitySuperviseDetailsRecord recordDto = qualitySuperviseDetailsRecordMapper.selectSuperviseDetailRecord(superviseDetailsId);
-
+ if(Objects.isNull(recordDto)) {
+ throw new ErrorException("璇ユ暟鎹湭杩涜璁板綍");
+ }
//鑾峰彇鎶�鏈礋璐ｄ汉鐨勭鍚嶅湴鍧�
String ratifyUrl = null;
if (recordDto.getRatifyUserId() != null) {
@@ -494,6 +493,9 @@
@Override
public void superviseDetailAccordingExport(Integer superviseDetailAccordingId, HttpServletResponse response) {
QualitySuperviseDetailsAccordingDto exportDto = qualitySuperviseDetailsAccordingMapper.selectSuperviseDetailsAccording(superviseDetailAccordingId);
+ if(Objects.isNull(exportDto)) {
+ throw new ErrorException("璇ユ暟鎹湭杩涜澶勭悊");
+ }
// 鍙戠幇閮ㄩ棬
String discovererUrl = null;
if (exportDto.getRecordUserId() != null) {
@@ -737,6 +739,9 @@
@Override
public void exportSuperviseDetaillCorrect(Integer superviseDetailsCorrectId, HttpServletResponse response) {
QualitySuperviseDetailsCorrect detailsCorrect = qualitySuperviseDetailsCorrectMapper.selectById(superviseDetailsCorrectId);
+ if (ObjectUtils.isNull(detailsCorrect)) {
+ throw new ErrorException("杩樻病鏈夊～鍐欑籂姝ｅ崟鐨勬暟鎹�");
+ }
QualitySuperviseDetailsCorrectDto detailsCorrectDto = new QualitySuperviseDetailsCorrectDto();
BeanUtils.copyProperties(detailsCorrect, detailsCorrectDto);
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
--
Gitblit v1.9.3