From 6ea71e8b30fa296d20fba91f94af75695fdd5b07 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=BD=98=E5=BB=BA=E4=B8=9C?= <617601767@qq.com>
Date: Mon, 26 Feb 2024 13:52:43 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=BB=B4=E4=BF=AE=E5=8D=95?=
 =?UTF-8?q?=E5=A4=87=E6=B3=A8=E8=96=84=E7=89=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 LanSheng/LanShengModel/DeviceData.cs      | 5 ++---
 LanSheng/LanShengService/DeviceService.cs | 8 ++++----
 ZhongLian/ZhongLianModel/MaintenanceDO.cs | 6 ++++++
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/LanSheng/LanShengModel/DeviceData.cs b/LanSheng/LanShengModel/DeviceData.cs
index 485ce08..8407ced 100644
--- a/LanSheng/LanShengModel/DeviceData.cs
+++ b/LanSheng/LanShengModel/DeviceData.cs
@@ -1126,14 +1126,13 @@ namespace LanShengModel
         public DeviceData? WZ { get; set; }
         #endregion
 
-        public string[] GetNotNullColumns()
+        public static string[] GetNotNullColumns(IEnumerable<DeviceData> datas)
         {
             var Result = new List<string>();
             var Type = typeof(DeviceData);
             foreach (var Propety in Type.GetProperties())
             {
-                if(Propety.GetValue(this) != null)
-                {
+                if (datas.Any(x => Propety.GetValue(x) != null)) {
                     Result.Add(Propety.Name);
                 }
             }
diff --git a/LanSheng/LanShengService/DeviceService.cs b/LanSheng/LanShengService/DeviceService.cs
index d490e39..3e37573 100644
--- a/LanSheng/LanShengService/DeviceService.cs
+++ b/LanSheng/LanShengService/DeviceService.cs
@@ -121,7 +121,7 @@ namespace LanShengService
                     await temp.AsInsertable.ExecuteCommandAsync();
 
                     await temp.AsUpdateable
-                        .UpdateColumns(Values1001[0].GetNotNullColumns())
+                        .UpdateColumns(DeviceData.GetNotNullColumns(Values1001))
                         .ExecuteCommandAsync();
                 }
 
@@ -134,7 +134,7 @@ namespace LanShengService
                     await temp.AsInsertable.ExecuteCommandAsync();
 
                     await temp.AsUpdateable
-                        .UpdateColumns(Values1103[0].GetNotNullColumns())
+                        .UpdateColumns(DeviceData.GetNotNullColumns(Values1103))
                         .ExecuteCommandAsync();
                 }
 
@@ -147,7 +147,7 @@ namespace LanShengService
                     await temp.AsInsertable.ExecuteCommandAsync();
 
                     await temp.AsUpdateable
-                        .UpdateColumns(Values2001[0].GetNotNullColumns())
+                        .UpdateColumns(DeviceData.GetNotNullColumns(Values2001))
                         .ExecuteCommandAsync();
                 }
 
@@ -160,7 +160,7 @@ namespace LanShengService
                     await temp.AsInsertable.ExecuteCommandAsync();
 
                     await temp.AsUpdateable
-                        .UpdateColumns(Values2103[0].GetNotNullColumns())
+                        .UpdateColumns(DeviceData.GetNotNullColumns(Values2103))
                         .ExecuteCommandAsync();
                 }
             }
diff --git a/ZhongLian/ZhongLianModel/MaintenanceDO.cs b/ZhongLian/ZhongLianModel/MaintenanceDO.cs
index bcdb999..5cf29a2 100644
--- a/ZhongLian/ZhongLianModel/MaintenanceDO.cs
+++ b/ZhongLian/ZhongLianModel/MaintenanceDO.cs
@@ -151,6 +151,12 @@ namespace ZhongLianModel
         [SugarColumn(IsJson = true, IsNullable = true, ColumnDataType = "Text")]
         public string[]? ProcessResultPhoto { get; set; }
 
+        /// <summary>
+        /// 备注照片图片
+        /// </summary>
+        [SugarColumn(IsJson = true, IsNullable = true, ColumnDataType = "Text")]
+        public string[]? RemarkPhoto { get; set; }
+
         /// <summary>
         /// 创建日期
         /// </summary>