三公费用-草稿调整

OASystem/OASystem.Api/Controllers/GroupsController.cs

@@ -387,7 +387,6 @@ namespace OASystem.API.Controllers
 
         #endregion
 
-
         #region 团组前期信息
 
         /// <summary>
@@ -9140,7 +9139,8 @@ FROM
 FROM
   Grp_DelegationInfo di
 WHERE
-  di.Isdel = 0 ", dto.CurrUserId);
+  di.Isdel = 0 
+  ORDER BY di.VisitStartDate DESC", dto.CurrUserId);
 
             var data = await _sqlSugar.SqlQueryable<EnterExitCostMobileGroupView>(sql)
                 .Where(x => !string.IsNullOrEmpty(x.GroupName))
@@ -9149,6 +9149,16 @@ WHERE
                 .OrderByDescending(x => x.Id)
                 .ToPageListAsync(dto.PageIndex, dto.PageSize, total);
 
+            var basicUserId = await _enterExitCostRep.PermissionViewUsersAsync();
+
+            if (basicUserId.Any(x => x.Id == dto.CurrUserId))
+            {
+                foreach (var item in data)
+                {
+                    item.IsView = true;
+                }
+            }
+            
             return Ok(JsonView(true, "查询成功！", data, total));
         }
 
@@ -11354,7 +11364,7 @@ WHERE
             if (id < 1) return Ok(JsonView(false, MsgTips.DiId));
             if (dto.CurrUserId < 1) return Ok(JsonView(false, MsgTips.UserId));
 
-            var info = _mapper.Map<Grp_EnterExitCost>(dto);
+            var info = _mapper.Map<Grp_EnterExitCostDraft>(dto);
 
             info.OutsideJJPay = dto.OutsideJJPay;
             info.OutsideGWPay = dto.OutsideGWPay;

OASystem/OASystem.Domain/AutoMappers/_baseMappingProfile.cs

@@ -136,6 +136,12 @@ namespace OASystem.Domain.AutoMappers
 
             CreateMap<EnterExitCostDraftOpDto, Grp_EnterExitCostDraft>();
             CreateMap<PostEnterExitCostDraftMobileOpStep1Dto, Grp_EnterExitCostDraft>();
+            CreateMap<PostEnterExitCostDraftMobileOpStep2Dto, Grp_EnterExitCostDraft>();
+            CreateMap<PostEnterExitCostDraftMobileFeeOpCheckboxDto, Grp_EnterExitCostDraft>();
+            CreateMap<DayAndCostMobileInfoDto, Grp_DayAndCostDraft>();
+            CreateMap<PostEnterExitCostDraftMobileOpSingleStep3To6Dto, Grp_DayAndCostDraft>();
+            CreateMap<DayOtherPriceMobileInfoDto, Grp_DayOtherPriceDraft>();
+            CreateMap<PostEnterExitCostDraftMobileOpSingleStep7Dto, Grp_DayOtherPriceDraft>();
             CreateMap<DayAndCostDraftAddView, Grp_DayAndCostDraft>();
             CreateMap<Grp_DayAndCostDraft, DayAndCostDraftAddView>();