Merge branch 'master' of http://192.168.1.222:3000/zhoufan/SQ12345_Api

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/workorder/WorkOrderController.cs

@@ -9267,6 +9267,10 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 string deptids = RequestString.GetFormString("deptids");//通告单位
                 string noticereson = RequestString.GetFormString("noticereson");//通告原因
 
+                //2020-3-4添加通告选项
+                int noticeid = RequestString.GetInt("noticeid", 0);//通告选项id
+                string noticeinfo = RequestString.GetFormString("noticeinfo");//通告内容
+
                 Model.T_Bus_WorkOrder modelT_Bus_WorkOrder = workorderBLL.GetModel(workorderid);
                 Model.T_Bus_AssignedInfo modelT_Bus_AssignedInfo = assignBLL.GetNewModelByWorkOrderID(workorderid);
                 if (modelT_Bus_WorkOrder != null)
@@ -9398,6 +9402,10 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 string deptids = RequestString.GetFormString("deptids");//通告单位
                 string noticereson = RequestString.GetFormString("noticereson");//通告原因
 
+                //2020-3-4添加通告选项
+                int noticeid = RequestString.GetInt("noticeid", 0);//通告选项id
+                string noticeinfo = RequestString.GetFormString("noticeinfo");//通告内容
+
                 Model.T_Bus_WorkOrder modelT_Bus_WorkOrder = workorderBLL.GetModel(workorderid);
                 Model.T_Bus_AssignedInfo modelT_Bus_AssignedInfo = assignBLL.GetNewModelByWorkOrderID(workorderid);
                 if (modelT_Bus_WorkOrder != null)

CallCenterApi/CallCenterApi.Model/T_Bus_WorkOrder.cs

@@ -70,6 +70,8 @@ namespace CallCenterApi.Model
         private decimal? _f_longitude;
         private decimal? _f_latitude;
         private string _f_maindeptid3;
+        private string _f_noticeinfo;
+        private int?  _f_noticeid;
         /// <summary>
         /// 
         /// </summary>
@@ -550,6 +552,24 @@ namespace CallCenterApi.Model
             set { _f_maindeptid3 = value; }
             get { return _f_maindeptid3; }
         }
+
+        /// <summary>
+        /// 通报内容
+        /// </summary>
+        public string F_NoticeInfo
+        {
+            set { _f_noticeinfo = value; }
+            get { return _f_noticeinfo; }
+        }
+
+        /// <summary>
+        /// 通报内容id
+        /// </summary>
+        public int? F_NoticeID
+        {
+            set { _f_noticeid = value; }
+            get { return _f_noticeid; }
+        }
         #endregion Model
 
     }