工单发布

Entity/OrderPublish.cs

@@ -0,0 +1,107 @@
+using DataTransmission.Enum;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace DataTransmission.Entity
+{
+	/// <summary>
+	/// 已发布工单
+	/// </summary>
+	[Description("工单发布")]
+	//[SugarIndex("index_publish_orderId", nameof(OrderPublish.OrderId), OrderByType.Asc)]
+	public class OrderPublish : FullStateEntity
+	{
+		public string OrderId { get; set; }
+
+		/// <summary>
+		/// 工单编码（冗余）
+		/// </summary>
+		public string No { get; set; }
+
+		/// <summary>
+		/// 发布范围
+		/// </summary>
+		public bool PublishState { get; set; }
+
+		/// <summary>
+		/// 整理标题
+		/// </summary>
+		public string ArrangeTitle { get; set; }
+
+		/// <summary>
+		/// 整理内容
+		/// </summary>
+		//[SugarColumn(ColumnDataType = "text")]
+		public string ArrangeContent { get; set; }
+
+		/// <summary>
+		/// 整理结果
+		/// </summary>
+		//[SugarColumn(ColumnDataType = "text")]
+		public string ArrangeOpinion { get; set; }
+
+		/// <summary>
+		/// 已发布工单
+		/// </summary>
+		//[Navigate(NavigateType.OneToOne, nameof(OrderId))]
+		//public Order Order { get; set; }
+
+		#region 省工单使用字段
+
+		/// <summary>
+		/// 省是否公开
+		/// </summary>
+		public bool? ProPublishState { get; set; }
+
+		/// <summary>
+		/// 反馈电话
+		/// </summary>
+		//[SugarColumn(IsNullable = true)]
+		public string? FeedBackPhone { get; set; }
+
+		/// <summary>
+		/// 不公开原因
+		/// </summary>
+		//[SugarColumn(IsNullable = true)]
+		public string? NoPubReason { get; set; }
+
+		/// <summary>
+		/// 是否联系
+		/// </summary>
+		public bool? IsContact { get; set; }
+
+		/// <summary>
+		/// 是否评价
+		/// </summary>
+		public bool? IsVisited { get; set; }
+
+		/// <summary>
+		/// 网民评价
+		/// </summary>
+		//[SugarColumn(ColumnDataType = "json", IsJson = true, IsNullable = true)]
+		public Kv? NetizenEvaluate { get; set; }
+
+		/// <summary>
+		/// 评价内容
+		/// </summary>
+		public string? EvaluateContent { get; set; }
+
+		/// <summary>
+		/// 备注
+		/// </summary>
+		public string? Remark { get; set; }
+
+		/// <summary>
+		/// 答复口径
+		/// </summary>
+		//[SugarColumn(ColumnDataType = "text", IsNullable = true)]
+		public string? AnswerContent { get; set; }
+		#endregion
+
+		public bool? Resolve { get; set; }
+	}
+}

Joint/Order.cs

@@ -138,7 +138,7 @@ namespace DataTransmission.Joint
 						 '{order.AcceptTypeCode}', '[]', '热线中心',
 						'坐席', '[""001""]', '[]', 1, '{order.ProvinceNo}', NULL, '{order.Password}',
 						'08dc0121-5960-4267-817c-b6dc6c068fa4', '坐席',
-						'{CommonTool.Name}','0','t','f','f','{order.IsUrgent.ToString()}','f'
+						'{Form1.Name}','0','t','f','f','{order.IsUrgent.ToString()}','f'
 						'19', '{order.NearlyExpiredTime.ToString()}', '[]', '[]', '[]', '[]',
 						'f','f','f','f','f','{order.OldOrderId}');";
 			return pgOrderSql;

Joint/OrderPublic.cs

@@ -21,7 +21,7 @@ namespace DataTransmission.Joint
 	WFSCT_Content Content,   WFSH_RSFlag ResultState ,WFSH_BMName BMName,WFSCT_Result Result ,
 	WFSH_AddDate AddDate,FSH_AcceptDate  AcceptDate,WFSH_PubDate PubDate ,FSH_DisposeDate DisposeDate
 	                                    from Web10_FlowSearch wfsh with(nolock)
-																		left join Web10_FlowSearchContent wfshc with(nolock) on wfshc.WFSCT_FlowID=WFSH_FlowID
+										left join Web10_FlowSearchContent wfshc with(nolock) on wfshc.WFSCT_FlowID=WFSH_FlowID
 	                                    left join CityHotline_Ver3.dbo.View_Flow_Process fsh with(nolock) on WFSH_FlowID=FSH_FlowID
 	                                    where WFSH_PubFlag=2 and  WFSH_AddDate>='{st_time}' and WFSH_AddDate<='{end_time}'";
             return tool.GetDataTable(sql, conn);