Merge branch 'test' of http://110.188.24.182:10023/Fengwo/hotline into test

src/Hotline.Api/Controllers/OrderController.cs

@@ -531,6 +531,13 @@ public class OrderController : BaseController
         if (order.Status != EOrderStatus.Filed)
             throw UserFriendlyException.SameMessage("当前状态无法发布");
 
+
+        if(order.SourceChannelCode=="SZMHD" && order.IsProvince && dto.PublishState && dto.IsOpenReview is null)
+        {
+            throw UserFriendlyException.SameMessage("公开信件必须选择开展保密审查");
+        }
+
+
         var enabled = _systemSettingCacheManager.CancelPublishOrderEnabled;
         if (enabled)
         {

src/Hotline.Share/Dtos/Order/OrderDto.cs

@@ -1469,6 +1469,11 @@ namespace Hotline.Share.Dtos.Order
         /// </summary>
         public string? ReceiveProvinceNo { get; set; }
 
+        /// <summary>
+        /// 省是否公开（省政府网站、省政务服务网、天府通办App）
+        /// </summary>
+        public bool? IsPublic { get; set; }
+
         /// <summary>
         /// 省过期时间（省工单才有）
         /// </summary>

src/Hotline.Share/Dtos/Order/PublishedDto.cs

@@ -236,7 +236,7 @@ public class PublishPublishOrderDto
     /// </summary>
     public List<FileJson>? FileJsons { get; set; }
     #region 省工单使用
-
+    #region 中国政府网
     /// <summary>
     /// 省是否公开
     /// </summary>
@@ -247,7 +247,7 @@ public class PublishPublishOrderDto
     public string? FeedBackPhone { get; set; }
 
     /// <summary>
-    /// 不公开原因
+    /// 不公开原因(省工单公用)
     /// </summary>
     public string? NoPubReason { get; set; }
 
@@ -280,7 +280,14 @@ public class PublishPublishOrderDto
     /// 答复口径
     /// </summary>
     public string AnswerContent { get; set; }
+    #endregion
 
+    #region  省政府网、省政务服务网、天府通办App
+    /// <summary>
+    /// 是否开展保密审查
+    /// </summary>
+    public bool? IsOpenReview { get; set; }
+    #endregion
     #endregion
 }
 
@@ -366,6 +373,11 @@ public class PublishOrderDto
 
     #endregion
 
+    /// <summary>
+    /// 是否开展保密审查
+    /// </summary>
+    public bool? IsOpenReview { get; set; }
+
     /// <summary>
     /// 是否解决
     /// </summary>

src/Hotline.Share/Hotline.Share.csproj

@@ -7,7 +7,7 @@
     <GenerateDocumentationFile>True</GenerateDocumentationFile>
     <NoWarn>$(NoWarn);1591;8618;</NoWarn>
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
-    <Version>1.0.121</Version>
+    <Version>1.0.123</Version>
   </PropertyGroup>
 
   <ItemGroup>

src/Hotline/Orders/Order.cs

@@ -915,6 +915,12 @@ namespace Hotline.Orders
         [SugarColumn(ColumnDescription = "省退回结果")]
         public bool? ProvinceSendBack { get; set; }
 
+        /// <summary>
+        /// 省是否公开（省政府网站、省政务服务网、天府通办App）
+        /// </summary>
+        [SugarColumn(ColumnDescription ="省是否公开")]
+        public bool? IsPublic { get; set; }
+
         #endregion
 
         #region 附件冗余
@@ -990,6 +996,7 @@ namespace Hotline.Orders
         public string? CaseProcessType { get; set; }
         #endregion
 
+        #region 工单标签
         /// <summary>
         /// 敏感标签
         /// </summary>
@@ -1117,12 +1124,13 @@ namespace Hotline.Orders
         /// </summary>
         [SugarColumn(ColumnDescription = "话务提醒是否转办")]
         public bool? IsForwarded { get; set; }
+        #endregion
 
         #region 回访信息
         /// <summary>
         /// 话务员评价（话务评价）
         /// </summary>
-		[SugarColumn(ColumnDescription = "话务员评价")]
+        [SugarColumn(ColumnDescription = "话务员评价")]
         public ESeatEvaluate? SeatEvaluate { get; set; }
 
         /// <summary>
@@ -1143,6 +1151,7 @@ namespace Hotline.Orders
         /// </summary>
         [SugarColumn(ColumnDataType = "json", IsJson = true, IsNullable = true, ColumnDescription = "知识库引用")]
         public List<Kv>? KnowledgeQuote { get; set; }
+
     }
 
     public partial class Order

src/Hotline/Orders/OrderPublish.cs

@@ -51,6 +51,7 @@ public class OrderPublish : FullStateEntity
 
     #region 省工单使用字段
 
+    #region 中国政府网
     /// <summary>
     /// 省是否公开
     /// </summary>
@@ -99,6 +100,16 @@ public class OrderPublish : FullStateEntity
     /// </summary>
     [SugarColumn(ColumnDataType = "text", IsNullable = true)]
     public string? AnswerContent { get; set; }
+
+    #endregion
+
+    #region  省政府网站、省政务服务网、天府通办App
+
+    /// <summary>
+    /// 是否开展保密审查
+    /// </summary>
+    public bool? IsOpenReview { get; set; }
+    #endregion
     #endregion
 
     public bool? Resolve { get; set; }