指派工单修改

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

@@ -94,7 +94,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     model.IconCls = "";//图标
                     model.text = categorylist[i].F_QuestionName;
                     model.headerid = categorylist[i].F_ParentId ?? 0;   
-                    tab2 = new BLL.T_Sys_Department().GetList("F_ParentId=" + currentID + " and F_IsDelete=0 ").Tables[0];
+                    tab2 = new BLL.T_Wo_QuestionManage().GetList("F_ParentId=" + currentID + " and F_IsDelete=0 ").Tables[0];
                     if (tab2 != null && tab2.Rows.Count > 0)
                     {
                         model.children = BindTree(tab2, currentID);

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

@@ -26,8 +26,8 @@ namespace CallCenterApi.Interface.Controllers.workorder
         /// 获取工单列表
         /// </summary>
         /// <returns></returns>
-        public ActionResult GetList(string code,int  type, string cusname, string cusphone, string companyname, string province, string city,
-            string country, string township, string touser, int state=-1, int pageindex = 1,int pagesize = 10)
+        public ActionResult GetList(string code, string cusname, string cusphone, string companyname, string province, string city,
+            string country, string township, string touser, int type = 0, int state=-1, int pageindex = 1,int pagesize = 10)
         {
 
             string sql = $" and F_IsDelete=0";
@@ -241,7 +241,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         deptname = deptmodel.F_DeptName + "-";
                     }
                     #endregion
-                    AddLog(input.F_ID, model.F_State.Value, deptname + ua.F_UserName + "(" + ua.F_UserCode + ")" + "修改工单", (int)EnumItemType.update, (int)EnumItemOpt.update, "", 0, ua);
+                    AddLog(input.F_ID, model.F_State.Value, deptname + ua.F_UserName + "(" + ua.F_UserCode + ")" + "修改工单", (int)EnumItemType.update, (int)EnumItemOpt.update, "", 0, ua,0,0);
                     return Success("保存成功！");
                 }
                 else
@@ -437,10 +437,9 @@ namespace CallCenterApi.Interface.Controllers.workorder
         /// <summary>
         /// 添加工单记录
         /// </summary>
-        public long AddLog(long woid, int wostate, string content, int itemtype, int opttype, string nextuser, int nextdept, Model.T_Sys_UserAccount nowUser)
+        public long AddLog(long woid, int wostate, string content, int itemtype, int opttype, string nextuser, int nextdept, Model.T_Sys_UserAccount nowUser ,int overtime,int sms )
         {
             Model.T_Wo_WorkOrderItem_New itemModel = new Model.T_Wo_WorkOrderItem_New();
-            string starttime = "";string endtime = "";
             #region 
             //处理当前工单的记录之前的记录过期
             var itemlast = itembll.GetModelList(" isnull(F_IsUsed,'0')='0' and F_ItemType=" + itemtype + " and  F_WoID=" + woid + " ");
@@ -450,18 +449,11 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 {
                     it.F_IsUsed = 1;
                     itembll.Update(it);
-                    if ( it.F_WoState == 2)
-                    {
-                        starttime = it.F_CreateTime.ToString ();
-                    }
-                    if (it.F_WoState == 10)
-                    {
-                        endtime = it.F_CreateTime.ToString();
-                    }
                 }
             }
             #endregion
             itemModel.F_WoID = woid;
+            itemModel.F_IsSMS = sms;
             itemModel.F_WoState = wostate;
             itemModel.F_ItemType = itemtype;
             itemModel.F_OptType = opttype;
@@ -469,14 +461,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
             itemModel.F_NextUser = nextuser;
             itemModel.F_NextDept = nextdept;
             itemModel.F_IsUsed = 0;
-            if (starttime!=""&& endtime!="")
-            {
-                itemModel.F_LimitTime = (DateTime.Parse(endtime) - DateTime.Parse(starttime)).ToString();
-            }
-            else
-            {
-                itemModel.F_LimitTime = "0";
-            }
+            itemModel.F_LimitTime = overtime.ToString ();
             itemModel.F_CreateUser = nowUser.F_UserCode;
             itemModel.F_CreateTime = DateTime.Now;
             var res = itembll.Add(itemModel);
@@ -516,7 +501,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
         /// </summary>
         /// <returns></returns>
         [Authority]
-        public ActionResult AssignWorkOrder(long orderid, string cont, int clbm = 0, int clid = 0)
+        public ActionResult AssignWorkOrder(long orderid, string cont,int overtime=0,int sms=0,int clbm = 0, int clid = 0)
         {
             int userId = CurrentUser.UserData.F_UserId;
             string usercode = CurrentUser.UserData.F_UserCode;
@@ -530,7 +515,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     Model.T_Wo_WorkOrder model = workOrder.GetModel(orderid);
                     if (model != null)
                     {
-                        var res = AssignWO(ua, model, cont, clbm, clid);
+                        var res = AssignWO(ua, model, cont, clbm, clid, overtime, sms);
                         if (res)
                             return Success("转派成功");
                         else
@@ -544,9 +529,8 @@ namespace CallCenterApi.Interface.Controllers.workorder
         }
         /// <summary>
         /// 转派工单
-        /// 
         /// </summary>
-        public bool AssignWO(Model.T_Sys_UserAccount nowUser, Model.T_Wo_WorkOrder model, string cont, int clbm = 0, int clid = 0)
+        public bool AssignWO(Model.T_Sys_UserAccount nowUser, Model.T_Wo_WorkOrder model, string cont, int clbm = 0, int clid = 0,int overtime = 0, int sms = 0)
         {
             string touser = ""; string tousername = "";
             #region 获取接收人
@@ -595,7 +579,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
             if (!string.IsNullOrEmpty(cont))
                 optcont = "，说明：" + cont;
             var content = deptname + nowUser.F_UserName + "(" + nowUser.F_UserCode + ")" + opt + "工单给 " + tousername + optcont;
-            var itemid = AddLog(model.F_ID , wostate, content, (int)EnumItemType.deal, optbut, touser, clbm, nowUser);
+            var itemid = AddLog(model.F_ID , wostate, content, (int)EnumItemType.deal, optbut, touser, clbm, nowUser , overtime,sms);
             if (itemid > 0)
             {
                 #region 处理工单