| 
					
				 | 
			
			
				@@ -34,6 +34,7 @@ using OASystem.Domain.ViewModels.OCR; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 using OASystem.Infrastructure.Repositories.CRM; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 using OASystem.Infrastructure.Repositories.Financial; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 using OASystem.Infrastructure.Repositories.Groups; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+using Quartz.Logging; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 using Quartz.Util; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 using SqlSugar.Extensions; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 using System.Collections; 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -2753,12 +2754,13 @@ FROM 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         /// <summary> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         /// 报批完成企微通知 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         /// </summary> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        /// <param name="currUserId"></param> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        /// <param name="diid"></param> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        /// <param name="dto"></param> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         /// <returns></returns> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         [HttpPost] 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        public async Task<IActionResult> EnterpriseWeChatNotificationAsyncBaoPi(int currUserId,int diid) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        public async Task<IActionResult> EnterpriseWeChatNotificationAsyncBaoPi(EnterpriseWeChatNotificationAsyncBaoPiDto dto) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            int currUserId = dto.currUserId; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            int diid = dto.diid; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             var jw = JsonView(true); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             var users = new List<string>(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             var ssd = _sqlSugar.Queryable<Sys_SetData>() 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -2768,7 +2770,7 @@ FROM 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 users = JsonConvert.DeserializeObject<List<string>>(ssd.Remark); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 var res = await AppNoticeLibrary.SendUserMsg_BaoPi_ToUser(users, diid); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 //消息通知成功 更改团组step、记录日志 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 if (res) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 { 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -2791,7 +2793,6 @@ FROM 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     }; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     //记录日志 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				- 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     var teamName = _sqlSugar.Queryable<Grp_DelegationInfo>() 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                         .Where(x => x.Id == diid && x.IsDel == 0) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                         .Select(x => x.TeamName) 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -2805,7 +2806,6 @@ FROM 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     _groupTextLogger.LogInformation("团组:【{teamName}({groupId})】 操作人:【{operationName}】 操作时间:【{operationTime}】{logContent}", teamName, diid, operationName, DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"), groupStepLabel); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				- 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             catch (Exception ex) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             { 
			 |