amigotrip 9 місяців тому
батько
коміт
f0c8bebbd5

+ 1 - 1
OASystem/OASystem.Api/Controllers/StatisticsController.cs

@@ -2923,7 +2923,7 @@ Order By Count Desc");
                                            .ToListAsync();
 
                 //return Ok(JsonView(true, "查询成功!", _view, total));
-                return Ok(JsonView(false, "查询失败"));
+                return Ok(JsonView(false, "查询失败",_view));
 
             }
             else

+ 0 - 1
OASystem/OASystem.Domain/Dtos/Statistics/DailypaymentDto.cs

@@ -14,5 +14,4 @@ namespace OASystem.Domain.Dtos.Statistics
     { 
         
     }
-
 }

+ 2 - 2
OASystem/OASystem.Domain/Entities/Financial/Fin_ForeignReceivables.cs

@@ -100,13 +100,13 @@ namespace OASystem.Domain.Entities.Financial
         /// 0 - 未审核 1 - 审核通过 2 - 审核不通过
         /// </summary>
         [SugarColumn(IsNullable = true, ColumnDataType = "int")]
-        public int Status { get; set; } = 0;
+        public int Status { get; set; }
 
         /// <summary> 
         /// 审核人 AddingWay==2该项有值
         /// </summary>
         [SugarColumn(IsNullable = true, ColumnDataType = "int")]
-        public int Auditor { get; set; } = 0;
+        public int Auditor { get; set; } 
 
         /// <summary>
         /// 审核时间 AddingWay==2该项有值

+ 5 - 3
OASystem/OASystem.Domain/ViewModels/Statistics/DailypaymentView.cs

@@ -18,15 +18,17 @@ namespace OASystem.Domain.ViewModels.Statistics
         public int Id { get; set; }
         public string Name { get; set; }
 
-        [Navigate(NavigateType.OneToOne, nameof(Id))]//一对一 SchoolId是StudentA类里面的
+        [Navigate(NavigateType.OneToMany, nameof(DailypaymentSubTypeView.STid))]
         public List<DailypaymentSubTypeView> SubData { get; set; }
 
     }
 
     [SqlSugar.SugarTable("Sys_SetData")]
     public class DailypaymentSubTypeView
-    { 
-       public int Id { get; set; }
+    {
+
+        [SugarColumn(IsPrimaryKey = true, IsIdentity = true)]
+        public int Id { get; set; }
         public int STid { get; set; }
         public string Name { get; set; }
     }

+ 7 - 1
OASystem/OASystem.Infrastructure/Repositories/Financial/ForeignReceivablesRepository.cs

@@ -396,7 +396,13 @@ Where ffr.IsDel=0 And ffr.Diid={0}", dto.DiId);
                 {
                     var x = _sqlSugar.Storageable(_ForeignReceivables).ToStorage();
                     addCount = x.AsInsertable.ExecuteCommand();       //不存在插入
-                    updateCount = x.AsUpdateable.ExecuteCommand();    //存在更新
+                    updateCount = x.AsUpdateable.IgnoreColumns(it => new 
+                                    {  it.Status, 
+                                        it.Auditor, 
+                                        it.AuditTime, 
+                                        it.CreateUserId, 
+                                        it.CreateTime 
+                                    }).ExecuteCommand();    //存在更新
                 }
                 result.Code = 200;
                 result.Msg = string.Format(@"操作成功!添加:{0}条;更新:{1};", addCount, updateCount);