公务出访 Res_OfficialActivities

新增字段 国家(Country)、地区(Area)、公务请示范例(ReqSample)、涉及领域(Field)
表对应新增，修改 接口对应更改

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

@@ -36,9 +36,7 @@ namespace OASystem.Domain.Dtos.Resource
         /// 邀请方 1  公务方 0 
         /// </summary>
         public int Type { get; set; }
-        /// <summary>
-        /// 公务单位
-        /// </summary>
+
         public string Client { get; set; }
         /// <summary>
         /// 公务日期
@@ -113,6 +111,28 @@ namespace OASystem.Domain.Dtos.Resource
         /// 是否付费
         /// </summary>
         public int IsPay { get; set; }
+
+
+        /// <summary>
+        /// 国家
+        /// </summary>
+        public string Country { get; set; }
+
+        /// <summary>
+        /// 区域
+        /// </summary>
+        public string Area { get; set; }
+
+        /// <summary>
+        /// 涉及领域
+        /// </summary>
+        public string Field { get; set; }
+
+        /// <summary>
+        /// 请示范例
+        /// </summary>
+        public string ReqSample { get; set; }
+
     }
 
     /// <summary>

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

@@ -16,11 +16,25 @@ namespace OASystem.Domain.Entities.Resource
          /// </summary>
         [SugarColumn(IsNullable = true, ColumnDataType = "int")]
         public int DiId { get; set; }
+
         /// <summary>
         /// 邀请方 1  公务方 0 
         /// </summary>
         [SugarColumn(IsNullable = true, ColumnDataType = "int")]
         public int Type { get; set; }
+
+        /// <summary>
+        /// 所在国家
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(100)")]
+        public string Country { get; set; }
+
+        /// <summary>
+        /// 所在区域(城市)
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(200)")]
+        public string Area { get; set; }
+
         /// <summary>-
         /// 公务单位
         /// </summary>
@@ -62,6 +76,20 @@ namespace OASystem.Domain.Entities.Resource
         /// </summary>
         [SugarColumn(IsNullable = true, ColumnDataType = "int")]
         public int OfficialForm { get; set; }
+
+
+        /// <summary>
+        /// 公务方所属领域
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(100)")]
+        public string Field { get; set; }
+
+        /// <summary>
+        /// 请示范例
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(500)")]
+        public string ReqSample { get; set; }
+
         /// <summary>
         /// 公务方背景
         /// </summary>

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

@@ -174,113 +174,113 @@ namespace OASystem.Infrastructure.Repositories.Resource
         public async Task<Result> OpOfficialActivities(OpOfficialActivitiesDto dto)
         {
             Result result = new Result() { Code = -2, Msg = "未知错误" };
-            try
+
+            #region 特殊字符转码  037 - 4.28 15:17
+
+            if (!string.IsNullOrEmpty(dto.Contact))
             {
-                #region 特殊字符转码  037 - 4.28 15:17
+                byte[] utf8Bytes = Encoding.UTF8.GetBytes(dto.Contact);
+                byte[] utf16Bytes = Encoding.Convert(Encoding.UTF8, Encoding.Unicode, utf8Bytes);
+                dto.Contact = Encoding.Unicode.GetString(utf16Bytes);
+            }
 
-                if (!string.IsNullOrEmpty(dto.Contact))
-                {
-                    byte[] utf8Bytes = Encoding.UTF8.GetBytes(dto.Contact);
-                    byte[] utf16Bytes = Encoding.Convert(Encoding.UTF8, Encoding.Unicode, utf8Bytes);
-                    dto.Contact = Encoding.Unicode.GetString(utf16Bytes);
-                }
-                
-                #endregion
+            #endregion
 
+            if (dto.Status == 1)//添加
+            {
+                _sqlSugar.BeginTran();
 
-                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);
+                var res_InvitationOfficial = await _sqlSugar.SqlQueryable<Res_OfficialActivities>(selectSql).FirstAsync();//查询是否存在
+                if (res_InvitationOfficial != null)
+                {
+                    _sqlSugar.RollbackTran();
+                    return result = new Result() { Code = -1, Msg = "该信息已存在，请勿重复添加！" };
+
+                }
+                else//不存在，可添加
                 {
-                    _sqlSugar.BeginTran();
 
-                    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)
+                    Res_OfficialActivities _InvitationOfficialActivityData = _mapper.Map<Res_OfficialActivities>(dto);
+                    int id = await _sqlSugar.Insertable(_InvitationOfficialActivityData).ExecuteReturnIdentityAsync();
+                    if (id == 0)
                     {
                         _sqlSugar.RollbackTran();
-                        return result = new Result() { Code = -1, Msg = "该信息已存在，请勿重复添加！" };
-
+                        return result = new Result() { Code = -1, Msg = "添加失败！" };
                     }
-                    else//不存在，可添加
-                    {
 
-                        Res_OfficialActivities _InvitationOfficialActivityData = _mapper.Map<Res_OfficialActivities>(dto);
-                        int id = await _sqlSugar.Insertable(_InvitationOfficialActivityData).ExecuteReturnIdentityAsync();
-                        if (id == 0)
-                        {
-                            _sqlSugar.RollbackTran();
-                            return result = new Result() { Code = -1, Msg = "添加失败！" };
-                        }
+                    //添加到资料库
+                    Res_InvitationOfficialActivityData res_InvitationData = new Res_InvitationOfficialActivityData();
+                    res_InvitationData.Country = dto.Country;
+                    res_InvitationData.City = dto.Area;
+                    res_InvitationData.UnitName = dto.Client;
+                    res_InvitationData.Delegation = dto.DiId.ToString();
+                    res_InvitationData.Address = dto.Address;
+                    res_InvitationData.CreateUserId = dto.CreateUserId;
+                    res_InvitationData.Contact = dto.Contact;
+                    res_InvitationData.Job = dto.Job;
+                    res_InvitationData.Tel = dto.Tel;
 
-                        //添加到资料库
-                        Res_InvitationOfficialActivityData res_InvitationData = new Res_InvitationOfficialActivityData();
-                        res_InvitationData.Country = "";
-                        res_InvitationData.City = "";
-                        res_InvitationData.UnitName = dto.Client;
-                        res_InvitationData.Delegation = dto.DiId.ToString();
-                        res_InvitationData.Address = dto.Address;
-                        res_InvitationData.CreateUserId = dto.CreateUserId;
-                        res_InvitationData.Contact = dto.Contact;
-                        res_InvitationData.Job = dto.Job;
-                        res_InvitationData.Tel = dto.Tel;
+                    Res_InvitationOfficialActivityData ifNullUp = await _sqlSugar.Queryable<Res_InvitationOfficialActivityData>().FirstAsync
+                        (a => a.Country == res_InvitationData.Country && a.City == res_InvitationData.City && a.UnitName == res_InvitationData.UnitName && a.IsDel == 0 && a.Address == res_InvitationData.Address);
 
-                        Res_InvitationOfficialActivityData ifNullUp = await _sqlSugar.Queryable<Res_InvitationOfficialActivityData>().FirstAsync
-                            (a => a.Country == res_InvitationData.Country && a.City == res_InvitationData.City && a.UnitName == res_InvitationData.UnitName && a.IsDel == 0 && a.Address == res_InvitationData.Address);
-
-                        if (ifNullUp == null)
+                    if (ifNullUp == null)
+                    {
+                        int DataID = await _sqlSugar.Insertable(res_InvitationData).ExecuteReturnIdentityAsync();
+                        if (DataID != 0)
                         {
-                            int DataID = await _sqlSugar.Insertable(res_InvitationData).ExecuteReturnIdentityAsync();
-                            if (DataID != 0)
-                            {
-                                result = new Result() { Code = 0, Msg = "添加成功！" };
-                            }
-                            else
-                            {
-                                result = new Result() { Code = -1, Msg = "添加失败！" };
-                            }
+                            _sqlSugar.CommitTran();
+                            return  new Result() { Code = 0, Msg = "添加成功！", Data = new { Id = id } };
+                        }
+                        else
+                        {
+                            _sqlSugar.RollbackTran();
+                            return  new Result() { Code = -1, Msg = "添加失败！" };
                         }
-
-                        _sqlSugar.CommitTran();
-                        return result = new Result() { Code = 0, Msg = "添加成功！", Data = new { Id = id } };
                     }
+
+                   
                 }
-                else if (dto.Status == 2)//修改
+            }
+            else if (dto.Status == 2)//修改
+            {
+                bool res = await UpdateAsync(a => a.Id == dto.Id, a => new Res_OfficialActivities
                 {
-                    bool res = await UpdateAsync(a => a.Id == dto.Id, a => new Res_OfficialActivities
-                    {
-                        Type = dto.Type,
-                        Client = dto.Client,
-                        Date = dto.Date,
-                        Time = dto.Time,
-                        Address = dto.Address,
-                        Contact = dto.Contact,
-                        Job = dto.Job,
-                        Tel = dto.Tel,
-                        OfficialForm = dto.OfficialForm,
-                        Setting = dto.Setting,
-                        Dresscode = dto.Dresscode,
-                        Attendees = dto.Attendees,
-                        IsNeedTrans = dto.IsNeedTrans,
-                        Translators = dto.Translators,
-                        language = dto.language,
-                        Trip = dto.Trip,
-                        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
+
+                    Country = dto.Country,
+                    Area = dto.Area,
+                    Type = dto.Type,
+                    Client = dto.Client,
+                    Date = dto.Date,
+                    Time = dto.Time,
+                    Address = dto.Address,
+                    Contact = dto.Contact,
+                    Job = dto.Job,
+                    Tel = dto.Tel,
+                    OfficialForm = dto.OfficialForm,
+                    Field = dto.Field,
+                    ReqSample = dto.ReqSample,
+                    Setting = dto.Setting,
+                    Dresscode = dto.Dresscode,
+                    Attendees = dto.Attendees,
+                    IsNeedTrans = dto.IsNeedTrans,
+                    Translators = dto.Translators,
+                    language = dto.language,
+                    Trip = dto.Trip,
+                    CreateUserId = dto.CreateUserId,
+                    Remark = dto.Remark,
+                });
+                if (!res)
                 {
-                    return result = new Result() { Code = -1, Msg = "请传入Status参数，1添加 2修改！" };
+                    return result = new Result() { Code = -1, Msg = "修改失败！" };
                 }
+                return result = new Result() { Code = 0, Msg = "修改成功！", Data = new { Id = dto.Id } };
             }
-            catch (Exception ex)
+            else
             {
-                return result = new Result() { Code = -2, Msg = "程序错误！" };
+                return new Result() { Code = -1, Msg = "请传入Status参数，1添加 2修改！" };
             }
+            return result;
         }
     }
 }