Переглянути джерело

Sys_User StartWorkDate 字段属性更改为string

leiy 1 рік тому
батько
коміт
ab7087e3f9

+ 23 - 23
OASystem/OASystem.Api/Controllers/GroupsController.cs

@@ -3028,29 +3028,29 @@ namespace OASystem.API.Controllers
             }
         }
 
-        /// <summary>
-        /// op费用录入操作(Status:1.新增,2.修改)
-        /// </summary>
-        /// <param name="dto"></param>
-        /// <returns></returns>
-        [HttpPost]
-        [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
-        public async Task<IActionResult> OpCarTouristGuideGround(OpCarTouristGuideGroundDto dto)
-        {
-            try
-            {
-                Result groupData = await _visaPriceRep.OpVisaPrice(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, ex.Message));
-            }
-        }
+        ///// <summary>
+        ///// op费用录入操作(Status:1.新增,2.修改)
+        ///// </summary>
+        ///// <param name="dto"></param>
+        ///// <returns></returns>
+        //[HttpPost]
+        //[ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
+        //public async Task<IActionResult> OpCarTouristGuideGround(OpCarTouristGuideGroundDto dto)
+        //{
+        //    try
+        //    {
+        //        Result groupData = await _visaPriceRep.OpVisaPrice(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, ex.Message));
+        //    }
+        //}
         #endregion
     }
 }

+ 2 - 2
OASystem/OASystem.Domain/Entities/System/Sys_Users.cs

@@ -101,8 +101,8 @@ namespace OASystem.Domain.Entities.System
         /// <summary>
         /// 开始工作时
         /// </summary>
-        [SugarColumn(IsNullable = true, ColumnDataType = "DateTime")]
-        public DateTime? StartWorkDate { get; set; }
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(20)")]
+        public string? StartWorkDate { get; set; }
         /// <summary>
         /// 毕业学校
         /// </summary>

+ 1 - 1
OASystem/OASystem.Infrastructure/Repositories/Login/LoginRepository.cs

@@ -132,7 +132,7 @@ namespace OASystem.Infrastructure.Repositories.Login
                 Seniority = 0, //工龄默认 0
                 Birthday = Convert.ToDateTime(birthDay),
                 IDCard = registerDto.IdCrad,
-                StartWorkDate = new DateTime(1990, 1, 1),  //开始工作时间默认最原始时间
+                StartWorkDate = "1900-01-01 00:00:00.000",  //开始工作时间默认最原始时间
                 GraduateInstitutions = registerDto.GraduationSchhol,
                 Professional = registerDto.Major,
                 Education = registerDto.Education, //学历类型