调整工单

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/UserAccountController.cs

@@ -134,7 +134,7 @@ namespace CallCenterApi.Interface.Controllers
                 if (userModel == null) return Error("获取失败");
                 var depModel = departmentBLL.GetModel(userModel.F_DeptId);
                 var zxzModel = dicValueBLL.GetModel(userModel.F_GroupId ?? 0);
-                var modelRegion = bllCus_Region.GetModel(userModel.RegionId);
+                //var modelRegion = bllCus_Region.GetModel(userModel.RegionId);
                 res = Success("获取成功", new
                 {
                     F_UserId = userModel.F_UserId,
@@ -168,8 +168,8 @@ namespace CallCenterApi.Interface.Controllers
                     F_SeatGroup = userModel.F_SeartGroup,
                     zxzname = zxzModel?.F_Name ?? "",
                     depname = depModel?.F_DeptName ?? "",
-                    regionId = userModel.RegionId,   //项目id,
-                    regionName = modelRegion?.F_RegionName   //项目名称
+                    //regionId = userModel.RegionId,   //项目id,
+                    //regionName = modelRegion?.F_RegionName   //项目名称
                 });
             }
             return res;
@@ -436,7 +436,7 @@ namespace CallCenterApi.Interface.Controllers
                 string sql = " f_seatflag=1 ";
                 int userId = CurrentUser.UserData.F_UserId;
                 int roleId = CurrentUser.UserData.F_RoleId;
-                int userRegionId = CurrentUser.UserData.RegionId;  //项目id
+                //int userRegionId = CurrentUser.UserData.RegionId;  //项目id
 
                 List<Model.T_Sys_UserAccount> userSeartList = sysUserAccountBll.GetModelList(sql + " order by f_userid desc ");
                 res = Success("列表加载成功", userSeartList);

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/tel/CallInScreenController.cs

@@ -617,8 +617,11 @@ namespace CallCenterApi.Interface.Controllers.tel
                             }
                         }
                         #endregion
+                        model.F_IsOver = isover;
                         if (isover == 1)
                         {
+                            model.LastDealUser = usercode;
+                            model.LastDealTime = DateTime.Now;
                             model.State = 2;
                         }
                         else
@@ -648,42 +651,44 @@ namespace CallCenterApi.Interface.Controllers.tel
                         if (orderid > 0)
                         {
                             #region 创建工单 处理记录
-                            if (clbm != 0 || clid != 0)
-                            {
-                                Model.T_Wo_WorkOrderItem item = new Model.T_Wo_WorkOrderItem();
-                                item.ToUser = users;
-                                item.WorkOrderID = model.WorkOrderID;
-                                item.Type = 1;      //处理
-                                item.ToDept = clbm; //部门
-                                                    //item.ToUser = clus != null ? clus.F_UserCode : "";  //接收人
-                                item.Detail = detailutf8;
-                                item.IsDel = 0;
-                                //转派
-                                item.State = 0;
-                                item.IsLast = 0;
-                                item.IsStart = 0;
-                                item.IsTimeOut = 0;
-                                item.CreateUser = ua.F_UserCode;
-                                item.CreateTime = DateTime.Now;
-                                long itemid = new BLL.T_Wo_WorkOrderItem().Add(item);
-                                if (itemid > 0)
+                            if (isover == 0) {
+                                if (clbm != 0 || clid != 0)
                                 {
-                                    string strmsg = string.Empty;
-                                    strmsg = ua.F_UserName + "创建转派了工单，单号：" + model.WorkOrderID;
-                                    #region 消息表
-                                    Model.T_Msg_List msg = new Model.T_Msg_List();
-                                    msg.Type = 1;//处理
-                                    msg.ToUser = ua.F_UserCode;
-                                    msg.ToID = Int32.Parse(itemid.ToString());
-                                    msg.Detail = strmsg;
-                                    msg.State = 0;
-                                    msg.IsDel = 0;
-                                    msg.CreateUser = ua.F_UserCode;
-                                    msg.CreateDate = DateTime.Now;
-
-                                    new BLL.T_Msg_List().Add(msg);
-                                    #endregion
-                                    res = Success("处理成功");
+                                    Model.T_Wo_WorkOrderItem item = new Model.T_Wo_WorkOrderItem();
+                                    item.ToUser = users;
+                                    item.WorkOrderID = model.WorkOrderID;
+                                    item.Type = 1;      //处理
+                                    item.ToDept = clbm; //部门
+                                                        //item.ToUser = clus != null ? clus.F_UserCode : "";  //接收人
+                                    item.Detail = detailutf8;
+                                    item.IsDel = 0;
+                                    //转派
+                                    item.State = 0;
+                                    item.IsLast = 0;
+                                    item.IsStart = 0;
+                                    item.IsTimeOut = 0;
+                                    item.CreateUser = ua.F_UserCode;
+                                    item.CreateTime = DateTime.Now;
+                                    long itemid = new BLL.T_Wo_WorkOrderItem().Add(item);
+                                    if (itemid > 0)
+                                    {
+                                        string strmsg = string.Empty;
+                                        strmsg = ua.F_UserName + "创建转派了工单，单号：" + model.WorkOrderID;
+                                        #region 消息表
+                                        Model.T_Msg_List msg = new Model.T_Msg_List();
+                                        msg.Type = 1;//处理
+                                        msg.ToUser = ua.F_UserCode;
+                                        msg.ToID = Int32.Parse(itemid.ToString());
+                                        msg.Detail = strmsg;
+                                        msg.State = 0;
+                                        msg.IsDel = 0;
+                                        msg.CreateUser = ua.F_UserCode;
+                                        msg.CreateDate = DateTime.Now;
+
+                                        new BLL.T_Msg_List().Add(msg);
+                                        #endregion
+                                        res = Success("处理成功");
+                                    }
                                 }
                             }
                             #endregion

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

@@ -660,6 +660,8 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         int iseffective = RequestString.GetFormInt("iseffective", 0);
                         //备注
                         string note = RequestString.GetFormString("note");
+                        //是否结束
+                        int isover = RequestString.GetFormInt("isover", 0);
                         if (!string.IsNullOrEmpty(workorderid))
                         {
                             var models = new BLL.T_Wo_WorkOrder().GetModelList(" WorkOrderID='" + workorderid + "'");
@@ -678,6 +680,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                 //反馈内容
                                 var detailutf8 = System.Web.HttpUtility.UrlDecode(fkcont, System.Text.Encoding.UTF8);
                                 model.Detail = detailutf8;
+                                model.F_IsOver = isover;
                                 model.IsEffective = iseffective;    //是否有效工单项(0有效，1无效)
                                 if (iseffective == 1)
                                     model.Province = System.Web.HttpUtility.UrlDecode(note, System.Text.Encoding.UTF8); //备注
@@ -2126,6 +2129,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
             var detailutf8 = System.Web.HttpUtility.UrlDecode(fkcont, System.Text.Encoding.UTF8);
             model.Detail = detailutf8;
             model.IsEffective = iseffective;    //是否有效工单项(-1未知，0有效，1无效)          
+            model.F_IsOver = 0;
             model.CreateTime = DateTime.Now;
             model.IsDel = 0;
             model.IsReturn = 0;

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Models/Input/UserAccountInput.cs

@@ -28,6 +28,6 @@ namespace CallCenterApi.Interface.Models.Input
         public DateTime? Birth { get; set; }
         public int? HjType { get; set; }
         public string Remark { get; set; }
-        public int RegionId { get; set; } = 0;   //区域项目id
+        //public int RegionId { get; set; } = 0;   //区域项目id
     }
 }

codegit/CallCenterApi/CallCenterApi.Model/T_Wo_WorkOrder.cs

@@ -406,7 +406,10 @@ namespace CallCenterApi.Model
         /// 是否有效工单项(0有效，1无效)
         /// </summary>
         public int IsEffective { get; set; }
-
+        /// <summary>
+        /// 是否立即处理 0否 1是
+        /// </summary>
+        public int F_IsOver { set; get; }
 
         /// <summary>
         /// 楼号