团组成本币种显示

OASystem/OASystem.Api/Controllers/GroupsController.cs

@@ -8386,7 +8386,8 @@ namespace OASystem.API.Controllers
 
                 foreach (var item in _GroupCostParameters)
                 {
-                    decimal _rate = item.Rate;
+                    decimal _rate = 1;
+                    decimal _rate1 = item.Rate;
                     decimal _scale = 0.95M;
                     #region 处理地接价格比例 总经理 国交部经理 主管 不下调 其他人 下调 5% 
                     var userInfo = _usersRep._sqlSugar.Queryable<Sys_Users>().Where(it => it.IsDel == 0 && it.Id == dto.UserId).First();
@@ -8406,7 +8407,7 @@ namespace OASystem.API.Controllers
                     GroupCostModulePromptInfo modulePromptInfo = new GroupCostModulePromptInfo()
                     {
                         CurrencyCode = currCode,
-                        Rate = _rate,
+                        Rate = _rate1,
                         CostType = item.CostType,
                         CostTypeStartTime = Convert.ToDateTime(item.CostTypeStartTime).ToString("yyyy-MM-dd"),
                         CostTypeEndTime = Convert.ToDateTime(item.CostTypeendTime).ToString("yyyy-MM-dd"),
@@ -10801,12 +10802,12 @@ namespace OASystem.API.Controllers
         public async Task<IActionResult> PostInvertedListFileDownload(InvertedListFileDownloadDto dto)
         {
 
-            var info1 = await _invertedListRep._sqlSugar.Queryable<Grp_InvertedList>().Where(it => it.IsDel == 0 && it.DiId == dto.DiId).FirstAsync();
-            if (info1 == null)
+            var info2 = await _invertedListRep._Info(1, dto.DiId);
+            if (info2.Code != 0)
             {
                 return Ok(JsonView(false, "倒推表数据未生成，请先生成倒退表数据！"));
             }
-
+            var info1 = info2.Data as InvertedListInfoView;
             var info = await _invertedListRep._sqlSugar.Queryable<Grp_DelegationInfo>().Where(it => it.Id == dto.DiId).FirstAsync();
             string teamName = "";
             if (info != null) teamName = info.TeamName;
@@ -10837,7 +10838,19 @@ namespace OASystem.API.Controllers
             dic.Add("QZRemark", info1.VisaInformationRemark);
 
             dic.Add("SQQZtime", info1.SendVisaDt.ConvertToDatetime());
-            dic.Add("SQQZRemark", info1.SendVisaRemark);
+
+            string sqqzRemark = "";
+            foreach (var item in info1.VisaCountryData)
+            {
+                sqqzRemark += $"{item.Country}，";
+            }
+
+            if (sqqzRemark.Length > 0)
+            {
+                sqqzRemark = sqqzRemark.Substring(0, sqqzRemark.Length - 1);
+            }
+
+            dic.Add("SQQZRemark", sqqzRemark);
 
             dic.Add("CQtime", info1.IssueVisaDt.ConvertToDatetime());
             dic.Add("CQRemark", info1.IssueVisaRemark);

OASystem/OASystem.Infrastructure/Repositories/Groups/InvertedListRepository.cs

@@ -258,8 +258,6 @@ namespace OASystem.Infrastructure.Repositories.Groups
             return _result;
         }
 
-
-
         /// <summary>
         /// Update
         /// </summary>
@@ -318,5 +316,7 @@ namespace OASystem.Infrastructure.Repositories.Groups
             _result.Msg = @$"操作成功!";
             return _result;
         }
+    
+    
     }
 }