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/controller/FeStandardSubstanceAcceptanceController.java | 17 +++++++++++++++++
1 files changed, 17 insertions(+), 0 deletions(-)
diff --git a/cnas-require/src/main/java/com/ruoyi/require/controller/FeStandardSubstanceAcceptanceController.java b/cnas-require/src/main/java/com/ruoyi/require/controller/FeStandardSubstanceAcceptanceController.java
index 923fc72..5113952 100644
--- a/cnas-require/src/main/java/com/ruoyi/require/controller/FeStandardSubstanceAcceptanceController.java
+++ b/cnas-require/src/main/java/com/ruoyi/require/controller/FeStandardSubstanceAcceptanceController.java
@@ -4,9 +4,11 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.domain.Result;
import com.ruoyi.require.dto.AcceptanceDto;
+import com.ruoyi.require.pojo.FeStandardSubstance;
import com.ruoyi.require.pojo.FeStandardSubstanceAcceptanceInspection;
import com.ruoyi.require.service.FeStandardSubstanceAcceptanceInspectionService;
import com.ruoyi.require.service.FeStandardSubstanceAcceptanceService;
+import com.ruoyi.require.service.FeStandardSubstanceService;
import com.ruoyi.require.vo.AcceptanceVo;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Operation;
@@ -34,6 +36,8 @@
private FeStandardSubstanceAcceptanceInspectionService inspectionService;
@Resource
private FeStandardSubstanceAcceptanceService feStandardSubstanceAcceptanceService;
+ @Resource
+ private FeStandardSubstanceService feStandardSubstanceService;
@Operation(summary = "鏂板")
@PostMapping("/addAcceptance")
@@ -58,7 +62,20 @@
@Operation(summary = "缂栬緫")
@PostMapping("/updateAcceptance")
+ @Transactional
public Result updateAcceptance(@RequestBody AcceptanceDto acceptanceDto) {
+ FeStandardSubstance substance = acceptanceDto.getSubstance();
+ if (substance != null) {
+ if (substance.getId() == null) {
+ substance.setState(0);
+ feStandardSubstanceService.save(substance);
+ } else {
+ // 棰嗙敤鐘舵�佺敱棰嗙敤/褰掕繕鎿嶄綔缁存姢锛岀紪杈戦獙鏀跺崟鏃朵笉鍥炲啓
+ substance.setState(null);
+ feStandardSubstanceService.updateById(substance);
+ }
+ acceptanceDto.getAcceptance().setSubstanceId(substance.getId());
+ }
feStandardSubstanceAcceptanceService.updateById(acceptanceDto.getAcceptance());
for (FeStandardSubstanceAcceptanceInspection v : acceptanceDto.getList()) {
if (v.getId()== null) {
--
Gitblit v1.9.3