| 
					
				 | 
			
			
				@@ -22,7 +22,7 @@ namespace OASystem.Infrastructure.Repositories.Resource 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             _mapper = mapper; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-         
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         /// <summary> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         /// 根据Diid查询公务出访数据List 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -35,7 +35,7 @@ namespace OASystem.Infrastructure.Repositories.Resource 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             try 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 string sqlWhere = string.Empty; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                sqlWhere += string.Format(@"And o.Isdel={0} And o.DiId={1} ", 0,dto.DiId); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                sqlWhere += string.Format(@"And o.Isdel={0} And o.DiId={1} ", 0, dto.DiId); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 if (!string.IsNullOrEmpty(sqlWhere.Trim())) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 { 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -65,6 +65,13 @@ namespace OASystem.Infrastructure.Repositories.Resource 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                             var RowIndex = i + (dto.PageIndex - 1) * dto.PageSize; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                             if (RowIndex < OfficialActivities.Count) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                             { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                                //2024年4月1日 11:55:44  -蒋金辰 -日期处理 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                                DateTime dt; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                                bool b_dt = DateTime.TryParse(OfficialActivities[RowIndex].Date, out dt); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                                if (b_dt) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                                { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                                    OfficialActivities[RowIndex].Date = dt.ToString("yyyy-MM-dd HH:mm"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                                } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                                 _OfficialActivities.Add(OfficialActivities[RowIndex]); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                             } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                             else 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -72,6 +79,8 @@ namespace OASystem.Infrastructure.Repositories.Resource 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                                 break; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                             } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                         } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                         ListViewBase<OfficialActivitiesView> rst = new ListViewBase<OfficialActivitiesView>(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                         rst.DataList = _OfficialActivities; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                         rst.DataCount = count; 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -105,7 +114,7 @@ namespace OASystem.Infrastructure.Repositories.Resource 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             try 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 string sqlWhere = string.Empty; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                sqlWhere += string.Format(@"And o.Isdel={0} And o.DiId={1} And o.Id={2}", 0, dto.DiId,dto.Id); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                sqlWhere += string.Format(@"And o.Isdel={0} And o.DiId={1} And o.Id={2}", 0, dto.DiId, dto.Id); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 if (!string.IsNullOrEmpty(sqlWhere.Trim())) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 { 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -115,8 +124,8 @@ namespace OASystem.Infrastructure.Repositories.Resource 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 string sql = string.Format(@"select *,(select CnName from Sys_Users where o.CreateUserId=Id) as CreateUserName,(select Name from Sys_SetData 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                                             where Id=o.OfficialForm) as OfficialFormName from Res_OfficialActivities o {0}", sqlWhere); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 OfficialActivitiesView OfficialActivities = await _sqlSugar.SqlQueryable<OfficialActivitiesView>(sql).FirstAsync(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                result = new Result() { Code = 0, Msg = "查询成功!", Data=OfficialActivities}; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                result = new Result() { Code = 0, Msg = "查询成功!", Data = OfficialActivities }; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             catch (Exception ex) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             { 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -131,7 +140,7 @@ namespace OASystem.Infrastructure.Repositories.Resource 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 if (dto.Status == 1)//添加 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                    string selectSql = string.Format(@"select * from Res_OfficialActivities where Client='{0}' and Address='{1}' and IsDel='{2}'", dto.Client,dto.Address, 0); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    string selectSql = string.Format(@"select * from Res_OfficialActivities where Client='{0}' and Address='{1}' and IsDel='{2}'", dto.Client, dto.Address, 0); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     var res_InvitationOfficial = await _sqlSugar.SqlQueryable<Res_OfficialActivities>(selectSql).FirstAsync();//查询是否存在 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     if (res_InvitationOfficial != null) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     { 
			 |