数据同步

App.config

@@ -7,11 +7,12 @@
     <!--<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=10.4.117.50;Port=5432;UserId=fwkjluzhou;Password=Fwkj2024$$!Tgs*_;Database=hotline;"/>-->
+    <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/Order.cs

@@ -46,7 +46,7 @@ namespace DataTransmission.Joint
 			var EmergencyLevel = row["FSH_Urgent"].ToString() == "1" ? 2 : 0;
 			var ExpiredStatus = row["FSH_OverTimeState"].ToString() == "正常" ? 0 : row["FSH_OverTimeState"].ToString() == "即将超期" ? 1 : 2;
 			var IsSecret = row["FLM_SFlag"].ToString() == "1" ? "t" : "f";
-			var IsProvince = row["RCI_FlowID"].ToString() == "NULL" ? "f" : "t";
+			var IsProvince = row["RCI_FlowID"].ToString() == "NULL" || string.IsNullOrEmpty(row["RCI_FlowID"].ToString()) ? "f" : "t";
 			var ActualHandleOrgCode = row["FSH_AcceptBMID"].ToString();
 			try
 			{
@@ -159,7 +159,7 @@ namespace DataTransmission.Joint
 						'{order.Id}', '{order.CallId}', '{order.FromPhone}', '{order.TransferPhone}',  '{order.FromName}', {order.FromGender}, {order.IdentityType}, 
 						 '{order.Contact}', '{order.ContactMask}', '{order.AcceptSms.ToString()}',
 						'{order.No}', '{order.AcceptType}', '{order.Title}', '{order.HotspotId}', '{order.HotspotName}', '{order.HotspotSpliceName}',
-						'{order.PushTypeCode}', '{order.Contact}', 500, '{order.StartTime}', '{order.ExpiredTime}', '{order.FiledTime}',
+						'{order.PushTypeCode}', '{order.Content}', 500, '{order.StartTime}', '{order.ExpiredTime}', '{order.FiledTime}',
 						{order.ExpiredStatus}, '{order.AreaCode}', '{order.Street}',
 						'{order.IsDeleted.ToString()}', '{order.CreationTime}', '{order.SmsSended.ToString()}',
 						{order.ProcessType}, '{order.IsPublicity.ToString()}', '{order.IsSecret.ToString()}', '{order.ActualHandleOrgName}', {order.ActualHandleOrgCode}, '{order.ActualOpinion}', '{order.SourceChannel}', '{order.IsProvince.ToString()}',

Joint/Workflow.cs

@@ -59,6 +59,11 @@ namespace DataTransmission.Joint
 			var creator = user.AsEnumerable().FirstOrDefault(x => x.Field<int?>("oldUserId").ToString() == stStep["FTRB_MoveUserID"].ToString());
 			var creatorOrg = org.AsEnumerable().FirstOrDefault(x => x.Field<string?>("Id").ToString() == creator["OrgId"].ToString());
 
+			if (workflow.ModuleCode == "OrderDelay")
+			{
+				 endStep = data.AsEnumerable().OrderByDescending(x => x.Field<DateTime?>("FTRB_MoveDate")).FirstOrDefault();
+				actualStep = endStep;
+			}
 			workflow.EndTime = DateTime.Parse(endStep["FTRB_DisposeDate"].ToString());
 			workflow.ActualHandleStepCode = "";
 			workflow.ActualHandleStepName = "";
@@ -86,7 +91,7 @@ namespace DataTransmission.Joint
 			}
 			else if (workflow.ModuleCode == "OrderDelay")
 			{
-				workflow.FlowType =  EFlowType.Handle;
+				workflow.FlowType =  EFlowType.Review;
 				workflow.ReviewResult =  delay.DelayState == EDelayState.Pass ? EReviewResult.Approval : delay.DelayState == EDelayState.NoPass ? EReviewResult.Failed : EReviewResult.Unknown ;
 				workflow.ExternalId = delay.Id;
 			}