From 0388d54af57e8d3d4a99554501b232ca572b50c6 Mon Sep 17 00:00:00 2001
From: 吴羡 <16976746+Xian-TT3@user.noreply.gitee.com>
Date: 星期一, 12 十月 2026 17:48:51 +0800
Subject: [PATCH] 客户满意度新增附件与委托单关联；供应商管理新增附件；标准物质接收、记录、验收模块调整；委托单新增已完成列表接口（满意度下拉用）；管理记录服务调整
---
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