qinchaoyue 3 місяців тому
батько
коміт
b24052a5a1

+ 7 - 4
src/Hotline.Api/Controllers/Snapshot/SnapshotController.cs

@@ -22,6 +22,7 @@ using Mapster;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using SqlSugar;
+using SqlSugar.Extensions;
 using System.ComponentModel.DataAnnotations;
 using System.Reflection;
 using XF.Domain.Authentications;
@@ -86,7 +87,7 @@ public class SnapshotController : BaseController
     [LogFilter("添加随手拍工单")]
     public async Task<AddSnapshotOrderOutDto> AddOrderAsync([FromBody] AddSnapshotOrderInDto dto)
     {
-        var ssp = _systemDicDataCacheManager.SourceChannel.FirstOrDefault(m => m.DicDataName == "随手拍") 
+        var ssp = _systemDicDataCacheManager.SourceChannel.FirstOrDefault(m => m.DicDataName == "随手拍")
             ?? throw UserFriendlyException.SameMessage("请添加[随手拍]来源.");
         var order = dto.Adapt<Order>();
         dto.ValidateObject();
@@ -113,6 +114,8 @@ public class SnapshotController : BaseController
         orderSnapshot.IndustryId = dto.IndustryId;
         orderSnapshot.IndustryName = industry.Name;
         orderSnapshot.CompanyName = dto.CompanyName;
+        if (dto.StartWorkTime.NotNullOrEmpty()) orderSnapshot.StartWorkTime = dto.StartWorkTime.ObjToDate();
+        if (dto.EndWorkTime.NotNullOrEmpty()) orderSnapshot.EndWorkTime = dto.EndWorkTime.ObjToDate();
         await _orderSnapshotRepository.AddAsync(orderSnapshot);
         return order.Adapt<AddSnapshotOrderOutDto>();
     }
@@ -261,7 +264,7 @@ public class SnapshotController : BaseController
     /// <param name="dtos"></param>
     /// <returns></returns>
     [HttpPost("practitioner")]
-    public async Task AddPractitionerAsync([FromBody]IList<AddBatchPractitionerInDto> dtos)
+    public async Task AddPractitionerAsync([FromBody] IList<AddBatchPractitionerInDto> dtos)
         => await _snapshotApplication.AddPractitionerAsync(dtos);
 
     /// <summary>
@@ -281,7 +284,7 @@ public class SnapshotController : BaseController
     /// <returns></returns>
     [HttpGet("practitioner")]
     [AllowAnonymous]
-    public async Task<IList<PractitionerItemOutDto>> GetPractitionerDetailAsync([FromQuery]PractitionerItemInDto dto)
+    public async Task<IList<PractitionerItemOutDto>> GetPractitionerDetailAsync([FromQuery] PractitionerItemInDto dto)
         => await _snapshotApplication.GetPractitionerItemsAsync(dto, HttpContext.RequestAborted);
 
     /// <summary>
@@ -301,7 +304,7 @@ public class SnapshotController : BaseController
     /// <returns></returns>
     [HttpGet("report/base")]
     public Dictionary<string, dynamic> GetReportBaseAsync()
-    { 
+    {
         return new Dictionary<string, dynamic>
         {
             { "jobType", _systemDicDataCacheManager.JobType },

+ 3 - 3
src/Hotline.Share/Dtos/Snapshot/OrderDto.cs

@@ -125,12 +125,12 @@ public class AddSnapshotOrderInDto : Position
     /// <summary>
     /// 作业时间
     /// </summary>
-    public DateTime? StartWorkTime { get; set; }
+    public string? StartWorkTime { get; set; }
 
     /// <summary>
     /// 作业结束时间
     /// </summary>
-    public DateTime? EndWorkTime { get; set; }
+    public string? EndWorkTime { get; set; }
 
     /// <summary>
     /// 姓名
@@ -173,7 +173,7 @@ public class AddSnapshotOrderInDto : Position
                     $"场所名称:{this.WorkplaceName}\r\n" + // 多业态混合经营场所 - 存储多种功能的劳动密集型企业
                     $"作业区域: {this.County + this.Town}\r\n" + // 自流井区舒坪街道
                     $"作业类型: {this.JobType}\r\n" + // 电焊
-                    $"作业时间:{this.StartWorkTime.Value.ToString("yyyy-MM-dd hh:mm")}~{this.EndWorkTime.Value.ToString("yyyy-MM-dd hh:mm")}\r\n" +
+                    $"作业时间:{this.StartWorkTime}~{this.EndWorkTime}\r\n" +
                     $"作业地点: {this.Town}({this.County})({this.Street})"; // 舒平(自流井区)(油库)"
         }
         return $"{Description}";