新增团组英文资料

OASystem/EntitySync/Program.cs

@@ -101,5 +101,6 @@ db.CodeFirst.SetStringDefaultLength(50).BackupTable().InitTables(new Type[]
     //typeof(Fin_OtherPrice),            // 其他款项
     //typeof(Res_OfficialActivities)     //公务出访
     //typeof(Res_AskData),//请示数据库
+    //typeof(Grp_DelegationEnData)
 });
 Console.WriteLine("数据库结构同步完成!");

OASystem/OASystem.Api/Controllers/GroupsController.cs

@@ -36,12 +36,13 @@ namespace OASystem.API.Controllers
         private readonly AirTicketResRepository _airTicketResRep;
         private readonly DecreasePaymentsRepository _decreasePaymentsRep;
         private readonly InvitationOfficialActivitiesRepository _InvitationOfficialActivitiesRep;
+        private readonly DelegationEnDataRepository _delegationEnDataRep;
         private readonly SqlSugarClient _sqlSugar;
         private string url;
         private string path;
         public GroupsController(IMapper mapper, SqlSugarClient sqlSugar, GrpScheduleRepository grpScheduleRep, DelegationInfoRepository groupRepository,
             TaskAssignmentRepository taskAssignmentRep, AirTicketResRepository airTicketResRep, DecreasePaymentsRepository decreasePaymentsRep,
-            InvitationOfficialActivitiesRepository InvitationOfficialActivitiesRep)
+            InvitationOfficialActivitiesRepository InvitationOfficialActivitiesRep, DelegationEnDataRepository delegationEnDataRep)
         {
             _mapper = mapper;
             _grpScheduleRep = grpScheduleRep;
@@ -57,6 +58,7 @@ namespace OASystem.API.Controllers
             }
             _decreasePaymentsRep = decreasePaymentsRep;
             _InvitationOfficialActivitiesRep = InvitationOfficialActivitiesRep;
+            _delegationEnDataRep = delegationEnDataRep;
         }
 
         #region 流程管控
@@ -1847,6 +1849,79 @@ namespace OASystem.API.Controllers
 
         #endregion
 
-
+        #region 团组英文资料
+        /// <summary>
+        /// 查询团组英文所有资料
+        /// </summary>
+        /// <param name="dto"></param>
+        /// <returns></returns>
+        [HttpPost]
+        [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
+        public async Task<IActionResult> QueryDelegationEnData(QueryDelegationEnDataDto dto)
+        {
+            try
+            {
+                List<Grp_DelegationEnData> grp_DelegationEns = await _sqlSugar.Queryable<Grp_DelegationEnData>().Where(a => a.IsDel == 0 && a.Area==dto.Area && a.Job==dto.Job).ToListAsync();
+                if (grp_DelegationEns.Count == 0)
+                {
+                    return Ok(JsonView(true, "暂无数据！", grp_DelegationEns));
+                }
+                return Ok(JsonView(true, "查询成功！", grp_DelegationEns));
+            }
+            catch (Exception ex)
+            {
+                return Ok(JsonView(false, "程序错误！"));
+                throw;
+            }
+        }
+        /// <summary>
+        /// 团组英文资料操作（Status:1.新增,2.修改）
+        /// </summary>
+        /// <param name="dto"></param>
+        /// <returns></returns>
+        [HttpPost]
+        [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
+        public async Task<IActionResult> OpDelegationEnData(OpDelegationEnDataDto dto)
+        {
+            try
+            {
+                Result groupData = await _delegationEnDataRep.OpDelegationEnData(dto);
+                if (groupData.Code != 0)
+                {
+                    return Ok(JsonView(false, groupData.Msg));
+                }
+                return Ok(JsonView(true, groupData.Msg, groupData.Data));
+            }
+            catch (Exception ex)
+            {
+                return Ok(JsonView(false, "程序错误！"));
+                throw;
+            }
+        }
+        /// <summary>
+        /// 团组英文资料删除
+        /// </summary>
+        /// <param name="dto"></param>
+        /// <returns></returns>
+        [HttpPost]
+        [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
+        public async Task<IActionResult> DelDelegationEnData(DelBaseDto dto)
+        {
+            try
+            {
+                var res = await _delegationEnDataRep.SoftDeleteByIdAsync<Grp_DelegationEnData>(dto.Id.ToString(), dto.DeleteUserId);
+                if (!res)
+                {
+                    return Ok(JsonView(false, "删除失败"));
+                }
+                return Ok(JsonView(true, "删除成功！"));
+            }
+            catch (Exception ex)
+            {
+                return Ok(JsonView(false, "程序错误！"));
+                throw;
+            }
+        }
+        #endregion
     }
 }

OASystem/OASystem.Api/Controllers/ResourceController.cs

@@ -1687,6 +1687,139 @@ Inner Join Sys_Department as d With(Nolock) On u.DepId=d.Id Where m.Id={0} ", _m
                 throw;
             }
         }
+
+        /// <summary>
+        /// 根据Id查询请示数据库单挑数据
+        /// </summary>
+        /// <param name="dto"></param>
+        /// <returns></returns>
+        [HttpPost]
+        [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
+        public async Task<IActionResult> QueryAskDataById(QueryAskDataByIdDto dto)
+        {
+            try
+            {
+                Res_AskData _AskData = await _sqlSugar.Queryable<Res_AskData>().FirstAsync(a => a.IsDel == 0 && a.Id == dto.id);
+                if (_AskData==null)
+                {
+                    return Ok(JsonView(true, "暂无数据！", _AskData));
+                }
+                return Ok(JsonView(true, "查询成功！", _AskData));
+            }
+            catch (Exception ex)
+            {
+                return Ok(JsonView(false, "程序错误！"));
+                throw;
+            }
+        }
+        /// <summary>
+        /// 请示数据库操作（Status:1.新增,2.修改）
+        /// </summary>
+        /// <param name="dto"></param>
+        /// <returns></returns>
+        [HttpPost]
+        [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
+        public async Task<IActionResult> OpAskData(OpAskDataDto dto)
+        {
+            try
+            {
+                Result groupData = await _askDataRep.OpAskData(dto);
+                if (groupData.Code != 0)
+                {
+                    return Ok(JsonView(false, groupData.Msg));
+                }
+                return Ok(JsonView(true, groupData.Msg, groupData.Data));
+            }
+            catch (Exception ex)
+            {
+                return Ok(JsonView(false, "程序错误！"));
+                throw;
+            }
+        }
+        /// <summary>
+        /// 删除请示资料信息
+        /// </summary>
+        /// <param name="dto"></param>
+        /// <returns></returns>
+        [HttpPost]
+        [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
+        public async Task<IActionResult> DelAskData(DelBaseDto dto)
+        {
+            try
+            {
+                var res = await _askDataRep.SoftDeleteByIdAsync<Res_AskData>(dto.Id.ToString(), dto.DeleteUserId);
+                if (!res)
+                {
+                    return Ok(JsonView(false, "删除失败"));
+                }
+                return Ok(JsonView(true, "删除成功！"));
+            }
+            catch (Exception ex)
+            {
+                return Ok(JsonView(false, "程序错误！"));
+                throw;
+            }
+        }
+
+
+        /// <summary>
+        /// 导出省外办请示
+        /// </summary>
+        /// <param name="dto"></param>
+        /// <returns></returns>
+        [HttpPost]
+        [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
+        public async Task<IActionResult> AskAdviceDerive(AskAdviceDerive dto)
+        {
+            try
+            {
+                string Air = "";//机票信息
+                string Area = "";//城市
+                string Area2 = "";//城市
+                string ClientName = "";//人员
+                string ClientName2 = "";//人员
+                int ClientNumber =0;//总人数
+                string Content = "";//行程安排
+                string CountryAndDay = "";//各个国家待的天数
+                string Destination = "";//此行目的
+                string Destination2 = "";//此行目的
+                string Duration = "";//出访时间
+                int Durationdays = 0;//出访天数
+                int Durationdays2 =0;//出访天数
+                string Official = "";//对谁的邀请
+                string Temp = "";//出访任务
+                string VisitDate = "";//出访日期，多少号到多少号
+
+
+                return Ok(JsonView(true, "导出成功！"));
+            }
+            catch (Exception ex)
+            {
+                return Ok(JsonView(false, "程序错误！"));
+                throw;
+            }
+        }
+
+        /// <summary>
+        /// 导出市外办请示
+        /// </summary>
+        /// <param name="dto"></param>
+        /// <returns></returns>
+        [HttpPost]
+        [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
+        public async Task<IActionResult> AskCityDerive(AskAdviceDerive dto)
+        {
+            try
+            {
+              
+                return Ok(JsonView(true, "导出成功！"));
+            }
+            catch (Exception ex)
+            {
+                return Ok(JsonView(false, "程序错误！"));
+                throw;
+            }
+        }
         #endregion
     }
 

OASystem/OASystem.Domain/AutoMappers/_baseMappingProfile.cs

@@ -92,7 +92,9 @@ namespace OASystem.Domain.AutoMappers
             CreateMap<OpInvitationOfficialActivitiesDto, Grp_InvitationOfficialActivities>();
             CreateMap<OpInvitationOfficialActivitiesDto,Res_InvitationOfficialActivityData>();
             #endregion
-
+            #region 团组英文资料
+            CreateMap<OpDelegationEnDataDto, Grp_DelegationEnData>();
+            #endregion
             #endregion
 
             #region Resource
@@ -145,6 +147,9 @@ namespace OASystem.Domain.AutoMappers
             #region 公务出访
             CreateMap<OpOfficialActivitiesDto, Res_OfficialActivities>();
             #endregion
+            #region 请示数据库
+            CreateMap<OpAskDataDto, Res_AskData>();
+            #endregion
             #endregion
 
             #region Crm

OASystem/OASystem.Domain/Dtos/DtoBase.cs

@@ -48,4 +48,26 @@ namespace OASystem.Domain.Dtos
         /// </summary>
         public int DeleteUserId { get; set; }
     }
+
+    public class OpBaseDto
+    {
+        /// <summary>
+        /// 操作状态
+        /// 1 添加 
+        /// 2 修改 
+        /// </summary>
+        public int Status { get; set; }
+        /// <summary>
+        /// 编号
+        /// </summary>
+        public int Id { get; set; }
+        /// <summary>
+        /// 创建者Id
+        /// </summary>
+        public int CreateUserId { get; set; }
+        /// <summary>
+        /// 备注
+        /// </summary>
+        public string Remark { get; set; }
+    }
 }

OASystem/OASystem.Domain/Dtos/Groups/QueryDelegationEnDataDto.cs

@@ -0,0 +1,63 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace OASystem.Domain.Dtos.Groups
+{
+    /// <summary>
+    /// 查询
+    /// </summary>
+    public class QueryDelegationEnDataDto
+    {
+        /// <summary>
+        ///  区域
+        /// </summary>
+        public string Area { get; set; }
+
+        /// <summary>
+        ///  职务
+        /// </summary>
+        public string Job { get; set; }
+    }
+    /// <summary>
+    /// 团组英文资料操作
+    /// </summary>
+    public class OpDelegationEnDataDto:OpBaseDto
+    {
+        /// <summary>
+        ///  区域
+        /// </summary>
+        public string Area { get; set; }
+
+        /// <summary>
+        ///  职务
+        /// </summary>
+        public string Job { get; set; }
+
+        /// <summary>
+        ///  职务英文
+        /// </summary>
+        public string JobEn { get; set; }
+
+        /// <summary>
+        ///  背景
+        /// </summary>
+        public string DelegationSetting { get; set; }
+
+        /// <summary>
+        ///  背景英文
+        /// </summary>
+        public string DelegationSettingEn { get; set; }
+    }
+
+    public class TranslationOneKeyDto 
+    {
+        /// <summary>
+        /// 待翻译的文本
+        /// </summary>
+        public string? TranslationOneKeyStr { get; set; }
+
+    }
+}

OASystem/OASystem.Domain/Dtos/Resource/QueryAskDataDto.cs

@@ -21,4 +21,58 @@ namespace OASystem.Domain.Dtos.Resource
         /// </summary>
         public string Field { get; set; }
     }
+    public class QueryAskDataByIdDto
+    {
+        public int id { get; set; }
+    }
+    public class OpAskDataDto
+    {
+        /// <summary>
+        /// 操作状态
+        /// 1 添加 
+        /// 2 修改 
+        /// </summary>
+        public int Status { get; set; }
+        /// <summary>
+        /// 编号
+        /// </summary>
+        public int Id { get; set; }
+        /// <summary>
+        /// 国家
+        /// </summary>
+        public string Country { get; set; }
+        /// <summary>
+        /// 地区
+        /// </summary>
+        public string Area { get; set; }
+        /// <summary>
+        /// 公务方名称
+        /// </summary>
+        public string UnitName { get; set; }
+        /// <summary>
+        /// 涉及领域
+        /// </summary>
+        public string Field { get; set; }
+        /// <summary>
+        /// 话术范例
+        /// </summary>
+        public string TalkCase { get; set; }
+        /// <summary>
+        /// 创建者Id
+        /// </summary>
+        public int CreateUserId { get; set; }
+        /// <summary>
+        /// 备注
+        /// </summary>
+        public string Remark { get; set; }
+    }
+    /// <summary>
+    /// 导出请示参数
+    /// </summary>
+    public class AskAdviceDerive
+    {
+        public int DiId { get; set; }
+
+        public int[] IdList { get; set; }
+    }
 }

OASystem/OASystem.Domain/Entities/Groups/Grp_DelegationEnData.cs

@@ -0,0 +1,40 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace OASystem.Domain.Entities.Groups
+{
+    /// <summary>
+    /// 团组英文资料
+    /// </summary>
+    [SugarTable("Grp_DelegationEnData")]
+    public class Grp_DelegationEnData:EntityBase
+    {
+        /// <summary>
+        ///  区域
+        /// </summary>
+        public string Area { get; set; }
+
+        /// <summary>
+        ///  职务
+        /// </summary>
+        public string Job { get; set; }
+
+        /// <summary>
+        ///  职务英文
+        /// </summary>
+        public string JobEn { get; set; }
+
+        /// <summary>
+        ///  背景
+        /// </summary>
+        public string DelegationSetting { get; set; }
+
+        /// <summary>
+        ///  背景英文
+        /// </summary>
+        public string DelegationSettingEn { get; set; }
+    }
+}

OASystem/OASystem.Domain/Entities/Resource/Res_AskData.cs

@@ -13,17 +13,13 @@ namespace OASystem.Domain.Entities.Resource
     public class Res_AskData:EntityBase
     {
         /// <summary>
-        /// 团组ID
-        /// </summary>
-        [SugarColumn(IsNullable =true,ColumnDataType ="int")]
-        public int DiId { get; set; }
-        /// <summary>
-        /// 团名
+        /// 关联团组
         /// </summary>
         [SugarColumn(IsNullable = true, ColumnDataType = "varchar(100)")]
-        public string DeleName { get; set; }
+        public string DeleName { get; set; } = "";
         /// <summary>
         /// 国家
+        /// 
         /// </summary>
         [SugarColumn(IsNullable =true,ColumnDataType ="varchar(100)")]
         public string Country { get; set; }

OASystem/OASystem.Infrastructure/Repositories/Groups/DelegationEnDataRepository.cs

@@ -0,0 +1,88 @@
+using AutoMapper;
+using OASystem.Domain;
+using OASystem.Domain.Dtos.Groups;
+using OASystem.Domain.Entities.Groups;
+using OASystem.Domain.Entities.Resource;
+using OASystem.Domain.ViewModels.Groups;
+using OASystem.Infrastructure.Repositories.System;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace OASystem.Infrastructure.Repositories.Groups
+{
+    public class DelegationEnDataRepository : BaseRepository<Grp_DelegationEnData, Grp_DelegationEnData>
+    {
+
+
+        private readonly IMapper _mapper;
+        public DelegationEnDataRepository(SqlSugarClient sqlSugar, IMapper mapper) : base(sqlSugar)
+        {
+            _mapper = mapper;
+        }
+
+        /// <summary>
+        /// 团组英文资料操作（Status:1.新增,2.修改）
+        /// </summary>
+        /// <param name="dto"></param>
+        /// <returns></returns>
+        /// <exception cref="NotImplementedException"></exception>
+        public async Task<Result> OpDelegationEnData(OpDelegationEnDataDto dto)
+        {
+            Result result = new Result() { Code = -2, Msg = "未知错误" };
+            try
+            {
+                if (dto.Status == 1)//添加
+                {
+                    string selectSql = string.Format(@"select * from Grp_DelegationEnData where Area='{0}' and Job='{1}' and IsDel='{2}'", dto.Area, dto.Job, 0);
+                    var grp_DelegationEnData = await _sqlSugar.SqlQueryable<Grp_DelegationEnData>(selectSql).FirstAsync();//查询是否存在
+                    if (grp_DelegationEnData != null)
+                    {
+                        return result = new Result() { Code = -1, Msg = "该信息已存在，请勿重复添加！" };
+
+                    }
+                    else//不存在，可添加
+                    {
+
+                        Grp_DelegationEnData _DelegationEnData = _mapper.Map<Grp_DelegationEnData>(dto);
+                        int id = await _sqlSugar.Insertable(_DelegationEnData).ExecuteReturnIdentityAsync();
+                        if (id == 0)
+                        {
+                            return result = new Result() { Code = -1, Msg = "添加失败！" };
+
+                        }
+                        return result = new Result() { Code = 0, Msg = "添加成功！", Data = new { Id = id } };
+                    }
+                }
+                else if (dto.Status == 2)//修改
+                {
+                    bool res = await UpdateAsync(a => a.Id == dto.Id, a => new Grp_DelegationEnData
+                    {
+                        Area = dto.Area,
+                        Job = dto.Job,
+                        JobEn = dto.JobEn,
+                        DelegationSetting = dto.DelegationSetting,
+                        DelegationSettingEn = dto.DelegationSettingEn,
+                        CreateUserId = dto.CreateUserId,
+                        Remark = dto.Remark,
+                    });
+                    if (!res)
+                    {
+                        return result = new Result() { Code = -1, Msg = "修改失败！" };
+                    }
+                    return result = new Result() { Code = 0, Msg = "修改成功！", Data = new { Id = dto.Id } };
+                }
+                else
+                {
+                    return result = new Result() { Code = -1, Msg = "请传入Status参数，1添加 2修改！" };
+                }
+            }
+            catch (Exception ex)
+            {
+                return result = new Result() { Code = -2, Msg = "程序错误！" };
+            }
+        }
+    }
+}

OASystem/OASystem.Infrastructure/Repositories/Resource/AskDataRepository.cs

@@ -19,6 +19,7 @@ namespace OASystem.Infrastructure.Repositories.Resource
         {
             _mapper = mapper;
         }
+        
 
         public async Task<Result> QueryAskData(QueryAskDataDto dto)
         {
@@ -45,7 +46,7 @@ namespace OASystem.Infrastructure.Repositories.Resource
                     Regex r = new Regex("And");
                     sqlWhere = r.Replace(sqlWhere, "Where", 1);
                 }
-                string sql = string.Format(@"select * from Res_AskData {0}", sqlWhere);
+                string sql = string.Format(@"select * from Res_AskData {0} order by CreateTime desc", sqlWhere);
                 List<Res_AskData> askDatd = await _sqlSugar.SqlQueryable<Res_AskData>(sql).ToListAsync();
                 List<Grp_DelegationInfo> delegationInfo=await _sqlSugar.Queryable<Grp_DelegationInfo>().Where(a=>a.IsDel==0).ToListAsync();
                 if (askDatd.Count != 0 && delegationInfo.Count!=0)
@@ -63,5 +64,67 @@ namespace OASystem.Infrastructure.Repositories.Resource
             }
             return result;
         }
+
+        /// <summary>
+        /// 请示数据库操作（Status:1.新增,2.修改）
+        /// </summary>
+        /// <param name="dto"></param>
+        /// <returns></returns>
+        /// <exception cref="NotImplementedException"></exception>
+        public async Task<Result> OpAskData(OpAskDataDto dto)
+        {
+            Result result = new Result() { Code = -2, Msg = "未知错误" };
+            try
+            {
+                if (dto.Status == 1)//添加
+                {
+                    string selectSql = string.Format(@"select * from Res_AskData where Country='{0}' and Area='{1}' and UnitName='{2} and IsDel={3}'", dto.Country, dto.Area,dto.UnitName, 0);
+                    var res_AskData = await _sqlSugar.SqlQueryable<Res_AskData>(selectSql).FirstAsync();//查询是否存在
+                    if (res_AskData != null)
+                    {
+                        return result = new Result() { Code = -1, Msg = "该信息已存在，请勿重复添加！" };
+
+                    }
+                    else//不存在，可添加
+                    {
+
+                        Res_AskData _AskData = _mapper.Map<Res_AskData>(dto);
+                        int id = await _sqlSugar.Insertable(_AskData).ExecuteReturnIdentityAsync();
+                        if (id == 0)
+                        {
+                            return result = new Result() { Code = -1, Msg = "添加失败！" };
+
+                        }
+                        return result = new Result() { Code = 0, Msg = "添加成功！", Data = new { Id = id } };
+                    }
+                }
+                else if (dto.Status == 2)//修改
+                {
+                    bool res = await UpdateAsync(a => a.Id == dto.Id, a => new Res_AskData
+                    {
+                        Country=dto.Country,
+                        Area=dto.Area,
+                        UnitName =dto.UnitName,
+                        Field =dto.Field,
+                        TalkCase =dto.TalkCase,
+                        CreateUserId = dto.CreateUserId,
+                        Remark = dto.Remark,
+                    });
+                    if (!res)
+                    {
+                        return result = new Result() { Code = -1, Msg = "修改失败！" };
+                    }
+                    return result = new Result() { Code = 0, Msg = "修改成功！", Data = new { Id = dto.Id } };
+                }
+                else
+                {
+                    return result = new Result() { Code = -1, Msg = "请传入Status参数，1添加 2修改！" };
+                }
+            }
+            catch (Exception ex)
+            {
+                return result = new Result() { Code = -2, Msg = "程序错误！" };
+            }
+        }
     }
 }