+1

OASystem/OASystem.Api/Controllers/GroupsController.cs

@@ -1837,6 +1837,20 @@ FROM
                     else _detail.CardType = initDatas.Find(it => it.Id == entity.CTDId)?.Name ?? "-";
 
 
+
+                    //处理金额
+                    if (entity.CTable == 1015)
+                    {
+                        var czInfo = _GroupExtraCosts.Find(x => entity.CId == x.Id);
+
+                        if (czInfo != null)
+                        {
+                            entity.PayMoney = czInfo.Price * czInfo.PriceCount;
+                            entity.RMBPrice = czInfo.Price * czInfo.PriceCount * entity.DayRate;
+                        }
+                        
+                    }
+
                     /*
                      * 应付款金额	
                      */
@@ -4884,7 +4898,7 @@ FROM
                 string md5Sign = GeneralMethod.Encrypt($"{sign}&fileName={fileUrl}");
                 string url = string.Format("http://oa.pan-american-intl.com:4399/#/Sankunginfo?sign={0}&fileName={1}", sign, fileUrl);
                 await AppNoticeLibrary.SendUserMsg_GroupShare_ToGM(dto.DiId, new List<string>() { "208", "233", "21" }, dto.UserId, url);
-                //保存 汇率信息记录
+                //汇率信息记录
                 await GeneralMethod.RateRecordSave(dto.UserId,sign,"出入境费用");
 
                 return Ok(JsonView(true, data.Msg, data.Data));
@@ -15225,7 +15239,7 @@ And (UnitName != '' Or UnitName != null) {sqlWhere}");
 
         #region 团组接待意见调查 Grp_ReceptionOpinionSurvey
         /// <summary>
-        /// 团组接待意见调查
+        /// 团组接待意见调查 - 信息管理
         /// 基础数据(团组)
         /// </summary>
         /// <param name="dto"></param>
@@ -15246,6 +15260,34 @@ And (UnitName != '' Or UnitName != null) {sqlWhere}");
             return Ok(JsonView(groupData, groupData.Count));
         }
 
+        /// <summary>
+        /// 团组接待意见调查 - 信息管理
+        /// 信息列表
+        /// </summary>
+        /// <param name="groupId"></param>
+        /// <returns></returns>
+        [HttpGet("{groupId}")]
+        [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
+        public async Task<IActionResult> OpinionaireManageList(int groupId)
+        {
+            if (groupId < 1) Ok(JsonView(false,"请传入有效的diId"));
+
+            var data = await _opinionaireRep.Query(x => x.IsDel == 0 && x.DiId == groupId)
+                .LeftJoin<Sys_Users>((x,u) => x.CreateUserId == u.Id)
+                .Select((x, u) => new
+                {
+                    x.Id,
+                    x.TourGuideName,
+                    x.CityName,
+                    CreateUserName = u.CnName,
+                    x.CreateTime
+                })
+                .OrderByDescending(x => x.Id)
+                .ToListAsync();
+            return Ok(JsonView(data));
+        }
+
+
         #endregion
 
         //        /// <summary>

OASystem/OASystem.Infrastructure/Repositories/Financial/ForeignReceivablesRepository.cs

@@ -334,7 +334,21 @@ namespace OASystem.Infrastructure.Repositories.Financial
         {
             JsonView result = new() { Code = 400,Msg="" };
 
-            var groupInfoData = await _delegationRep.GetGroupInfo(new GroupInfoDto() { Id = dto.DiId });
+            var groupInfoData = await _delegationRep.Query(x => x.IsDel == 0)
+                .Select(x => new
+                {
+                    x.Id,
+                    x.TeamName,
+                    x.VisitStartDate,
+                    x.VisitEndDate,
+                    x.VisitPNumber,
+                    x.VisitDays,
+                    x.VisitCountry,
+                    x.TourCode,
+                    x.ClientName
+                })
+                .OrderByDescending(x => x.Id)
+                .ToListAsync();
 
             //应收款项
             string groupReceivedSql = string.Format(@"Select *,su.CnName As AuditorName From Fin_ForeignReceivables  ffr
@@ -346,7 +360,7 @@ Where ffr.IsDel=0 And ffr.Diid={0}", dto.DiId);
             result.Msg = "查询成功!";
             result.Data = new
             {
-                GroupInfo = groupInfoData.Data,
+                GroupInfo = groupInfoData,
                 GroupCollectionStatementData = groupReceivedList
             };
 

OASystem/OASystem.Infrastructure/Repositories/Groups/DelegationInfoRepository.cs

@@ -423,6 +423,7 @@ namespace OASystem.Infrastructure.Repositories.Groups
                         GroupProcessOperationDtoParam.PortType = dto.PortType;
                         GroupProcessOperationDtoParam.TourClientListInfos = TourClientListInfoArr;
                         GroupProcessOperationDtoParam.VisitDate = DateTime.TryParse(GroupProcessOperationDtoParam.VisitDate, out timeParam) ? timeParam.ToString("yyyy-MM-dd") : "";
+                        GroupProcessOperationDtoParam.VisitDate = DateTime.TryParse(GroupProcessOperationDtoParam.VisitDate, out timeParam) ? timeParam.ToString("yyyy-MM-dd") : "";
                         GroupProcessOperationDtoParam.TontractTime = DateTime.TryParse(GroupProcessOperationDtoParam.TontractTime, out timeParam) ? timeParam.ToString("yyyy-MM-dd") : "";
 
                         result.Data = GroupProcessOperationDtoParam;