From a0d5f2224a6ec422f9f9d1493d81bdc0b161e18b Mon Sep 17 00:00:00 2001
From: 吴羡 <16976746+Xian-TT3@user.noreply.gitee.com>
Date: 星期四, 15 十月 2026 11:21:22 +0800
Subject: [PATCH] 质量监督：新增监督计划下发接口（校验已批准且未重复下发，向监督员及被监督人推送站内消息与企业微信通知）；详情记录新增监督内容、监督记录、存在问题、整改意见字段；计划导出监督频次按月份数自动计算、监督时间仅显示月份、签名缺失兜底透明图避免导出失败，模板补全标题并新增记录编号；新增日常监督检查记录表 Word 模板并接入记录单导出；方法验证：新增数据处理、质量控制方法、方法结果验证、验证结论及评审、审批意见字段，导出支持评审、审批勾选项与日期格式化，同步调整 Word 模板
---
cnas-process/src/main/java/com/ruoyi/process/listener/NewJuOrderInspectionListener.java | 17 ++++++++++++++---
1 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/cnas-process/src/main/java/com/ruoyi/process/listener/NewJuOrderInspectionListener.java b/cnas-process/src/main/java/com/ruoyi/process/listener/NewJuOrderInspectionListener.java
index c444fa5..c93886d 100644
--- a/cnas-process/src/main/java/com/ruoyi/process/listener/NewJuOrderInspectionListener.java
+++ b/cnas-process/src/main/java/com/ruoyi/process/listener/NewJuOrderInspectionListener.java
@@ -30,9 +30,20 @@
return;
}
// 骞傜瓑锛氬悓涓�鎴愬搧璁㈠崟宸叉湁妫�楠屽鎵樺崟鍒欒烦杩�
- Long count = inspectionOrderMapper.selectCount(Wrappers.<InspectionOrder>lambdaQuery()
- .eq(InspectionOrder::getInsOrderId, order.getId()));
- if (count > 0) {
+ InspectionOrder existingOrder = inspectionOrderMapper.selectOne(Wrappers.<InspectionOrder>lambdaQuery()
+ .eq(InspectionOrder::getInsOrderId, order.getId()).last("limit 1"));
+ if (existingOrder != null) {
+ existingOrder.setEntrustCode(order.getEntrustCode());
+ existingOrder.setSampleName(StringUtils.isNotBlank(order.getSampleView()) ? order.getSampleView() : order.getSample());
+ existingOrder.setProduction(order.getProduction());
+ existingOrder.setQuantity(order.getTestQuantity());
+ existingOrder.setCommissionUnit(order.getCompany());
+ existingOrder.setCommissionUser(order.getPrepareUser());
+ existingOrder.setCommissionPhone(order.getPhone());
+ existingOrder.setIsLeave(Integer.valueOf(1).equals(order.getIsLeave()) ? 1 : 2);
+ existingOrder.setProcessing(Integer.valueOf(1).equals(order.getSampleDisposal()) ? 0 : 1);
+ existingOrder.setSend(Integer.valueOf(1).equals(order.getReportDelivery()) ? 1 : 0);
+ inspectionOrderMapper.updateById(existingOrder);
return;
}
InspectionOrder inspectionOrder = new InspectionOrder();
--
Gitblit v1.9.3