src/Sharing.Api/Controllers/HotlineMessageReceiveController.cs

@@ -5,6 +5,7 @@ using Hotline.Share.Enums.Order;
 using MapsterMapper;
 using MediatR;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.VisualBasic;
 using Sharing.Application;
 using Sharing.Notifications.HuiJu;
 using Sharing.Notifications.Knowledge;
@@ -810,9 +811,8 @@ namespace Sharing.Api.Controllers
             if (data.DisableDate == null)//如果没得有失效时间，默认在生效日期上面加10年
                 data.DisableDate = data.BeginDate.Value.AddYears(10);
             //将上报信息写入本地库
-            var id = await _getKnowledgeInfoSendRepository.AddAsync(data);
+            data.Id = await _getKnowledgeInfoSendRepository.AddAsync(data);
 
-            data.Id = id;
             //信息上报
             await _mediator.Publish(new GetKnowledgeInfoSendNotification(data));
         }
@@ -831,9 +831,8 @@ namespace Sharing.Api.Controllers
             if (data.DisableDate == null)//如果没得有失效时间，默认在生效日期上面加10年
                 data.DisableDate = data.BeginDate.Value.AddYears(10);
             //将上报信息写入本地库
-            var id = await _getKnowledgeInfoUpdateRepository.AddAsync(data);
+            data.Id = await _getKnowledgeInfoUpdateRepository.AddAsync(data);
 
-            data.Id = id;
             //信息上报
             await _mediator.Publish(new GetKnowledgeInfoUpdateNotification(data));
         }
@@ -850,9 +849,8 @@ namespace Sharing.Api.Controllers
             var data = _mapper.Map<GetKnowledgeInfoAbandon>(dto);
             data.AreaCode = AreaCode;
             //将上报信息写入本地库
-            var id = await _getKnowledgeInfoAbandonRepository.AddAsync(data);
+            data.Id = await _getKnowledgeInfoAbandonRepository.AddAsync(data);
 
-            data.Id = id;
             //信息上报
             await _mediator.Publish(new GetKnowledgeInfoAbandonNotification(data));
         }
@@ -870,9 +868,8 @@ namespace Sharing.Api.Controllers
             var data = _mapper.Map<SendRealTimeStatus>(dto);
             data.AreaCode = AreaCode;
             //将上报信息写入本地库
-            var id = await _sendRealTimeStatusRepository.AddAsync(data);
+            data.Id = await _sendRealTimeStatusRepository.AddAsync(data);
 
-            data.Id = id;
             //信息上报
             await _mediator.Publish(new SendRealTimeStatusNotification(data));
         }

src/Sharing.Application/Mappers/MapperConfigs.cs

@@ -1,6 +1,8 @@
-using Hotline.Share.Dtos.Order;
+using Hotline.Share.Dtos.Knowledge;
+using Hotline.Share.Dtos.Order;
 using Mapster;
 using Sharing.Province.HuiJu.Send;
+using Sharing.Province.XieTong.Knowledge;
 
 namespace Sharing.Application.Mappers
 {
@@ -8,6 +10,18 @@ namespace Sharing.Application.Mappers
     {
         public void Register(TypeAdapterConfig config)
         {
+            config.ForType<KnowledgeSendDto, GetKnowledgeInfoSend>()
+            .Map(d => d.CreatDate, x => x.CreatDate == null ? null : x.CreatDate.Value.ToString("yyyy-MM-dd HH:mm:ss"))
+            .Map(d => d.BeginDate, x => x.BeginDate == null ? null : x.BeginDate.Value.ToString("yyyy-MM-dd HH:mm:ss"))
+            .Map(d => d.DisableDate, x => x.DisableDate == null ? null : x.DisableDate.Value.ToString("yyyy-MM-dd HH:mm:ss"))
+          ;
+
+            config.ForType<GetKnowledgeInfoUpdate, GetKnowledgeInfoSend>()
+            .Map(d => d.CreatDate, x => x.CreatDate == null ? null : x.CreatDate.Value.ToString("yyyy-MM-dd HH:mm:ss"))
+            .Map(d => d.BeginDate, x => x.BeginDate == null ? null : x.BeginDate.Value.ToString("yyyy-MM-dd HH:mm:ss"))
+            .Map(d => d.DisableDate, x => x.DisableDate == null ? null : x.DisableDate.Value.ToString("yyyy-MM-dd HH:mm:ss"))
+          ;
+
             config.ForType<OrderDto, SubmitCaseInfo>()
                 .Ignore(d => d.Id)
                 .Map(d => d.OrderID, x => x.Id)
@@ -24,14 +38,14 @@ namespace Sharing.Application.Mappers
                 .Map(d => d.CaseProcessType, x => Convert.ToInt32(x.ProcessType))
                 .Map(d => d.CaseIsSecrect, x => x.IsSecret)
                 .Map(d => d.CaseIsVisit, x => x.ProcessType == Hotline.Share.Enums.Order.EProcessType.Zhiban ? "0" : "1")
-                .Map(d => d.EventDate, x => x.IncidentTime)
+                .Map(d => d.EventDate, x => x.IncidentTime == null ? null : x.IncidentTime.Value.ToString("yyyy-MM-dd HH:mm:ss"))
                 .Map(d => d.PushType, x => x.PushTypeCode)
               ;
 
             config.ForType<OrderFlowDto, SubmitCaseProcess>()
             .Map(d => d.DeptName, x => x.WorkflowTrace.OrgName)
             //.Map(d => d.TacheName, x => x.WorkflowTrace.OrgName)
-            .Map(d => d.ProcessTime, x => x.WorkflowTrace.CompleteTime)
+            .Map(d => d.ProcessTime, x => x.WorkflowTrace.CompleteTime == null ? null : x.WorkflowTrace.CompleteTime.Value.ToString("yyyy-MM-dd HH:mm:ss"))
             .Map(d => d.ProcessName, x => x.WorkflowTrace.UserName)
             .Map(d => d.ProcessNote, x => x.WorkflowTrace.Opinion)
             .Map(d => d.EndAreaCode, x => x.WorkflowTrace.OrgAreaCode)

src/Sharing.Province/Dtos/ProvinceRequest.cs

@@ -10,31 +10,9 @@ public abstract class ProvinceRequest<TData> : ProvinceRequest, IProvinceRequest
 
     public void SetData(TData data)
     {
-        //ForeachClass<TData>(data);
         Data = data;
     }
 
-    /// <summary>
-    /// 处理时间格式
-    /// </summary>
-    /// <typeparam name="T"></typeparam>
-    /// <param name="model"></param>
-    public void ForeachClass<T>(T model)
-    {
-        Type t = model.GetType();
-        foreach (PropertyInfo item in t.GetProperties())
-        {
-            if (item.PropertyType == typeof(DateTime?) || item.PropertyType == typeof(DateTime))
-            {
-                object value = item.GetValue(model, null);
-                if (value != null)
-                {
-                    DateTime? data = Convert.ToDateTime(Convert.ToDateTime(value).ToString("yyyy-MM-dd HH:mm:ss"));
-                    item.SetValue(model, data, null);
-                }
-            }
-        }
-    }
 }
 
 public abstract class ProvinceRequest : IProvinceRequest

src/Sharing.Province/Handlers/HuiJu/OrderCreatedHandler.cs

@@ -42,7 +42,6 @@ namespace Sharing.Province.Handlers.HuiJu
 
             var dataReceive = _mapper.Map<CaseInfo>(order);
             var request = new SubmitCaseInfoRequest();
-            request.ForeachClass(dataReceive);
             var data = new SubmitCaseInfoData
             {
                 CaseInfos = new List<CaseInfo>

src/Sharing.Province/Handlers/HuiJu/SubmitCaseProcessHandler.cs

@@ -46,7 +46,6 @@ namespace Sharing.Province.Handlers.HuiJu
             var dataReceive = _mapper.Map<CaseProcess>(order);
 
             var request = new SubmitCaseProcessRequest();
-            request.ForeachClass(request);
             var data = new SubmitCaseProcessData
             {
                 CaseProcesss = new List<CaseProcess>

src/Sharing.Province/Handlers/Knowledge/GetKnowledgeInfoAbandonHandler.cs

@@ -45,7 +45,6 @@ namespace Sharing.Province.Handlers.Knowledge
             var dataReceive = _mapper.Map<GetKnowledgeInfoAbandonInfo>(notification.Data);
 
             var request = new GetKnowledgeInfoAbandonRequest();
-            request.ForeachClass(dataReceive);
             request.SetData(dataReceive);
 
             var response = await pusher.PushGetKnowledgeInfoAbandonAsync(request, cancellationToken);

src/Sharing.Province/Handlers/Knowledge/GetKnowledgeInfoSendHandler.cs

@@ -45,7 +45,6 @@ namespace Sharing.Province.Handlers.Knowledge
             var dataReceive = _mapper.Map<KnowledgeInfoSendInfo>(notification.Data);
 
             var request = new GetKnowledgeInfoSendRequest();
-            request.ForeachClass(dataReceive);
             request.SetData(dataReceive);
 
             var response = await pusher.PushGetKnowledgeInfoSendAsync(request, cancellationToken);

src/Sharing.Province/Handlers/Knowledge/GetKnowledgeInfoUpdateHandler.cs

@@ -45,7 +45,6 @@ namespace Sharing.Province.Handlers.Knowledge
             var dataReceive = _mapper.Map<GetKnowledgeInfoUpdateInfo>(notification.Data);
 
             var request = new GetKnowledgeInfoUpdateRequest();
-            request.ForeachClass(dataReceive);
             request.SetData(dataReceive);
 
             var response = await pusher.PushGetKnowledgeInfoUpdateAsync(request, cancellationToken);