Merge branch 'develop' of http://132.232.92.186:3000/XinXiBu/OA2023 into develop

OASystem/OASystem.Api/Controllers/GroupsController.cs

@@ -17,6 +17,7 @@ using static OASystem.Infrastructure.Repositories.Groups.AirTicketResRepository;
 using static OpenAI.GPT3.ObjectModels.SharedModels.IOpenAiModels;
 using Cell = Aspose.Words.Tables.Cell;
 using Row = Aspose.Words.Tables.Row;
+using System.Runtime.Intrinsics.Arm;
 
 namespace OASystem.API.Controllers
 {
@@ -500,8 +501,6 @@ namespace OASystem.API.Controllers
             exp.AndIF(_dto.AuditStatus != -1, it => it.IsAuditGM == _dto.AuditStatus);
             exp.AndIF(_dto.Label != -1, it => it.CTable == _dto.Label);
 
-
-            //缺少IF的语法糖 CTable
             List<Grp_CreditCardPayment> entityList = _groupRepository
                 .Query<Grp_CreditCardPayment>(s => s.DIId == _dto.DiId && s.IsDel == 0 && s.CreateUserId > 0)
                 .Where(exp.ToExpression())
@@ -552,7 +551,14 @@ namespace OASystem.API.Controllers
                     case 79:
                         _detail.BusName = "待增加";
                         break;
-
+                    case 98:
+                        Grp_DecreasePayments gdpRes = _groupRepository.Query<Grp_DecreasePayments>(s => s.Id == entity.CId).First();
+                        if (gdpRes != null)
+                        {
+                            _detail.PriceMsgContent = "备注：" + gdpRes.Remark;
+                            _detail.PriceNameContent = gdpRes.PriceName;
+                        }
+                        break;
                     default:
                         break;
                 }