1

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/workorder/ConvergeController.cs

@@ -2053,9 +2053,9 @@ namespace CallCenterApi.Interface.Controllers
                     jsonList.FINISH_TYPE = "10";
                     jsonList.DEPT_NAME = "热线中心";
                     if (model.F_CloseTime != null)
-                        jsonList.END_TIME = model.F_CloseTime.Value.ToString("yyyy-MM-dd HH:mm:ss");
+                        jsonList.FINISH_TIME = model.F_CloseTime.Value.ToString("yyyy-MM-dd HH:mm:ss");
                     else
-                        jsonList.END_TIME = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
+                        jsonList.FINISH_TIME = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
                     jsonList.DEPT_CODE = "4106000299";
                 }
                 else
@@ -2064,11 +2064,11 @@ namespace CallCenterApi.Interface.Controllers
                     if (model.F_MainDeptId > 0)
                     {
                         if (model.F_DealTime != null)
-                            jsonList.END_TIME = model.F_DealTime.Value.ToString("yyyy-MM-dd HH:mm:ss");
+                            jsonList.FINISH_TIME = model.F_DealTime.Value.ToString("yyyy-MM-dd HH:mm:ss");
                         else if (model.F_CloseTime != null)
-                            jsonList.END_TIME = model.F_CloseTime.Value.ToString("yyyy-MM-dd HH:mm:ss");
+                            jsonList.FINISH_TIME = model.F_CloseTime.Value.ToString("yyyy-MM-dd HH:mm:ss");
                         else
-                            jsonList.END_TIME = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
+                            jsonList.FINISH_TIME = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
                         var NAME = DbHelperSQL.GetSingle(" select dbo.GetDeptNames('" + model.F_MainDeptId + "')");
                         if (NAME != null)
                             jsonList.DEPT_NAME = NAME.ToString();
@@ -2086,9 +2086,9 @@ namespace CallCenterApi.Interface.Controllers
                     else
                     {
                         if (model.F_CloseTime != null)
-                            jsonList.END_TIME = model.F_CloseTime.Value.ToString("yyyy-MM-dd HH:mm:ss");
+                            jsonList.FINISH_TIME = model.F_CloseTime.Value.ToString("yyyy-MM-dd HH:mm:ss");
                         else
-                            jsonList.END_TIME = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
+                            jsonList.FINISH_TIME = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
                         jsonList.DEPT_NAME = "热线中心";
                         jsonList.DEPT_CODE = "4106000299";
                     }
@@ -2098,9 +2098,9 @@ namespace CallCenterApi.Interface.Controllers
                     jsonList.DEPT_CODE = "4106000299";
 
                 if (model.F_CloseTime != null)
-                    jsonList.FINISH_TIME = model.F_CloseTime.Value.ToString("yyyy-MM-dd HH:mm:ss");
+                    jsonList.END_TIME = model.F_CloseTime.Value.ToString("yyyy-MM-dd HH:mm:ss");
                 else
-                    jsonList.FINISH_TIME = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
+                    jsonList.END_TIME = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
                 if (!string.IsNullOrEmpty(model.F_DealUser))
                 {
                     var FINISH_NAME = DbHelperSQL.GetSingle(" select dbo.GetUserName('" + model.F_DealUser + "')");

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

@@ -20908,9 +20908,9 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                 satisfie = "，结果：满意";
                                 if (issatisfie == 0)
                                     satisfie = "，结果：不满意";
-                                else if (issatisfie == 1)
-                                    satisfie = "，结果：基本满意";
                                 else if (issatisfie == 2)
+                                    satisfie = "，结果：基本满意";
+                                else if (issatisfie == 3)
                                     satisfie = "，结果：非常满意";
                                 else if (issatisfie == -1)
                                     satisfie = "，结果：非常不满意";