From eb6c7513b771d7565eb196050de98a1fa0a877b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BD=95=E7=BE=8E=E8=8D=A3?=
 <10755671+mei-rong-he@user.noreply.gitee.com>
Date: Tue, 16 Dec 2025 15:59:36 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=86=E5=AF=BC=E5=B8=A6=E7=8F=AD=E4=B8=8B?=
 =?UTF-8?q?=E4=BA=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/LeaderWellRecordController.cs | 35 ++++++++++---------
 1 file changed, 18 insertions(+), 17 deletions(-)

diff --git a/APT.MicroApi/APT.FO.WebApi/Controllers/LeaderWellRecordController.cs b/APT.MicroApi/APT.FO.WebApi/Controllers/LeaderWellRecordController.cs
index 1b91256..0d4aa82 100644
--- a/APT.MicroApi/APT.FO.WebApi/Controllers/LeaderWellRecordController.cs
+++ b/APT.MicroApi/APT.FO.WebApi/Controllers/LeaderWellRecordController.cs
@@ -153,13 +153,28 @@ namespace APT.FO.WebApi.Controllers
                     foreach (var item in details)
                     {
                         T_FO_LEADER_WELL_RECORD_DETAIL de = new T_FO_LEADER_WELL_RECORD_DETAIL();
+                        de.ORG_ID = entity.ORG_ID;
+                        de.LEADER_WELL_RECORD_ID = entity.ID;
+                        de.START_DATE = item.START_DATE;
+                        de.END_DATE = item.END_DATE;
+                        de.USER_ID = item.USER_ID;
+                        de.DESCRIPTION = item.DESCRIPTION;
+                        de.QUESTION = item.QUESTION;
+                        de.MEASURE = item.MEASURE;
+                        de.ITEM = item.ITEM;
+                        de.PLACE = item.PLACE;
+                        if (de.USER_ID == loginUserId)
+                        {
+                            item.USER_DEAL_STATUS = MS.Domain.Enums.FOUserShiftStatusEnum.已处理;
+                        }
+                        detailList.Add(item);
                         if (item.Nav_DetailFiles != null && item.Nav_DetailFiles.Any())
                         {
                             foreach (var file in item.Nav_DetailFiles.Where(t=>!t.IS_DELETED))
                             {
                                 T_FO_LEADER_WELL_RECORD_DETAIL_FILE item2 = new T_FO_LEADER_WELL_RECORD_DETAIL_FILE();
                                 item2.ORG_ID = entity.ORG_ID;
-                                item2.LEADER_WELL_RECORD_DETAIL_ID = item.ID;
+                                item2.LEADER_WELL_RECORD_DETAIL_ID = de.ID;
                                 item2.Nav_ImgFile = null;
                                 item2.IMG_FILE_ID = file.IMG_FILE_ID;
                                 detailFileList.Add(item2);
@@ -171,7 +186,7 @@ namespace APT.FO.WebApi.Controllers
                             {
                                 T_FO_LEADER_WELL_RECORD_DETAIL_AREA item2 = new T_FO_LEADER_WELL_RECORD_DETAIL_AREA();
                                 item2.ORG_ID = entity.ORG_ID;
-                                item2.LEADER_WELL_RECORD_DETAIL_ID = item.ID;
+                                item2.LEADER_WELL_RECORD_DETAIL_ID = de.ID;
                                 item2.AREA_ID = area.AREA_ID;
                                 item2.Nav_Area = null;
                                 detailAreaList.Add(item2);
@@ -222,21 +237,7 @@ namespace APT.FO.WebApi.Controllers
                         //        detailAfterUserList.Add(item2);
                         //    }
                         //}
-                        de.ORG_ID = entity.ORG_ID;
-                        de.LEADER_WELL_RECORD_ID = entity.ID;
-                        de.START_DATE = item.START_DATE;
-                        de.END_DATE= item.END_DATE;
-                        de.USER_ID = item.USER_ID;
-                        de.DESCRIPTION = item.DESCRIPTION;
-                        de.QUESTION = item.QUESTION;
-                        de.MEASURE = item.MEASURE;
-                        de.ITEM = item.ITEM;
-                        de.PLACE = item.PLACE;
-                        if (de.USER_ID == loginUserId)
-                        {
-                            item.USER_DEAL_STATUS = MS.Domain.Enums.FOUserShiftStatusEnum.已处理;
-                        }
-                        detailList.Add(item);
+                       
                     }
                 }
                 var files = entity.Nav_Files;