修复导工单缺少的字段

SnapshotWinFormsApp/Application/OrderSnapshotApplication.cs

@@ -53,7 +53,7 @@ public class OrderSnapshotApplication : ImportApplicationBase<OrderFullEntity, O
     private readonly List<SystemDicData> snapshotOrderLabels;
     private readonly List<SystemDicData> VisitSatisfaction;
     private readonly List<SystemDicData> DissatisfiedReason;
-    private  IList<ThirdAccount> ThirdAccounts;
+    private IList<ThirdAccount> ThirdAccounts;
     private readonly ISelectRepository<SelectOrderNo> OrderRepository;
     private readonly IList<SelectOrderNo> OrderNos;
     private readonly CreateInstanceInDto _inDto;
@@ -183,6 +183,8 @@ public class OrderSnapshotApplication : ImportApplicationBase<OrderFullEntity, O
         order.ProcessType = source.FSH_AcceptBMID.Trim() == config.CenterId ? 10 : 20;
         if (config.Name == "自贡市")
         {
+            order.Province = "四川省";
+            order.City = "自贡市";
             order.IsPublicity = false;
         }
         else
@@ -231,8 +233,15 @@ public class OrderSnapshotApplication : ImportApplicationBase<OrderFullEntity, O
         order.ProvinceNo = source.FSH_ProCode;
         order.IsUrgent = source.FSH_Urgent.Trim() == "1";
         order.OldOrderId = source.FSH_FlowID;
-        order.CreatorId = await GetUserIdByOpenIdAsync(null, source.WFAT_WXOpenid, order.OldId,  token);
+        order.CreatorId = await GetUserIdByOpenIdAsync(null, source.WFAT_WXOpenid, order.OldId, token);
+
+        order.FileOpinion = source.FTRB_RRemark;
+        order.CurrentStepName = source.FSH_ItemName;
+
         order.InitId();
+
+        order.County = source.FSH_AreaName; // 自流井区
+        //order.Town = ""; // 丹桂街道
         return order;
     }
 
@@ -737,7 +746,7 @@ public class OrderSnapshotApplication : ImportApplicationBase<OrderFullEntity, O
 
         var points = new SnapshotPointsRecord
         {
-            UserId = await GetUserIdByOpenIdAsync(log, item.WFAT_WXOpenid,item.Id, token),
+            UserId = await GetUserIdByOpenIdAsync(log, item.WFAT_WXOpenid, item.Id, token),
             Source = EPointsSource.Report,
             Points = 1,
             Direction = EPointsDirection.In,
@@ -760,7 +769,7 @@ public class OrderSnapshotApplication : ImportApplicationBase<OrderFullEntity, O
         return Users.FirstOrDefault(m => m.OldUserId == oldId.ObjToInt())?.Name;
     }
 
-    public async Task<string> GetUserIdByOpenIdAsync(Action<string>log,  string openId, string fsh_code,  CancellationToken token)
+    public async Task<string> GetUserIdByOpenIdAsync(Action<string> log, string openId, string fsh_code, CancellationToken token)
     {
         if (openId.IsNullOrEmpty()) return null;
         var user = ThirdAccounts.FirstOrDefault(m => m.OpenId == openId);

SnapshotWinFormsApp/Application/RedPackAuditApplication.cs

@@ -10,6 +10,7 @@ using SnapshotWinFormsApp.Entities.OldHotline;
 using SnapshotWinFormsApp.Repository;
 using SnapshotWinFormsApp.Repository.Enum;
 using SnapshotWinFormsApp.Repository.Interfaces;
+using SnapshotWinFormsApp.Tools;
 using SqlSugar;
 using SqlSugar.Extensions;
 using System.ComponentModel;
@@ -74,6 +75,7 @@ public class RedPackAuditApplication : ImportApplicationBase<Flow04_ExpandClapEn
         var order = Orders.FirstOrDefault(m => m.No == source.FSH_Code.Trim());
         if (order == null)
         {
+            Logs.Err($"审核缺少工单数据. OldAuditId: {source.Id}, No: {source.FSH_Code}");
             return null;
         }
         audit.OrderId = order.Id;

SnapshotWinFormsApp/Application/SnapshotUserInfoApplication.cs

@@ -89,7 +89,6 @@ public class SnapshotUserInfoApplication : ImportApplicationBase<WeChatUserEntit
         {
             var thirdAccount = item.Adapt<ThirdAccount>();
             thirdAccount.InitId();
-            thirdAccount.OldId = item.Id;
             thirdAccount.ExternalId = target.Id;
             if (thirdAccount.OpenId.IsNullOrEmpty())
             { log?.Invoke("openid为空"); return null; }

SnapshotWinFormsApp/Tools/Logs.cs

@@ -32,7 +32,7 @@ namespace SnapshotWinFormsApp.Tools
         /// <param name="msg">记录的内容</param>
         public static void Err(string msg)
         {
-            string logPath = System.IO.Path.Combine(Path(), "err.log");
+            string logPath = System.IO.Path.Combine(Path(), $"err-{DateTime.Now:yyyy-MM-dd}.log");
 
             StackTrace trace = new StackTrace();
             MethodBase methodBase = trace.GetFrame(1).GetMethod();
@@ -65,7 +65,7 @@ namespace SnapshotWinFormsApp.Tools
         /// <param name="msg">内容</param>
         public static void Warning(string msg)
         {
-            Note(System.IO.Path.Combine(Path() , "Warning.log"),msg,true);
+            Note(System.IO.Path.Combine(Path() , $"Warning-{DateTime.Now:yyyy-MM-dd}.log"),msg,true);
         }
 
         /// <summary>
@@ -97,7 +97,7 @@ namespace SnapshotWinFormsApp.Tools
         /// <param name="msg">记录的内容</param>
         public static void Note(string msg)
         {
-            var logPath = System.IO.Path.Combine(Path(), "note.log");
+            var logPath = System.IO.Path.Combine(Path(), $"note-{DateTime.Now:yyyy-MM-dd}.log");
             Note(logPath, msg, true);
         }
 
@@ -110,7 +110,7 @@ namespace SnapshotWinFormsApp.Tools
         {
             StackTrace trace = new StackTrace();
             MethodBase metbodBase = trace.GetFrame(1).GetMethod();
-            Note(System.IO.Path.Combine(Path(), "note.log"), metbodBase.Name + ":" + msg);
+            Note(System.IO.Path.Combine(Path(), $"note-{DateTime.Now:yyyy-MM-dd}.log"), metbodBase.Name + ":" + msg);
         }
 
         /// <summary>
@@ -139,9 +139,9 @@ namespace SnapshotWinFormsApp.Tools
                     fs.Dispose();
                     fs.Close();
                 }
-                using (FileStream fs = new FileStream(path, FileMode.Append, FileAccess.Write, FileShare.Write))
+                using (FileStream fs = new(path, FileMode.Append, FileAccess.Write, FileShare.Write))
                 {
-                    StreamWriter sw = new StreamWriter(fs, Encoding.UTF8);
+                    StreamWriter sw = new(fs, Encoding.UTF8);
                     if (format) sw.WriteLine(DateTime.Now + "  " + msg);
                     else sw.WriteLine(msg);
                     sw.Dispose();

SnapshotWinFormsApp/Tools/MapsterConfig.cs

@@ -48,6 +48,8 @@ public static class MapsterConfig
             .Map(m => m.UserName, n => n.WUR_WebUserName)
             .Map(m => m.OpenId, n => n.WUR_Openid)
             .Map(m => m.UnIonId, n => n.WUR_unionid)
+            .Map(m => m.PhoneNumber, n => n.WUR_PhoneNum)
+            .Map(m => m.OldId, n => n.Id)
             .Map(m => m.CreationTime, n => n.WUR_RegDate);
 
         TypeAdapterConfig<WeChatUserEntity, Citizen>.NewConfig()