修改公务出访编辑及上传

OASystem/OASystem.Api/Controllers/GroupsController.cs

@@ -209,23 +209,7 @@ namespace OASystem.API.Controllers
 
             return Ok(JsonView(groupData.Data));
         }
-        /// <summary>
-        ///  获取团组所有信息
-        /// </summary>
-        /// <param name="dto"></param>
-        /// <returns></returns>
-        [HttpPost]
-        [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
-        public async Task<IActionResult> GetGroupAllList()
-        {
-            List<Grp_DelegationInfo> _DelegationInfos=_sqlSugar.Queryable<Grp_DelegationInfo>().Where(a=>a.IsDel==0).OrderBy(a=>a.CreateTime,OrderByType.Desc).ToList();
-            if (_DelegationInfos.Count == 0)
-            {
-                return Ok(JsonView(false, "暂无数据！"));
-            }
-
-            return Ok(JsonView(true,"查询成功！",_DelegationInfos));
-        }
+       
 
         /// <summary>
         ///  接团信息详情

OASystem/OASystem.Api/Controllers/ResourceController.cs

@@ -26,8 +26,9 @@ namespace OASystem.API.Controllers
         private readonly AirTicketAgentRepository _airTicketAgentRep;
         private readonly InvitationOfficialActivityDataRepository _InvitationOfficialActivityDataRep;
         private readonly OfficialActivitiesRepository _officialActivitiesRep;
+        private readonly SqlSugarClient _sqlSugar;
 
-        public ResourceController(IMapper mapper, IConfiguration config, CarDataRepository carDataRep,
+        public ResourceController(IMapper mapper, IConfiguration config, SqlSugarClient sqlSugar, CarDataRepository carDataRep,
             LocalGuideDataRepository localGuideDataRep, ThreeCodeRepository threeCodeRep,
             HotelDataRepository hotelDataRep, ResItemInfoRepository resItemInfoRep, SetDataRepository setDataRepository,
             CountryFeeRepository countryFeeRep, SetDataTypeRepository setDataTypeRep, AirTicketAgentRepository airTicketAgentRep,
@@ -35,6 +36,7 @@ namespace OASystem.API.Controllers
         {
             _mapper = mapper;
             _config = config;
+            _sqlSugar = sqlSugar;
             _carDataRep = carDataRep;
             _localGuideDataRep = localGuideDataRep;
             _ThreeCodeRep = threeCodeRep;
@@ -1454,6 +1456,20 @@ Inner Join Sys_Department as d With(Nolock) On u.DepId=d.Id Where m.Id={0} ", _m
         }
 
         #region 公务出访
+        /// <summary>
+        ///  获取团组所有信息,绑定下拉框
+        /// </summary>
+        /// <param name="dto"></param>
+        /// <returns></returns>
+        [HttpPost]
+        [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
+        public async Task<IActionResult> GetGroupAllList(OfficialActivitiesByDiIdDto dto)
+        {
+            List<Grp_DelegationInfo> _DelegationInfos = _sqlSugar.Queryable<Grp_DelegationInfo>().Where(a => a.IsDel == 0).OrderBy(a => a.CreateTime, OrderByType.Desc).ToList();
+            List<Sys_SetData> data = await _sqlSugar.Queryable<Sys_SetData>().Where(a => a.IsDel == 0 && a.STid == 38).ToListAsync();
+            List<Grp_DeleFile> _DeleFile = _sqlSugar.Queryable<Grp_DeleFile>().Where(a => a.Diid == dto.DiId && a.IsDel==0 && a.Category== 970).ToList();
+            return Ok(JsonView(true, "查询成功！", new { Delegation=_DelegationInfos,SetData=data, DeleFile= _DeleFile }));
+        }
         [HttpPost]
         [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
         public async Task<IActionResult> QueryOfficialActivitiesByDiId(OfficialActivitiesByDiIdDto dto)
@@ -1521,6 +1537,60 @@ Inner Join Sys_Department as d With(Nolock) On u.DepId=d.Id Where m.Id={0} ", _m
                 throw;
             }
         }
+
+        [HttpPost]
+        [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
+        public async Task<IActionResult> UploadOfficialActivities(IFormFile file)
+        {
+            try
+            {
+                int Type =int.Parse(Request.Headers["Type"]);//1公务方简介，2公务活动图片，3发票
+                int DiId= int.Parse(Request.Headers["DiId"]);
+                int CreateUserId= DiId = int.Parse(Request.Headers["CreateUserId"]);
+                if (file != null)
+                {
+                    var fileDir = AppSettingsHelper.Get("GrpFileBasePath");
+                    //文件名称
+                    string projectFileName = file.FileName;
+
+                    //上传的文件的路径
+                    string filePath = "";
+                    if (!Directory.Exists(fileDir))
+                    {
+                        Directory.CreateDirectory(fileDir);
+                    }
+
+                    //上传的文件的路径
+                    filePath = fileDir + $@"\商邀相关文件\{projectFileName}";
+                    using (FileStream fs = System.IO.File.Create(filePath))
+                    {
+                        file.CopyTo(fs);
+                        fs.Flush();
+                    }
+                    Grp_DeleFile d = new Grp_DeleFile();
+                    d.Diid = DiId;
+                    d.Category = 970;
+                    if (Type == 1) d.Kind = 1;
+                    else if (Type == 2) d.Kind = 2;
+                    else if (Type == 3) d.Kind = 3;
+                    d.FileName = projectFileName;
+                    d.FilePath = "";
+                    d.CreateUserId = CreateUserId;
+                    int id = await _sqlSugar.Insertable(d).ExecuteReturnIdentityAsync();
+
+                    return Ok(JsonView(true, "上传成功！", projectFileName));
+                }
+                else
+                {
+                    return Ok(JsonView(false, "上传失败！"));
+                }
+            }
+            catch (Exception ex)
+            {
+                return Ok(JsonView(false, "程序错误！"));
+                throw;
+            }
+        }
         #endregion
     }
     #endregion

OASystem/OASystem.Domain/Dtos/Resource/OfficialActivitiesDto.cs

@@ -31,7 +31,7 @@ namespace OASystem.Domain.Dtos.Resource
         /// <summary>
         /// 团组ID
         /// </summary>
-        public string Diid { get; set; }
+        public int DiId { get; set; }
         /// <summary>
         /// 邀请方 1  公务方 0 
         /// </summary>

OASystem/OASystem.Domain/Entities/Resource/Res_OfficialActivities.cs

@@ -15,7 +15,7 @@ namespace OASystem.Domain.Entities.Resource
          /// 团组ID
          /// </summary>
         [SugarColumn(IsNullable =true,ColumnDataType ="int")]
-        public int Diid { get; set; }
+        public int DiId { get; set; }
         /// <summary>
         /// 邀请方 1  公务方 0 
         /// </summary>

OASystem/OASystem.Infrastructure/Repositories/Resource/OfficialActivitiesRepository.cs

@@ -45,6 +45,7 @@ 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} order by o.CreateTime desc", sqlWhere);
                 List<OfficialActivitiesView> OfficialActivities = await _sqlSugar.SqlQueryable<OfficialActivitiesView>(sql).ToListAsync();
+                List<Sys_SetData> data = await _sqlSugar.Queryable<Sys_SetData>().Where(a => a.IsDel == 0 && a.STid == 38).ToListAsync();
                 if (OfficialActivities.Count != 0)
                 {
                     if (dto.PageSize == 0 && dto.PageIndex == 0)
@@ -114,12 +115,7 @@ 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();
-                List<Sys_SetData> data = await _sqlSugar.Queryable<Sys_SetData>().Where(a => a.IsDel == 0 && a.STid == 38).ToListAsync();
-               
-                result = new Result() { Code = 0, Msg = "查询成功！", Data =new{
-                    OfficialActivities=OfficialActivities,
-                    SetData=data
-                    } };
+                result = new Result() { Code = 0, Msg = "查询成功！", Data=OfficialActivities};
                
             }
             catch (Exception ex)
@@ -145,7 +141,6 @@ namespace OASystem.Infrastructure.Repositories.Resource
                     else//不存在，可添加
                     {
 
-                        int Dovid =0;
                         Res_OfficialActivities _InvitationOfficialActivityData = _mapper.Map<Res_OfficialActivities>(dto);
                         int id = await _sqlSugar.Insertable(_InvitationOfficialActivityData).ExecuteReturnIdentityAsync();
                         if (id == 0)