amigotrip 8 months ago
parent
commit
8a5aa926ad

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

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

+ 9 - 3
OASystem/OASystem.Infrastructure/Repositories/Financial/ForeignReceivablesRepository.cs

@@ -378,16 +378,19 @@ Where ffr.IsDel=0 And ffr.Diid={0}", dto.DiId);
                 List <Fin_ForeignReceivables> _ForeignReceivables = new List<Fin_ForeignReceivables>();
                 foreach (var item in dto.foreignReceivablesInfos)
                 {
+                    int status = 0, auditor = 0;
+                    string auditTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
                     var info = selectInfos.Find(x => x.Id == item.Id);
                     if (info != null)
                     {
                         if (info.ItemSumPrice == item.ItemSumPrice)
                         {
-                            continue;
+                            status = info.Status;
+                            auditor = info.Auditor;
+                            auditTime = info.AuditTime;
                         }
                     }
 
-
                     _ForeignReceivables.Add(new Fin_ForeignReceivables()
                     {
                         Diid = dto.DiId,
@@ -402,7 +405,10 @@ Where ffr.IsDel=0 And ffr.Diid={0}", dto.DiId);
                         AddingWay = item.AddingWay,
                         CreateUserId = dto.UserId,
                         CreateTime = DateTime.Now,
-                        Remark = item.Remark
+                        Remark = item.Remark,
+                        Status = status,
+                        Auditor = auditor
+                        AuditTime = auditTime
                     });
                 }
                 if (_ForeignReceivables.Count > 0)