完成导入随手拍工单

DataTransmission/Joint/Order.cs

@@ -39,7 +39,8 @@ namespace DataTransmission.Joint
 			return tool.GetDataTable(orderSql, conn);
 		}
 
-		public string GetOrderISql(DataRow row,string orderId,DataTable org,DataTable user, Entity.Config config) {
+		public string GetOrderISql(DataRow row,string orderId,DataTable org,DataTable user, Entity.Config config, string creatorId = "") 
+		{
 			var sex = row["FLM_LKSex"].ToString() == "1" ? 1 : row["FLM_LKSex"].ToString() == "2" ? 0 : 2;
 			var identityType = row["FSH_PersonnelType"].ToString() == "企业" ? 2 : 1;
 			var ContactMask = tool.MaskPhoneNumber(row["FSH_LinkTel"].ToString());
@@ -134,6 +135,7 @@ namespace DataTransmission.Joint
 			order.ProvinceNo = row["FSH_ProCode"].ToString();
 			order.IsUrgent = row["FSH_Urgent"].ToString() == "1";
 			order.OldOrderId = row["FSH_FlowID"].ToString();
+			order.CreatorId = creatorId;
 			#endregion
 			//""WorkflowId"", ""ExpiredTimeConfigId"", ""Longitude"", ""Latitude"", ""ActualHandleStepCode"",""ActualHandleStepName"", ""ActualHandleStepCreateTime"", ""ActualHandleTime"", ""ActualHandlerId"", ""ActualHandlerName"",
 			//""ExpiredTimeProvince"", ""AcceptorStaffNo"", ""FirstVisitResult"", ""FirstVisitResultCode"", ""CenterToOrgTime"",""ActualHandleStepAcceptTime"",  ""HandleDuration"", ""HandleDurationWorkday"", ""AllDuration"",

DataTransmission/Joint/Visit.cs

@@ -30,7 +30,12 @@ namespace DataTransmission.Joint
 			Entity.OrderVisit  visit = new Entity.OrderVisit();
 			foreach (DataRow item in data.Rows)
 			{
-				DataRow ogrRow = org.AsEnumerable().First(x => x.Field<int?>("oldBmid").ToString() == item["FALT_AppBMID"].ToString());
+				var a = item["FALT_AppBMID"].ToString();
+                DataRow ogrRow = org.AsEnumerable().FirstOrDefault(x => x.Field<int?>("oldBmid").ToString() == item["FALT_AppBMID"].ToString());
+				if (ogrRow == null)
+				{
+					;
+				}
 				var VisitOrgCode = string.IsNullOrEmpty(ogrRow?["Id"].ToString()) ? item["FALT_AppBMID"].ToString() : ogrRow?["Id"].ToString();
 				if (num == 0)
 				{

SnapshotWinFormsApp/Application/CommunityInfoApplication.cs

@@ -15,7 +15,7 @@ using System.Threading.Tasks;
 
 namespace SnapshotWinFormsApp.Application;
 
-[Description("导入社区信息")]
+[Description("社区信息")]
 public class CommunityInfoApplication :  ImportApplicationBase<SSP_AreaEntity, CommunityInfo, int>, IImportApplication
 {
     public CommunityInfoApplication(CreateInstanceInDto inDto) : base(inDto)

SnapshotWinFormsApp/Application/GuiderApplication.cs

@@ -1,59 +0,0 @@
-using DataTransmission.Enum;
-using SnapshotWinFormsApp.Application.Dtos;
-using SnapshotWinFormsApp.Application.Interfaces;
-using SnapshotWinFormsApp.Entities.NewHotline;
-using SnapshotWinFormsApp.Entities.OldHotline;
-using SnapshotWinFormsApp.Repository;
-using SnapshotWinFormsApp.Repository.Enum;
-using SnapshotWinFormsApp.Repository.Interfaces;
-using SnapshotWinFormsApp.Tools;
-using SqlSugar;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace SnapshotWinFormsApp.Application;
-
-//[Description("导入网格员")]
-//public class GuiderApplication : ImportApplicationBase<Flow03_PushContent, Citizen, int, Flow03_PushContentDto>, IImportApplication
-//{
-//    private readonly ITargetRepository<Citizen> _userRepo;
-
-//    public GuiderApplication(CreateInstanceInDto inDto) : base(inDto)
-//    {
-//        _userRepo = new TargetRepository<Citizen>(inDto);
-//    }
-
-//    public override ISugarQueryable<Flow03_PushContentDto> GetSourceList()
-//    {
-//        return _sourceRepo.Queryable()
-//            .Where(m => m.MemberMobile != null && m.MemberName != null)
-//            .Select(m => new Flow03_PushContentDto(), true)
-//            .Distinct();
-//            //.GroupBy(m => new { m.MemberName, m.MemberMobile });
-//    }
-
-//    public override async Task<bool> HasOldDataAsync(Flow03_PushContentDto item, CancellationToken token)
-//    {
-//        var userId = await _userRepo.Queryable()
-//            .Where(m => m.PhoneNumber == item.MemberMobile)
-//            .Select(m => m.Id)
-//            .FirstAsync(token);
-//        return userId.IsNullOrEmpty();
-//    }
-
-//    public override async Task<Citizen> GetTargetAsync(Flow03_PushContentDto source, CancellationToken token)
-//    {
-//        var userInfo = new Citizen
-//        {
-//            PhoneNumber = source.MemberMobile.Replace("\t", ""),
-//            Name = source.MemberName.Replace("\t", ""),
-//            CitizenType = EReadPackUserType.Guider,
-//            IdentityType = EIdentityType.Citizen
-//        };
-//        return await Task.FromResult(userInfo);
-//    }
-//}

SnapshotWinFormsApp/Application/Interfaces/ImportApplicationBase.cs

@@ -30,7 +30,8 @@ public class ImportApplicationBase<TSource, TEntity, TKey, TMix> : IImportApplic
     public readonly CreateInstanceInDto _instance;
     public readonly ISelectRepository<SystemDicData> _systemDicDataRepo;
     public readonly IList<SystemDicData> JobType;
-    public List<TMix> Sources = new List<TMix>();
+    public IList<TMix> Sources = new List<TMix>();
+    public IList<TEntity> Targets = new List<TEntity>();
     public ImportApplicationBase(CreateInstanceInDto inDto)
     {
         _instance = inDto;

SnapshotWinFormsApp/Entities/NewHotline/Industry.cs

@@ -9,7 +9,7 @@ namespace SnapshotWinFormsApp.Entities.NewHotline;
 /// </summary>
 [SugarTable("industry")]
 [Description("行业")]
-public class Industry : CreationSoftDeleteEntity
+public class Industry : DataTransmission.Entity.CreationSoftDeleteEntity
 {
     /// <summary>
     /// 行业名称

SnapshotWinFormsApp/Entities/NewHotline/Order.cs

@@ -0,0 +1,17 @@
+using SqlSugar;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace SnapshotWinFormsApp.Entities.NewHotline;
+
+[SugarTable("order")]
+public class Order : DataTransmission.Entity.FullStateEntity
+{
+    /// <summary>
+    /// No
+    /// </summary>
+    public string No { get; set; }
+}

SnapshotWinFormsApp/Entities/NewHotline/User.cs

@@ -9,7 +9,7 @@ namespace SnapshotWinFormsApp.Entities.NewHotline
     /// </summary>
     [SugarTable("user")]
     [Description("用户")]
-    public class User : CreationSoftDeleteEntity
+    public class User : DataTransmission.Entity.CreationSoftDeleteEntity
     {
         /// <summary>
         /// 手机号(冗余)