yuanrf пре 3 месеци
родитељ
комит
4169c92f8a

+ 3 - 2
OASystem/OASystem.Api/Controllers/GroupsController.cs

@@ -11759,7 +11759,7 @@ ORDER by  gctggrc.id DESC
                                 extraCostList.Add(new
                                      Fin_GroupExtraCostDto_OP
                                 {
-                                    Area = 0,
+                                    Area = _dto.AreaId,
                                     coefficient = 1.5M,
                                     createUser = _dto.UserId,
                                     currency = _dto.CardPriceCurrency,
@@ -11774,7 +11774,7 @@ ORDER by  gctggrc.id DESC
                                     priceType = 1027,
                                     priceDetailType = 1044,
                                     PriceDt = start_Time.ToString("yyyy-MM-dd"),
-                                    priceName = "酒店超支费用-酒店导入",
+                                    priceName = $"酒店超支费用-酒店导入-({start_Time.ToString("yyyy/MM/dd")})",
                                 });
                             }
                         }
@@ -11788,6 +11788,7 @@ ORDER by  gctggrc.id DESC
             {
                  await _carTouristGuideGroundRep.GroupExtraCost_OperatorList(extraCostList);
             }
+            _sqlSugar.CommitTran();
 
             #endregion
 

+ 7 - 0
OASystem/OASystem.Infrastructure/Repositories/Groups/CarTouristGuideGroundRepository.cs

@@ -1524,6 +1524,13 @@ namespace OASystem.Infrastructure.Repositories.Groups
             Result rt = new Result();
             foreach (var item in dto)
             {
+                await  _daiRep.UpdateAsync<Fin_GroupExtraCost>(s => s.PriceName == item.priceName && s.DiId == item.diId, 
+                    s => new Fin_GroupExtraCost
+                    {
+                        IsDel = 1,
+                        DeleteTime = DateTime.Now.ToString("yyyy-MM-dd"),
+                        DeleteUserId = item.createUser
+                    });
                 rt = await PostGroupExtraCost_Operator(item);
             }
             return rt;