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-require/src/main/java/com/ruoyi/require/service/impl/FeStandardSubstanceServiceImpl.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/cnas-require/src/main/java/com/ruoyi/require/service/impl/FeStandardSubstanceServiceImpl.java b/cnas-require/src/main/java/com/ruoyi/require/service/impl/FeStandardSubstanceServiceImpl.java
index 7b97938..ea70f27 100644
--- a/cnas-require/src/main/java/com/ruoyi/require/service/impl/FeStandardSubstanceServiceImpl.java
+++ b/cnas-require/src/main/java/com/ruoyi/require/service/impl/FeStandardSubstanceServiceImpl.java
@@ -90,11 +90,12 @@
FeStandardSubstance substance = new FeStandardSubstance();
substance.setName(required(row.getName(), rowNumber, "鏍囧噯鐗╄川鍚嶇О"));
substance.setModel(required(row.getModel(), rowNumber, "瑙勬牸鍨嬪彿"));
- substance.setFactoryManufacturer(required(row.getFactoryManufacturer(), rowNumber, "鐢熶骇鍘傚"));
+ substance.setFactoryManufacturer(trim(row.getFactoryManufacturer()));
substance.setFactoryNum(required(row.getFactoryNum(), rowNumber, "鍑哄巶缂栧彿"));
substance.setManageNum(manageNum);
substance.setUncertainty(required(row.getUncertainty(), rowNumber, "涓嶇‘瀹氬害"));
substance.setQuantity(parseQuantity(row.getQuantity(), rowNumber));
+ substance.setUnit(trim(row.getUnit()));
substance.setAcquisitionDate(parseDate(row.getAcquisitionDate(), rowNumber, "璐疆鏃ユ湡"));
substance.setEffectiveDate(parseDate(row.getEffectiveDate(), rowNumber, "鏈夋晥鏈�"));
substance.setFileNum(required(row.getFileNum(), rowNumber, "妗f缂栧彿"));
--
Gitblit v1.9.3