From cf4fbcbf19c7d326611598c2fc90a4aeb354c4a5 Mon Sep 17 00:00:00 2001
From: 吴羡 <16976746+Xian-TT3@user.noreply.gitee.com>
Date: 星期三, 21 十月 2026 15:06:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cnas-personnel/src/main/java/com/ruoyi/personnel/service/impl/PersonTrainingServiceImpl.java | 39 +-
cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageDocumentControlledServiceImpl.java | 20
cnas-personnel/src/main/java/com/ruoyi/personnel/pojo/PersonTrainingDetailed.java | 3
cnas-process/src/main/java/com/ruoyi/process/service/impl/QualitySuperviseServiceImpl.java | 143 ++++++++-
cnas-personnel/src/main/java/com/ruoyi/personnel/controller/PersonTrainingController.java | 11
cnas-process/src/main/resources/static/daily-supervise-record.docx | 0
cnas-process/src/main/resources/static/quality-monitor.docx | 0
cnas-personnel/src/main/java/com/ruoyi/personnel/service/impl/PersonTrainingDetailedServiceImpl.java | 49 ++
cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageDocumentListServiceImpl.java | 33 +-
cnas-process/src/main/resources/static/quality-monitor-evaluate.docx | 0
inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderServiceImpl.java | 136 +++++++++
cnas-process/src/main/java/com/ruoyi/process/service/QualityMonitorInspectionEvaluationService.java | 20 +
cnas-process/src/main/java/com/ruoyi/process/controller/QualitySuperviseController.java | 10
inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderPlanServiceImpl.java | 2
basic-server/src/main/java/com/ruoyi/basic/service/StandardTreeService.java | 7
cnas-process/src/main/java/com/ruoyi/process/service/QualityMonitorService.java | 4
inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsOrder.java | 3
cnas-process/src/main/resources/mapper/QualitySuperviseDetailsRecordMapper.xml | 5
basic-server/src/main/java/com/ruoyi/basic/controller/StandardTreeController.java | 6
cnas-process/src/main/resources/static/quality-monitor-details-ratify.docx | 0
cnas-process/src/main/java/com/ruoyi/process/pojo/QualityMonitorDetailsEvaluate.java | 8
inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsOrderStandardTemplate.java | 3
inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsProductServiceImpl.java | 5
inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsSampleReceiptServiceImpl.java | 89 ++++-
basic-server/src/main/java/com/ruoyi/basic/utils/StandardTemplateInspectionItemParser.java | 32 +
cnas-manage/src/main/java/com/ruoyi/manage/util/DocumentPreviewUtils.java | 90 ++++++
cnas-process/src/main/java/com/ruoyi/process/task/QualitySuperviseSchedule.java | 5
cnas-process/src/main/java/com/ruoyi/process/service/impl/QualityMonitorServiceImpl.java | 58 +--
cnas-process/src/main/java/com/ruoyi/process/service/QualitySuperviseService.java | 7
basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardTreeServiceImpl.java | 23 +
cnas-personnel/src/main/resources/mapper/PersonTrainingDetailedMapper.xml | 8
cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageDocumentAlterServiceImpl.java | 20
cnas-process/src/main/java/com/ruoyi/process/pojo/QualitySuperviseDetailsRecord.java | 13
33 files changed, 683 insertions(+), 169 deletions(-)
diff --git a/basic-server/src/main/java/com/ruoyi/basic/controller/StandardTreeController.java b/basic-server/src/main/java/com/ruoyi/basic/controller/StandardTreeController.java
index 55c0845..08b9bf9 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/controller/StandardTreeController.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/controller/StandardTreeController.java
@@ -193,6 +193,12 @@
return Result.success(standardTreeService.selectTemplateBindings(standardTreeId));
}
+ @Operation(summary = "鏍规嵁鏍囧噯鏂规硶鏌ヨ鏍囧噯缁戝畾鐨勫師濮嬭褰曟ā鏉�")
+ @GetMapping("/selectTemplateBindingsByStandardMethod")
+ public Result selectTemplateBindingsByStandardMethod(Integer standardMethodId) {
+ return Result.success(standardTreeService.selectTemplateBindingsByStandardMethod(standardMethodId));
+ }
+
@Operation(summary = "淇濆瓨鏍囧噯缁戝畾鐨勫師濮嬭褰曟ā鏉�")
@PostMapping("/saveTemplateBindings")
public Result saveTemplateBindings(@RequestBody StandardTreeTemplateBindingDto dto) {
diff --git a/basic-server/src/main/java/com/ruoyi/basic/service/StandardTreeService.java b/basic-server/src/main/java/com/ruoyi/basic/service/StandardTreeService.java
index aca97aa..58373e4 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/service/StandardTreeService.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/service/StandardTreeService.java
@@ -43,6 +43,13 @@
List<StandardTreeTemplateBindingVo> selectTemplateBindings(Integer standardTreeId);
+ /**
+ * 鏍规嵁鏍囧噯鏂规硶鏌ヨ鏍囧噯搴撲腑宸茬粦瀹氱殑鍘熷璁板綍妯℃澘
+ * @param standardMethodId 鏍囧噯鏂规硶ID
+ * @return 宸茬粦瀹氱殑妯℃澘锛堝涓爣鍑嗗簱鑺傜偣缁戝畾鐨勬ā鏉夸細鍘婚噸鍚堝苟锛�
+ */
+ List<StandardTreeTemplateBindingVo> selectTemplateBindingsByStandardMethod(Integer standardMethodId);
+
boolean saveTemplateBindings(StandardTreeTemplateBindingDto dto);
List<TemplateInspectionItemDto> selectTemplateInspectionItems(Integer standardTreeId);
diff --git a/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardTreeServiceImpl.java b/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardTreeServiceImpl.java
index 8b5ae45..159fcb0 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardTreeServiceImpl.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardTreeServiceImpl.java
@@ -419,6 +419,29 @@
}
@Override
+ public List<StandardTreeTemplateBindingVo> selectTemplateBindingsByStandardMethod(Integer standardMethodId) {
+ List<StandardTreeTemplateBindingVo> result = new ArrayList<>();
+ if (standardMethodId == null) {
+ return result;
+ }
+ List<StandardTree> trees = this.list(Wrappers.<StandardTree>lambdaQuery()
+ .eq(StandardTree::getStandardMethodId, standardMethodId)
+ .isNull(StandardTree::getSampleType)
+ .isNull(StandardTree::getModel)
+ .isNotNull(StandardTree::getSample)
+ .orderByAsc(StandardTree::getId));
+ Set<Integer> templateIds = new HashSet<>();
+ for (StandardTree tree : trees) {
+ for (StandardTreeTemplateBindingVo binding : selectTemplateBindings(tree.getId())) {
+ if (templateIds.add(binding.getTemplateId())) {
+ result.add(binding);
+ }
+ }
+ }
+ return result;
+ }
+
+ @Override
@Transactional(rollbackFor = Exception.class)
public boolean saveTemplateBindings(StandardTreeTemplateBindingDto dto) {
if (dto == null || dto.getStandardTreeId() == null) {
diff --git a/basic-server/src/main/java/com/ruoyi/basic/utils/StandardTemplateInspectionItemParser.java b/basic-server/src/main/java/com/ruoyi/basic/utils/StandardTemplateInspectionItemParser.java
index fe80870..d13456b 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/utils/StandardTemplateInspectionItemParser.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/utils/StandardTemplateInspectionItemParser.java
@@ -13,9 +13,10 @@
import java.util.List;
import java.util.Set;
-/** 瑙f瀽 Luckysheet 鍘熷璁板綍妯℃澘涓殑鈥滄楠岄」鈥濇爣璁般�� */
+/** 瑙f瀽 Luckysheet 鍘熷璁板綍妯℃澘涓殑鈥滄楠岄」鈥濓紱鏈爣璁版椂鍥為��鍒扳�滃鍑哄�尖�濊銆� */
public final class StandardTemplateInspectionItemParser {
private static final String INSPECTION_ITEM_MARK = "妫�楠岄」";
+ private static final String EXPORT_VALUE_MARK = "瀵煎嚭鍊�";
private StandardTemplateInspectionItemParser() {
}
@@ -34,11 +35,22 @@
} catch (Exception e) {
throw new BaseException("鍘熷璁板綍妯℃澘鏍煎紡閿欒");
}
- List<TemplateInspectionItemDto> result = new ArrayList<>();
- Set<Integer> rows = new HashSet<>();
if (sheets == null) {
throw new BaseException("鍘熷璁板綍妯℃澘鏍煎紡閿欒");
}
+ List<TemplateInspectionItemDto> result = parseMarkedCells(sheets, templateId, templateSort,
+ INSPECTION_ITEM_MARK);
+ if (result.isEmpty()) {
+ result = parseMarkedCells(sheets, templateId, templateSort, EXPORT_VALUE_MARK);
+ }
+ result.sort(Comparator.comparing(TemplateInspectionItemDto::getTemplateRowIndex));
+ return result;
+ }
+
+ private static List<TemplateInspectionItemDto> parseMarkedCells(JSONArray sheets, Integer templateId,
+ Integer templateSort, String mark) {
+ List<TemplateInspectionItemDto> result = new ArrayList<>();
+ Set<Integer> rows = new HashSet<>();
for (Object sheetObject : sheets) {
JSONObject sheet = (JSONObject) sheetObject;
JSONArray cells = sheet.getJSONArray("celldata");
@@ -48,16 +60,19 @@
for (Object cellObject : cells) {
JSONObject cell = (JSONObject) cellObject;
JSONObject value = cell.getJSONObject("v");
- if (value == null || !isInspectionItem(value)) {
+ if (value == null || !hasMark(value, mark)) {
continue;
}
Integer row = cell.getInteger("r");
String item = getCellText(value);
if (row == null || !StringUtils.hasText(item)) {
- throw new BaseException("鈥滄楠岄」鈥濇爣璁版墍鍦ㄥ崟鍏冩牸蹇呴』濉啓妫�楠岄」鍚嶇О");
+ throw new BaseException("鈥�" + mark + "鈥濇爣璁版墍鍦ㄥ崟鍏冩牸蹇呴』濉啓妫�楠岄」鍚嶇О");
}
if (!rows.add(row)) {
- throw new BaseException("鍚屼竴妯℃澘琛屽彧鑳介厤缃竴涓�滄楠岄」鈥濇爣璁�");
+ if (EXPORT_VALUE_MARK.equals(mark)) {
+ continue;
+ }
+ throw new BaseException("鍚屼竴妯℃澘琛屽彧鑳介厤缃竴涓��" + mark + "鈥濇爣璁�");
}
TemplateInspectionItemDto dto = new TemplateInspectionItemDto();
dto.setTemplateId(templateId);
@@ -67,7 +82,6 @@
result.add(dto);
}
}
- result.sort(Comparator.comparing(TemplateInspectionItemDto::getTemplateRowIndex));
return result;
}
@@ -101,8 +115,8 @@
return richText.toString();
}
- private static boolean isInspectionItem(JSONObject value) {
+ private static boolean hasMark(JSONObject value, String mark) {
JSONObject ps = value.getJSONObject("ps");
- return ps != null && INSPECTION_ITEM_MARK.equals(ps.getString("value"));
+ return ps != null && mark.equals(ps.getString("value"));
}
}
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageDocumentAlterServiceImpl.java b/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageDocumentAlterServiceImpl.java
index 6576d4b..6984e14 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageDocumentAlterServiceImpl.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageDocumentAlterServiceImpl.java
@@ -13,7 +13,9 @@
import com.ruoyi.common.utils.QueryWrappers;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.framework.exception.ErrorException;
import com.ruoyi.system.mapper.UserMapper;
+import com.ruoyi.manage.util.DocumentPreviewUtils;
import com.ruoyi.manage.mapper.*;
@@ -239,21 +241,11 @@
@Override
public void checkManageDocumentAlterPdf(Long id, HttpServletResponse response) throws Exception {
ManageDocumentAlter manageDocumentAlter = manageDocumentAlterMapper.selectById(id);
- File file = new File(wordUrl + "/" + manageDocumentAlter.getAlterAfterUrl());
- FileInputStream fileInputStream = new FileInputStream(file);
- response.setContentType("application/pdf");
- response.setCharacterEncoding("UTF-8");
- response.setHeader("Content-disposition", "inline;filename=" + file.getName());
- response.setContentLength((int)file.length());
- OutputStream os = response.getOutputStream();
- // 灏嗘枃浠跺唴瀹瑰啓鍏ヨ緭鍑烘祦
- byte[] buffer = new byte[4096];
- int bytesRead;
- while ((bytesRead = fileInputStream.read(buffer)) != -1) {
- os.write(buffer, 0, bytesRead);
+ if (manageDocumentAlter == null || ObjectUtils.isEmpty(manageDocumentAlter.getAlterAfterUrl())) {
+ throw new ErrorException("鏂囦欢鏈笂浼�");
}
- os.flush();
- os.close();
+ // PDF 鐩存帴杈撳嚭锛學ord/鍥剧墖鍦ㄧ嚎杞� PDF锛屼緵鍓嶇棰勮鐩栫珷
+ DocumentPreviewUtils.writeAsPdf(new File(wordUrl + "/" + manageDocumentAlter.getAlterAfterUrl()), response);
}
@Override
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageDocumentControlledServiceImpl.java b/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageDocumentControlledServiceImpl.java
index 06edf3c..29ed115 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageDocumentControlledServiceImpl.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageDocumentControlledServiceImpl.java
@@ -8,6 +8,7 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.core.domain.entity.User;
import com.ruoyi.common.utils.QueryWrappers;
+import com.ruoyi.framework.exception.ErrorException;
import com.ruoyi.manage.mapper.ManageDocumentControlledMapper;
import com.ruoyi.manage.mapper.ManageDocumentListMapper;
import com.ruoyi.manage.mapper.ManageRecordCheckMapper;
@@ -15,6 +16,7 @@
import com.ruoyi.manage.pojo.ManageDocumentList;
import com.ruoyi.manage.pojo.ManageRecordCheck;
import com.ruoyi.manage.service.ManageDocumentControlledService;
+import com.ruoyi.manage.util.DocumentPreviewUtils;
import com.ruoyi.system.mapper.UserMapper;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
@@ -199,21 +201,11 @@
@Override
public void checkManageDocumentControlledPdf(Long id, HttpServletResponse response) throws Exception {
ManageDocumentControlled manageDocumentControlled = manageDocumentControlledMapper.selectById(id);
- File file = new File(wordUrl + "/" + manageDocumentControlled.getUrl());
- FileInputStream fileInputStream = new FileInputStream(file);
- response.setContentType("application/pdf");
- response.setCharacterEncoding("UTF-8");
- response.setHeader("Content-disposition", "inline;filename=" + file.getName());
- response.setContentLength((int)file.length());
- OutputStream os = response.getOutputStream();
- // 灏嗘枃浠跺唴瀹瑰啓鍏ヨ緭鍑烘祦
- byte[] buffer = new byte[4096];
- int bytesRead;
- while ((bytesRead = fileInputStream.read(buffer)) != -1) {
- os.write(buffer, 0, bytesRead);
+ if (manageDocumentControlled == null || ObjectUtils.isEmpty(manageDocumentControlled.getUrl())) {
+ throw new ErrorException("鏂囦欢鏈笂浼�");
}
- os.flush();
- os.close();
+ // PDF 鐩存帴杈撳嚭锛學ord/鍥剧墖鍦ㄧ嚎杞� PDF锛屼緵鍓嶇棰勮鐩栫珷
+ DocumentPreviewUtils.writeAsPdf(new File(wordUrl + "/" + manageDocumentControlled.getUrl()), response);
}
}
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageDocumentListServiceImpl.java b/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageDocumentListServiceImpl.java
index ef35755..6284493 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageDocumentListServiceImpl.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageDocumentListServiceImpl.java
@@ -11,6 +11,7 @@
import com.ruoyi.common.utils.QueryWrappers;
+import com.ruoyi.framework.exception.ErrorException;
import com.ruoyi.manage.mapper.ManageDocumentListMapper;
import com.ruoyi.manage.pojo.ManageDocumentList;
import com.ruoyi.manage.service.ManageDocumentListService;
@@ -25,6 +26,8 @@
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
+import java.nio.file.Files;
+import java.nio.file.StandardCopyOption;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -58,29 +61,29 @@
@Override
public int uploadFile(Integer id, MultipartFile file) {
- String urlString;
String pathName;
- String path;
ManageDocumentList manageDocumentList = manageDocumentListMapper.selectById(id);
- if (ObjectUtils.isNotEmpty(manageDocumentList.getUrl())){
- // 鍒犻櫎鏃ф枃浠�
- File oldFile = new File(wordUrl + "/" + manageDocumentList.getUrl());
- oldFile.delete();
+ if (manageDocumentList == null) {
+ throw new ErrorException("鏂囦欢娓呭崟涓嶅瓨鍦�");
}
- //涓婁紶鏂版枃浠�
- path = wordUrl;
+ if (file == null || file.isEmpty()) {
+ throw new ErrorException("璇烽�夋嫨瑕佷笂浼犵殑鏂囦欢");
+ }
+ File realpath = new File(wordUrl).getAbsoluteFile();
try {
- File realpath = new File(path);
- if (!realpath.exists()) {
- realpath.mkdirs();
+ if (!realpath.exists() && !realpath.mkdirs()) {
+ throw new IOException("鐩綍鍒涘缓澶辫触: " + realpath);
}
pathName = UUID.randomUUID() + "_" + file.getOriginalFilename();
- urlString = realpath + "/" + pathName;
- file.transferTo(new File(urlString));
+ // 鐢� Files.copy 鑰屼笉鏄� transferTo锛歵ransferTo 閬囧埌鐩稿璺緞浼氭寜 Tomcat 涓存椂鐩綍瑙f瀽
+ Files.copy(file.getInputStream(), new File(realpath, pathName).toPath(), StandardCopyOption.REPLACE_EXISTING);
} catch (Exception e) {
e.printStackTrace();
- System.err.println("闄勪欢涓婁紶閿欒");
- return 0;
+ throw new ErrorException("闄勪欢涓婁紶閿欒: " + e.getMessage());
+ }
+ if (ObjectUtils.isNotEmpty(manageDocumentList.getUrl())) {
+ // 鍒犻櫎鏃ф枃浠�
+ new File(realpath, manageDocumentList.getUrl()).delete();
}
manageDocumentList.setUrl(pathName);
return manageDocumentListMapper.updateById(manageDocumentList);
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/util/DocumentPreviewUtils.java b/cnas-manage/src/main/java/com/ruoyi/manage/util/DocumentPreviewUtils.java
new file mode 100644
index 0000000..67d6824
--- /dev/null
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/util/DocumentPreviewUtils.java
@@ -0,0 +1,90 @@
+package com.ruoyi.manage.util;
+
+import com.aspose.words.Document;
+import com.aspose.words.DocumentBuilder;
+import com.aspose.words.License;
+import com.aspose.words.SaveFormat;
+import com.ruoyi.framework.exception.ErrorException;
+import jakarta.servlet.http.HttpServletResponse;
+import org.springframework.core.io.ClassPathResource;
+
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.InputStream;
+import java.io.OutputStream;
+
+/**
+ * 浣撶郴鏂囦欢闄勪欢棰勮宸ュ叿锛氭妸闄勪欢缁熶竴浠� PDF 娴佽緭鍑虹粰鍓嶇棰勮/鐩栫珷銆�
+ * PDF 鍘熸牱杈撳嚭锛沇ord銆佸浘鐗囩敤 Aspose.Words 鍦ㄧ嚎杞� PDF锛汦xcel/PPT 绛夋棤娉曡浆 PDF 鐨勬牸寮忕粰鍑烘槑纭彁绀恒��
+ */
+public final class DocumentPreviewUtils {
+
+ private static final String[] WORD_EXT = {".doc", ".docx", ".rtf", ".txt", ".wps"};
+ private static final String[] IMAGE_EXT = {".png", ".jpg", ".jpeg", ".bmp", ".gif"};
+
+ private DocumentPreviewUtils() {
+ }
+
+ public static void writeAsPdf(File file, HttpServletResponse response) throws Exception {
+ if (file == null || !file.exists()) {
+ throw new ErrorException("闄勪欢涓嶅瓨鍦ㄦ垨宸茶鍒犻櫎");
+ }
+ String name = file.getName().toLowerCase();
+ if (name.endsWith(".pdf")) {
+ prepare(response, file.getName(), file.length());
+ try (InputStream in = new FileInputStream(file);
+ OutputStream os = response.getOutputStream()) {
+ in.transferTo(os);
+ os.flush();
+ }
+ return;
+ }
+
+ Document doc;
+ if (endsWithAny(name, WORD_EXT)) {
+ applyLicense();
+ doc = new Document(file.getPath());
+ } else if (endsWithAny(name, IMAGE_EXT)) {
+ applyLicense();
+ doc = new Document();
+ new DocumentBuilder(doc).insertImage(file.getPath());
+ } else {
+ throw new ErrorException("璇ユ枃浠舵牸寮忎笉鏀寔鍦ㄧ嚎鐩栫珷棰勮锛岃涓婁紶 PDF 鎴� Word 鏂囦欢");
+ }
+
+ // 鍏堣浆鎹㈠埌鍐呭瓨锛岃浆鎹㈠け璐ユ椂鍝嶅簲澶磋繕娌℃彁浜わ紝鍓嶇鎵嶈兘鏀跺埌閿欒淇℃伅
+ ByteArrayOutputStream buffer = new ByteArrayOutputStream();
+ doc.save(buffer, SaveFormat.PDF);
+ byte[] bytes = buffer.toByteArray();
+ prepare(response, file.getName() + ".pdf", bytes.length);
+ try (OutputStream os = response.getOutputStream()) {
+ os.write(bytes);
+ os.flush();
+ }
+ }
+
+ private static void prepare(HttpServletResponse response, String fileName, long length) {
+ response.setContentType("application/pdf");
+ response.setCharacterEncoding("UTF-8");
+ response.setHeader("Content-disposition", "inline;filename=" + fileName);
+ response.setContentLength((int) length);
+ }
+
+ private static boolean endsWithAny(String name, String[] suffixes) {
+ for (String suffix : suffixes) {
+ if (name.endsWith(suffix)) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ private static void applyLicense() throws Exception {
+ // 鍑瘉锛屽惁鍒欒浆鎹㈠悗甯︽按鍗�
+ try (InputStream is = new ClassPathResource("lib/license.xml").getInputStream()) {
+ License license = new License();
+ license.setLicense(is);
+ }
+ }
+}
diff --git a/cnas-personnel/src/main/java/com/ruoyi/personnel/controller/PersonTrainingController.java b/cnas-personnel/src/main/java/com/ruoyi/personnel/controller/PersonTrainingController.java
index e25a6e0..93d8a98 100644
--- a/cnas-personnel/src/main/java/com/ruoyi/personnel/controller/PersonTrainingController.java
+++ b/cnas-personnel/src/main/java/com/ruoyi/personnel/controller/PersonTrainingController.java
@@ -96,8 +96,17 @@
public Result<?> addOrUpdatePersonTrainingDetailed(@RequestBody PersonTrainingDetailed personTrainingDetailed) {
if (ObjectUtils.isEmpty(personTrainingDetailed.getId())) {
personTrainingDetailed.setState(3);
+ personTrainingDetailedService.save(personTrainingDetailed);
+ return Result.success();
}
- personTrainingDetailedService.saveOrUpdate(personTrainingDetailed);
+ // 璁插笀鍙兘鍦ㄥ唴閮ㄤ汉鍛樺拰澶栬仒浜哄憳涔嬮棿鍒囨崲锛屽厛鏄惧紡瑕嗙洊涓ゅ垪锛岄伩鍏� updateById 璺宠繃 null 瀵艰嚧鏃у�兼畫鐣�
+ personTrainingDetailedService.update(null, Wrappers.<PersonTrainingDetailed>lambdaUpdate()
+ .eq(PersonTrainingDetailed::getId, personTrainingDetailed.getId())
+ .set(PersonTrainingDetailed::getTrainingLecturerId, personTrainingDetailed.getTrainingLecturerId())
+ .set(PersonTrainingDetailed::getTrainingLecturerName, personTrainingDetailed.getTrainingLecturerName()));
+ personTrainingDetailed.setTrainingLecturerId(null);
+ personTrainingDetailed.setTrainingLecturerName(null);
+ personTrainingDetailedService.updateById(personTrainingDetailed);
return Result.success();
}
diff --git a/cnas-personnel/src/main/java/com/ruoyi/personnel/pojo/PersonTrainingDetailed.java b/cnas-personnel/src/main/java/com/ruoyi/personnel/pojo/PersonTrainingDetailed.java
index aabc0b1..892dbe5 100644
--- a/cnas-personnel/src/main/java/com/ruoyi/personnel/pojo/PersonTrainingDetailed.java
+++ b/cnas-personnel/src/main/java/com/ruoyi/personnel/pojo/PersonTrainingDetailed.java
@@ -56,6 +56,9 @@
@Schema(description = "鍩硅璁插笀_id")
private Integer trainingLecturerId;
+ @Schema(description = "澶栬仒/闈炵郴缁熻甯堝鍚嶏紱鍐呴儴璁插笀浠嶅瓨 trainingLecturerId")
+ private String trainingLecturerName;
+
@Schema(description = "璁″垝鍩硅鏃ユ湡")
private String trainingDate;
diff --git a/cnas-personnel/src/main/java/com/ruoyi/personnel/service/impl/PersonTrainingDetailedServiceImpl.java b/cnas-personnel/src/main/java/com/ruoyi/personnel/service/impl/PersonTrainingDetailedServiceImpl.java
index 7c05355..39274d6 100644
--- a/cnas-personnel/src/main/java/com/ruoyi/personnel/service/impl/PersonTrainingDetailedServiceImpl.java
+++ b/cnas-personnel/src/main/java/com/ruoyi/personnel/service/impl/PersonTrainingDetailedServiceImpl.java
@@ -2,7 +2,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
-import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -47,17 +47,24 @@
PersonTrainingDetailed personTrainingDetailed = new PersonTrainingDetailed();
BeanUtils.copyProperties(i, personTrainingDetailed);
- // 鍖归厤璁插笀
- User user = userMapper.selectOne(Wrappers.<User>lambdaQuery()
- .eq(User::getName, i.getTrainingLecturerName()));
- if (ObjectUtils.isEmpty(user)) {
- throw new ErrorException("鏈壘鍒拌璁插笀锛�" + i.getTrainingLecturerName());
+ // 鍖归厤璁插笀锛氱郴缁熷唴鍞竴鍖归厤鐨勫瓨鐢ㄦ埛ID锛涘鑱�/闈炵郴缁熻甯堟寜濮撳悕鏂囨湰淇濆瓨
+ if (StringUtils.isBlank(i.getTrainingLecturerName())) {
+ throw new ErrorException("鍩硅璁插笀涓嶈兘涓虹┖");
}
- personTrainingDetailed.setTrainingLecturerId(user.getId());
+ String lecturerName = i.getTrainingLecturerName().trim();
+ List<User> lecturers = userMapper.selectList(Wrappers.<User>lambdaQuery()
+ .eq(User::getName, lecturerName));
+ if (lecturers.size() == 1) {
+ personTrainingDetailed.setTrainingLecturerId(lecturers.get(0).getId());
+ personTrainingDetailed.setTrainingLecturerName(null);
+ } else {
+ personTrainingDetailed.setTrainingLecturerId(null);
+ personTrainingDetailed.setTrainingLecturerName(lecturerName);
+ }
personTrainingDetailed.setPlanId(planId);
personTrainingDetailed.setState(3);
- personTrainingDetailed.setTrainingDate(i.getTrainingDate());
+ personTrainingDetailed.setTrainingDate(normalizeTrainingDate(i.getTrainingDate()));
personTrainingDetailedList.add(personTrainingDetailed);
@@ -68,6 +75,32 @@
}
}
+ /**
+ * 鍩硅鏃堕棿缁熶竴鎴� yyyy-MM-dd銆�
+ * Excel 閲岃鑷姩璇嗗埆鎴愭棩鏈熺殑鍗曞厓鏍艰鍑烘潵鏄� 2026/3/15锛屾墜宸ュ綍鍏ョ殑鏄� 2026-03-15锛�
+ * 杩欓噷缁熶竴杞崲锛岄伩鍏嶅鍑烘椂鏍煎紡涓嶄竴鑷淬��
+ */
+ private String normalizeTrainingDate(String value) {
+ if (value == null || value.isBlank()) {
+ return value;
+ }
+ String text = value.trim().split("\\s+")[0]
+ .replace('骞�', '-').replace('鏈�', '-').replace("鏃�", "")
+ .replace('/', '-').replace('.', '-');
+ String[] parts = text.split("-");
+ if (parts.length == 3) {
+ try {
+ int year = Integer.parseInt(parts[0].trim());
+ int month = Integer.parseInt(parts[1].trim());
+ int day = Integer.parseInt(parts[2].trim());
+ return String.format("%04d-%02d-%02d", year, month, day);
+ } catch (NumberFormatException ignored) {
+ // 涓嶆槸鍙瘑鍒殑鏃ユ湡鏍煎紡锛屽師鏍蜂繚瀛�
+ }
+ }
+ return value.trim();
+ }
+
@Override
public void deleteAnnualPlanDetailTable(String ids) {
String[] split = ids.split(",");
diff --git a/cnas-personnel/src/main/java/com/ruoyi/personnel/service/impl/PersonTrainingServiceImpl.java b/cnas-personnel/src/main/java/com/ruoyi/personnel/service/impl/PersonTrainingServiceImpl.java
index e5d2c50..8a6bd95 100644
--- a/cnas-personnel/src/main/java/com/ruoyi/personnel/service/impl/PersonTrainingServiceImpl.java
+++ b/cnas-personnel/src/main/java/com/ruoyi/personnel/service/impl/PersonTrainingServiceImpl.java
@@ -19,6 +19,7 @@
import com.ruoyi.common.utils.WxCpUtils;
import com.ruoyi.framework.exception.ErrorException;
import com.ruoyi.inspect.util.HackLoopTableRenderPolicy;
+import com.ruoyi.inspect.util.UserUtils;
import com.ruoyi.personnel.dto.PersonTrainingDetailedDto;
import com.ruoyi.personnel.dto.PersonTrainingDto;
import com.ruoyi.personnel.dto.PersonTrainingRecordDto;
@@ -131,11 +132,14 @@
message += "CNAS鍩硅璁″垝瀹℃牳閫氱煡";
message += "\n璇峰幓璧勬簮绠$悊-浜哄憳-鍩硅璁″垝濉啓";
message += "\n" + fileName + "鐨勫煿璁鍒掑緟瀹℃牳";
- //鍙戦�佷紒涓氬井淇℃秷鎭�氱煡
+ //鍙戦�佷紒涓氬井淇℃秷鎭�氱煡锛堟帴鏀朵汉涓嶅瓨鍦ㄦ垨鍙戦�佸け璐ヤ笉褰卞搷瀵煎叆娴佺▼锛�
+ if (personnel == null || StringUtils.isBlank(personnel.getAccount())) {
+ return;
+ }
try {
WxCpUtils.inform(personnel.getAccount(), message, null);
} catch (Exception e) {
- throw new RuntimeException(e);
+ e.printStackTrace();
}
});
@@ -306,9 +310,10 @@
// 鏌ヨ浜哄憳鍩硅鏄庣粏
PersonTrainingDetailedDto detailedDto = personTrainingDetailedMapper.selectTrainingDetail(id);
- // 鐢熸垚鍩硅鑰佸笀绛惧悕
- detailedDto.setTrainingLecturerRender(StringUtils.isNotBlank(detailedDto.getTrainingLecturerSignatureUrl())
- ? Pictures.ofLocal(imgUrl + "/" + detailedDto.getTrainingLecturerSignatureUrl()).create() : null);
+ // 鐢熸垚鍩硅鑰佸笀绛惧悕锛堟湭閰嶇疆绛惧悕鏃剁敤閫忔槑鍥剧墖鍏滃簳锛屾ā鏉块噷鐨勫浘鐗囧崰浣嶄笉鑳戒负 null锛�
+ detailedDto.setTrainingLecturerRender(UserUtils.orTransparentPicture(
+ StringUtils.isNotBlank(detailedDto.getTrainingLecturerSignatureUrl())
+ ? Pictures.ofLocal(imgUrl + "/" + detailedDto.getTrainingLecturerSignatureUrl()).create() : null));
// 鏌ヨ鍩硅鐨勪汉鍛�
List<PersonTrainingRecordDto> recordDtos = personTrainingRecordMapper.selectListByTrainingDetailedId(id);
@@ -320,15 +325,15 @@
for (PersonTrainingRecordDto recordDto : recordDtos) {
switch (count) {
case 0:
- exportDto.setUserNameRender1(StringUtils.isNotBlank(recordDto.getSignatureUrl())
- ? Pictures.ofLocal(imgUrl + "/" + recordDto.getSignatureUrl()).create() : null);
+ exportDto.setUserNameRender1(UserUtils.orTransparentPicture(StringUtils.isNotBlank(recordDto.getSignatureUrl())
+ ? Pictures.ofLocal(imgUrl + "/" + recordDto.getSignatureUrl()).create() : null));
exportDto.setDepartment1(recordDto.getDepartment());
exportDto.setExaminationResults1(recordDto.getExaminationResults());
count ++;
break;
case 1:
- exportDto.setUserNameRender2(StringUtils.isNotBlank(recordDto.getSignatureUrl())
- ? Pictures.ofLocal(imgUrl + "/" + recordDto.getSignatureUrl()).create() : null);
+ exportDto.setUserNameRender2(UserUtils.orTransparentPicture(StringUtils.isNotBlank(recordDto.getSignatureUrl())
+ ? Pictures.ofLocal(imgUrl + "/" + recordDto.getSignatureUrl()).create() : null));
exportDto.setDepartment2(recordDto.getDepartment());
exportDto.setExaminationResults2(recordDto.getExaminationResults());
exportDtoList.add(exportDto);
@@ -337,14 +342,17 @@
break;
}
}
- exportDtoList.add(exportDto);
+ // 鍙湁鍗曟暟鏉¤褰曟椂锛屾渶鍚庝竴琛屾墠鏈夋暟鎹紱鍋舵暟鏉℃椂 exportDto 鏄┖瀵硅薄锛屼笉鑳藉姞杩涜〃鏍�
+ if (count != 0) {
+ exportDtoList.add(exportDto);
+ }
- // 璐ㄩ噺璐熻矗浜�
+ // 璐ㄩ噺璐熻矗浜猴紙鏈鍚嶆椂鐢ㄩ�忔槑鍥剧墖鍏滃簳锛�
String assessmentUserUrl = null;
if (detailedDto.getAssessmentUserId() != null) {
- assessmentUserUrl = userMapper.selectById(detailedDto.getAssessmentUserId()).getSignatureUrl();
- if (StringUtils.isBlank(assessmentUserUrl)) {
- throw new ErrorException("鎵句笉鍒拌瘎浠蜂汉鐨勭鍚�");
+ User assessmentUser = userMapper.selectById(detailedDto.getAssessmentUserId());
+ if (assessmentUser != null) {
+ assessmentUserUrl = assessmentUser.getSignatureUrl();
}
}
@@ -359,7 +367,8 @@
new HashMap<String, Object>() {{
put("trainingDetail", detailedDto);
put("trainingRecordsList", exportDtoList);
- put("assessmentUserUrl", StringUtils.isNotBlank(finalAssessmentUserUrl) ? Pictures.ofLocal(imgUrl + "/" + finalAssessmentUserUrl).create() : null);
+ put("assessmentUserUrl", UserUtils.orTransparentPicture(StringUtils.isNotBlank(finalAssessmentUserUrl)
+ ? Pictures.ofLocal(imgUrl + "/" + finalAssessmentUserUrl).create() : null));
}});
try {
response.setContentType("application/msword");
diff --git a/cnas-personnel/src/main/resources/mapper/PersonTrainingDetailedMapper.xml b/cnas-personnel/src/main/resources/mapper/PersonTrainingDetailedMapper.xml
index e0013ed..307c8ed 100644
--- a/cnas-personnel/src/main/resources/mapper/PersonTrainingDetailedMapper.xml
+++ b/cnas-personnel/src/main/resources/mapper/PersonTrainingDetailedMapper.xml
@@ -4,7 +4,7 @@
<select id="queryTheAnnualPlanDetailsTable" resultType="com.ruoyi.personnel.dto.PersonTrainingDetailedDto">
SELECT cptd.*,
- u1.name training_lecturer_name,
+ COALESCE(u1.name, cptd.training_lecturer_name) training_lecturer_name,
dl.name holding_department_name, !isnull(cptr.training_record_id) whether_claim
FROM cnas_person_training_detailed cptd
left join user u1 on cptd.training_lecturer_id = u1.id
@@ -18,7 +18,7 @@
and u1.id = #{userId}
</if>
<if test="trainingLecturerName != null and trainingLecturerName != ''">
- and u1.name like concat('%', #{trainingLecturerName}, '%')
+ and COALESCE(u1.name, cptd.training_lecturer_name) like concat('%', #{trainingLecturerName}, '%')
</if>
<if test="trainingDate != null and trainingDate != ''">
and date_format(cptd.training_date,'%Y-%m-%d') = #{trainingDate}
@@ -29,7 +29,7 @@
<!-- 鏍规嵁涓昏〃id鏌ヨ璇︽儏 -->
<select id="selectTrainingList" resultType="com.ruoyi.personnel.dto.PersonTrainingDetailedDto">
SELECT cptd.*,
- u1.name training_lecturer_name
+ COALESCE(u1.name, cptd.training_lecturer_name) training_lecturer_name
FROM cnas_person_training_detailed cptd
left join user u1 on cptd.training_lecturer_id = u1.id
where cptd.plan_id = #{trainingId}
@@ -38,7 +38,7 @@
<!-- 鏌ヨ璇︾粏 -->
<select id="selectTrainingDetail" resultType="com.ruoyi.personnel.dto.PersonTrainingDetailedDto">
SELECT cptd.*,
- u1.name training_lecturer_name,
+ COALESCE(u1.name, cptd.training_lecturer_name) training_lecturer_name,
u1.signature_url training_lecturer_signature_url
FROM cnas_person_training_detailed cptd
left join user u1 on cptd.training_lecturer_id = u1.id
diff --git a/cnas-process/src/main/java/com/ruoyi/process/controller/QualitySuperviseController.java b/cnas-process/src/main/java/com/ruoyi/process/controller/QualitySuperviseController.java
index 369546a..1430ed5 100644
--- a/cnas-process/src/main/java/com/ruoyi/process/controller/QualitySuperviseController.java
+++ b/cnas-process/src/main/java/com/ruoyi/process/controller/QualitySuperviseController.java
@@ -191,6 +191,16 @@
}
/**
+ * 琚洃鐫d汉鍛樼‘璁ょ洃鐫h褰�
+ * @return
+ */
+ @Operation(summary = "琚洃鐫d汉鍛樼‘璁ょ洃鐫h褰�")
+ @PostMapping("/confirmSuperviseRecord")
+ public Result confirmSuperviseRecord(@RequestBody QualitySuperviseDetailsRecord qualitySuperviseDetailsRecord){
+ return Result.success(qualitySuperviseService.confirmSuperviseRecord(qualitySuperviseDetailsRecord));
+ }
+
+ /**
* 瀵煎嚭璐ㄩ噺鐩戠潱璇︽儏璁板綍琛�
* @return
*/
diff --git a/cnas-process/src/main/java/com/ruoyi/process/pojo/QualityMonitorDetailsEvaluate.java b/cnas-process/src/main/java/com/ruoyi/process/pojo/QualityMonitorDetailsEvaluate.java
index 622320e..6a92a3c 100644
--- a/cnas-process/src/main/java/com/ruoyi/process/pojo/QualityMonitorDetailsEvaluate.java
+++ b/cnas-process/src/main/java/com/ruoyi/process/pojo/QualityMonitorDetailsEvaluate.java
@@ -29,10 +29,16 @@
@Schema(description = "鍏宠仈鐨勮川鎺ф楠屼换鍔D")
private Integer insOrderId;
- @Schema(description = "鐩戠潱鍛樼敤鎴稩D锛屼笌璇勪环浜哄垎寮�")
+ @Schema(description = "鐩戠潱鍛樼敤鎴稩D锛岄粯璁や负璁″垝涓寚瀹氱殑璇勪环浜�")
private Integer supervisorUserId;
+ @Schema(description = "鐩戠潱鍛樺悕绉帮紝闈炴暟鎹簱瀛楁")
+ @TableField(exist = false)
+ private String supervisorName;
@Schema(description = "琚洃鐫f娴嬪憳鐢ㄦ埛ID")
private Integer inspectorUserId;
+ @Schema(description = "琚洃鐫f娴嬪憳鍚嶇О锛岄潪鏁版嵁搴撳瓧娈�")
+ @TableField(exist = false)
+ private String inspectorName;
@Schema(description = "妫�娴嬫牱鍝佸悕绉�")
private String sampleName;
@Schema(description = "妫�娴嬫牱鍝佽鏍�")
diff --git a/cnas-process/src/main/java/com/ruoyi/process/pojo/QualitySuperviseDetailsRecord.java b/cnas-process/src/main/java/com/ruoyi/process/pojo/QualitySuperviseDetailsRecord.java
index e652262..3f10ab6 100644
--- a/cnas-process/src/main/java/com/ruoyi/process/pojo/QualitySuperviseDetailsRecord.java
+++ b/cnas-process/src/main/java/com/ruoyi/process/pojo/QualitySuperviseDetailsRecord.java
@@ -14,7 +14,8 @@
* @since 2024-11-07
*/
@Data
-@TableName("cnas_quality_supervise_details_record")
+// autoResultMap: testing_process/supervision_evaluation 澶嶇敤浜嗗巻鍙插垪鍚�, 闇�瑕� MP 鑷姩鐢熸垚缁撴灉鏄犲皠
+@TableName(value = "cnas_quality_supervise_details_record", autoResultMap = true)
@Schema(description = "璐ㄩ噺鐩戠潱璇︽儏璁板綍琛�")
public class QualitySuperviseDetailsRecord {
@@ -51,8 +52,9 @@
@Schema(description = "妫�娴嬫棩鏈�")
private String testDate;
- @Schema(description = "妫�娴嬭繃绋�")
- private String testingProcess;
+ @Schema(description = "鐩戠潱鏂瑰紡(澶氶」椤垮彿鍒嗛殧)锛氭牳鏌ュ師濮嬭褰曞拰鎶ュ憡銆佺幇鍦虹洃鐫e疄闄呮搷浣滆繃绋嬬瓑")
+ @TableField("testing_process")
+ private String superviseMethod;
@Schema(description = "鎯呭喌璁板綍")
private String caseReload;
@@ -81,8 +83,9 @@
@Schema(description = "妫�娴嬫姤鍛�")
private String examiningReport;
- @Schema(description = "鐩戠潱鎯呭喌璇勪环")
- private String supervisionEvaluation;
+ @Schema(description = "琚洃鐫d汉鍛樼‘璁ゆ剰瑙�(绋嬪簭4.2.5)")
+ @TableField("supervision_evaluation")
+ private String confirmOpinion;
@Schema(description = "涓嶅悎鏍煎鐞嗘剰瑙�")
private String handlingAdvice;
diff --git a/cnas-process/src/main/java/com/ruoyi/process/service/QualityMonitorInspectionEvaluationService.java b/cnas-process/src/main/java/com/ruoyi/process/service/QualityMonitorInspectionEvaluationService.java
index f94a4e1..3b64429 100644
--- a/cnas-process/src/main/java/com/ruoyi/process/service/QualityMonitorInspectionEvaluationService.java
+++ b/cnas-process/src/main/java/com/ruoyi/process/service/QualityMonitorInspectionEvaluationService.java
@@ -61,6 +61,14 @@
evaluation.setSampleName(detail.getSampleName());
evaluation.setSampleSpec(detail.getSampleSpec());
}
+ // 璇勪环璁板綍閲岀殑鈥滅洃鐫e憳鈥濆氨鏄鍒掍腑鎸囧畾鐨勨�滆瘎浠蜂汉鈥濓紝鏈繚瀛樿繃璇勪环鏃剁洿鎺ュ弽鏄捐瘎浠蜂汉
+ if (evaluation.getSupervisorUserId() == null) {
+ evaluation.setSupervisorUserId(detail.getEvaluatorUserId());
+ }
+ // 鍘嗗彶璇勪环璁板綍鍙兘娌℃湁淇濆瓨琚洃鐫d汉鍛橈紝鍥為��鍒拌鍒掓槑缁嗕腑鐨勬娴嬪憳
+ if (evaluation.getInspectorUserId() == null) {
+ evaluation.setInspectorUserId(detail.getInspectorUserId());
+ }
List<QualityMonitorEvaluateResult> rows = evaluation.getDetailsEvaluateId() == null
? List.of() : resultMapper.selectList(Wrappers.<QualityMonitorEvaluateResult>lambdaQuery()
.eq(QualityMonitorEvaluateResult::getDetailsEvaluateId, evaluation.getDetailsEvaluateId())
@@ -85,6 +93,15 @@
}
evaluation.setResultRows(rows);
evaluation.setInspectionTaskState(task == null ? null : task.getInsState());
+ // 鐩戠潱鍛樸�佹娴嬪憳鍙兘涓嶅湪鍓嶇浜哄憳涓嬫媺鍒楄〃涓紙瑙掕壊鎴栫姸鎬佽杩囨护锛夛紝鍥炰紶鍚嶇О淇濊瘉鑳芥甯稿弽鏄�
+ if (evaluation.getSupervisorUserId() != null) {
+ var supervisor = userMapper.selectById(evaluation.getSupervisorUserId());
+ if (supervisor != null) evaluation.setSupervisorName(supervisor.getName());
+ }
+ if (evaluation.getInspectorUserId() != null) {
+ var inspector = userMapper.selectById(evaluation.getInspectorUserId());
+ if (inspector != null) evaluation.setInspectorName(inspector.getName());
+ }
if (Integer.valueOf(1).equals(evaluation.getIsFinish())) {
evaluation.setEvaluationEditReason("璇勪环宸叉壒鍑嗗綊妗o紝鍙兘鏌ョ湅");
} else if (task == null) {
@@ -117,9 +134,8 @@
throw new ErrorException("鍙湁鎸囧畾璇勪环浜哄彲浠ュ~鍐欒瘎浠�");
if (input.getSupervisorUserId() == null
|| input.getSupervisorUserId().equals(detail.getInspectorUserId())
- || input.getSupervisorUserId().equals(detail.getEvaluatorUserId())
|| userMapper.selectById(input.getSupervisorUserId()) == null)
- throw new ErrorException("璇烽�夋嫨涓庢娴嬪憳銆佽瘎浠蜂汉涓嶅悓鐨勭洃鐫e憳");
+ throw new ErrorException("璇烽�夋嫨鐩戠潱鍛橈紙榛樿涓鸿鍒掕瘎浠蜂汉锛屼笉鑳戒笌妫�娴嬪憳鐩稿悓锛�");
Long pendingCount = stateMapper.selectCount(Wrappers.<InsOrderState>lambdaQuery()
.eq(InsOrderState::getInsOrderId, task.getId()).ne(InsOrderState::getInsState, 5));
if (pendingCount > 0) throw new ErrorException("鍘熷璁板綍澶嶆牳閫氳繃鍚庢墠鑳借瘎浠�");
diff --git a/cnas-process/src/main/java/com/ruoyi/process/service/QualityMonitorService.java b/cnas-process/src/main/java/com/ruoyi/process/service/QualityMonitorService.java
index 55182c4..c2ee587 100644
--- a/cnas-process/src/main/java/com/ruoyi/process/service/QualityMonitorService.java
+++ b/cnas-process/src/main/java/com/ruoyi/process/service/QualityMonitorService.java
@@ -30,9 +30,9 @@
/**
* 瀵煎叆鐩戞帶璁″垝
* @param file
- * @return
+ * @return 瀵煎叆鍚庣敓鎴愮殑鑽夌璁″垝
*/
- boolean importQualityMonitor(MultipartFile file, QualityMonitor qualityMonitor);
+ QualityMonitor importQualityMonitor(MultipartFile file, QualityMonitor qualityMonitor);
/**
diff --git a/cnas-process/src/main/java/com/ruoyi/process/service/QualitySuperviseService.java b/cnas-process/src/main/java/com/ruoyi/process/service/QualitySuperviseService.java
index 832f672..5de8b83 100644
--- a/cnas-process/src/main/java/com/ruoyi/process/service/QualitySuperviseService.java
+++ b/cnas-process/src/main/java/com/ruoyi/process/service/QualitySuperviseService.java
@@ -90,6 +90,13 @@
boolean addSuperviseRecordOpinion(QualitySuperviseDetailsRecord qualitySuperviseDetailsRecord);
/**
+ * 琚洃鐫d汉鍛樼‘璁ょ洃鐫h褰�(绋嬪簭4.2.5)
+ * @param qualitySuperviseDetailsRecord 鑷冲皯鍖呭惈 superviseDetailsId 鍜� confirmOpinion
+ * @return
+ */
+ boolean confirmSuperviseRecord(QualitySuperviseDetailsRecord qualitySuperviseDetailsRecord);
+
+ /**
* 瀵煎嚭鐩戠潱璁板綍琛�
* @param superviseDetailsId
* @param response
diff --git a/cnas-process/src/main/java/com/ruoyi/process/service/impl/QualityMonitorServiceImpl.java b/cnas-process/src/main/java/com/ruoyi/process/service/impl/QualityMonitorServiceImpl.java
index bf60509..b27630c 100644
--- a/cnas-process/src/main/java/com/ruoyi/process/service/impl/QualityMonitorServiceImpl.java
+++ b/cnas-process/src/main/java/com/ruoyi/process/service/impl/QualityMonitorServiceImpl.java
@@ -211,7 +211,7 @@
* @return
*/
@Override
- public boolean importQualityMonitor(MultipartFile file, QualityMonitor monitor) {
+ public QualityMonitor importQualityMonitor(MultipartFile file, QualityMonitor monitor) {
// 褰撳墠鐧诲綍鐢ㄦ埛
Integer userId = SecurityUtils.getUserId().intValue();
// 鏂囦欢鍚嶇О
@@ -226,39 +226,10 @@
qualityMonitor.setWriteUserId(userId);
qualityMonitor.setExamineUserId(monitor.getExamineUserId());
qualityMonitor.setWriteTime(LocalDateTime.now());
- qualityMonitor.setWorkflowStatus("PENDING_REVIEW");
+ // 瀵煎叆鍙敓鎴愯崏绋匡紝瀵煎叆鐨勮川鎺ч」鐩繕闇�瑕佽ˉ鍏ㄦ娴嬫爣鍑嗐�佹娴嬪憳绛変俊鎭紱
+ // 瀹℃牳閫氱煡鍦ㄧ紪鍒朵汉鐐瑰嚮鈥滄彁浜ゅ鏍糕�濇椂缁熶竴鍙戦�併��
+ qualityMonitor.setWorkflowStatus("DRAFT");
baseMapper.insert(qualityMonitor);
-
- User user = userMapper.selectById(userId);
- // 娑堟伅鍙戦��
- InformationNotification info = new InformationNotification();
- // 鍙戦�佷汉
- info.setCreateUser(user.getName());
- info.setMessageType("6");
- info.setTheme("CNAS璐ㄩ噺鐩戞帶璁″垝瀹℃牳閫氱煡");
- info.setContent(fileName + "璐ㄩ噺鐩戞帶璁″垝寰呭鏍�");
- info.setSenderId(userId);
- // 鎺ユ敹浜�
- info.setConsigneeId(monitor.getExamineUserId());
- info.setJumpPath(MenuJumpPathConstants.QUALITY_MONITOR);
- informationNotificationService.addInformationNotification(info);
-
- // 鍙戦�佷紒涓氬井淇¢�氱煡
- threadPoolTaskExecutor.execute(() -> {
- // 鏌ヨ鍙戦�佷汉
- User people = userMapper.selectById(monitor.getExamineUserId());
- String message = "";
- message += "CNAS璐ㄩ噺鐩戞帶璁″垝瀹℃牳閫氱煡";
- message += "\n璇峰幓杩囩▼瑕佹眰-璐ㄩ噺鐩戞帶璁″垝";
- message += "\n" + fileName + "璐ㄩ噺鐩戞帶璁″垝寰呭鏍�";
- //鍙戦�佷紒涓氬井淇℃秷鎭�氱煡
- try {
- WxCpUtils.inform(people.getAccount(), message, null);
- } catch (Exception e) {
- throw new RuntimeException(e);
- }
- });
-
List<QualityMonitorDetails> detailsUploadList = new ArrayList<>();
@@ -277,6 +248,7 @@
// 瀵硅薄澶嶅埗
QualityMonitorDetails monitorDetails = new QualityMonitorDetails();
BeanUtils.copyProperties(detailsUpload, monitorDetails);
+ monitorDetails.setMonitorWay(normalizeMonitorWay(detailsUpload.getMonitorWay()));
monitorDetails.setQualityMonitorId(qualityMonitor.getQualityMonitorId());
if (!detailsUpload.getCompletionMonth().matches("\\d{4}-\\d{2}")) {
throw new ErrorException("瀹屾垚鏃堕檺鏍煎紡搴斾负yyyy-MM");
@@ -303,7 +275,21 @@
} catch (IOException e) {
throw new RuntimeException(e);
}
- return true;
+ return qualityMonitor;
+ }
+
+ /**
+ * 璐ㄦ帶鏂瑰紡缁熶竴鐢ㄢ�溿�佲�濆垎闅旓紝鍏煎瀵煎叆妯℃澘閲屽父瑙佺殑閫楀彿/鍒嗗彿鍐欐硶銆�
+ */
+ private String normalizeMonitorWay(String value) {
+ if (StringUtils.isBlank(value)) {
+ return value;
+ }
+ return java.util.Arrays.stream(value.split("[銆�,锛�;锛沒"))
+ .map(String::trim)
+ .filter(StringUtils::isNotBlank)
+ .distinct()
+ .collect(Collectors.joining("銆�"));
}
/**
@@ -657,7 +643,7 @@
try {
response.setContentType("application/msword");
String fileName = URLEncoder.encode(
- "璐ㄩ噺鐩戞帶瀹炴柦璁″垝", "UTF-8");
+ "璐ㄩ噺鎺у埗鎺柦", "UTF-8");
response.setHeader("Content-disposition",
"attachment;filename=" + fileName + ".docx");
OutputStream os = response.getOutputStream();
@@ -871,7 +857,7 @@
try {
response.setContentType("application/msword");
String fileName = URLEncoder.encode(
- "鐩戞帶璇勪环", "UTF-8");
+ "璐ㄩ噺鎺у埗璇勪环璁板綍", "UTF-8");
response.setHeader("Content-disposition",
"attachment;filename=" + fileName + ".docx");
OutputStream os = response.getOutputStream();
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 6219c17..87f9a83 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
@@ -56,6 +56,8 @@
import java.time.YearMonth;
import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
import java.util.Base64;
import java.util.HashMap;
import java.util.LinkedHashSet;
@@ -178,8 +180,8 @@
throw new ErrorException("鏈壘鍒拌鐩戠潱鍛橈細" + superviseDetails.getSupervisee());
}
superviseDetails.setSupervisedUserId(user.getId());
- // 鏍煎紡鍖栨椂闂�
- superviseDetails.setSuperviseTime(detailsUpload.getSuperviseTime());
+ // 缁熶竴鏃ユ湡鏍煎紡锛岄伩鍏� Excel 鎶� 2026-03-15 瀛樻垚 2026/3/15 鍚庢棤娉曡В鏋�
+ superviseDetails.setSuperviseTime(normalizeSuperviseTime(detailsUpload.getSuperviseTime()));
detailsUploadList.add(superviseDetails);
}
@@ -432,6 +434,59 @@
}
/**
+ * 缁熶竴鐩戠潱鏃ユ湡鏍煎紡涓� yyyy.M锛�
+ * 2026-03-15 / 2026/3/15 / 2026.3.15 / 2026骞�3鏈�15鏃� -> 2026.3锛�
+ * 宸茬粡鏄� 2026.3 鎴� "3鏈堛��12鏈�" 绛夊啓娉曚繚鎸佸師鏍枫��
+ */
+ private static String normalizeSuperviseTime(String superviseTime) {
+ if (StringUtils.isBlank(superviseTime)) {
+ return superviseTime;
+ }
+ String text = superviseTime.trim();
+ Matcher matcher = Pattern.compile("^(\\d{4})\\s*[./骞�-]\\s*(\\d{1,2})(?:\\s*[./鏈�-]\\s*(\\d{1,2})\\s*鏃�?)?$")
+ .matcher(text);
+ if (matcher.matches()) {
+ int month = Integer.parseInt(matcher.group(2));
+ if (month >= 1 && month <= 12) {
+ return matcher.group(1) + "." + month;
+ }
+ }
+ return text;
+ }
+
+ /**
+ * 瑙f瀽鐩戠潱鏃ユ湡瀵瑰簲鐨勫勾鏈堬紝鍏煎鍘嗗彶鏁版嵁涓殑瀹屾暣鏃ユ湡鍐欐硶銆�
+ */
+ private static YearMonth parseSuperviseYearMonth(String superviseTime, String fallbackYear) {
+ if (StringUtils.isNotBlank(superviseTime)) {
+ String first = superviseTime.split("[銆�,锛�;锛沒+")[0].trim();
+ Matcher fullDate = Pattern.compile("(\\d{4})\\s*[./骞�-]\\s*(\\d{1,2})").matcher(first);
+ if (fullDate.find()) {
+ int month = Integer.parseInt(fullDate.group(2));
+ if (month >= 1 && month <= 12) {
+ return YearMonth.of(Integer.parseInt(fullDate.group(1)), month);
+ }
+ }
+ // "3鏈堛��12鏈�" 杩欑被娌℃湁骞翠唤鐨勫啓娉曪紝浣跨敤璁″垝骞村害
+ Matcher monthOnly = Pattern.compile("^(\\d{1,2})").matcher(first);
+ if (monthOnly.find()) {
+ int month = Integer.parseInt(monthOnly.group(1));
+ if (month >= 1 && month <= 12) {
+ int year = LocalDate.now().getYear();
+ if (StringUtils.isNotBlank(fallbackYear)) {
+ Matcher yearMatcher = Pattern.compile("(\\d{4})").matcher(fallbackYear);
+ if (yearMatcher.find()) {
+ year = Integer.parseInt(yearMatcher.group(1));
+ }
+ }
+ return YearMonth.of(year, month);
+ }
+ }
+ }
+ return YearMonth.now();
+ }
+
+ /**
* 鐩戠潱棰戞: 鎸夌洃鐫f椂闂翠腑鐨勬湀浠戒釜鏁拌绠�, 濡� "2026.3" -> "1娆�/骞�", "3鏈堛��12鏈�" -> "2娆�/骞�"
*/
private static String buildSuperviseFrequency(String superviseTime) {
@@ -439,7 +494,7 @@
return "";
}
int count = 0;
- for (String part : superviseTime.split("[銆�,锛�;锛�/\\s]+")) {
+ for (String part : normalizeSuperviseTime(superviseTime).split("[銆�,锛�;锛�/\\s]+")) {
if (part.matches(".*\\d.*")) {
count++;
}
@@ -456,7 +511,7 @@
}
StringBuilder sb = new StringBuilder();
for (String part : superviseTime.split("[銆�,锛�;锛沒+")) {
- String s = part.trim();
+ String s = normalizeSuperviseTime(part.trim());
if (s.isEmpty()) {
continue;
}
@@ -491,9 +546,11 @@
if (detailsRecord == null) {
// 鏌ヨ璇︽儏淇℃伅
QualitySuperviseDetails qualitySuperviseDetails = qualitySuperviseDetailsMapper.selectById(superviseDetailsId);
+ QualitySupervise qualitySupervise = baseMapper.selectById(qualitySuperviseDetails.getSuperviseId());
// 鏌ヨ涓婁竴涓湀绗竴鏉$殑璁板綍淇℃伅, 鍒ゆ柇琚洃鐫d汉鍘诲彟澶栦竴涓�
- DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy.M");
- YearMonth yearMonth = YearMonth.parse(qualitySuperviseDetails.getSuperviseTime(), formatter);
+ // 鐩戠潱鏃ユ湡鍏煎 2026.3 / 2026-03-15 / 2026/3/15 / 2026骞�3鏈�15鏃� 绛夊啓娉�
+ YearMonth yearMonth = parseSuperviseYearMonth(qualitySuperviseDetails.getSuperviseTime(),
+ qualitySupervise == null ? null : qualitySupervise.getSuperviseYear());
YearMonth previousYearMonth = yearMonth.minusMonths(1);
LocalDate startDate = previousYearMonth.atDay(1);
@@ -515,21 +572,17 @@
String supervisor = null;
- if (laseRecord != null) {
- // 鏌ヨ璁″垝鑾峰彇鍙︿竴涓洃鐫e憳
- QualitySupervise qualitySupervise = baseMapper.selectById(qualitySuperviseDetails.getSuperviseId());
- if (StringUtils.isNotBlank(qualitySupervise.getRecordUserIds())) {
- List<String> recordUserIds = StrUtil.split(qualitySupervise.getRecordUserIds(), ',');
- List<User> users = userMapper.selectList(Wrappers.<User>lambdaQuery()
- .in(User::getId, recordUserIds));
- if (CollectionUtils.isNotEmpty(users) && users.size() == 2) {
- // 鍒ゆ柇鏄惁涓�鏍�, 涓�鏍疯幏鍙栧彟澶栦竴涓�
- if (users.get(0).getName().equals(laseRecord.getSupervisor())) {
- supervisor = users.get(1).getName();
- } else {
- supervisor = users.get(0).getName();
- }
-
+ // 璁″垝鎸囧畾鐨勭洃鐫e憳锛氶娆″~鍐欐椂榛樿甯﹀嚭绗竴浣嶏紱鏈変笂鏈堣褰曟椂涓や綅鐩戠潱鍛樹氦鏇�
+ if (qualitySupervise != null && StringUtils.isNotBlank(qualitySupervise.getRecordUserIds())) {
+ List<String> recordUserIds = StrUtil.split(qualitySupervise.getRecordUserIds(), ',');
+ List<User> users = userMapper.selectList(Wrappers.<User>lambdaQuery()
+ .in(User::getId, recordUserIds));
+ if (CollectionUtils.isNotEmpty(users)) {
+ if (laseRecord != null && users.size() > 1
+ && users.get(0).getName().equals(laseRecord.getSupervisor())) {
+ supervisor = users.get(1).getName();
+ } else {
+ supervisor = users.get(0).getName();
}
}
}
@@ -643,6 +696,47 @@
}
/**
+ * 琚洃鐫d汉鍛樼‘璁ょ洃鐫h褰�(绋嬪簭4.2.5: 琚洃鐫e璞″鐩戠潱璁板綍鐪熷疄鎬ф彁鍑虹‘璁ゆ剰瑙�)
+ */
+ @Override
+ public boolean confirmSuperviseRecord(QualitySuperviseDetailsRecord input) {
+ if (input == null || input.getSuperviseDetailsId() == null) {
+ throw new ErrorException("缂哄皯鐩戠潱璇︾粏淇℃伅id");
+ }
+ QualitySuperviseDetailsRecord record = qualitySuperviseDetailsRecordMapper.selectOne(
+ Wrappers.<QualitySuperviseDetailsRecord>lambdaQuery()
+ .eq(QualitySuperviseDetailsRecord::getSuperviseDetailsId, input.getSuperviseDetailsId())
+ .last("limit 1"));
+ if (record == null) {
+ throw new ErrorException("鐩戠潱鍛樺皻鏈彁浜ょ洃鐫h褰曪紝鏃犳硶纭");
+ }
+ Integer userId = SecurityUtils.getUserId().intValue();
+ User user = userMapper.selectById(userId);
+ if (user == null) {
+ throw new ErrorException("褰撳墠鐢ㄦ埛涓嶅瓨鍦�");
+ }
+ // 鍙湁琚洃鐫d汉鍛樻湰浜烘墠鍙互纭
+ boolean isSupervisee = StrUtil.split(record.getTestMember(), '銆�').stream()
+ .map(String::trim)
+ .anyMatch(name -> name.equals(user.getName()));
+ if (!isSupervisee) {
+ QualitySuperviseDetails detail = qualitySuperviseDetailsMapper.selectById(input.getSuperviseDetailsId());
+ isSupervisee = detail != null && userId.equals(detail.getSupervisedUserId());
+ }
+ if (!isSupervisee) {
+ throw new ErrorException("鍙湁琚洃鐫d汉鍛樺彲浠ョ‘璁ょ洃鐫h褰�");
+ }
+ String opinion = StringUtils.isBlank(input.getConfirmOpinion())
+ ? "瀵圭洃鐫h褰曠湡瀹炴�ц〃绀鸿鍙��" : input.getConfirmOpinion().trim();
+ qualitySuperviseDetailsRecordMapper.update(null,
+ Wrappers.<QualitySuperviseDetailsRecord>lambdaUpdate()
+ .eq(QualitySuperviseDetailsRecord::getSuperviseDetailsRecordId,
+ record.getSuperviseDetailsRecordId())
+ .set(QualitySuperviseDetailsRecord::getConfirmOpinion, opinion));
+ return true;
+ }
+
+ /**
* 瀵煎嚭鐩戠潱璁板綍琛�(鏃ュ父鐩戠潱妫�鏌ヨ褰曡〃)
* @param superviseDetailsId
* @param response
@@ -670,6 +764,11 @@
put("qualityUrl", signatureOrTransparent(recordDto.getRatifyUserId()));
put("qualityDateStr", recordDto.getRatifyTime() != null ?
recordDto.getRatifyTime().format(RECORD_DATE_FORMATTER) : "");
+ // 绋嬪簭4.2.5: 琚洃鐫d汉鍛樺鐩戠潱璁板綍鐪熷疄鎬х殑纭鎰忚, 鏈‘璁ゆ椂娌跨敤绾稿紶琛ㄧ殑榛樿琛ㄨ堪
+ put("confirmOpinionText", StringUtils.isNotBlank(recordDto.getConfirmOpinion())
+ ? recordDto.getConfirmOpinion() : "瀵圭洃鐫h褰曠湡瀹炴�ц〃绀鸿鍙��");
+ put("superviseMethodText", StringUtils.isNotBlank(recordDto.getSuperviseMethod())
+ ? recordDto.getSuperviseMethod() : "");
}});
try {
@@ -690,7 +789,7 @@
}
/**
- * 鐩戠潱鍐呭(9椤�, 鎸夌焊寮犺〃妯帓椤哄簭)
+ * 鐩戠潱鍐呭(9椤�, 涓庡彈鎺ц褰曡〃 LMSY-CX29-JL02 鐨勬í鎺掗『搴忋�佹枃瀛楀畬鍏ㄤ竴鑷�)
*/
private static final String[] SUPERVISE_CONTENT_ITEMS = {
"浜哄憳鎸佽瘉鍙婂煿璁�", "璁炬柦鍙婄幆澧冩潯浠�", "妫�娴嬫柟娉�",
diff --git a/cnas-process/src/main/java/com/ruoyi/process/task/QualitySuperviseSchedule.java b/cnas-process/src/main/java/com/ruoyi/process/task/QualitySuperviseSchedule.java
index 0d42e19..385b8a6 100644
--- a/cnas-process/src/main/java/com/ruoyi/process/task/QualitySuperviseSchedule.java
+++ b/cnas-process/src/main/java/com/ruoyi/process/task/QualitySuperviseSchedule.java
@@ -91,8 +91,9 @@
List<QualitySuperviseDetails> qualitySuperviseDetails = qualitySuperviseDetailsMapper.selectList(Wrappers.<QualitySuperviseDetails>lambdaQuery()
.eq(QualitySuperviseDetails::getSuperviseTime, format));
- // 鏍规嵁瀹氭湡鐩戠潱鍜屽姩鎬佺洃鐫e尯鍒�
- Map<String, List<QualitySuperviseDetails>> superviseReasonMap = qualitySuperviseDetails.stream().collect(Collectors.groupingBy(QualitySuperviseDetails::getSuperviseReason));
+ // 鏍规嵁鐩戠潱鍘熷洜鍖哄垎(瀹氭湡鐩戠潱/鍔ㄦ�佺洃鐫�), 鐩戠潱鍘熷洜鍏佽鎵嬪伐濉啓鎴栦负绌�, 杩欓噷鍋氱┖鍊煎厹搴�
+ Map<String, List<QualitySuperviseDetails>> superviseReasonMap = qualitySuperviseDetails.stream()
+ .collect(Collectors.groupingBy(details -> StrUtil.nullToEmpty(details.getSuperviseReason())));
// 鑾峰彇褰撴湀鏃ユ湡
DateTimeFormatter formatter2 = DateTimeFormatter.ofPattern("yyyy骞碝M鏈�");
diff --git a/cnas-process/src/main/resources/mapper/QualitySuperviseDetailsRecordMapper.xml b/cnas-process/src/main/resources/mapper/QualitySuperviseDetailsRecordMapper.xml
index 1dd051f..fe2981c 100644
--- a/cnas-process/src/main/resources/mapper/QualitySuperviseDetailsRecordMapper.xml
+++ b/cnas-process/src/main/resources/mapper/QualitySuperviseDetailsRecordMapper.xml
@@ -4,7 +4,10 @@
<!--瀵煎嚭鐩戠潱璁板綍琛�-->
<select id="selectSuperviseDetailRecord" resultType="com.ruoyi.process.pojo.QualitySuperviseDetailsRecord">
- select cqsdr.*
+ <!-- 澶嶇敤鍘嗗彶鍒� testing_process / supervision_evaluation锛宺esultType 鑷姩鏄犲皠闇�瑕佸埆鍚� -->
+ select cqsdr.*,
+ cqsdr.testing_process as supervise_method,
+ cqsdr.supervision_evaluation as confirm_opinion
from cnas_quality_supervise_details_record cqsdr
where cqsdr.supervise_details_id = #{superviseDetailsId}
</select>
diff --git a/cnas-process/src/main/resources/static/daily-supervise-record.docx b/cnas-process/src/main/resources/static/daily-supervise-record.docx
index 79b52e9..a429545 100644
--- a/cnas-process/src/main/resources/static/daily-supervise-record.docx
+++ b/cnas-process/src/main/resources/static/daily-supervise-record.docx
Binary files differ
diff --git a/cnas-process/src/main/resources/static/quality-monitor-details-ratify.docx b/cnas-process/src/main/resources/static/quality-monitor-details-ratify.docx
index 420d810..546e893 100644
--- a/cnas-process/src/main/resources/static/quality-monitor-details-ratify.docx
+++ b/cnas-process/src/main/resources/static/quality-monitor-details-ratify.docx
Binary files differ
diff --git a/cnas-process/src/main/resources/static/quality-monitor-evaluate.docx b/cnas-process/src/main/resources/static/quality-monitor-evaluate.docx
index c3e8a2e..9ab3edd 100644
--- a/cnas-process/src/main/resources/static/quality-monitor-evaluate.docx
+++ b/cnas-process/src/main/resources/static/quality-monitor-evaluate.docx
Binary files differ
diff --git a/cnas-process/src/main/resources/static/quality-monitor.docx b/cnas-process/src/main/resources/static/quality-monitor.docx
index 8ad9990..ad03438 100644
--- a/cnas-process/src/main/resources/static/quality-monitor.docx
+++ b/cnas-process/src/main/resources/static/quality-monitor.docx
Binary files differ
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsOrder.java b/inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsOrder.java
index 56cf817..a74b48b 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsOrder.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsOrder.java
@@ -42,6 +42,9 @@
@Schema(description = "璐ㄩ噺鐩戞帶璁″垝鏄庣粏ID")
private Integer qualityMonitorDetailsId;
+ @Schema(description = "鏂拌仛鐩寸粦妯℃澘涓嬪崟鏃堕�夋嫨鐨勬爣鍑嗗簱浜岀骇鑺傜偣ID")
+ private Integer standardTreeId;
+
@Schema(description = "涓嬪崟瀹㈡埛")
private String custom;
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsOrderStandardTemplate.java b/inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsOrderStandardTemplate.java
index 395a0cc..cf12774 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsOrderStandardTemplate.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsOrderStandardTemplate.java
@@ -64,6 +64,9 @@
@Schema(description = "鍘熷璁板綍宸插~鍐欏崟鍏冩牸锛屾寜鍧愭爣淇濆瓨")
private String recordValues;
+ @Schema(description = "榛樿璁惧鏄惁宸插湪棣栨杩涘叆妫�楠屼换鍔℃椂鍒濆鍖栵細0鍚︼紝1鏄�")
+ private Integer deviceDefaultsInitialized;
+
@Schema(description = "璇ユā鏉挎楠屾椂鐨勬俯搴�")
private String temperature;
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderPlanServiceImpl.java b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderPlanServiceImpl.java
index 9e811fd..40dcb48 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderPlanServiceImpl.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderPlanServiceImpl.java
@@ -1659,6 +1659,8 @@
refreshed.setRemark(standardTemplate == null ? oldSnapshot.getRemark() : standardTemplate.getRemark());
refreshed.setThing(standardTemplate == null ? oldSnapshot.getThing() : standardTemplate.getThing());
refreshed.setRecordValues(templateRecordValuesMap.get(templateId));
+ refreshed.setDeviceDefaultsInitialized(oldSnapshot == null ? 1
+ : oldSnapshot.getDeviceDefaultsInitialized());
refreshed.setTemperature(templateTemperatureMap.get(templateId));
refreshed.setHumidity(templateHumidityMap.get(templateId));
// 鍒锋柊妯℃澘缁撴瀯鏃跺繀椤讳繚鐣欐楠岄樁娈靛~鍐欑殑涓氬姟鏁版嵁锛岄伩鍏嶈繘鍏ュ鏍稿悗鍥炴樉涓虹┖銆�
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderServiceImpl.java b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderServiceImpl.java
index a79bfcd..f4b1b84 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderServiceImpl.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderServiceImpl.java
@@ -581,6 +581,9 @@
.thenComparing(item -> item.getTemplateRowIndex() == null
? Integer.MAX_VALUE : item.getTemplateRowIndex()))
.collect(Collectors.toList());
+ if (templateItems.isEmpty()) {
+ throw new ErrorException("鎵�閫夊師濮嬭褰曟ā鏉挎湭閰嶇疆妫�楠岄」鎴栧鍑哄�硷紝涓嶈兘涓嬪崟");
+ }
StandardMethod standardMethod = standardMethodService.getById(standard.getStandardMethodId());
if (standardMethod == null || StringUtils.isBlank(standardMethod.getCode())) {
@@ -596,6 +599,7 @@
order.setIsExemption(0);
order.setFactory(null);
order.setLaboratory(standard.getLaboratory());
+ order.setStandardTreeId(dto.getStandardTreeId());
order.setSampleType(null);
order.setSample(standardCode);
order.setPrepareUserEn(null);
@@ -740,6 +744,9 @@
.sorted(Comparator.comparing((TemplateInspectionItemDto item) -> templateSortMap.get(item.getTemplateId()))
.thenComparing(item -> item.getTemplateRowIndex() == null ? Integer.MAX_VALUE : item.getTemplateRowIndex()))
.collect(Collectors.toList());
+ if (templateItems.isEmpty()) {
+ throw new ErrorException("鎵�閫夊師濮嬭褰曟ā鏉挎湭閰嶇疆妫�楠岄」鎴栧鍑哄�硷紝涓嶈兘涓嬪崟");
+ }
StandardMethod standardMethod = standardMethodService.getById(standard.getStandardMethodId());
if (standardMethod == null || StringUtils.isBlank(standardMethod.getCode())) {
throw new ErrorException("鏍囧噯缂栧彿涓嶅瓨鍦�");
@@ -754,6 +761,7 @@
order.setIsExemption(currentOrder.getIsExemption());
order.setFactory(null);
order.setLaboratory(standard.getLaboratory());
+ order.setStandardTreeId(dto.getStandardTreeId());
order.setSampleType(null);
order.setSample(standardCode);
order.setPrepareUserEn(null);
@@ -839,6 +847,7 @@
snapshot.setRemark(template.getRemark());
snapshot.setThing(template.getThing());
snapshot.setSort(selection.getSort());
+ snapshot.setDeviceDefaultsInitialized(0);
insOrderStandardTemplateMapper.insert(snapshot);
StandardTreeTemplateBindingVo binding = bindingMap.get(selection.getTemplateId());
@@ -929,7 +938,9 @@
.eq(StandardMethod::getCode, insOrder.getSample())
.select(StandardMethod::getId)).stream()
.map(StandardMethod::getId).collect(Collectors.toList());
- if (!methodIds.isEmpty() && !orderTemplateIds.isEmpty()) {
+ if (insOrder.getStandardTreeId() != null) {
+ map.put("standardTreeId", insOrder.getStandardTreeId());
+ } else if (!methodIds.isEmpty() && !orderTemplateIds.isEmpty()) {
List<StandardTree> candidates = standardTreeService.list(Wrappers.<StandardTree>lambdaQuery()
.in(StandardTree::getStandardMethodId, methodIds)
.isNull(StandardTree::getSampleType)
@@ -1053,8 +1064,10 @@
}
@Override
+ @Transactional(rollbackFor = Exception.class)
public Map<String, Object> getInsOrderAndSample(Integer id, String laboratory) {
Map<String, Object> map = new HashMap<>();
+ initializeTemplateDevicesOnFirstOpen(id);
// InsOrder insOrder = insOrderMapper.selectById(id);
IfsOrderVO ifsOrderVO = insOrderMapper.selectOrderInfoById(id);
Map<Integer, List<Integer>> templateDeviceIds = insOrderTemplateDeviceMapper.selectList(
@@ -1097,6 +1110,127 @@
return map;
}
+ /** 棣栨鎵撳紑妫�楠屼换鍔℃椂锛屽皢浠嶄负绌虹殑妯℃澘璁惧浠庡搴旀爣鍑嗚ˉ鍏ヨ鍗曘�� */
+ private void initializeTemplateDevicesOnFirstOpen(Integer orderId) {
+ InsOrder order = insOrderMapper.selectById(orderId);
+ if (order == null || !DIRECT_TEMPLATE_LABORATORY.equals(order.getLaboratory())
+ || !Objects.equals(order.getTypeSource(), -1)
+ || !Objects.equals(order.getState(), 1)
+ || "QUALITY_MONITOR".equals(order.getTaskSource())) {
+ return;
+ }
+ List<InsOrderStandardTemplate> snapshots = insOrderStandardTemplateMapper.selectList(
+ Wrappers.<InsOrderStandardTemplate>lambdaQuery()
+ .eq(InsOrderStandardTemplate::getInsOrderId, orderId)
+ .orderByAsc(InsOrderStandardTemplate::getSort, InsOrderStandardTemplate::getId)
+ .last("FOR UPDATE"));
+ if (snapshots.isEmpty() || snapshots.stream().allMatch(
+ snapshot -> Objects.equals(snapshot.getDeviceDefaultsInitialized(), 1))) {
+ return;
+ }
+
+ Set<Integer> existingTemplateIds = insOrderTemplateDeviceMapper.selectList(
+ Wrappers.<InsOrderTemplateDevice>lambdaQuery()
+ .eq(InsOrderTemplateDevice::getInsOrderId, orderId))
+ .stream().map(InsOrderTemplateDevice::getTemplateId)
+ .filter(Objects::nonNull).collect(Collectors.toSet());
+ boolean inspectionStarted = order.getFirstInspectDate() != null
+ || (order.getInsState() != null && order.getInsState() > 0)
+ || snapshots.stream().anyMatch(snapshot -> StringUtils.isNotBlank(snapshot.getRecordValues())
+ || snapshot.getDetectionTime() != null || snapshot.getTemperature() != null
+ || snapshot.getDetectionPlace() != null);
+ Map<Integer, List<Integer>> defaults = inspectionStarted ? Collections.emptyMap()
+ : findStandardDeviceDefaults(order, snapshots);
+
+ for (InsOrderStandardTemplate snapshot : snapshots) {
+ if (Objects.equals(snapshot.getDeviceDefaultsInitialized(), 1)) {
+ continue;
+ }
+ Integer templateId = snapshot.getTemplateId();
+ if (!inspectionStarted && !existingTemplateIds.contains(templateId)
+ && defaults.containsKey(templateId)) {
+ List<Integer> deviceIds = defaults.get(templateId);
+ for (int index = 0; index < deviceIds.size(); index++) {
+ InsOrderTemplateDevice relation = new InsOrderTemplateDevice();
+ relation.setInsOrderId(orderId);
+ relation.setTemplateId(templateId);
+ relation.setDeviceId(deviceIds.get(index));
+ relation.setSort(index);
+ insOrderTemplateDeviceMapper.insert(relation);
+ }
+ }
+ // 鏃犳硶鍞竴纭畾鏉ユ簮鏃朵篃鍙皾璇曡繖涓�娆★紝閬垮厤浠ュ悗鏍囧噯搴撹皟鏁存椂鎰忓鏀瑰姩璁㈠崟銆�
+ insOrderStandardTemplateMapper.update(null,
+ Wrappers.<InsOrderStandardTemplate>lambdaUpdate()
+ .eq(InsOrderStandardTemplate::getId, snapshot.getId())
+ .set(InsOrderStandardTemplate::getDeviceDefaultsInitialized, 1));
+ }
+ }
+
+ private Map<Integer, List<Integer>> findStandardDeviceDefaults(InsOrder order,
+ List<InsOrderStandardTemplate> snapshots) {
+ Set<Integer> templateIds = snapshots.stream().map(InsOrderStandardTemplate::getTemplateId)
+ .filter(Objects::nonNull).collect(Collectors.toSet());
+ Integer standardTreeId = order.getStandardTreeId();
+ if (standardTreeId == null && StringUtils.isNotBlank(order.getSample()) && !templateIds.isEmpty()) {
+ List<Integer> methodIds = standardMethodService.list(Wrappers.<StandardMethod>lambdaQuery()
+ .eq(StandardMethod::getCode, order.getSample())
+ .select(StandardMethod::getId)).stream()
+ .map(StandardMethod::getId).collect(Collectors.toList());
+ if (!methodIds.isEmpty()) {
+ List<StandardTree> candidates = standardTreeService.list(Wrappers.<StandardTree>lambdaQuery()
+ .in(StandardTree::getStandardMethodId, methodIds)
+ .eq(StandardTree::getLaboratory, order.getLaboratory())
+ .isNotNull(StandardTree::getSample)
+ .isNull(StandardTree::getSampleType)
+ .isNull(StandardTree::getModel));
+ List<StandardTree> matches = candidates.stream()
+ .filter(tree -> StringUtils.isNotBlank(tree.getSample()))
+ .filter(tree -> {
+ Set<Integer> boundIds = standardTreeService.selectTemplateBindings(tree.getId()).stream()
+ .map(StandardTreeTemplateBindingVo::getTemplateId).collect(Collectors.toSet());
+ return boundIds.containsAll(templateIds);
+ }).collect(Collectors.toList());
+ if (matches.size() == 1) {
+ standardTreeId = matches.get(0).getId();
+ } else {
+ List<StandardTree> exact = matches.stream().filter(tree ->
+ standardTreeService.selectTemplateBindings(tree.getId()).stream()
+ .map(StandardTreeTemplateBindingVo::getTemplateId)
+ .collect(Collectors.toSet()).equals(templateIds))
+ .collect(Collectors.toList());
+ if (exact.size() == 1) {
+ standardTreeId = exact.get(0).getId();
+ }
+ }
+ }
+ }
+ if (standardTreeId == null) {
+ return Collections.emptyMap();
+ }
+ StandardTree standard = standardTreeService.getById(standardTreeId);
+ if (standard == null || StringUtils.isBlank(standard.getSample())
+ || !Objects.equals(standard.getLaboratory(), order.getLaboratory())
+ || standard.getSampleType() != null || standard.getModel() != null) {
+ return Collections.emptyMap();
+ }
+ if (order.getStandardTreeId() == null) {
+ insOrderMapper.update(null, Wrappers.<InsOrder>lambdaUpdate()
+ .eq(InsOrder::getId, order.getId())
+ .isNull(InsOrder::getStandardTreeId)
+ .set(InsOrder::getStandardTreeId, standardTreeId));
+ }
+ List<StandardTreeTemplateBindingVo> bindings = standardTreeService.selectTemplateBindings(standardTreeId);
+ Map<Integer, List<Integer>> defaults = new HashMap<>();
+ for (StandardTreeTemplateBindingVo binding : bindings) {
+ if (templateIds.contains(binding.getTemplateId())) {
+ defaults.put(binding.getTemplateId(), binding.getDeviceIds() == null
+ ? Collections.emptyList() : binding.getDeviceIds());
+ }
+ }
+ return defaults;
+ }
+
@Override
public IPage<SampleProductDto2> selectSampleAndProductByOrderId(IPage<SampleProductDto2> page, SampleProductDto2 sampleProductDto) {
IPage<SampleProductDto2> productDto2IPage = insOrderMapper.selectSampleAndProductByOrderId(page,
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsProductServiceImpl.java b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsProductServiceImpl.java
index 8f642dc..ed0e8e7 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsProductServiceImpl.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsProductServiceImpl.java
@@ -94,6 +94,11 @@
InsOrderStandardTemplate::getInsResult, dto.getInsResult()));
}
if (dto.isDeviceIdsPresent()) {
+ // 鎵嬪姩閫夋嫨鎴栨竻绌洪兘瑙嗕负宸插垵濮嬪寲锛屽悗缁繘鍏ヤ换鍔′笉寰楀啀娆″鐢ㄦ爣鍑嗗簱榛樿鍊笺��
+ insOrderStandardTemplateMapper.update(null,
+ Wrappers.<InsOrderStandardTemplate>lambdaUpdate()
+ .eq(InsOrderStandardTemplate::getId, snapshot.getId())
+ .set(InsOrderStandardTemplate::getDeviceDefaultsInitialized, 1));
insOrderTemplateDeviceMapper.delete(
Wrappers.<InsOrderTemplateDevice>lambdaQuery()
.eq(InsOrderTemplateDevice::getInsOrderId, dto.getId())
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsSampleReceiptServiceImpl.java b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsSampleReceiptServiceImpl.java
index 5337574..37b2953 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsSampleReceiptServiceImpl.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsSampleReceiptServiceImpl.java
@@ -4,46 +4,44 @@
import com.alibaba.excel.ExcelWriter;
import com.alibaba.excel.write.metadata.WriteSheet;
import com.alibaba.excel.write.style.column.LongestMatchColumnWidthStyleStrategy;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.basic.dto.TemplateInspectionItemDto;
+import com.ruoyi.basic.utils.StandardTemplateInspectionItemParser;
+import com.ruoyi.common.utils.GZipUtil;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.framework.exception.ErrorException;
import com.ruoyi.inspect.dto.SampleReceiptActionDto;
import com.ruoyi.inspect.dto.SampleReceiptPageDto;
import com.ruoyi.inspect.dto.SampleReceiptQueryDto;
-import com.ruoyi.inspect.mapper.InsOrderMapper;
-import com.ruoyi.inspect.mapper.InsOrderStandardTemplateMapper;
-import com.ruoyi.inspect.mapper.InsProductMapper;
-import com.ruoyi.inspect.mapper.InsSampleMapper;
-import com.ruoyi.inspect.mapper.InsSampleReceiptMapper;
-import com.ruoyi.inspect.mapper.InsSampleUserMapper;
-import com.ruoyi.inspect.pojo.InsOrder;
-import com.ruoyi.inspect.pojo.InsOrderStandardTemplate;
-import com.ruoyi.inspect.pojo.InsProduct;
-import com.ruoyi.inspect.pojo.InsSample;
-import com.ruoyi.inspect.pojo.InsSampleReceipt;
-import com.ruoyi.inspect.pojo.InsSampleUser;
+import com.ruoyi.inspect.mapper.*;
+import com.ruoyi.inspect.pojo.*;
import com.ruoyi.inspect.service.InsOrderService;
import com.ruoyi.inspect.service.InsOrderStateService;
import com.ruoyi.inspect.service.InsSampleReceiptService;
import com.ruoyi.system.mapper.UserMapper;
+import jakarta.servlet.http.HttpServletResponse;
import lombok.AllArgsConstructor;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import jakarta.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.net.URLEncoder;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
import java.util.List;
+import java.util.stream.Collectors;
@Service
@AllArgsConstructor
public class InsSampleReceiptServiceImpl extends ServiceImpl<InsSampleReceiptMapper, InsSampleReceipt>
implements InsSampleReceiptService {
+ private static final String DIRECT_TEMPLATE_LABORATORY = "鏂拌仛";
+
private final InsSampleReceiptMapper receiptMapper;
private final InsOrderMapper insOrderMapper;
private final InsOrderStandardTemplateMapper insOrderStandardTemplateMapper;
@@ -55,13 +53,17 @@
private final UserMapper userMapper;
@Override
- public com.baomidou.mybatisplus.core.metadata.IPage<SampleReceiptPageDto> page(Page<?> page, SampleReceiptQueryDto query) {
- return receiptMapper.selectPage(page, query);
+ public IPage<SampleReceiptPageDto> page(Page<?> page, SampleReceiptQueryDto query) {
+ IPage<SampleReceiptPageDto> result = receiptMapper.selectPage(page, query);
+ result.getRecords().forEach(this::fillInspectionItemsFromSnapshots);
+ return result;
}
@Override
public SampleReceiptPageDto detail(Integer id) {
- return receiptMapper.selectDetail(id);
+ SampleReceiptPageDto detail = receiptMapper.selectDetail(id);
+ fillInspectionItemsFromSnapshots(detail);
+ return detail;
}
@Override
@@ -91,7 +93,26 @@
Long productCount = insProductMapper.selectCount(Wrappers.<InsProduct>lambdaQuery()
.eq(InsProduct::getInsSampleId, sample.getId()).eq(InsProduct::getState, 1));
if (productCount == 0) {
- throw new ErrorException("璇ュ鎵樻湭缁戝畾妫�楠岄」鐩紝涓嶈兘鎻愪氦妫�楠�");
+ List<TemplateInspectionItemDto> items = getSnapshotInspectionItems(order.getId());
+ if (items.isEmpty()) {
+ throw new ErrorException("璁㈠崟鍘熷璁板綍妯℃澘鏈厤缃楠岄」鎴栧鍑哄�硷紝涓嶈兘鎻愪氦妫�楠�");
+ }
+ int sort = 0;
+ for (TemplateInspectionItemDto item : items) {
+ InsProduct product = new InsProduct();
+ product.setInsSampleId(sample.getId());
+ product.setInspectionItem(item.getInspectionItem());
+ product.setInspectionItemClass("");
+ product.setInspectionItemSubclass("");
+ product.setLaboratory(order.getLaboratory());
+ product.setSample(order.getSample());
+ product.setTemplateId(item.getTemplateId());
+ product.setTemplateRowIndex(item.getTemplateRowIndex());
+ product.setSonLaboratory(DIRECT_TEMPLATE_LABORATORY);
+ product.setState(1);
+ product.setSort(sort++);
+ insProductMapper.insert(product);
+ }
}
if (userMapper.selectById(dto.getMainInspectorId()) == null) {
throw new ErrorException("涓绘楠屼汉涓嶅瓨鍦ㄦ垨宸插仠鐢�");
@@ -160,9 +181,43 @@
}
}
+ private List<TemplateInspectionItemDto> getSnapshotInspectionItems(Integer orderId) {
+ List<InsOrderStandardTemplate> snapshots = insOrderStandardTemplateMapper.selectList(
+ Wrappers.<InsOrderStandardTemplate>lambdaQuery()
+ .eq(InsOrderStandardTemplate::getInsOrderId, orderId)
+ .orderByAsc(InsOrderStandardTemplate::getSort, InsOrderStandardTemplate::getId));
+ List<TemplateInspectionItemDto> items = new ArrayList<>();
+ for (InsOrderStandardTemplate snapshot : snapshots) {
+ String thing = snapshot.getThing();
+ try {
+ thing = GZipUtil.uncompress(thing);
+ } catch (RuntimeException ignored) {
+ // 鍏煎鏈帇缂╃殑鍘嗗彶妯℃澘蹇収銆�
+ }
+ items.addAll(StandardTemplateInspectionItemParser.parse(
+ snapshot.getTemplateId(), snapshot.getSort(), thing));
+ }
+ return items;
+ }
+
+ private void fillInspectionItemsFromSnapshots(SampleReceiptPageDto row) {
+ if (row == null || row.getOrderId() == null || StringUtils.isNotBlank(row.getInspectionItem())) {
+ return;
+ }
+ try {
+ String names = getSnapshotInspectionItems(row.getOrderId()).stream()
+ .map(TemplateInspectionItemDto::getInspectionItem)
+ .distinct().collect(Collectors.joining("\n"));
+ row.setInspectionItem(names);
+ } catch (RuntimeException ignored) {
+ // 鍒楄〃浠嶅彲鏌ョ湅锛涙彁浜ゆ楠屾椂浼氳繑鍥炲叿浣撶殑妯℃澘瑙f瀽閿欒銆�
+ }
+ }
+
@Override
public void export(SampleReceiptQueryDto query, HttpServletResponse response) {
List<SampleReceiptPageDto> list = receiptMapper.selectExportList(query);
+ list.forEach(this::fillInspectionItemsFromSnapshots);
response.setContentType("application/vnd.ms-excel");
response.setCharacterEncoding("UTF-8");
try {
--
Gitblit v1.9.3