【修改】Property.Set Datetime反序列化Overire添加空字符串判断;团组流程管控SqlSugar.Update语法因版本不同报错，更新语法

OASystem/OASystem.Api/Controllers/GroupsController.cs

@@ -78,8 +78,15 @@ namespace OASystem.API.Controllers
         {
             Grp_ScheduleDetailInfo _detail = _mapper.Map<Grp_ScheduleDetailInfo>(dto);
             var result = await _grpScheduleRep._sqlSugar.Updateable<Grp_ScheduleDetailInfo>()
+                .SetColumns(it => it.Duty == _detail.Duty)
+                .SetColumns(it => it.ExpectBeginDt == _detail.ExpectBeginDt)
+                .SetColumns(it => it.ExpectEndDt == _detail.ExpectEndDt)
+                .SetColumns(it => it.JobContent == _detail.JobContent)
+                .SetColumns(it => it.Remark == _detail.Remark)
+                .SetColumns(it => it.StepStatus == _detail.StepStatus)
                 .Where(s => s.Id == dto.Id)
-                .UpdateColumns(s => new { s.Duty, s.ExpectBeginDt, s.ExpectEndDt, s.JobContent, s.Remark, s.StepStatus })
+
+                //.UpdateColumns(s => new { s.Duty, s.ExpectBeginDt, s.ExpectEndDt, s.JobContent, s.Remark, s.StepStatus })
                 .ExecuteCommandAsync();
             if (result > 0)
             {
@@ -103,8 +110,13 @@ namespace OASystem.API.Controllers
             _detail.DeleteUserId = dto.Duty;
             _detail.DeleteTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
             var result = await _grpScheduleRep._sqlSugar.Updateable<Grp_ScheduleDetailInfo>()
-               .Where(s => s.Id == dto.Id)
-               .UpdateColumns(s => new { s.IsDel, s.DeleteUserId, s.DeleteTime })
+               .SetColumns(it => it.IsDel == _detail.IsDel)
+               .SetColumns(it => it.DeleteUserId == _detail.DeleteUserId)
+               .SetColumns(it => it.DeleteTime == _detail.DeleteTime)
+               .Where(it => it.Id == dto.Id)
+
+               //.UpdateColumns(s => new { s.IsDel, s.DeleteUserId, s.DeleteTime })
+               //.WhereColumns(s => s.Id == dto.Id)
                .ExecuteCommandAsync();
             if (result > 0)
             {
@@ -313,7 +325,7 @@ namespace OASystem.API.Controllers
             {
                 return Ok(JsonView(false, groupData.Msg));
             }
-            
+
             return Ok(JsonView(groupData.Data, groupData.Data.Count));
         }
 
@@ -358,7 +370,7 @@ namespace OASystem.API.Controllers
             return Ok(JsonView(groupData.Data));
         }
 
-       
+
 
         #endregion
     }

OASystem/OASystem.Api/OAMethodLib/ExcelOutput/Excel_BusConfItemList.cs

@@ -24,7 +24,6 @@ namespace OASystem.API.OAMethodLib.ExcelOutput
             }
         }
 
-
         public string Excel(Bus_ConfItemListInfo _entity)
         {
 

OASystem/OASystem.Api/OAMethodLib/JsonConvertOverride.cs

@@ -14,14 +14,25 @@ namespace OASystem.API.OAMethodLib
         {
             Format = format;
         }
-        public override void Write(Utf8JsonWriter writer, DateTime date, JsonSerializerOptions options)
-        {
-            writer.WriteStringValue(date.ToString(Format));
-        }
+
         public override DateTime Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
+            if (string.IsNullOrEmpty(reader.GetString()))
+            {
+                return default(DateTime);
+            }
+
             return DateTime.ParseExact(reader.GetString(), Format, null);
         }
+
+        public override void Write(Utf8JsonWriter writer, DateTime date, JsonSerializerOptions options)
+        {
+            writer.WriteStringValue(date.ToString(Format));
+        }
+        //public override DateTime Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        //{
+        //    return DateTime.ParseExact(reader.GetString(), Format, null);
+        //}
     }
     #endregion
 

OASystem/OASystem.Domain/Dtos/Groups/Grp_ScheduleDetailDto.cs

@@ -28,5 +28,6 @@ namespace OASystem.Domain.Dtos.Groups
         public DateTime ExpectEndDt { get; set; }
         public int CreateUserId { get; set; }
         public string Remark { get; set; }
+        public int SLevel { get; set; }
     }
 }