部分调整

OASystem/OASystem.Api/Controllers/GroupsController.cs

@@ -17646,6 +17646,14 @@ end as 'country'
                         var visa = _sqlSugar.Queryable<Res_VisaFeeStandard>()
                             .Where(x => x.IsDel == 0 && x.Country == item)
                             .ToList();
+
+                        if (!visa.Any())
+                        {
+                            visa = _sqlSugar.Queryable<Res_VisaFeeStandard>()
+                                .Where(x => x.IsDel == 0 && x.Country.Contains(item))
+                                .ToList();
+                        }
+
                         if (visa.Any())
                         {
                             var visainfo = _sqlSugar.Queryable<Res_VisaFeeStandardDetails>()
@@ -28386,11 +28394,12 @@ ORDER BY
             var msg = "SUCCESS";
             if (total <= 0) msg = "暂无可操作的团组，请联系经理分配团组！";
 
-            var groups1 = groups.Select(x => new { 
-                    x.Id, 
-                    x.GroupName,
-                    x.CompletedCount 
-                }).ToList();
+            var groups1 = groups.Select(x => new
+            {
+                x.Id,
+                x.GroupName,
+                x.CompletedCount
+            }).ToList();
 
             return Ok(JsonView(true, msg, groups1, total));
         }
@@ -28580,7 +28589,7 @@ ORDER BY
         /// </summary>
         /// <returns></returns>
         [HttpGet]
-        public async Task<IActionResult> VisaProcessDownload(int groupId,int currUserId)
+        public async Task<IActionResult> VisaProcessDownload(int groupId, int currUserId)
         {
             var userValid = await _sqlSugar.Queryable<Sys_Users>().Where(x => x.Id == currUserId && x.IsDel == 0).AnyAsync();
             if (!userValid) return Ok(JsonView(false, "用户ID无效。"));
@@ -28801,7 +28810,7 @@ WHERE
         /// <returns></returns>
         [HttpGet]
         [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
-        public async Task<IActionResult> GroupProcessInitTest(int groupId,int currUserId)
+        public async Task<IActionResult> GroupProcessInitTest(int groupId, int currUserId)
         {
             return Ok(await _processOverviewRep.ProcessInitAsync(groupId, currUserId));
 

OASystem/OASystem.Api/OAMethodLib/GeneralMethod.cs

@@ -1087,7 +1087,7 @@ namespace OASystem.API.OAMethodLib
             var authUsers = _sqlSugar.Queryable<Grp_GroupsTaskAssignment>()
                 .LeftJoin<Sys_Users>((x, u) => x.UId == u.Id)
                 .Where((x, u) => x.DIId == groupId && x.IsDel == 0)
-                .Select((x,u) => new 
+                .Select((x, u) => new
                 {
                     GroupId = x.DIId,
                     CType = x.CTId,
@@ -1186,12 +1186,14 @@ namespace OASystem.API.OAMethodLib
             // 79	车/导游地接
             // 80	签证
             // 81	邀请/公务活动
-            var setdataids = new List<int>() { 79, 81 };
+            var setdataids = new List<int>() { 79, 81, 80 };
 
+            //职位Id
             // 27	商邀
             // 28	OP
             // 22   王鸽（主管）
-            var jobSetdataids = new List<int>() { 22, 27, 28 };
+            // 26   签证
+            var jobSetdataids = new List<int>() { 22, 27, 28, 26 };
 
             var q = _sqlSugar.Queryable<Grp_GroupsTaskAssignment, Sys_Users>(
             (ccta, su) => new JoinQueryInfos(