出入境费用明细

Add And Update 调整

OASystem/OASystem.Api/Controllers/FinancialController.cs

@@ -625,6 +625,32 @@ namespace OASystem.API.Controllers
         #region 对外收款账单
 
 
+        /// <summary>
+        /// 对外收款账单 
+        /// 账单详情
+        /// </summary>
+        /// <param name="dto"></param>
+        /// <returns></returns>
+        [HttpPost]
+        [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
+        public async Task<IActionResult> PostGroupReceivablesInfoByDiId(ForForeignReceivablesInfoDto dto)
+        {
+            try
+            {
+                Result ffrData = await _ForForeignReceivablesRep.GetGroupReceivablesInfoByDiId(dto);
+                if (ffrData.Code != 0)
+                {
+                    return Ok(JsonView(false, ffrData.Msg));
+                }
+                return Ok(JsonView(true, ffrData.Msg, ffrData.Data));
+            }
+            catch (Exception ex)
+            {
+                return Ok(JsonView(false, ex.Message));
+                throw;
+            }
+        }
+
 
         #endregion
     }

OASystem/OASystem.Api/Controllers/GroupsController.cs

@@ -640,7 +640,7 @@ namespace OASystem.API.Controllers
                         {
                             Type = 5,
                             IssuerId = dto.publisher,
-                            Title = dto.title,
+                            Title = title,
                             Content = content,
                             ReleaseTime = DateTime.Now,
                             UIdList = new List<int> {

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

@@ -36,6 +36,8 @@ namespace OASystem.Infrastructure.Repositories.Financial
             _setDataRep = setDataRep;
         }
 
+        #region 关联已收款项
+
         /// <summary>
         /// 收款账单 数据源
         /// </summary>
@@ -45,13 +47,14 @@ namespace OASystem.Infrastructure.Repositories.Financial
             Result result = new() { Code = -2 };
 
             var groupNameData = await _delegationRep.GetGroupNameList(new GroupNameDto());
-            var currencyData = await _setDataRep.GetSetDataBySTId(_setDataRep,66); //币种
+            var currencyData = await _setDataRep.GetSetDataBySTId(_setDataRep, 66); //币种
             var remittanceMethodData = await _setDataRep.GetSetDataBySTId(_setDataRep, 14); //汇款方式
 
             result.Code = 0;
             result.Msg = "成功！";
-            result.Data = new {
-                GroupNameData= groupNameData.Data,
+            result.Data = new
+            {
+                GroupNameData = groupNameData.Data,
                 CurrencyData = currencyData.Data,
                 RemittanceMethodData = remittanceMethodData.Data
             };
@@ -79,14 +82,14 @@ namespace OASystem.Infrastructure.Repositories.Financial
             var groupProceedsReceivedList = await _sqlSugar.SqlQueryable<ProceedsReceivedView>(groupProceedsReceivedSql).ToListAsync();
 
             List<ProceedsReceivedView> NotFIDData = new List<ProceedsReceivedView>();
-            if (dto.PortType == 1 )
+            if (dto.PortType == 1)
             {
                 foreach (var item in groupReceivedList)
                 {
                     item._ProceedsReceivedDatas = groupProceedsReceivedList.Where(s => s.FID == item.Id).ToList();
                 }
 
-                NotFIDData = groupProceedsReceivedList.Where(s =>! groupReceivedList.Any(e => s.FID == e.Id)).ToList();
+                NotFIDData = groupProceedsReceivedList.Where(s => !groupReceivedList.Any(e => s.FID == e.Id)).ToList();
 
             }
 
@@ -158,11 +161,11 @@ namespace OASystem.Infrastructure.Repositories.Financial
             catch (Exception ex)
             {
                 _sqlSugar.RollbackTran();
-                result.Msg= ex.Message;
+                result.Msg = ex.Message;
                 return result;
             }
 
-            
+
 
             return result;
         }
@@ -209,7 +212,7 @@ namespace OASystem.Infrastructure.Repositories.Financial
                 }
                 if (_ForeignReceivables.Count > 0)
                 {
-                    var x =  _sqlSugar.Storageable(_ForeignReceivables).ToStorage();
+                    var x = _sqlSugar.Storageable(_ForeignReceivables).ToStorage();
                     addCount = x.AsInsertable.ExecuteCommand();        //不存在插入
                     updateCount = x.AsUpdateable.ExecuteCommand();    //存在更新
                 }
@@ -254,7 +257,7 @@ namespace OASystem.Infrastructure.Repositories.Financial
             //string sql = string.Format(@"Select * From Fin_ProceedsReceived Where IsDel=0 And Diid={0}", diids);
 
             var groupReceivedList = await _sqlSugar.Queryable<Fin_ForeignReceivables>()
-                .Where(pr =>  pr.IsDel == 0 && diids.Contains(pr.Diid)).ToListAsync();
+                .Where(pr => pr.IsDel == 0 && diids.Contains(pr.Diid)).ToListAsync();
 
             result.Code = 0;
             result.Msg = "查询成功!";
@@ -264,7 +267,9 @@ namespace OASystem.Infrastructure.Repositories.Financial
 
         }
 
+        #endregion
+
+
 
-       
     }
 }

OASystem/OASystem.Infrastructure/Repositories/Groups/EnterExitCostRepository.cs

@@ -222,9 +222,33 @@ namespace OASystem.Infrastructure.Repositories.Groups
 
             if (dto.PortType == 1) //web
             {
+
                 var _nationalTravelFee = _sqlSugar.Storageable<Grp_NationalTravelFee>(nationalTravelFee).ToStorage();
-                _nationalTravelFee.AsInsertable.ExecuteCommand();   //不存在插入
-                _nationalTravelFee.AsUpdateable.IgnoreColumns(it => new { it.CreateUserId, it.CreateTime, it.IsDel }).ExecuteCommand();   //存在更新
+                if (dto.Id != 0) //新增
+                {
+                    string selectSql = string.Format(@"Select * From Grp_NationalTravelFee 
+                                                   Where IsDel = 0 
+                                                   And Continent = '{0}' 
+                                                   And Country = '{1}'
+                                                   And City = '{2}'", dto.Continent, dto.Country, dto.City);
+                    Grp_NationalTravelFee nationalTravelFee1 = new Grp_NationalTravelFee();
+                    nationalTravelFee1 = await _sqlSugar.SqlQueryable<Grp_NationalTravelFee>(selectSql).FirstAsync();
+                    if (nationalTravelFee1 != null)
+                    {
+                        result.Msg = "该国家 城市已存在,请勿重复添加!";
+                        return result;
+                    }
+
+                    _nationalTravelFee.AsInsertable.ExecuteCommand();   //不存在插入
+                }
+                else
+                {
+                    _nationalTravelFee.AsUpdateable
+                    .IgnoreColumns(it => new { it.CreateUserId, it.CreateTime, it.IsDel })
+                    .WhereColumns(it => it.Id)
+                    .ExecuteCommand();   //存在更新
+                }
+
                 result.Code = 0;
             }
             else if (dto.PortType == 2) //Android