Browse Source

修复属性赋值和查询条件

在 `GroupsController.cs` 中,将 `FirstItemRemark` 的赋值从 `eecInfo.Remark` 更改为 `eecInfo.FirstItemRemark`,并在相关位置保持一致性。同时,添加了 `x.FirstItemRemark` 到查询选择列表中。

在 `OfficialActivitiesRepository.cs` 中,添加了对 `translatorId` 的赋值,并更新了查询条件,以确保正确获取翻译者的信息。
LEIYI 2 months ago
parent
commit
43e562d313

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

@@ -8830,7 +8830,7 @@ FROM
                     Service = eecInfo.Service,
                     Ticket = eecInfo.Ticket,
                     Safe = eecInfo.Safe,
-                    FirstItemRemark = eecInfo.Remark
+                    FirstItemRemark = eecInfo.FirstItemRemark
                 };
                 return Ok(JsonView(oneData));
             }
@@ -9295,7 +9295,7 @@ FROM
             if (dto.CurrUserId < 1) return Ok(JsonView(false, MsgTips.UserId));
 
             var info = _mapper.Map<Grp_EnterExitCost>(dto);
-            info.Remark = dto.FirstItemRemark;
+            info.FirstItemRemark = dto.FirstItemRemark;
             info.InsidePay = dto.Visa + dto.Service + dto.Safe + dto.Ticket + dto.HeSuan + dto.YiMiao;
 
             int id = dto.Id;
@@ -9321,6 +9321,7 @@ FROM
                         x.Ticket,
                         x.HeSuan,
                         x.YiMiao,
+                        x.FirstItemRemark
                     })
                     .Where(x => x.Id == id)
                     .ExecuteCommandAsync();

+ 1 - 1
OASystem/OASystem.Infrastructure/Repositories/Groups/EnterExitCostRepository.cs

@@ -83,7 +83,7 @@ namespace OASystem.Infrastructure.Repositories.Groups
                 if (enterExitCostData != null)
                 {
                     enterExitCostInfoView = _mapper.Map<EnterExitCostInfoView>(enterExitCostData);
-                    enterExitCostInfoView.FirstItemRemark = enterExitCostData.Remark;
+                    //enterExitCostInfoView.FirstItemRemark = enterExitCostData.Remark;
                     var dayAndCostSql = string.Format(@"Select ntf.Country,ntf.City,ssd.Name CurremcyCode,ssd.Remark CurrencyName,gdac.* From Grp_DayAndCost gdac
                                                         Left Join Grp_NationalTravelFee ntf On ntf.Id = gdac.NationalTravelFeeId
                                                         Left Join Sys_SetData ssd On ssd.STid = 66 And gdac.Currency = ssd.Id

+ 3 - 3
OASystem/OASystem.Infrastructure/Repositories/Resource/OfficialActivitiesRepository.cs

@@ -161,7 +161,6 @@ FROM
   LEFT JOIN Sys_SetData sd ON oa.OfficialForm = sd.Id
 {0}", sqlWhere);
                 var oa = await _sqlSugar.SqlQueryable<OfficialActivitiesView>(sql).FirstAsync();
-                //OfficialActivities.ScreenshotOfMailUrls.ForEach(url => { url = AppSettingsHelper.Get("GrpFileBaseUrl") + url; });
 
                 var array1 =  _sqlSugar.Queryable<Grp_OfficialDutyLinkTranslator>()
                     .Where(x => x.IsDel == 0 && x.OfficialDutyId == dto.Id)
@@ -172,9 +171,10 @@ FROM
                 {
                     oa.TranslatorIdItem = array1;
 
+                    int translatorId = array1[0];
                     var translatorInfo = await _sqlSugar.Queryable<Res_TranslatorLibrary>()
-                   .Where(x => x.IsDel == 0 && oa.TranslatorIdItem[0] == dto.Id)
-                   .FirstAsync();
+                        .Where(x => x.IsDel == 0 && x.Id == translatorId)
+                        .FirstAsync();
 
                     EncryptionProcessor.DecryptProperties(translatorInfo);