数据同步

App.config

@@ -7,11 +7,11 @@
     <!--<add key ="SQLServerDB" value="server=172.15.28.10,4666;database=CityHotline_Ver3;uid=CityHotlineUser;pwd=yb12345#@!;"/>
     <add key ="PGSQLDB" value="Server=100.122.1.9;Port=5432;UserId=fwkjyibin;Password=Fwkj2023##!!**;Database=hotline;"/>-->
     <!--自贡-->
-    <!--<add key ="SQLServerDB" value="server=61.157.186.3,4368;database=ZG_CityHotline_Ver3;uid=ZGCityHotlineUser;pwd=fway09!@ZG_15;"/>
-    <add key ="PGSQLDB" value="Server=110.188.24.182;Port=5432;UserId=dev;Password=fengwo11!!;Database=hotline_zg;"/>-->
+    <add key ="SQLServerDB" value="server=61.157.186.3,4368;database=ZG_CityHotline_Ver3;uid=ZGCityHotlineUser;pwd=fway09!@ZG_15;"/>
+    <add key ="PGSQLDB" value="Server=110.188.24.182;Port=5432;UserId=dev;Password=fengwo11!!;Database=hotline_zg;"/>
     <!--泸州-->
-    <add key ="SQLServerDB" value="server=172.20.200.11,4433;database=CityHotline_Ver3;uid=HotlineUser_Ver3;pwd=lzs12345aA!@#;"/>
-    <add key ="PGSQLDB" value="Server=110.188.24.182;Port=5432;UserId=dev;Password=fengwo11!!;Database=hotline_lz;"/>
+    <!--<add key ="SQLServerDB" value="server=172.20.200.11,4433;database=CityHotline_Ver3;uid=HotlineUser_Ver3;pwd=lzs12345aA!@#;"/>
+    <add key ="PGSQLDB" value="Server=110.188.24.182;Port=5432;UserId=dev;Password=fengwo11!!;Database=hotline_lz;"/>-->
     <!--日志-->
     <add key ="LogLevel" value="10"/>
   </appSettings>

Joint/Delay.cs

@@ -75,7 +75,7 @@ namespace DataTransmission.Joint
 				}
 				delayNum++;
 				pgDelaySql += ";";
-				var pgDelayWorkflow = workflow.GetWorkflow(row["FSH_FlowID"].ToString(), "Flow_Postpone");
+				var pgDelayWorkflow = workflow.GetWorkflow_Run(row["FSH_FlowID"].ToString(), "Flow_Postpone");
 				if (pgDelayWorkflow.Rows.Count > 0)
 				{
 					var pgDelayWorkflowSql = workflow.GetWorkflowSql(pgDelayWorkflow, row, orderId, org, user, delayModule, model, config);

Joint/Order.cs

@@ -138,7 +138,7 @@ namespace DataTransmission.Joint
 			//""WorkflowId"", ""ExpiredTimeConfigId"", ""Longitude"", ""Latitude"", ""ActualHandleStepCode"",""ActualHandleStepName"", ""ActualHandleStepCreateTime"", ""ActualHandleTime"", ""ActualHandlerId"", ""ActualHandlerName"",
 			//""ExpiredTimeProvince"", ""AcceptorStaffNo"", ""FirstVisitResult"", ""FirstVisitResultCode"", ""CenterToOrgTime"",""ActualHandleStepAcceptTime"",  ""HandleDuration"", ""HandleDurationWorkday"", ""AllDuration"",
 			//""AllDurationWorkday"", ""FileDuration"", ""FileDurationWorkday""
-			tool.SaveLog("order :" + JsonConvert.SerializeObject(order) + "  ;" , 1);
+			//tool.SaveLog("order :" + JsonConvert.SerializeObject(order) + "  ;" , 1);
 			var pgOrderSql = $@"INSERT INTO ""public"".""order"" (""Id"", ""CallId"", ""FromPhone"", ""TransferPhone"", ""FromName"", ""FromGender"", ""IdentityType"", 
 						 ""Contact"", ""ContactMask"", ""AcceptSms"",
 						""No"", ""AcceptType"", ""Title"", ""HotspotId"", ""HotspotName"", ""HotspotSpliceName"", 

Joint/User.cs

@@ -36,7 +36,7 @@ namespace DataTransmission.Joint
 					{
 						continue;
 					}
-					var isDeleted = row["SUser_DelFlag"].ToString() == "0" || row["SUser_ResStatus"].ToString() == "0" || row["SUser_LStatus"].ToString() == "1" ? "f" : "t";
+					var isDeleted = row["SUser_DelFlag"].ToString() == "0" &&  row["SUser_ResStatus"].ToString() == "0" && row["SUser_LStatus"].ToString() == "1" ? "f" : "t";
 					insertSql += $@"INSERT INTO ""public"".""user"" (""Id"",""Name"",""Gender"",""IsDeleted"",""CreationTime"",""CreatorOrgLevel"",""UserType"",""OldUserId"",""OrgId"",""PhoneNo""
 									)VALUES('{id}','{row["SUser_Name"]}',2,'{isDeleted}','2024-04-19 00:00:00.000000',1,0,{row["SUser_ID"]},{row["SUser_BMID"]},'{row["SInfo_Mobile"].ToString().Trim()}');";
 					insertSql += GetUserAccountSql(row,id, isDeleted);

Joint/Workflow.cs

@@ -23,6 +23,19 @@ namespace DataTransmission.Joint
 			return tool.GetDataTable(orderSql, conn);
 		}
 
+		public DataTable GetWorkflow_Run(string OldOrderId, string StoreCode)
+		{
+			var conn = tool.GetConSqlServer();
+			var orderSql = $@"SELECT  FTR_RunID as FTRB_RunID,FTR_ItemName as FTRB_ItemName, FTR_APBMID as FTRB_APBMID,FTR_APDate as FTRB_APDate,FTR_MoveUserID as FTRB_MoveUserID,
+							FTR_DisposeDate as FTRB_DisposeDate, FTC.FTC_RRemark as FTRB_RRemark , FTR_APUserID as FTRB_APUserID ,FTR_UserID as FTRB_UserID,FTR_PRunID as FTRB_PRunID,
+							FTR_TTime as FTRB_TTime,FTR_MoveUserID as FTRB_MoveUserID,FTR_MoveDate as FTRB_MoveDate,* FROM Flow_Transfer01_Run  FTR
+							LEFT JOIN Flow_Set01_Store  FSS ON FTR.FTR_StoreID = FSS.FSL_StoreID  
+							LEFT JOIN Flow03_Search FS ON FTR.FTR_FlowID = FS.FSH_FlowID
+							LEFT JOIN Flow_Transfer02_Content FTC ON FTR.FTR_ListID = FTC.FTC_ListID
+							WHERE FTR_FlowID ='{OldOrderId}' AND FSS.FSL_Code ='{StoreCode}' ORDER BY  FTR_MoveDate  ";
+			return tool.GetDataTable(orderSql, conn);
+		}
+
 		public string GetWorkflowSql(DataTable data, DataRow row, string orderId, DataTable org, DataTable user, DataRow module,Entity.OrderDelay delay, Entity.Config config)
 		{
 			var pgSql = string.Empty;
@@ -263,7 +276,7 @@ namespace DataTransmission.Joint
 			'{step.HandlerOrgIsCenter.ToString()}', '{step.HandlerOrgName}', '{step.HandlerOrgAreaCode}', '{step.HandlerOrgAreaName}', {step.HandleTime.ToString()}, '{step.Name}', '', {(int)step.StepType}, {(int)step.BusinessType},
 			3, 'f', 0, 'f',  '[]',  'f', 'f', '{step.Opinion}', {step.StepExpiredTime.ToString()},
 			'f', '{step.CreationTime.ToString()}', '{step.CreatorId}', '{step.CreatorName}', '{step.CreatorOrgId}', '{step.CreatorOrgName}', {step.CreatorOrgLevel}, '{step.AreaId}', NULL, '[]',
-			'f', '{workflow.ModuleId}', '{workflow.ModuleName}', '{workflow.ModuleCode}', 0, '{step.ExternalId}', 1, '[]', '{step.PrevStepId}', NULL, 'f', 'f', '',
+			'f', '{workflow.ModuleId}', '{workflow.ModuleName}', '{workflow.ModuleCode}', 0, '{workflow.ExternalId}', 1, '[]', '{step.PrevStepId}', NULL, 'f', 'f', '',
 			0, '[]', NULL, 'f', 'f', '', 0, NULL, NULL, 0,
 			NULL, 0, NULL, NULL, NULL, '{step.CreatorId}', '{step.CreatorName}', '{step.CreatorOrgId}', '{step.CreatorOrgName}', '{step.AssignerOrgIsCenter.ToString()}', NULL, 0,0);";