Merge branch 'master' of http://192.168.1.222:3000/duhongyu/HeBi12345_API

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

@@ -2747,10 +2747,6 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                 }
                             }
                         }
-
-
-
-
                         #endregion
                     }
                     else
@@ -13268,6 +13264,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                 
                                 if (nexttype == 0)
                                 {
+                                    keyValuePairs.Add("F_Note", "");
                                     keyValuePairs.Add("F_WorkState", 7);
 
                                     modelT_Bus_WorkOrder.F_WorkState = (int)EnumWorkState.visit;//已回访
@@ -13302,6 +13299,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                     //  modelT_Bus_WorkOrder.F_IsSms = 0;
                                     keyValuePairs2.Add("F_Identification", 0);
                                     // modelT_Bus_WorkOrder.F_Identification = 0;
+                                    keyValuePairs2.Add("F_Note", "");
                                     workorderBLL.UpdateWorkOrder(modelT_Bus_WorkOrder.F_Id, keyValuePairs2);
                                     #endregion
                                     opt = "于" + DateTime.Now
@@ -13332,6 +13330,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                         {
                                             Dictionary<string, object> keyValuePairs3 = new Dictionary<string, object>();
                                             keyValuePairs3.Add("F_WorkState", (int)EnumWorkState.backaudit);
+                                            keyValuePairs3.Add("F_Note", "");
                                             modelT_Bus_WorkOrder.F_WorkState = (int)EnumWorkState.backaudit;//重办审核
                                             if (statistics > 0)
                                             {
@@ -13422,6 +13421,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                                 // modelT_Bus_WorkOrder.F_DealUser = "";
                                                 keyValuePairs3.Add("F_DealTime", null);
                                                 //   modelT_Bus_WorkOrder.F_DealTime = null;
+                                                keyValuePairs3.Add("F_Note", "");
                                                 if (workorderBLL.UpdateWorkOrder(modelT_Bus_WorkOrder.F_Id, keyValuePairs3))
                                                 {
                                                     var user = new BLL.T_Sys_UserAccount().GetModelList("F_DeptId in ('" + modelT_Bus_WorkOrder.F_MainDeptId + "') ");
@@ -16211,7 +16211,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
 
                 Model.T_Bus_WorkOrder modelT_Bus_WorkOrder = workorderBLL.GetModel(workorderid);
 
-                if (modelT_Bus_WorkOrder != null&& modelT_Bus_WorkOrder.F_WorkState== (int)EnumWorkState.visit)
+                if (modelT_Bus_WorkOrder != null && (modelT_Bus_WorkOrder.F_WorkState == (int)EnumWorkState.dealed || modelT_Bus_WorkOrder.F_WorkState == (int)EnumWorkState.visit))
                 {
                     Dictionary<string, object> keyValuePairs = new Dictionary<string, object>();
                     keyValuePairs.Add("F_Note", modelT_Bus_WorkOrder.F_Note + "|||" + note);
@@ -16249,7 +16249,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
 
                 Model.T_Bus_WorkOrder modelT_Bus_WorkOrder = workorderBLL.GetModel(workorderid);
 
-                if (modelT_Bus_WorkOrder != null && modelT_Bus_WorkOrder.F_WorkState == (int)EnumWorkState.visit)
+                if (modelT_Bus_WorkOrder != null && (modelT_Bus_WorkOrder.F_WorkState == (int)EnumWorkState.dealed || modelT_Bus_WorkOrder.F_WorkState == (int)EnumWorkState.visit))
                 {
                     Dictionary<string, object> keyValuePairs = new Dictionary<string, object>();
                     keyValuePairs.Add("F_Note", note);

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Models/Common/ButtonGroup.cs

@@ -521,6 +521,7 @@ namespace CallCenterApi.Interface.Models.Common
                             buttons.Add(Audittransfer());
                             buttons.Add(Unsuccessful());
                             buttons.Add(turnsee());
+                            buttons.Add(Note());
                         }
                         if (code == "ZXHWY")
                         {
@@ -531,6 +532,7 @@ namespace CallCenterApi.Interface.Models.Common
                             buttons.Add(Audittransfer());
                             buttons.Add(Unsuccessful());
                             buttons.Add(turnsee());
+                            buttons.Add(Note());
                         }
                     }
                     break;