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

OASystem/OASystem.Api/Controllers/FinancialController.cs

@@ -25,12 +25,13 @@ namespace OASystem.API.Controllers
         private readonly SqlSugarClient _sqlSugar;
         private readonly SetDataTypeRepository _setDataTypeRep;
         private readonly DailyFeePaymentRepository _daiRep;    //日付申请仓库
-        private readonly TeamRateRepository _teamRateRep;    //团组汇率仓库
+        private readonly TeamRateRepository _teamRateRep;      //团组汇率仓库
+        private readonly ForeignReceivablesRepository _ForForeignReceivablesRep;  //对外收款账单仓库
 
         /// <summary>
         /// 初始化
         /// </summary>
-        public FinancialController(IMapper mapper, IConfiguration configuration, DailyFeePaymentRepository daiRep, SqlSugarClient sqlSugar, SetDataTypeRepository setDataTypeRep, TeamRateRepository teamRateRep) 
+        public FinancialController(IMapper mapper, IConfiguration configuration, DailyFeePaymentRepository daiRep, SqlSugarClient sqlSugar, SetDataTypeRepository setDataTypeRep, TeamRateRepository teamRateRep, ForeignReceivablesRepository ForForeignReceivablesRep) 
         {
             _mapper = mapper;
             _config = configuration;
@@ -38,6 +39,7 @@ namespace OASystem.API.Controllers
             _sqlSugar = sqlSugar;
             _setDataTypeRep = setDataTypeRep;
             _teamRateRep = teamRateRep;
+            _ForForeignReceivablesRep = ForForeignReceivablesRep;
         }
 
         #region 日付申请
@@ -104,6 +106,7 @@ namespace OASystem.API.Controllers
 
             return Ok(JsonView(result.Data));
         }
+        
         /// <summary>
         /// 日付申请 添加
         /// </summary>
@@ -294,17 +297,42 @@ namespace OASystem.API.Controllers
             }
         }
 
+        ///// <summary>
+        ///// 团组汇率 changge
+        ///// </summary>
+        ///// <returns></returns>
+        //[HttpPost]
+        //[ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
+        //public async Task<IActionResult> ChangeGroupRateInfo()
+        //{
+        //    try
+        //    {
+        //        Result teamRateData = await _teamRateRep.GetGroupRateChangeData();
+        //        if (teamRateData.Code != 0)
+        //        {
+        //            return Ok(JsonView(false, teamRateData.Msg));
+        //        }
+        //        return Ok(JsonView(true, teamRateData.Msg, teamRateData.Data));
+        //    }
+        //    catch (Exception ex)
+        //    {
+        //        return Ok(JsonView(false, ex.Message));
+        //        throw;
+        //    }
+        //}
+
         /// <summary>
-        /// 团组汇率 changge
+        /// 团组汇率 Select汇率详情
         /// </summary>
+        /// <param name="dto"></param>
         /// <returns></returns>
         [HttpPost]
         [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
-        public async Task<IActionResult> ChangeGroupRateInfo()
+        public async Task<IActionResult> GetGroupRateInfo(TeamRateInfoDto dto)
         {
             try
             {
-                Result teamRateData = await _teamRateRep.GetGroupRateChangeData();
+                Result teamRateData = await _teamRateRep.GetGroupRateInfoByDiid(dto);
                 if (teamRateData.Code != 0)
                 {
                     return Ok(JsonView(false, teamRateData.Msg));
@@ -318,18 +346,19 @@ namespace OASystem.API.Controllers
             }
         }
 
+
         /// <summary>
-        /// 团组汇率 Select汇率详情
+        /// 团组汇率 添加 or 更新
         /// </summary>
         /// <param name="dto"></param>
         /// <returns></returns>
         [HttpPost]
         [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
-        public async Task<IActionResult> GetGroupRateInfo(TeamRateInfoDto dto)
+        public async Task<IActionResult> PostGroupRateUpdate(TeamRateUpdateDto dto)
         {
             try
             {
-                Result teamRateData = await _teamRateRep.GetGroupRateInfoByDiid(dto);
+                Result teamRateData = await _teamRateRep.PostGroupRateUpdate(dto);
                 if (teamRateData.Code != 0)
                 {
                     return Ok(JsonView(false, teamRateData.Msg));
@@ -344,5 +373,59 @@ namespace OASystem.API.Controllers
         }
 
         #endregion
+
+        #region 对外收款账单
+
+        /// <summary>
+        /// 对外收款账单 Select数据源(团组名,币种,汇款方式)
+        /// </summary>
+        /// <param name="dto"></param>
+        /// <returns></returns>
+        [HttpPost]
+        [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
+        public async Task<IActionResult> GetForeignReceivablesDataSources()
+        {
+            try
+            {
+                Result ffrData = await _ForForeignReceivablesRep.GetDataSource();
+                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;
+            }
+        }
+        
+        /// <summary>
+        /// 对外收款账单 
+        /// 账单详情
+        /// </summary>
+        /// <param name="dto"></param>
+        /// <returns></returns>
+        [HttpPost]
+        [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
+        public async Task<IActionResult> GetGroupReceivablesInfoByDiId(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/OAMethodLib/JsonConvertOverride.cs

@@ -60,25 +60,46 @@ namespace OASystem.API.OAMethodLib
     #endregion
 
 
-    #region String null值转换（读/写）
-
+    #region decimal格式化
 
-    //public class Int32JsonConverter : System.Text.Json.Serialization.JsonConverter<int?>
+    ///// <summary>
+    ///// decimal格式化
+    ///// </summary>
+    //public class JsonConverterDecimal : Newtonsoft.Json.JsonConverter
     //{
-    //    private readonly string Format;
-    //    public Int32JsonConverter(string format)
+    //    /// <summary>
+    //    /// 是否可以转换
+    //    /// </summary>
+    //    /// <param name="objectType"></param>
+    //    /// <returns></returns>
+    //    public override bool CanConvert(Type objectType)
     //    {
-    //        Format = format;
+    //        return objectType == typeof(decimal) || objectType == typeof(decimal?);
     //    }
-    //    public override void Write(Utf8JsonWriter writer, int? value, JsonSerializerOptions options)
+
+    //    public override object ReadJson(JsonReader reader, Type objectType, object existingValue, Newtonsoft.Json.JsonSerializer serializer)
     //    {
-    //        writer.WriteStringValue((value ?? 0).ToString());
+    //        if (reader.ValueType == null && reader.Value == null)
+
+    //        {
+    //            return null;
+    //        }
+    //        else
+    //        {
+    //            decimal.TryParse(reader.Value != null ? reader.Value.ToString() : "", out decimal value);
+    //            return value.ToString("F2");
+    //        }
+
     //    }
-    //    public override int Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+
+    //    public override void WriteJson(JsonWriter writer, object value, Newtonsoft.Json.JsonSerializer serializer)
     //    {
-    //        return Convert.ToInt32(reader.GetString()) ?? 0; 
-    //    }
+    //        if (value == null)
 
+    //            writer.WriteValue(value);
+    //        else
+    //            writer.WriteValue(value + "");
+    //    }
     //}
 
     #endregion

OASystem/OASystem.Api/Program.cs

@@ -13,6 +13,7 @@ using Quartz.Impl;
 using Quartz.Spi;
 using Quartz;
 using QuzrtzJob.Factory;
+using System.Runtime.CompilerServices;
 
 var builder = WebApplication.CreateBuilder(args);
 var basePath = AppContext.BaseDirectory;
@@ -33,8 +34,12 @@ builder.Services.AddControllers()
         //options.JsonSerializerOptions.DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull;
 
         options.JsonSerializerOptions.Converters.Add(new NullJsonConverter());
+
         //时间格式化响应
         options.JsonSerializerOptions.Converters.Add(new DateTimeJsonConverter("yyyy-MM-dd HH:mm:ss"));
+
+        ////decimal 四位小数
+        //options.JsonSerializerOptions.Converters.Add(new JsonConverterDecimal(0.0000M));
     });
 
 

OASystem/OASystem.Domain/Dtos/DtoBase.cs

@@ -10,16 +10,24 @@ namespace OASystem.Domain.Dtos
     /// <summary>
     /// 请求实体类 基类
     /// </summary>
-    public class DtoBase
+    public class DtoBase: PortDtoBase
+    {
+        public int PageIndex { get; set; } = 1;
+        public int PageSize { get; set; } = 10;
+    }
+
+    /// <summary>
+    /// 请求实体类
+    /// 端口
+    /// 基类
+    /// </summary>
+    public class PortDtoBase
     {
         /// <summary>
         /// 请求端口分类
         /// 1 Web 2 Android 3 IOS
         /// </summary>
         public int PortType { get; set; } = 1;
-
-        public int PageIndex { get; set; } = 1;
-        public int PageSize { get; set; } = 10;
     }
 
     public class JsonDtoBase

OASystem/OASystem.Domain/Dtos/Financial/ForForeignReceivablesDto.cs

@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace OASystem.Domain.Dtos.Financial
+{
+    /// <summary>
+    /// 财务模块
+    /// 对外收款
+    /// </summary>
+    public class ForForeignReceivablesInfoDto: PortDtoBase
+    {
+        /// <summary>
+        /// 团组Id
+        /// </summary>
+        public int DiId { get; set; }
+    }
+}

OASystem/OASystem.Domain/Dtos/Financial/TeamRateDto.cs

@@ -1,4 +1,5 @@
-using System;
+using OASystem.Domain.ViewModels.Financial;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -24,4 +25,47 @@ namespace OASystem.Domain.Dtos.Financial
         /// </summary>
         public int Diid { get; set; }
     }
+
+    /// <summary>
+    /// 团组汇率信息 Dto
+    /// </summary>
+    public class TeamRateUpdateDto : DtoBase
+    {
+        /// <summary>
+        /// 创建用户Id
+        /// </summary>
+        public int CreateUserId { get; set; }
+
+        /// <summary>
+        /// 团组Id
+        /// </summary>
+        public int DiId { get; set; }
+
+        /// <summary>
+        /// 团组汇率 信息
+        /// </summary>
+        public List<TeamRateUpdateInfo>? teamRateUpdateInfos { get; set; }
+    }
+
+    /// <summary>
+    /// 团组汇率信息
+    /// </summary>
+    public class TeamRateUpdateInfo
+    {
+        /// <summary>
+        /// 团组汇率Id
+        /// </summary>
+        public int Id { get; set; }
+
+
+        /// <summary>
+        /// 团组指向分类
+        /// </summary>
+        public int CTable { get; set; }
+
+        /// <summary>
+        /// 币种 Info
+        /// </summary>
+        public List<TeamRateDescView>? teamRates { get; set; }
+    }
 }

OASystem/OASystem.Domain/ViewModels/Financial/Fin_DailyFeePaymentView.cs

@@ -88,12 +88,25 @@ namespace OASystem.Domain.ViewModels.Financial
             {
                 string str = "未审核";
                 if (FAudit == 0) str = "未审核";
-                else if (FAudit == 1) str = "已通过";
-                else if (FAudit == 2) str = "未通过";
+                else if (FAudit == 1) 
+                {
+                    str = "已通过"; 
+                    FAuditName = "朱成梅";
+                }
+                else if (FAudit == 2)
+                {
+                    str = "未通过";
+                    FAuditName = "朱成梅";
+                }
                 return str;
             }
         }
 
+        /// <summary>
+        /// 财务审核人姓名
+        /// </summary>
+        public string? FAuditName { get; set; } = "无";
+
         /// <summary>
         /// 总经理审核
         /// </summary>
@@ -108,12 +121,17 @@ namespace OASystem.Domain.ViewModels.Financial
             {
                 string str = "未审核";
                 if (MAudit == 0) str = "未审核";
-                else if (MAudit == 1) str = "已通过";
-                else if (MAudit == 2) str = "未通过";
+                else if (MAudit == 1) { str = "已通过"; MAuditName = "张海麟"; }
+                else if (MAudit == 2) { str = "未通过"; MAuditName = "张海麟"; }
                 return str;
             }
         }
 
+        /// <summary>
+        /// 总经理审核姓名
+        /// </summary>
+        public string? MAuditName { get; set; } = "无";
+
         /// <summary>
         /// 费用类型
         /// </summary>

OASystem/OASystem.Domain/ViewModels/Financial/TeamRateView.cs

@@ -3,6 +3,7 @@ using OASystem.Domain.Entities.Groups;
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Runtime.CompilerServices;
 using System.Text;
 using System.Threading.Tasks;
 
@@ -29,6 +30,11 @@ namespace OASystem.Domain.ViewModels.Financial
     #region 团组汇率 信息
     public class TeamRateModelView
     {
+        /// <summary>
+        /// 汇率Id
+        /// </summary>
+        public int Id { get; set; }
+
         /// <summary>
         /// 汇率模块 Id
         /// </summary>

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

@@ -1,7 +1,11 @@
 using AutoMapper;
 using OASystem.Domain;
+using OASystem.Domain.Dtos.Financial;
+using OASystem.Domain.Dtos.Groups;
 using OASystem.Domain.Entities.Financial;
 using OASystem.Domain.ViewModels.Financial;
+using OASystem.Infrastructure.Repositories.Groups;
+using OASystem.Infrastructure.Repositories.System;
 using SqlSugar;
 using System;
 using System.Collections.Generic;
@@ -15,16 +19,73 @@ namespace OASystem.Infrastructure.Repositories.Financial
     /// 财务 - 团组应收款项 仓库
     /// 雷怡 2023.08.16 15：03
     /// </summary>
-    public class ForeignReceivablesRepository:BaseRepository<Fin_ForeignReceivables,Fin_ForeignReceivablesView>
+    public class ForeignReceivablesRepository : BaseRepository<Fin_ForeignReceivables, Fin_ForeignReceivablesView>
     {
         private readonly IMapper _mapper;
+        private readonly DelegationInfoRepository _delegationRep;
+        private readonly SetDataRepository _setDataRep;
 
-        public ForeignReceivablesRepository(SqlSugarClient sqlSugar, IMapper mapper)
-            :base(sqlSugar)
+        public ForeignReceivablesRepository(SqlSugarClient sqlSugar, IMapper mapper, DelegationInfoRepository delegationRep, SetDataRepository setDataRep)
+            : base(sqlSugar)
         {
             _mapper = mapper;
+            _delegationRep = delegationRep;
+            _setDataRep = setDataRep;
         }
 
+        /// <summary>
+        /// 收款账单 数据源
+        /// </summary>
+        /// <returns></returns>
+        public async Task<Result> GetDataSource()
+        {
+            Result result = new() { Code = -2 };
+
+            var groupNameData = await _delegationRep.GetGroupNameList(new GroupNameDto());
+            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,
+                CurrencyData = currencyData.Data,
+                RemittanceMethodData = remittanceMethodData.Data
+            };
+
+            return result;
+        }
+
+        /// <summary>
+        /// 根据diid查询团组应收款项
+        /// </summary>
+        /// <param name="diid"></param>
+        /// <returns></returns>
+        public async Task<Result> GetGroupReceivablesInfoByDiId(ForForeignReceivablesInfoDto dto)
+        {
+            Result result = new() { Code = -2 };
+
+            var groupInfoData = await _delegationRep.GetGroupInfo(new GroupInfoDto() { Id = dto.DiId });
+            string sql = string.Format(@"Select * From Fin_ForeignReceivables Where IsDel=0 And Diid={0}", dto.DiId);
+            var groupReceivedList = await _sqlSugar.SqlQueryable<Fin_ForeignReceivables>(sql).ToListAsync();
+
+            if (dto.PortType == 1 )
+            {
+
+            }
+
+            result.Code = 0;
+            result.Msg = "查询成功!";
+            result.Data = new {
+                GroupInfo = groupInfoData.Data,
+                GroupReceivedData=groupReceivedList
+            };
+
+            return result;
+
+        }
+
+
         /// <summary>
         /// 根据diid查询团组应收款项
         /// </summary>

OASystem/OASystem.Infrastructure/Repositories/Groups/TeamRateRepository.cs

@@ -45,11 +45,24 @@ namespace OASystem.Infrastructure.Repositories.Groups
 
             var teamRateDatas = await _setDataRep.GetSetDataBySTId(_setDataRep, 66); // STid=66 全球币种
 
+            
+
             dynamic _data = null;
 
             if (dto.PortType == 1)
             {
-                _data = new { GroupData = groups.Data, TeamRateData = teamRateDatas.Data };
+                List<Sys_SetData> sys_SetDatas = new List<Sys_SetData>();
+                sys_SetDatas = JsonConvert.DeserializeObject<List<Sys_SetData>>(JsonConvert.SerializeObject(teamRateDatas.Data));
+                List<TeamRateDescView> teamRateDescViews = new List<TeamRateDescView>();
+                foreach (Sys_SetData item in sys_SetDatas) 
+                {
+                    teamRateDescViews.Add(new TeamRateDescView() {
+                        CurrencyName = item.Remark,
+                        CurrencyCode = item.Name,
+                        Rate = 0.0000M
+                    });
+                }
+                _data = new { GroupData = groups.Data, TeamRateData = teamRateDescViews };
 
             }
             else if (dto.PortType == 2)
@@ -198,7 +211,6 @@ namespace OASystem.Infrastructure.Repositories.Groups
 
         }
 
-
         /// <summary>
         /// 团组汇率 Rep
         /// </summary>
@@ -296,6 +308,7 @@ namespace OASystem.Infrastructure.Repositories.Groups
                 {
                     TeamRateModelView teamRateModelInfo = new TeamRateModelView();
 
+                    teamRateModelInfo.Id = item.Id;
                     teamRateModelInfo.CTableId = item.CTable;
                     teamRateModelInfo.CTableName = item.Name;
                     List<TeamRateDescView> teamRateDescViews = new List<TeamRateDescView>();
@@ -347,5 +360,74 @@ namespace OASystem.Infrastructure.Repositories.Groups
             return result;
 
         }
+
+
+        /// <summary>
+        /// 团组汇率 更新 or 添加
+        /// </summary>
+        /// <param name="dto"></param>
+        /// <returns></returns>
+        public async Task<Result> PostGroupRateUpdate(TeamRateUpdateDto dto)
+        {
+
+            Result result = new() { Code = -2 };
+
+            
+            List<Grp_TeamRate> teamRates = new List<Grp_TeamRate>();
+            foreach (TeamRateUpdateInfo item in dto.teamRateUpdateInfos)
+            {
+                Grp_TeamRate teamRateInfo = new Grp_TeamRate();
+                string currencyStr = string.Empty;
+                foreach (TeamRateDescView currency in item.teamRates)
+                {
+                    currencyStr += string.Format(@"{0}({1}):{2}|", currency.CurrencyName, currency.CurrencyCode, currency.Rate);
+                }
+                if (currencyStr.Length > 0)
+                {
+                    currencyStr = currencyStr.Substring(0, currencyStr.Length - 1);
+                }
+
+                teamRateInfo.DiId = dto.DiId;
+                teamRateInfo.CreateUserId = dto.CreateUserId;
+                teamRateInfo.Id = item.Id;
+                teamRateInfo.CreateTime = DateTime.Now;
+                teamRateInfo.CTable = item.CTable;
+                teamRateInfo.Remark = currencyStr;
+                teamRates.Add(teamRateInfo);
+            }
+
+
+            int addCount = 0, updateCount = 0;
+            if (dto.PortType == 1)
+            {
+                try
+                {
+                    var x = _sqlSugar.Storageable(teamRates).ToStorage();
+                    addCount= x.AsInsertable.ExecuteCommand();        //不存在插入
+                    updateCount = x.AsUpdateable.ExecuteCommand();    //存在更新
+                }
+                catch (Exception ex)
+                {
+
+                    result.Msg = ex.Message;
+                }
+                
+
+            }
+            else if (dto.PortType == 2)
+            {
+
+            }
+            else if (dto.PortType == 3)
+            {
+
+            }
+
+            result.Code = 0;
+            result.Msg = string.Format(@"操作成功!添加：{0}条；更新：{1}；", addCount,updateCount);
+
+            return result;
+
+        }
     }
 }