Explorar el Código

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

yuanrf hace 8 meses
padre
commit
9c5bc6cb38

+ 226 - 85
OASystem/OASystem.Api/Controllers/GroupsController.cs

@@ -31,6 +31,7 @@ using OASystem.Domain.Entities.Customer;
 using OASystem.Domain.Entities.Financial;
 using OASystem.Domain.Entities.Groups;
 using OASystem.Domain.ViewModels;
+using OASystem.Domain.ViewModels.Financial;
 using OASystem.Domain.ViewModels.Groups;
 using OASystem.Domain.ViewModels.Statistics;
 using OASystem.Infrastructure.Repositories.CRM;
@@ -7279,6 +7280,38 @@ FROM
             return Ok(JsonView(true, "查询成功!", data, total));
         }
 
+        /// <summary>
+        /// 团组模块 - 出入境费用-移动端 - 其他款项 - 币种基础数据Data
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
+        public async Task<IActionResult> PostEnterExitCostMobileOtherItemCurrencyData(PostEnterExitCostMobileOtherItemCurrencyDataDto dto)
+        {
+            if (!_portTypeData.Contains(dto.PortType)) return Ok(JsonView(false, MsgTips.Port));
+            if (dto.DiId < 1) return Ok(JsonView(false, MsgTips.DiId));
+
+            var groupRateData = await GeneralMethod.PostGroupTeamRateByDiIdAndCTableId(dto.PortType, dto.DiId, 98);
+
+            if (groupRateData == null) return Ok(JsonView(false, "请填写“团组汇率-->其他款项”汇率!"));
+            var groupOtherRateData = groupRateData.TeamRates;
+
+            var enterExitCostInfo = await _sqlSugar.Queryable<Grp_EnterExitCost>().FirstAsync(it => it.DiId == dto.DiId && it.IsDel == 0);
+            if (enterExitCostInfo == null) return Ok(JsonView(groupOtherRateData));
+            var eecRateData = (List<CurrencyInfo>?)CommonFun.GetCurrencyChinaToList(enterExitCostInfo.CurrencyRemark);
+
+            groupOtherRateData = groupOtherRateData
+                .Select(x => new TeamRateDescAddCurrencyIdView {
+                    CurrencyId = x.CurrencyId,
+                    CurrencyName = x.CurrencyName,
+                    CurrencyCode = x.CurrencyCode,
+                    Rate = eecRateData.Find(it => it.CurrencyCode.ToUpper().Equals(x.CurrencyCode.ToUpper()))?.Rate ?? x.Rate
+
+                }).ToList();
+
+            return Ok(JsonView(true, "查询成功!", groupOtherRateData));
+        }
+
         /// <summary>
         /// 团组模块 - 出入境费用-移动端 - 实时汇率、签证费用、机票费用 Tips
         /// </summary>
@@ -7397,6 +7430,40 @@ FROM
 
         #region op
 
+        /// <summary>
+        /// 移动端更新费用消息通知
+        /// </summary>
+        /// <param name="diid"></param>
+        /// <param name="id"></param>
+        /// <param name="currUserId"></param>
+        private async Task EnterExitCostMobileOpNotice(int diid, int id,int currUserId)
+        {
+            try
+            {
+                ////生成默认文件pdf并且通知人员
+                //var fileView = await GeneralMethod.EnterExitCostDownload(new EnterExitCostDownloadDto()
+                //{
+                //    DiId = diid,
+                //    ExportType = 1,
+                //    SubTypeId = 1005
+                //}, "pdf");
+
+                ////发送通知
+                //string fileUrl = (string)fileView.Data.GetType().GetProperty("Url").GetValue(fileView.Data, null);
+                //string md5Sign = GeneralMethod.Encrypt($"{id}&fileName={fileUrl}");
+                //string url = string.Format("http://oa.pan-american-intl.com:4399/#/Sankunginfo?sign={0}&fileName={1}", id, fileUrl);
+                //await AppNoticeLibrary.SendUserMsg_GroupShare_ToGM(diid, new List<string>() { "208", "233", "21" }, currUserId, url);
+                ////汇率信息记录
+                //await GeneralMethod.RateRecordSave(currUserId, id, "出入境费用");
+            }
+            catch (Exception ex)
+            {
+                //记录日志
+                throw;
+            }
+        }
+
+
         /// <summary>
         /// 团组模块 - 出入境费用-移动端 - OP --> 汇率
         /// </summary>
@@ -7415,15 +7482,99 @@ FROM
             {
                 var add = await _sqlSugar.Insertable(new Grp_EnterExitCost() { CurrencyRemark = currencyStr, CreateUserId = dto.CurrUserId }).ExecuteCommandAsync();
 
-                if (add > 0) return Ok(JsonView(true));
+                if (add < 1) return Ok(JsonView(false));
+                id = add;
             }
             else //update
             {
                 var upd = await _sqlSugar.Updateable<Grp_EnterExitCost>().SetColumns(x => new Grp_EnterExitCost() { CurrencyRemark = currencyStr }).Where(x => x.Id == dto.Id).ExecuteCommandAsync();
-                if (upd > 0) return Ok(JsonView(true));
+                if (upd < 1) return Ok(JsonView(false));
             }
-            
-            return Ok(JsonView(false));
+
+            #region 汇率变更时更改币种相关费用
+            var opDayCosts = new List<Grp_DayAndCost>();
+            var opDayOtherCosts = new List<Grp_DayOtherPrice>();
+            var eecCurrencys = dto.Currencys.Select(x => x.CurrencyCode.ToUpper()).ToList();
+
+            var dayCosts = _sqlSugar.Queryable<Grp_DayAndCost>()
+                .LeftJoin<Sys_SetData>((dac,sd) => dac.Currency == sd.Id)
+                .Where((dac, sd) => dac.IsDel == 0 && dac.DiId == dto.DiId)
+                .Select((dac, sd) => new { 
+                    dac.Id,
+                    dac.DiId,
+                    CurrencyCode = sd.Name,
+                    dac.Cost
+                })
+               .ToList();
+            var dayOtherCosts = _sqlSugar.Queryable<Grp_DayOtherPrice>()
+                .LeftJoin<Sys_SetData>((dop, sd) => dop.Currency == sd.Id)
+                .Where((dop, sd) => dop.IsDel == 0 && dop.Diid == dto.DiId)
+                .Select((dop, sd) => new {
+                    dop.Id,
+                    dop.Diid,
+                    CurrencyCode = sd.Name,
+                    dop.Cost
+                })
+               .ToList();
+            if (dayCosts.Count > 0)
+            {
+                var new_dayCosts = dayCosts.Where(x => eecCurrencys.Contains(x.CurrencyCode.ToUpper())).GroupBy(x => x.CurrencyCode);
+                foreach (var dc in new_dayCosts)
+                {
+                    var thisCurrency = dc.Key.ToUpper();
+                    var thisRate = dto.Currencys.Where(x => x.CurrencyCode.ToUpper().Equals(thisCurrency)).First()?.Rate ?? 0.00M;
+                    if (thisRate == 0.00M) continue;
+
+                    foreach (var dcSub in dc)
+                    {
+                        opDayCosts.Add(new Grp_DayAndCost() { 
+                            Id = dcSub.Id,
+                            DiId = dcSub.DiId,
+                            Cost = dcSub.Cost,
+                            SubTotal = dcSub.Cost * thisRate,
+                            Remark = $"[移动端->汇率变更时费用变更][变更信息:currency:{thisCurrency}、opDatetime:{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}、opUserId:{dto.CurrUserId}]"
+                        });
+                    }
+                }
+                if (opDayCosts.Count > 0)
+                {
+                    await _sqlSugar.Updateable(opDayCosts).UpdateColumns(x => new { x.SubTotal, x.Remark }).WhereColumns(x => new { x.Id }).ExecuteCommandAsync();
+                }
+            }
+
+            if (dayOtherCosts.Count > 0)
+            {
+                var new_dayOtherCosts = dayOtherCosts.Where(x => eecCurrencys.Contains(x.CurrencyCode.ToUpper())).GroupBy(x => x.CurrencyCode);
+                foreach (var dc in new_dayOtherCosts)
+                {
+                    var thisCurrency = dc.Key.ToUpper();
+                    var thisRate = dto.Currencys.Where(x => x.CurrencyCode.ToUpper().Equals(thisCurrency)).First()?.Rate ?? 0.00M;
+                    if (thisRate == 0.00M) continue;
+
+                    foreach (var dcSub in dc)
+                    {
+                        opDayOtherCosts.Add(new Grp_DayOtherPrice()
+                        {
+                            Id = dcSub.Id,
+                            Diid = dcSub.Diid,
+                            Cost = dcSub.Cost,
+                            SubTotal = dcSub.Cost * thisRate,
+                           // Remark = $"[移动端->汇率变更时费用变更][变更信息:currency:{thisCurrency}、opDatetime:{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}、opUserId:{dto.CurrUserId}]"
+                        });
+                    }
+                }
+                if (opDayOtherCosts.Count > 0)
+                {
+                    await _sqlSugar.Updateable(opDayOtherCosts).UpdateColumns(x => new { x.SubTotal }).WhereColumns(x => new { x.Id }).ExecuteCommandAsync();
+                }
+            }
+
+            #endregion
+
+            //消息通知
+            await EnterExitCostMobileOpNotice(dto.DiId, id,dto.CurrUserId);
+
+            return Ok(JsonView(true));
         }
 
         /// <summary>
@@ -7446,7 +7597,7 @@ FROM
                 checkboxInfo.CreateUserId = dto.CurrUserId;
                 var add = await _sqlSugar.Insertable(checkboxInfo).ExecuteCommandAsync();
 
-                if (add > 0) return Ok(JsonView(true));
+                if (add < 1) return Ok(JsonView(false));
             }
             else //update
             {
@@ -7465,10 +7616,10 @@ FROM
                     })
                     .Where(x => x.Id == id)
                     .ExecuteCommandAsync();
-                if (upd > 0) return Ok(JsonView(true));
+                if (upd < 1) return Ok(JsonView(false));
             }
 
-            return Ok(JsonView(false));
+            return Ok(JsonView(true));
         }
 
         /// <summary>
@@ -7487,13 +7638,13 @@ FROM
             info.InsidePay = dto.Visa + dto.Service + dto.Safe + dto.Ticket + dto.HeSuan + dto.YiMiao;
 
             int id = dto.Id;
-            var status = false;
             if (id <= 0) //add 
             {
                 info.CreateUserId = dto.CurrUserId;
                 var add = await _sqlSugar.Insertable(info).ExecuteCommandAsync();
 
-                if (add > 0) status = true;
+                if (add < 1) return Ok(JsonView(false));
+                id = add;
             }
             else //update
             {
@@ -7510,15 +7661,14 @@ FROM
                     })
                     .Where(x => x.Id == id)
                     .ExecuteCommandAsync();
-                if (upd > 0) status = true;
+                if (upd < 1) return Ok(JsonView(false));
             }
 
-            if (status)
-            {
-                return Ok(JsonView(new { itemTotal = info.InsidePay }));
-            }
 
-            return Ok(JsonView(false));
+            //消息通知
+            await EnterExitCostMobileOpNotice(dto.DiId, id, dto.CurrUserId);
+
+            return Ok(JsonView(new { itemTotal = info.InsidePay }));
         }
 
         /// <summary>
@@ -7536,20 +7686,14 @@ FROM
             var info = _mapper.Map<Grp_EnterExitCost>(dto);
 
             int id = dto.Id;
-            var status = false;
             decimal jjcItemTotal = 0.00M, gwcItemTotal = 0.00M, tdcItemTotal = 0.00M;
             if (id <= 0) //add 
             {
                 info.CreateUserId = dto.CurrUserId;
                 var addInfo = await _sqlSugar.Insertable(info).ExecuteReturnEntityAsync();
 
-                if (addInfo != null)
-                {
-                    status = true;
-                    jjcItemTotal = addInfo.AirJJ + addInfo.CityTranffic;
-                    gwcItemTotal = addInfo.AirGW + addInfo.CityTranffic;
-                    tdcItemTotal = addInfo.AirTD + addInfo.CityTranffic;
-                }
+                if (addInfo == null) return Ok(JsonView(false));
+                id = addInfo.Id;
             }
             else //update
             {
@@ -7565,21 +7709,18 @@ FROM
                     })
                     .Where(x => x.Id == id)
                     .ExecuteCommandAsync();
-                if (upd > 0)
-                {
-                    status = true;
-                    jjcItemTotal = info.AirJJ + info.CityTranffic;
-                    gwcItemTotal = info.AirGW + info.CityTranffic;
-                    tdcItemTotal = info.AirTD + info.CityTranffic;
-                }
-            }
+                if (upd > 0) return Ok(JsonView(false));
 
-            if (status)
-            {
-                return Ok(JsonView(new { jjcItemTotal = jjcItemTotal, gwcItemTotal = gwcItemTotal, tdcItemTotal = tdcItemTotal }));
             }
 
-            return Ok(JsonView(false));
+            jjcItemTotal = info.AirJJ + info.CityTranffic;
+            gwcItemTotal = info.AirGW + info.CityTranffic;
+            tdcItemTotal = info.AirTD + info.CityTranffic;
+
+            //消息通知
+            await EnterExitCostMobileOpNotice(dto.DiId, id, dto.CurrUserId);
+
+            return Ok(JsonView(new { jjcItemTotal = jjcItemTotal, gwcItemTotal = gwcItemTotal, tdcItemTotal = tdcItemTotal }));
         }
 
         /// <summary>
@@ -7594,31 +7735,32 @@ FROM
             if (dto.DiId < 1) return Ok(JsonView(false, MsgTips.DiId));
             if (dto.CurrUserId < 1) return Ok(JsonView(false, MsgTips.UserId));
             if (dto.Infos.Length < 1) return Ok(JsonView(false, "请传入有效的费用信息!"));
-            var feeTypeIds = new List<int>() {1,2,3,4, };
+            var feeTypeIds = new List<int>() { 1, 2, 3, 4, };
             if (!feeTypeIds.Contains(dto.FeeType)) return Ok(JsonView(false, "请传入有效的费用类型!"));
 
             var infos1 = _mapper.Map<List<Grp_DayAndCost>>(dto.Infos);
             var infos = infos1.Select(x => new Grp_DayAndCost
-                {
-                    Id = x.Id,
-                    DiId = dto.DiId,
-                    Type = dto.FeeType,
-                    Days = x.Days,
-                    NationalTravelFeeId = x.NationalTravelFeeId,
-                    Cost = x.Cost,
-                    Currency = x.Currency,
-                    SubTotal = x.SubTotal,
-                    CreateUserId = dto.CurrUserId
-                })
+            {
+                Id = x.Id,
+                DiId = dto.DiId,
+                Type = dto.FeeType,
+                Days = x.Days,
+                NationalTravelFeeId = x.NationalTravelFeeId,
+                Cost = x.Cost,
+                Currency = x.Currency,
+                SubTotal = x.SubTotal,
+                CreateUserId = dto.CurrUserId
+            })
                 .ToList();
 
             var adds = infos.Where(x => x.Id <= 0).ToList();
             var upds = infos.Where(x => x.Id > 0).ToList();
-            var status = false;
+
             if (adds.Count > 0)
             {
                 var add = await _sqlSugar.Insertable(adds).ExecuteCommandAsync();
-                if (add > 0) status = true;
+                if (add < 1) return Ok(JsonView(false));
+                
             }
             if (upds.Count > 0)
             {
@@ -7633,16 +7775,16 @@ FROM
                     })
                     .WhereColumns(x => new { x.Id })
                     .ExecuteCommandAsync();
-                if (upd > 0) status = true;
+                if (upd < 1) return Ok(JsonView(false));
             }
 
-            if (status)
-            {
-                var itemTotal = await _sqlSugar.Queryable<Grp_DayAndCost>().Where(x => x.IsDel == 0 && x.DiId == dto.DiId && x.Type == dto.FeeType).SumAsync(x => x.SubTotal);
-                return Ok(JsonView(new { itemTotal = itemTotal }));
-            }
+            var itemTotal = _sqlSugar.Queryable<Grp_DayAndCost>().Where(x => x.IsDel == 0 && x.DiId == dto.DiId && x.Type == dto.FeeType).Sum(x => x.SubTotal);
 
-            return Ok(JsonView(false));
+            //消息通知
+            var id = _sqlSugar.Queryable<Grp_EnterExitCost>().Where(x => x.IsDel == 0 && x.DiId == dto.DiId).First()?.Id ?? 0;
+            await EnterExitCostMobileOpNotice(dto.DiId, id, dto.CurrUserId);
+
+            return Ok(JsonView(new { itemTotal = itemTotal }));
         }
 
         /// <summary>
@@ -7662,13 +7804,12 @@ FROM
             var info = _mapper.Map<Grp_DayAndCost>(dto);
             info.CreateUserId = dto.CurrUserId;
            
-            var status = false;
             if (info.Id < 1) //添加
             {
                 var add = await _sqlSugar.Insertable(info).ExecuteCommandAsync();
-                if (add > 0) status = true;
+                if (add < 1) return Ok(JsonView(false));
             }
-            else if (info.Id > 0)
+            else
             {
                 var upd = await _sqlSugar.Updateable(info)
                     .UpdateColumns(x => new
@@ -7681,16 +7822,16 @@ FROM
                     })
                     .WhereColumns(x => new { x.Id })
                     .ExecuteCommandAsync();
-                if (upd > 0) status = true;
+                if (upd < 1) return Ok(JsonView(false));
             }
 
-            if (status)
-            {
-                var itemTotal = await _sqlSugar.Queryable<Grp_DayAndCost>().Where(x => x.IsDel == 0 && x.DiId == dto.DiId && x.Type == dto.FeeType).SumAsync(x => x.SubTotal);
-                return Ok(JsonView(new { itemTotal = itemTotal }));
-            }
+            var itemTotal = _sqlSugar.Queryable<Grp_DayAndCost>().Where(x => x.IsDel == 0 && x.DiId == dto.DiId && x.Type == dto.FeeType).Sum(x => x.SubTotal);
 
-            return Ok(JsonView(false));
+            //消息通知
+            var id = _sqlSugar.Queryable<Grp_EnterExitCost>().Where(x => x.IsDel == 0 && x.DiId == dto.DiId).First()?.Id ?? 0;
+            await EnterExitCostMobileOpNotice(dto.DiId, id, dto.CurrUserId);
+
+            return Ok(JsonView(new { itemTotal = itemTotal }));
         }
 
         /// <summary>
@@ -7721,11 +7862,11 @@ FROM
 
             var adds = infos.Where(x => x.Id <= 0).ToList();
             var upds = infos.Where(x => x.Id > 0).ToList();
-            var status = false;
+
             if (adds.Count > 0)
             {
                 var add = await _sqlSugar.Insertable(adds).ExecuteCommandAsync();
-                if (add > 0) status = true;
+                if (add < 1) return Ok(JsonView(false));
             }
             if (upds.Count > 0)
             {
@@ -7741,15 +7882,14 @@ FROM
                     })
                     .WhereColumns(x => new { x.Id })
                     .ExecuteCommandAsync();
-                if (upd > 0) status = true;
+                if (upd < 1) return Ok(JsonView(false));
             }
 
-            if (status)
-            {
-                var itemTotal = await _sqlSugar.Queryable<Grp_DayOtherPrice>().Where(x => x.IsDel == 0 && x.Diid == dto.DiId).SumAsync(x => x.SubTotal);
-                return Ok(JsonView(new { itemTotal = itemTotal }));
-            }
-            return Ok(JsonView(false));
+            var itemTotal = _sqlSugar.Queryable<Grp_DayOtherPrice>().Where(x => x.IsDel == 0 && x.Diid == dto.DiId).Sum(x => x.SubTotal);
+            //消息通知
+            var id = _sqlSugar.Queryable<Grp_EnterExitCost>().Where(x => x.IsDel == 0 && x.DiId == dto.DiId).First()?.Id ?? 0;
+            await EnterExitCostMobileOpNotice(dto.DiId, id, dto.CurrUserId);
+            return Ok(JsonView(new { itemTotal = itemTotal }));
         }
 
         /// <summary>
@@ -7766,13 +7906,13 @@ FROM
 
             var info = _mapper.Map<Grp_DayOtherPrice>(dto);
             info.CreateUserId = dto.CurrUserId;
-            var status = false;
+
             if (info.Id < 1)//add
             {
                 var add = await _sqlSugar.Insertable(info).ExecuteCommandAsync();
-                if (add > 0) status = true;
+                if (add < 1) return Ok(JsonView(false));
             }
-            else if (info.Id > 0) //upd
+            else //upd
             {
                 var upd = await _sqlSugar.Updateable(info)
                     .UpdateColumns(x => new
@@ -7786,15 +7926,16 @@ FROM
                     })
                     .WhereColumns(x => new { x.Id })
                     .ExecuteCommandAsync();
-                if (upd > 0) status = true;
+                if (upd < 1) return Ok(JsonView(false));
             }
 
-            if (status)
-            {
-                var itemTotal = await _sqlSugar.Queryable<Grp_DayOtherPrice>().Where(x => x.IsDel == 0 && x.Diid == dto.DiId).SumAsync(x => x.SubTotal);
-                return Ok(JsonView(new { itemTotal = itemTotal }));
-            }
-            return Ok(JsonView(false));
+            var itemTotal = _sqlSugar.Queryable<Grp_DayOtherPrice>().Where(x => x.IsDel == 0 && x.Diid == dto.DiId).Sum(x => x.SubTotal);
+
+            //消息通知
+            var id = _sqlSugar.Queryable<Grp_EnterExitCost>().Where(x => x.IsDel == 0 && x.DiId == dto.DiId).First()?.Id ?? 0;
+            await EnterExitCostMobileOpNotice(dto.DiId, id, dto.CurrUserId);
+
+            return Ok(JsonView(new { itemTotal = itemTotal }));
         }
 
         #endregion

+ 6 - 6
OASystem/OASystem.Api/Controllers/ResourceController.cs

@@ -4161,7 +4161,7 @@ WHERE
         [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
         public async Task<IActionResult> MediaSupplierInit()
         {
-            return Ok(JsonView(await _mediaSupplierRep.Init()));
+            return Ok(await _mediaSupplierRep.Init());
         }
 
         /// <summary>
@@ -4178,14 +4178,14 @@ WHERE
 
             if (dto.Id < 1) return Ok(JsonView(false, MsgTips.Port));
 
-            return Ok(JsonView(await _mediaSupplierRep.Info(dto)));
+            return Ok(await _mediaSupplierRep.Info(dto));
         }
 
         /// <summary>
         /// 策划部供应商资料
         /// 分页查询
         /// </summary>
-        /// <param name="id"></param>
+        /// <param name="dto"></param>
         /// <returns></returns>
         [HttpPost]
         [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
@@ -4193,7 +4193,7 @@ WHERE
         {
             if (!_portIds.Contains(dto.PortType)) return Ok(JsonView(false, MsgTips.Port));
 
-            return Ok(JsonView(await _mediaSupplierRep.PageItem(dto)));
+            return Ok(await _mediaSupplierRep.PageItem(dto));
         }
 
         /// <summary>
@@ -4212,7 +4212,7 @@ WHERE
 
             if (userId < 1) return Ok(JsonView(false, MsgTips.UserId));
 
-            return Ok(JsonView(await _mediaSupplierRep.AddOrEdit(dto)));
+            return Ok(await _mediaSupplierRep.AddOrEdit(dto));
         }
 
         /// <summary>
@@ -4232,7 +4232,7 @@ WHERE
             if (userId < 1) return Ok(JsonView(false, MsgTips.UserId));
             if (id < 1) return Ok(JsonView(false, MsgTips.Id));
 
-            return Ok(JsonView(await _mediaSupplierRep.SoftDel(dto)));
+            return Ok(await _mediaSupplierRep.SoftDel(dto));
         }
 
         #endregion

+ 1 - 0
OASystem/OASystem.Api/Controllers/StatisticsController.cs

@@ -5039,6 +5039,7 @@ FROM
   Grp_DelegationInfo di
 WHERE
   di.IsDel = 0
+  AND di.IsBid = 0 
   AND di.TeamDid IN (38, 39, 40, 1048)
   AND di.VisitDate BETWEEN '{0}' AND '{1}'
 ", beginDt, endDt);

+ 0 - 1
OASystem/OASystem.Api/OAMethodLib/GeneralMethod.cs

@@ -1067,7 +1067,6 @@ namespace OASystem.API.OAMethodLib
         /// <returns></returns>
         public static async Task<TeamRateModelGeneralView> PostGroupTeamRateByDiIdAndCTableId(int portType, int diId, int cTable)
         {
-
             TeamRateModelGeneralView _view = new TeamRateModelGeneralView();
             _view = await _teamRateRep.PostGroupTeamRateByDiIdAndCTableId(portType, diId, cTable);
             return _view;

+ 5 - 0
OASystem/OASystem.Domain/Dtos/Groups/EnterExitCostDto.cs

@@ -421,6 +421,11 @@ namespace OASystem.Domain.Dtos.Groups
         public string CurrencyName { get; set; }
     }
 
+    public class PostEnterExitCostMobileOtherItemCurrencyDataDto : PortDtoBase
+    {
+        public int DiId { get; set; }
+    }
+
     public class GetEnterExitCostMobileFeeTipsDto : PortDtoBase {
 
         /// <summary>

+ 6 - 0
OASystem/OASystem.Domain/Dtos/Resource/MediaSuppliersDto.cs

@@ -18,6 +18,12 @@ namespace OASystem.Domain.Dtos.Resource
 
     public class MediaSupplierPageItemDto : DtoBase
     {
+        /// <summary>
+        /// 供应商类型 多个
+        /// 1,2,3
+        /// </summary>
+        public string TypeLabel { get; set; }
+
         /// <summary>
         /// 搜索条件(联系人、单位、电话)
         /// </summary>

+ 24 - 12
OASystem/OASystem.Infrastructure/Repositories/Resource/MediaSuppliersRepository.cs

@@ -76,6 +76,7 @@ namespace OASystem.Infrastructure.Repositories.Resource
 
             result.Code = 200;
             result.Data = info;
+            result.Msg = MsgTips.Succeed;
             return result;
         }
 
@@ -90,11 +91,27 @@ namespace OASystem.Infrastructure.Repositories.Resource
 
             if (!_portIds.Contains(dto.PortType)) { result.Msg = MsgTips.Port; return result; }
 
+
+            var typeLabel = new List<int>();
+            if (!string.IsNullOrEmpty(dto.TypeLabel))
+            {
+                typeLabel = dto.TypeLabel.Split(',')
+                               .Select(s =>
+                               {
+                                   int value = 0;
+                                   if (int.TryParse(s, out value)) return value;
+                                   return value;
+                               })
+                               .Where(i => i != 0)
+                               .ToList();
+            }
+
             var search = dto.Search;
             RefAsync<int> total = 0;
             var infos = await _sqlSugar.Queryable<Res_MediaSuppliers>()
                 .LeftJoin<Sys_Users>((ms, u) => ms.CreateUserId == u.Id)
                 .Where((ms, u) => ms.IsDel == 0)
+                .WhereIF(typeLabel.Count > 0 ,x=> typeLabel.Contains(x.TypeId))
                 .WhereIF(!string.IsNullOrEmpty(search), (ms, u) => ms.UnitName.Contains(search) || ms.Contact.Contains(search) || ms.Tel.Contains(search))
                 .OrderByDescending((ms, u) => ms.CreateTime)
                 .Select((ms, u) => new
@@ -112,6 +129,7 @@ namespace OASystem.Infrastructure.Repositories.Resource
                 })
                 .ToPageListAsync(dto.PageIndex, dto.PageSize, total);
 
+            result.Msg = MsgTips.Succeed;
             result.Code = 200;
             result.Data = infos;
             result.Count = total;
@@ -136,22 +154,16 @@ namespace OASystem.Infrastructure.Repositories.Resource
             if (info.Id < 1) //添加
             {
                 var add = await _sqlSugar.Insertable(info).ExecuteCommandAsync();
-                if (add > 0)
-                {
-                    result.Code = 200;
-                    result.Msg = $"操作成功!";
-                }
+                if (add  < 1) return result;
             }
-            else if (info.Id > 0) //编辑
+            else  //编辑
             {
                 var upd = await _sqlSugar.Updateable(info).IgnoreColumns(x => new { x.CreateUserId, x.CreateTime }).ExecuteCommandAsync();
-                if (upd > 0)
-                {
-                    result.Code = 200;
-                    result.Msg = $"操作成功!";
-                }
+                if (upd < 1) return result;
             }
 
+            result.Code = 200;
+            result.Msg = $"操作成功!";
             return result;
         }
 
@@ -169,7 +181,7 @@ namespace OASystem.Infrastructure.Repositories.Resource
             if (id < 1) { result.Msg = MsgTips.Id; return result; }
 
             var status = await _sqlSugar.Updateable<Res_MediaSuppliers>()
-                .SetColumns(x => new Res_MediaSuppliers() { DeleteUserId = userId, DeleteTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") })
+                .SetColumns(x => new Res_MediaSuppliers() { IsDel = 1, DeleteUserId = userId, DeleteTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") })
                 .Where(x => x.Id == id)
                 .ExecuteCommandAsync();
             if (status > 0)