src/Sharing.Application/Mappers/MapperConfigs.cs

@@ -1,14 +1,9 @@
-using Hotline.Share.Dtos.Knowledge;
-using Hotline.Share.Dtos.Order;
-using Hotline.Share.Enums.Order;
+using Hotline.Share.Dtos.Order;
 using Mapster;
-using Sharing.DaoShu110.Dtos;
 using Sharing.Province.Extend;
 using Sharing.Province.HuiJu.Send;
-using Sharing.Province.XieTong.Knowledge;
 using Sharing.Province.XieTong.Receive;
 using Sharing.Province.XieTong.Send;
-using System.Collections.Generic;
 
 namespace Sharing.Application.Mappers
 {
@@ -16,18 +11,7 @@ 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)
@@ -44,16 +28,17 @@ 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 == null ? null : x.IncidentTime.Value.ToString("yyyy-MM-dd HH:mm:ss"))
+                .Map(d => d.EventDate, x => x.IncidentTime)
                 .Map(d => d.PushType, x => x.PushTypeCode)
                 .Map(d => d.AreaCode, x => x.AreaCode)
                .Map(d => d.CaseSerial, x => x.ToProvinceNo)
               ;
 
+            //服务工单处理过程
             config.ForType<OrderFlowDto, SubmitCaseProcess>()
            .Map(d => d.CaseSerial, x => x.Order.ToProvinceNo)
             .Map(d => d.DeptName, x => x.WorkflowTrace.OrgName)
-            .Map(d => d.ProcessTime, x => x.WorkflowTrace.CompleteTime == null ? null : x.WorkflowTrace.CompleteTime.Value.ToString("yyyy-MM-dd HH:mm:ss"))
+            .Map(d => d.ProcessTime, x => x.WorkflowTrace.CompleteTime)
             .Map(d => d.ProcessName, x => x.WorkflowTrace.UserName)
             .Map(d => d.ProcessNote, x => x.WorkflowTrace.Opinion)
             .Map(d => d.EndAreaCode, x => x.WorkflowTrace.OrgAreaCode)
@@ -62,10 +47,11 @@ namespace Sharing.Application.Mappers
             .Map(d => d.AreaCode, x => x.Order.AreaCode)
               ;
 
+            //服务工单交办处理过程
             config.ForType<OrderFlowDto, GetCaseProcessReceive>()
           .Map(d => d.CaseSerial, x => x.Order.FromProvinceNo)
            .Map(d => d.DeptName, x => x.WorkflowTrace.OrgName)
-           .Map(d => d.ProcessTime, x => x.WorkflowTrace.CompleteTime == null ? null : x.WorkflowTrace.CompleteTime.Value.ToString("yyyy-MM-dd HH:mm:ss"))
+           .Map(d => d.ProcessTime, x => x.WorkflowTrace.CompleteTime)
            .Map(d => d.ProcessName, x => x.WorkflowTrace.UserName)
            .Map(d => d.ProcessNote, x => x.WorkflowTrace.Opinion)
            .Map(d => d.EndAreaCode, x => x.WorkflowTrace.OrgAreaCode)
@@ -74,9 +60,11 @@ namespace Sharing.Application.Mappers
             .Map(d => d.AreaCode, x => x.Order.AreaCode)
              ;
 
+            //服务工单回访评价
             config.ForType<PublishVisitDto, SubmitVisitInfo>()
             .Map(d => d.CaseSerial, x => x.Order.ToProvinceNo)
             ;
+            //服务工单交办评价
             config.ForType<PublishVisitDto, GetVisitInfoReceive>()
             .Map(d => d.CaseSerial, x => x.Order.FromProvinceNo)
             ;
@@ -119,7 +107,6 @@ namespace Sharing.Application.Mappers
              .Map(d => d.UBindTypeName, x => x.IndustryClassify)
              .Map(d => d.EntType, x => x.MarketTypeCode)
              .Map(d => d.EntTypeName, x => x.MarketType)
-             //.Map(d => d.ReqUnit, x => x.RegisterPosition.AreaCode)
              .Map(d => d.Addr, x => x.RegisterAddress)
              .Map(d => d.Sjztlxr, x => x.EnterpriseContact)
              .Map(d => d.Nbxh, x => x.UnifiedSocialCreditCode)
@@ -173,7 +160,6 @@ namespace Sharing.Application.Mappers
              .Map(d => d.UBindTypeName, x => x.IndustryClassify)
              .Map(d => d.EntType, x => x.MarketTypeCode)
              .Map(d => d.EntTypeName, x => x.MarketType)
-                   //.Map(d => d.ReqUnit, x => x.RegisterPosition.AreaCode)
               .Map(d => d.Addr, x => x.RegisterAddress)
              .Map(d => d.Sjztlxr, x => x.EnterpriseContact)
              .Map(d => d.Nbxh, x => x.UnifiedSocialCreditCode)
@@ -193,6 +179,20 @@ namespace Sharing.Application.Mappers
              .Map(d => d.Qtlxfs, x => x.OtherContact)
             ;
 
+
+
+
+
+
+
+
+
+
+
+
+
+            //接收
+
             config.ForType<ReceiveCaseInfo, OrderDto>()
            .Map(d => d.FromProvinceNo, x => x.CaseSerial)
            .Map(d => d.Title, x => x.CaseTitle)
@@ -208,17 +208,19 @@ namespace Sharing.Application.Mappers
            .Map(d => d.ProcessType, x => x.CaseProcessType)
            .Map(d => d.IsSecret, x => x.CaseIsSecrect == "1" ? true : false)
            .Map(d => d.IsPublicity, x => x.CaseIsPublic == "1" ? true : false)
-           .Map(d => d.ExpiredTimeProvince,x => x.TfdBackTimeBf)
+           .Map(d => d.ExpiredTimeProvince, x => x.TfdBackTimeBf)
            .Map(d => d.AreaCode, x => x.AreaCode)
-           .Map(d=>d.Street,x=>x.CaseAddress)
-           .Map(d=>d.IncidentTime,x=>x.EventDate)
-           .Map(d => d.SourceChannel,x=>x.CaseSource)
+           .Map(d => d.Street, x => x.CaseAddress)
+           .Map(d => d.IncidentTime, x => x.EventDate)
+           .Map(d => d.SourceChannel, x => x.CaseSource)
              ;
 
 
 
-          
+
             //以下未完全转换
+
+            //服务工单处理结果
             config.ForType<OrderFlowDto, SubmitCaseResult>()
            .Map(d => d.CaseSerial, x => x.Order.ToProvinceNo)
            .Map(d => d.DeptName, x => x.Order.ActualHandleOrgName)
@@ -227,7 +229,7 @@ namespace Sharing.Application.Mappers
            .Map(d => d.FinishNote, x => x.Order.ActualOpinion)
            .Map(d => d.EndDept, x => x.Order.ActualHandleOrgName)
            .Map(d => d.EndName, x => x.Order.ActualHandlerName)
-           .Map(d => d.SendTime, x => x.Order.Workflow.AssignTime == null ? null : x.Order.Workflow.AssignTime.ToString("yyyy-MM-dd HH:mm:ss"))//需要确认
+           .Map(d => d.SendTime, x => x.Order.Workflow.AssignTime)//需要确认
            .Map(d => d.FdBack, x => x.Order.ActualOpinion)
            .Map(d => d.AreaCode, x => x.Order.AreaCode)
            .Map(d => d.EndAreaCode, x => x.Order.ActualHandleOrgAreaCode)
@@ -238,6 +240,7 @@ namespace Sharing.Application.Mappers
            .Map(d => d.FdBackTime, x => x.Order.ActualHandleTime)
              ;
 
+            ///服务工单交办处理结果
             config.ForType<OrderFlowDto, GetCaseResultReceive>()
            .Map(d => d.CaseSerial, x => x.Order.ToProvinceNo)
            .Map(d => d.DeptName, x => x.Order.ActualHandleOrgName)
@@ -246,16 +249,11 @@ namespace Sharing.Application.Mappers
            .Map(d => d.FinishNote, x => x.Order.ActualOpinion)
            .Map(d => d.EndDept, x => x.Order.ActualHandleOrgName)
            .Map(d => d.EndName, x => x.Order.ActualHandlerName)
-           .Map(d => d.SendTime, x => x.Order.Workflow.AssignTime == null ? null : x.Order.Workflow.AssignTime.ToString("yyyy-MM-dd HH:mm:ss"))//需要确认
+           .Map(d => d.SendTime, x => x.Order.Workflow.AssignTime)//需要确认
            .Map(d => d.FdBack, x => x.Order.ActualOpinion)
            .Map(d => d.AreaCode, x => x.Order.AreaCode)
            .Map(d => d.EndAreaCode, x => x.Order.ActualHandleOrgAreaCode)
            .Map(d => d.EndAreaName, x => x.Order.ActualHandleOrgAreaName)
-           //.Map(d => d.SignTimeBf, x => x.Order.ExpiredTime)
-           //.Map(d => d.SignTime, x => x.Order.StartTime)//缺少签收时间
-           //.Map(d => d.FdBackTimeBf, x => x.Order.ExpiredTime)
-           //.Map(d => d.FdBackTime, x => x.Order.ActualHandleTime)
-
             ;