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

OASystem/OASystem.Api/Controllers/GroupsController.cs

@@ -3783,7 +3783,7 @@ FROM
             return Ok(JsonView(true, groupData.Msg, groupData.Data));
         }
 
-        //
+        
         /// <summary>
         /// 商邀费用 Info Page 基础数据源
         /// </summary>

OASystem/OASystem.Domain/Dtos/Groups/InvitationOfficialActivitiesListDto.cs

@@ -173,7 +173,6 @@ namespace OASystem.Domain.Dtos.Groups
         /// <summary>
         /// 公务翻译费币种
         /// </summary>
-        [SugarColumn(IsNullable = true, ColumnDataType = "int")]
         public int TranslateCurrency { get; set; }
 
         /// <summary>

OASystem/OASystem.Infrastructure/Repositories/Groups/InvitationOfficialActivitiesRepository.cs

@@ -325,11 +325,13 @@ Order By i.id  Desc ", sqlWhere);
                                                     .Where(a => a.Id == ifNullUp.Id)
                                                     .SetColumns(a => new Res_InvitationOfficialActivityData
                                                     {
+                                                        Address = dto.Address,
                                                         Contact = dto.Contact,
+                                                        Job = dto.Job,
                                                         Tel = dto.Tel,
                                                         Email = dto.Email,
                                                         Fax = dto.Fax,
-                                                        Address = dto.Address,
+                                                        //OtherInfo = dto.OtherInformation,
                                                         Remark = dto.OtherInformation,
                                                     })
                                                     .ExecuteCommandAsync();
@@ -461,6 +463,7 @@ Order By i.id  Desc ", sqlWhere);
                                                     {
                                                         Contact = dto.Contact,
                                                         Tel = dto.Tel,
+                                                        Job = dto.Job,
                                                         Email = dto.Email,
                                                         Fax = dto.Fax,
                                                         Address = dto.Address,

OASystem/OASystem.Infrastructure/Repositories/PersonnelModule/GoodsRepository.cs

@@ -4,6 +4,7 @@ using OASystem.Domain.Dtos.PersonnelModule;
 using OASystem.Domain.Entities.Groups;
 using OASystem.Domain.Entities.PersonnelModule;
 using OASystem.Domain.ViewModels.PersonnelModule;
+using System.Drawing;
 
 namespace OASystem.Infrastructure.Repositories.PersonnelModule
 {
@@ -558,17 +559,8 @@ namespace OASystem.Infrastructure.Repositories.PersonnelModule
             if (dto.GoodsId > 0) dto.GoodsName = string.Empty;
             if (!string.IsNullOrEmpty(dto.GoodsName)) dto.GoodsId = 0;
 
-            bool beginBool = false,
-                 endBool = false;
-            DateTime begin = DateTime.Now, 
-                     end = DateTime.Now;
-            if (!string.IsNullOrEmpty(dto.BeginDt) && !string.IsNullOrEmpty(dto.EndDt))
-            {
-                beginBool = DateTime.TryParse($"{dto.BeginDt} 00:00:00", out begin);
-                endBool = DateTime.TryParse($"{dto.EndDt} 23:59:59", out end);
-            }
-
-
+            var beginBool = DateTime.TryParse(!string.IsNullOrEmpty(dto.BeginDt) ? $"{dto.BeginDt} 00:00:00" : string.Empty, out var begin);
+            var endBool = DateTime.TryParse(!string.IsNullOrEmpty(dto.EndDt) ? $"{dto.EndDt} 00:00:00" : string.Empty, out var end);
 
             RefAsync<int> total = 0;
             var data = await _sqlSugar.Queryable<Pm_GoodsReceive>()