1、团组设置报批时间 更改接口（团组列表、设置报批时间）

2、付款申请新增设置背景颜色参数
3、优化部门任务页面响应时间

OASystem/OASystem.Api/Controllers/FinancialController.cs

@@ -3112,6 +3112,12 @@ namespace OASystem.API.Controllers
                     {
                         case 76:  //76	酒店预订
                             priName = $"[费用名称：{hotelDatas.Find(it => payInfo.DIId == it.DiId && payInfo.CId == it.Id)?.HotelName ?? ""}]";
+
+                            if (payInfo.IsAuditGM == 1)
+                            {
+
+                            }
+
                             break;
                         case 79:  //79	车/导游地接
                             var opData = opDatas.Find(it => payInfo.DIId == it.DiId && payInfo.CId == it.Id);
@@ -3246,7 +3252,6 @@ namespace OASystem.API.Controllers
                             break;
                     }
 
-
                     bool status1 = false;
                     if (_groupIds != null)
                     {
@@ -3297,8 +3302,8 @@ namespace OASystem.API.Controllers
                                 PaymentAmount = _PaymentAmount1,
                                 PayRate = hotelContent.Rate,
                                 CNYSubTotalAmount = _CNYSubTotalAmount1,
-                                AuditStatus = payInfo.IsAuditGM
-
+                                AuditStatus = payInfo.IsAuditGM,
+                                IsBgColorShown = Setting_IsBgColorShown(payInfo.CTable, payInfo.IsAuditGM)
                             };
                             string remaksDescription1 = $"【{childInfo1.PayType}】【{childInfo1.ModuleName}】{rouNumber}、[申请人：{childInfo1.Applicant}]{subPriceName}[收款方：{childInfo1.Payee}] {childInfo1.PayCurrCode} {_PaymentAmount1:#0.00}、CNY：{childInfo1.CNYSubTotalAmount:#0.00}(团组：{groupInfo.TeamName})";
 
@@ -3345,7 +3350,8 @@ namespace OASystem.API.Controllers
                             PaymentAmount = _PaymentAmount,
                             PayRate = payInfo.DayRate,
                             CNYSubTotalAmount = _CNYSubTotalAmount,
-                            AuditStatus = payInfo.IsAuditGM
+                            AuditStatus = payInfo.IsAuditGM,
+                            IsBgColorShown = Setting_IsBgColorShown(payInfo.CTable, payInfo.IsAuditGM)
                         };
 
                         string remaksDescription = $"【{childInfo.PayType}】【{childInfo.ModuleName}】{rouNumber}、[申请人：{childInfo.Applicant}]{priName}[收款方：{childInfo.Payee}] {childInfo.PayCurrCode} {_PaymentAmount:#0.00}、CNY：{childInfo.CNYSubTotalAmount:#0.00}(团组：{groupInfo.TeamName})";
@@ -3372,6 +3378,25 @@ namespace OASystem.API.Controllers
             return _DailyFeePaymentResult;
         }
 
+        /// <summary>
+        /// 设置背景颜色显示与否
+        /// 费用类型限制：76-酒店预订、79-车/导游地接、85-机票预订
+        /// </summary>
+        /// <param name="cType"></param>
+        /// <param name="auditStatus"></param>
+        /// <returns></returns>
+        private static bool Setting_IsBgColorShown(int cType, int auditStatus)
+        {
+            //费用类型限制
+            var types = new List<int>() { 76, 79, 85, };
+
+            if (types.Contains(cType) && auditStatus == 1)
+            {
+                return true;
+            }
+            return false;
+        }
+
         /// <summary>
         /// 付款申请(日付申请相关)
         /// 查询 根据日期范围

OASystem/OASystem.Api/Controllers/PersonnelModuleController.cs

@@ -1110,16 +1110,18 @@ namespace OASystem.API.Controllers
                 .ToPageListAsync(dto.PageIndex, dto.PageSize, total);
 
             int index = 1;
-            var taskCompletedPerm = _sqlSugar.Queryable<Pm_TaskJobRelevancy>().Where(x => x.IsDel == 0 && x.PrimaryUserId == dto.UserId).Any(); 
+            var taskCompletedPerm = _sqlSugar.Queryable<Pm_TaskJobRelevancy>().Where(x => x.IsDel == 0 && x.PrimaryUserId == dto.UserId).Any();
+            var allTaIds = view.Select(x => x.Id).ToList();
+            var allTaskRelevanceUsers = await _sqlSugar.Queryable<Pm_TaskRelevanceUser>()
+                .LeftJoin<Sys_Users>((tru, u) => tru.UserId == u.Id)
+                .Where((tru, u) => tru.IsDel == 0 && allTaIds.Contains(tru.TAId))
+                .Select((tru, u) => new { tru.TAId, u.CnName })
+                .ToListAsync();
             foreach (var item in view)
             {
                 item.RowNumber = index;
                 //设置参与人
-                var userNames = _sqlSugar.Queryable<Pm_TaskRelevanceUser>()
-                    .LeftJoin<Sys_Users>((tru, u) => tru.UserId == u.Id)
-                    .Where((tru, u) => tru.IsDel == 0 && tru.TAId == item.Id)
-                    .Select((tru, u) => u.CnName)
-                    .ToList();
+                var userNames = allTaskRelevanceUsers.Where(x => x.TAId == item.Id) .Select(x => x.CnName).ToList();
                 item.Participant = string.Join("、", userNames);
 
                 //设置任务确认权限
@@ -1142,7 +1144,7 @@ namespace OASystem.API.Controllers
                     item.TaskHavePerm = true;
                 }
 
-                if (taskCompletedPerm)
+                if (taskCompletedPerm || item.Status == (int)TaskEnum.Finished)
                 {
                     item.TaskHavePerm = false;
                 }

OASystem/OASystem.Domain/Dtos/Groups/GroupListDto.cs

@@ -362,6 +362,10 @@ namespace OASystem.Domain.Dtos.Groups
     {
         public int currUserId { get; set; }
         public int diid { get; set; }
+        /// <summary>
+        /// 实际操作时间
+        /// </summary>
+        public string stepOperationTime { get; set; }
     }
 
     public class tableSetting

OASystem/OASystem.Domain/Entities/Customer/Crm_DeleClient.cs

@@ -444,6 +444,43 @@ namespace OASystem.Domain.Entities.Customer
 
         //----------增加字段------------
 
+        /// <summary>
+        /// 拒签记录
+        /// </summary>
+        [SugarColumn(IsNullable = true, IsJson = true, ColumnDataType = "varchar(500)")]
+        public List<VisaRefusalRecord> RefusalRecords { get; set; } = new List<VisaRefusalRecord>();
+        /// <summary>
+        /// 出行历史
+        /// </summary>
+        [SugarColumn(IsNullable = true, IsJson = true, ColumnDataType = "varchar(500)")]
+        public List<TravelHistory> TravelHistories { get; set; } = new List<TravelHistory>();
+        /// <summary>
+        /// 军事信息
+        /// </summary>
+        [SugarColumn(IsNullable = true, IsJson = true, ColumnDataType = "varchar(500)")]
+        public List<MilitaryInfo> Militaries { get; set; } = new List<MilitaryInfo>();
+        /// <summary>
+        /// 已出访的国家
+        /// </summary>
+        [SugarColumn(IsNullable = true, IsJson = true, ColumnDataType = "varchar(500)")]
+        public List<CountryVisited> CountryVisiteds { get; set; } = new List<CountryVisited>();
+        /// <summary>
+        /// 申根签证记录
+        /// </summary>
+        [SugarColumn(IsNullable = true, IsJson = true, ColumnDataType = "varchar(500)")]
+        public List<SchengenVisaRecord> SchengenVisaRecords { get; set; } = new List<SchengenVisaRecord>();
+        /// <summary>
+        /// 社交账号
+        /// </summary>
+        [SugarColumn(IsNullable = true, IsJson = true, ColumnDataType = "varchar(500)")]
+        public List<SocialAccount> SocialAccounts { get; set; } = new List<SocialAccount>();
+        /// <summary>
+        /// 亲属朋友信息
+        /// </summary>
+        [SugarColumn(IsNullable = true, IsJson = true, ColumnDataType = "varchar(500)")]
+        public List<PersonInfo> PersonInfos { get; set; } = new List<PersonInfo>();
+
+
         /// <summary>
         /// 赴美目的
         /// </summary>
@@ -518,7 +555,6 @@ namespace OASystem.Domain.Entities.Customer
         [SugarColumn(IsNullable = true, ColumnDataType = "varchar(30)")]
         public string USAHadDays‌ { get; set; }
 
-
         /// <summary>
         /// 离婚原因
         /// </summary>

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

@@ -501,6 +501,12 @@ namespace OASystem.Domain.ViewModels.Financial
         /// 0 未审核 1已通过 2未通过 3 自动审核
         /// </summary>
         public int AuditStatus { get; set; }
+
+        /// <summary>
+        /// 费用背景颜色是否显示
+        /// 酒店、地接、机票 费用审核状态为 1 时显示背景颜色
+        /// </summary>
+        public bool IsBgColorShown { get; set; } = false;
     }
 
     public class PaymentRequestCheckedView

OASystem/OASystem.Domain/ViewModels/Groups/DelegationInfoView.cs

@@ -554,9 +554,9 @@ namespace OASystem.Domain.ViewModels.Groups
         /// </summary>
         public bool UseRedBackground { get; set; } = false;
 
-    }
+        public string StepOperationTime { get; set; }
 
-    
+    }
 
     /// <summary>
     /// 团组信息 Page List

OASystem/OASystem.Infrastructure/Repositories/Groups/DelegationInfoRepository.cs

@@ -1327,6 +1327,7 @@ namespace OASystem.Infrastructure.Repositories.Groups
 
                 if (view.Count > 0)
                 {
+                    result.Code = 0;
                     result.Msg = "成功!";
                     result.Data = view;
                 }
@@ -1335,7 +1336,6 @@ namespace OASystem.Infrastructure.Repositories.Groups
                     result.Code = 1;
                     result.Msg = "暂无数据!";
                 }
-                result.Code = 0;
             }
 
             return result;