币种List

增加访问方式

OASystem/OASystem.Api/Controllers/AuthController.cs

@@ -284,6 +284,92 @@ namespace OASystem.API.Controllers
                 Token = authorId + ":" + userToken
             };
 
+            return Ok(JsonView(view));
+        }
+
+        /// <summary>
+        /// 员工信息 迁移
+        /// Old OA To New OA
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost("UpdateUserDataOldOAToNewOA")]
+        [ProducesResponseType(typeof(LoginView), StatusCodes.Status200OK)]
+        public async Task<IActionResult> UpdateUserDataOldOAToNewOA()
+        {
+            dynamic view = null;
+
+            try
+            {
+                var _sqlSuar = _loginRep._sqlSugar;
+
+                var oldOaUsersData = await _sqlSuar.Queryable<OA2014UsersView>().AS("OA2014.dbo.Users").ToListAsync();
+                var newOaCompanyData = await _sqlSuar.Queryable<Sys_Company>().ToListAsync();
+                var newOaDepartmentData = await _sqlSuar.Queryable<Sys_Department>().ToListAsync();
+                var newOaJobPostData = await _sqlSuar.Queryable<Sys_JobPost>().ToListAsync();
+                List<Sys_Users> newOaUserDatas = new List<Sys_Users>();
+
+                foreach (var oldUser in oldOaUsersData)
+                {
+                    int depId = 0, postId = 0;
+                    DateTime? birthday = null;
+                    DateTime? startWorkDate = null;
+                    int education = 0;
+                    int theOrAdultEducation = 0;
+                    string maritalStatus = string.Empty;
+                    Sys_Users user = new Sys_Users() { 
+                        CnName = oldUser.CnName,
+                        EnName = oldUser.EnName,
+                        Number = oldUser.Number,
+                        CompanyId = 2,
+                        DepId = depId,
+                        JobPostId = postId,
+                        Password = oldUser.Password,
+                        Sex = oldUser.Sex,
+                        Phone = oldUser.Phone,
+                        UrgentPhone = oldUser.UrgentPhone,
+                        Email = oldUser.Email,
+                        Address = oldUser.Address,
+                        Edate = oldUser.Edate,
+                        Rdate = oldUser.Rdate,
+                        Seniority = oldUser.Seniority,
+                        Birthday =  birthday,
+                        IDCard = oldUser.IDCard,
+                        StartWorkDate = startWorkDate,
+                        GraduateInstitutions = oldUser.GraduateInstitutions,
+                        Professional = oldUser.Professional,
+                        Education = education,
+                        TheOrAdultEducation = theOrAdultEducation,
+                        MaritalStatus = maritalStatus,
+                        HomeAddress = oldUser.HomeAddress,
+                        UsePeriod = oldUser.UsePeriod,
+
+                    };
+
+                }
+
+
+
+
+                view = new
+                {
+                    Code = 200,
+                    Msg = "操作成功!",
+                    Data = oldOaUsersData
+
+                };
+            }
+            catch (Exception ex)
+            {
+
+                view = new
+                {
+                    Code = 400,
+                    Msg = ex.Message
+
+                };
+            }
+
+
             return Ok(JsonView(view));
         }
     }

OASystem/OASystem.Api/Controllers/BusinessController.cs

@@ -80,7 +80,7 @@ namespace OASystem.API.Controllers
         /// </summary>
         /// <param name="dto"></param>
         /// <returns></returns>
-        [HttpPost]
+        [HttpGet,HttpPost]
         [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
         public async Task<IActionResult> PostCurrencyList()
         {

OASystem/OASystem.Api/Controllers/PersonnelModuleController.cs

@@ -151,7 +151,10 @@ namespace OASystem.API.Controllers
                 }
                 else //更新
                 {
-                    int updCount = await _sqlSugar.Updateable(pm_WageIssueWorkingDay).IgnoreColumns(z => new { z.CreateUserId, z.CreateTime, z.DeleteUserId, z.DeleteTime, z.IsDel }).ExecuteCommandAsync();
+                    int updCount = await _sqlSugar.Updateable(pm_WageIssueWorkingDay)
+                        .IgnoreColumns(z => new { z.CreateUserId, z.CreateTime, z.DeleteUserId, z.DeleteTime, z.IsDel })
+                        .WhereColumns(it => it.Id)
+                        .ExecuteCommandAsync();
                 }
 
                 List<Sys_Calendar> sys_Calendars_add = new List<Sys_Calendar>();
@@ -168,7 +171,7 @@ namespace OASystem.API.Controllers
                 if (sys_Calendars_update.Count > 0)
                 {
                     await _sqlSugar.Updateable<Sys_Calendar>(sys_Calendars)
-                    .UpdateColumns(it => new { it.Dt, it.IsWorkDay, it.IsHoliDay, it.HoliDayName })
+                    .UpdateColumns(it => new { it.Dt, it.IsWorkDay, it.IsHoliDay, it.HoliName })
                     .WhereColumns(it => it.Id)
                     .ExecuteCommandAsync();
                 }

OASystem/OASystem.Domain/Dtos/PersonnelModule/WageSheetMonthWorkdaysDto.cs

@@ -20,6 +20,12 @@ namespace OASystem.Domain.Dtos.PersonnelModule
     public class WageSheetMonthWorkdaysAddOrEditDto 
     {
         public int UserId { get; set; }
+
+        /// <summary>
+        /// 月份Id 
+        /// </summary>
+        public int Id { get; set; }
+
         /// <summary>
         /// 年月
         /// </summary>

OASystem/OASystem.Domain/Entities/System/Sys_Calendar.cs

@@ -34,6 +34,6 @@ namespace OASystem.Domain.Entities.System
         /// 节假日名称
         /// </summary>
         [SugarColumn(IsNullable = true, ColumnDataType = "varchar(50)")]
-        public string HoliDayName { get; set; }
+        public string HoliName { get; set; }
     }
 }

OASystem/OASystem.Domain/Entities/System/Sys_Users.cs

@@ -92,7 +92,7 @@ namespace OASystem.Domain.Entities.System
         /// 生日
         /// </summary> 
         [SugarColumn(IsNullable = true,ColumnDataType = "DateTime")]
-        public DateTime Birthday { get; set; }
+        public DateTime? Birthday { get; set; }
         /// <summary>
         /// 身份证号码
         /// </summary>
@@ -102,7 +102,7 @@ namespace OASystem.Domain.Entities.System
         /// 开始工作时
         /// </summary>
         [SugarColumn(IsNullable = true, ColumnDataType = "DateTime")]
-        public DateTime StartWorkDate { get; set; }
+        public DateTime? StartWorkDate { get; set; }
         /// <summary>
         /// 毕业学校
         /// </summary>

OASystem/OASystem.Domain/ViewModels/System/OA2014UsersView.cs

@@ -0,0 +1,353 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace OASystem.Domain.ViewModels.System
+{
+    /// <summary>
+    /// 数据库 OA2014
+    /// 表  Users 
+    /// View 
+    /// </summary>
+    public class OA2014UsersView
+    {
+        int id;
+
+        /// <summary>
+        /// 主键
+        /// </summary>
+        public int Id
+        {
+            get { return id; }
+            set { id = value; }
+        }
+
+        string cnName;
+
+        /// <summary>
+        /// 中文姓名
+        /// </summary>
+        public string CnName
+        {
+            get { return cnName; }
+            set { cnName = value; }
+        }
+
+        string enName;
+
+        /// <summary>
+        /// 英文姓名
+        /// </summary>
+        public string EnName
+        {
+            get { return enName; }
+            set { enName = value; }
+        }
+
+        string number;
+
+        /// <summary>
+        /// 员工号
+        /// </summary>
+        public string Number
+        {
+            get { return number; }
+            set { number = value; }
+        }
+
+        int did;
+
+        /// <summary>
+        /// 设置数据类外键
+        /// </summary>
+        public int Did
+        {
+            get { return did; }
+            set { did = value; }
+        }
+
+        string password;
+
+        /// <summary>
+        /// 密码
+        /// </summary>
+        public string Password
+        {
+            get { return password; }
+            set { password = value; }
+        }
+
+        int sex;
+
+        /// <summary>
+        /// 性别
+        /// </summary>
+        public int Sex
+        {
+            get { return sex; }
+            set { sex = value; }
+        }
+
+        string post;
+
+        /// <summary>
+        /// 职位
+        /// </summary>
+        public string Post
+        {
+            get { return post; }
+            set { post = value; }
+        }
+
+        string ext;
+
+        /// <summary>
+        /// 分机号
+        /// </summary>
+        public string Ext
+        {
+            get { return ext; }
+            set { ext = value; }
+        }
+
+        string phone;
+
+        /// <summary>
+        /// 手机号
+        /// </summary>
+        public string Phone
+        {
+            get { return phone; }
+            set { phone = value; }
+        }
+
+        string urgentPhone;
+
+        /// <summary>
+        /// 紧急联络电话
+        /// </summary>
+        public string UrgentPhone
+        {
+            get { return urgentPhone; }
+            set { urgentPhone = value; }
+        }
+
+        string email;
+
+        /// <summary>
+        /// 电子邮箱
+        /// </summary>
+        public string Email
+        {
+            get { return email; }
+            set { email = value; }
+        }
+
+        string address;
+
+        /// <summary>
+        /// 目前所在地区
+        /// </summary>
+        public string Address
+        {
+            get { return address; }
+            set { address = value; }
+        }
+
+        DateTime edate;
+
+        /// <summary>
+        /// 入职日期
+        /// </summary>
+        public DateTime Edate
+        {
+            get { return edate; }
+            set { edate = value; }
+        }
+
+        DateTime rdate;
+
+        /// <summary>
+        /// 离职日期
+        /// </summary>
+        public DateTime Rdate
+        {
+            get { return rdate; }
+            set { rdate = value; }
+        }
+
+        int seniority;
+
+        /// <summary>
+        /// 工龄
+        /// </summary>
+        public int Seniority
+        {
+            get { return seniority; }
+            set { seniority = value; }
+        }
+
+        string remark;
+
+        /// <summary>
+        /// 备注
+        /// </summary>
+        public string Remark
+        {
+            get { return remark; }
+            set { remark = value; }
+        }
+
+        int isDel;
+
+        /// <summary>
+        /// 删除标识
+        /// </summary>
+        public int IsDel
+        {
+            get { return isDel; }
+            set { isDel = value; }
+        }
+
+        int company;
+
+        /// <summary>
+        /// 所属公司
+        /// </summary>
+        public int Company
+        {
+            get { return company; }
+            set { company = value; }
+        }
+
+        string birthday;
+
+        /// <summary>
+        /// 出生日期
+        /// </summary>
+        public string Birthday
+        {
+            get { return birthday; }
+            set { birthday = value; }
+        }
+        string iDCard;
+
+        /// <summary>
+        /// 身份证号码
+        /// </summary>
+        public string IDCard
+        {
+            get { return iDCard; }
+            set { iDCard = value; }
+        }
+        string startWorkDate;
+        /// <summary>
+        /// 最初参加工作时间
+        /// </summary>
+        public string StartWorkDate
+        {
+            get { return startWorkDate; }
+            set { startWorkDate = value; }
+        }
+        string education;
+
+        /// <summary>
+        /// 学历
+        /// </summary>
+        public string Education
+        {
+            get { return education; }
+            set { education = value; }
+        }
+        string professional;
+
+        /// <summary>
+        /// 专业
+        /// </summary>
+        public string Professional
+        {
+            get { return professional; }
+            set { professional = value; }
+        }
+        string graduateInstitutions;
+
+        /// <summary>
+        /// 毕业院校
+        /// </summary>
+        public string GraduateInstitutions
+        {
+            get { return graduateInstitutions; }
+            set { graduateInstitutions = value; }
+        }
+        string theOrAdultEducation;
+
+        /// <summary>
+        /// 统招/成教
+        /// </summary>
+        public string TheOrAdultEducation
+        {
+            get { return theOrAdultEducation; }
+            set { theOrAdultEducation = value; }
+        }
+        string maritalStatus;
+        /// <summary>
+        /// 婚姻状况
+        /// </summary>
+        public string MaritalStatus
+        {
+            get { return maritalStatus; }
+            set { maritalStatus = value; }
+        }
+        string homeAddress;
+
+        /// <summary>
+        /// 家庭地址
+        /// </summary>
+        public string HomeAddress
+        {
+            get { return homeAddress; }
+            set { homeAddress = value; }
+        }
+        string usePeriod;
+        /// <summary>
+        /// 试用期限
+        /// </summary>
+        public string UsePeriod
+        {
+            get { return usePeriod; }
+            set { usePeriod = value; }
+        }
+        string workExperience;
+
+        /// <summary>
+        /// 工作经历单位
+        /// </summary>
+        public string WorkExperience
+        {
+            get { return workExperience; }
+            set { workExperience = value; }
+        }
+        string certificateTime;
+        /// <summary>
+        /// 证书时间
+        /// </summary>
+        public string CertificateTime
+        {
+            get { return certificateTime; }
+            set { certificateTime = value; }
+        }
+        string certificate;
+
+        /// <summary>
+        /// 专业培训及资格证书
+        /// </summary>
+        public string Certificate
+        {
+            get { return certificate; }
+            set { certificate = value; }
+        }
+
+    }
+}