From 1e9595a4ffc6fb9c2fd4a14946d8d852e5f42c51 Mon Sep 17 00:00:00 2001
From: fangjiakai <450850793@qq.com>
Date: Wed, 24 Dec 2025 17:30:28 +0800
Subject: [PATCH] =?UTF-8?q?fix(branch-company):=20=E8=A7=A3=E5=86=B3?=
 =?UTF-8?q?=E8=B5=84=E8=B4=A8=E7=94=B3=E8=AF=B7=E8=AF=A6=E6=83=85=E5=8A=A0?=
 =?UTF-8?q?=E8=BD=BD=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 修复了特殊资质列表数据加载逻辑
- 添加了从资质维护信息中获取最新详情的功能
- 优化了文件上传关联逻辑，确保正确绑定到申请详情ID
- 改进了数据合并策略，保留现有数据并更新最新信息
---
 .../Qualification/Apply/Add/index.js          | 27 ++++++++++++++-----
 1 file changed, 20 insertions(+), 7 deletions(-)

diff --git a/src/pages/Container/BranchCompany/Qualification/Apply/Add/index.js b/src/pages/Container/BranchCompany/Qualification/Apply/Add/index.js
index 53d775f..f2706fe 100644
--- a/src/pages/Container/BranchCompany/Qualification/Apply/Add/index.js
+++ b/src/pages/Container/BranchCompany/Qualification/Apply/Add/index.js
@@ -16,7 +16,7 @@ import useDeleteFile from "zy-react-library/hooks/useDeleteFile";
 import useGetFile from "zy-react-library/hooks/useGetFile";
 import useGetUrlQuery from "zy-react-library/hooks/useGetUrlQuery";
 import useUploadFile from "zy-react-library/hooks/useUploadFile";
-import { getLabelName,validatorEndTime, validatorTimeGTCurrentDay } from "zy-react-library/utils";
+import { getLabelName, validatorEndTime, validatorTimeGTCurrentDay } from "zy-react-library/utils";
 import { NS_QUALIFICATION_APPLY, NS_QUALIFICATION_MAINTENANCE } from "~/enumerate/namespace";
 
 function Add(props) {
@@ -233,13 +233,26 @@ const StepTwoComponent = (props) => {
       await getTypeGroup(data.details)
       setSpecialList(data.details || []);
     } else {
-      await getTypeGroup(specialList)
-      for (let i = 0; i < specialList.length; i++) {
-        specialList[i].files = await getFile({
-          eqType: UPLOAD_FILE_TYPE_ENUM["148"],
-          eqForeignKey: specialList[i].applyDetailId
-        });
+      const { data } = await props["qualificationMaintenanceInfo"]({ id: props.formValues.qualificationsId });
+      const newSpecialList = data.details.map(item => {
+        const existsItem = specialList.find(specialItem => specialItem.qualificationsDetailId === item.id);
+        if (existsItem) {
+          return { ...item, ...existsItem };
+        }
+        return item;
+      })
+      
+      await getTypeGroup(newSpecialList)
+      for (let i = 0; i < newSpecialList.length; i++) {
+        if (newSpecialList[i].applyDetailId) {
+          newSpecialList[i].files = await getFile({
+            eqType: UPLOAD_FILE_TYPE_ENUM["148"],
+            eqForeignKey: newSpecialList[i].applyDetailId
+          });
+        }
       }
+
+      setSpecialList(newSpecialList);
     }
 
   };