微信工单，报表。大数据

codegit/CallCenterApi/CallCenterApi.DAL/T_Cus_CustomerBaseNew.cs

@@ -199,7 +199,7 @@ namespace CallCenterApi.DAL
             strSql.Append("F_DeleteOn=@F_DeleteOn");
             strSql.Append(" where F_CustomerId=@F_CustomerId");
             SqlParameter[] parameters = {
-                    new SqlParameter("@F_CustomerCode", SqlDbType.NVarChar,100),
+                    new SqlParameter("@F_CustomerCode", SqlDbType.NVarChar,200),
                     new SqlParameter("@F_CompanyName", SqlDbType.NVarChar,200),
                     new SqlParameter("@F_AreaID", SqlDbType.NVarChar,200),
                     new SqlParameter("@F_BranchID", SqlDbType.NVarChar,200),
@@ -242,8 +242,8 @@ namespace CallCenterApi.DAL
                     new SqlParameter("@F_UpdateOn", SqlDbType.DateTime),
                     new SqlParameter("@F_IsDelete", SqlDbType.SmallInt,2),
                     new SqlParameter("@F_DeleteBy", SqlDbType.NVarChar,100),
-                    new SqlParameter("@F_DeleteOn", SqlDbType.DateTime),
                       new SqlParameter("@F_Gender", SqlDbType.NVarChar,100),
+                    new SqlParameter("@F_DeleteOn", SqlDbType.DateTime),
                     new SqlParameter("@F_CustomerId", SqlDbType.Int,4)};
             parameters[0].Value = model.F_CustomerCode;
             parameters[1].Value = model.F_CompanyName;
@@ -288,8 +288,8 @@ namespace CallCenterApi.DAL
             parameters[40].Value = model.F_UpdateOn;
             parameters[41].Value = model.F_IsDelete;
             parameters[42].Value = model.F_DeleteBy;
-            parameters[43].Value = model.F_DeleteOn;
-            parameters[44].Value = model.F_Gender;
+            parameters[43].Value = model.F_Gender;
+            parameters[44].Value = model.F_DeleteOn;
             parameters[45].Value = model.F_CustomerId;
 
             int rows = DbHelperSQL.ExecuteSql(strSql.ToString(), parameters);

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

@@ -111,6 +111,36 @@ namespace CallCenterApi.Interface.Controllers
             }
             return res;
         }
+        /// <summary>
+        /// 获取下一个工号
+        /// </summary>
+        /// <returns></returns>
+        public ActionResult GetUserCode()
+        {
+            ActionResult res = NoToken("未知错误，请重新登录");
+            if (Request.IsAuthenticated)
+            {
+                int UserCode = 0;
+                string strSql = "select Max(F_UserCode) F_UserCode from T_Sys_UserAccount ";
+                object ob = DbHelperSQL.GetSingle(strSql.ToString());
+                if (ob == null)
+                {
+                    UserCode= 0;
+                }
+                else
+                {
+                    UserCode= Convert.ToInt32(ob);
+                }
+                var obj = new
+                {
+                    state = "success",
+                    message = "成功",
+                    UserCode  = UserCode+1,
+                };
+                return Content(obj.ToJson()); ;
+            }
+            return res;
+        }
         //[Authority]
         //获取用户信息
         public ActionResult GetUser(int userId = 0, string userCode = "")

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/weixin/WxLoginController.cs

@@ -109,6 +109,14 @@ namespace CallCenterApi.Interface.Controllers.weixin
                         {
                             UserType = 0;
                         }
+                        else if (user.F_RoleId == 61)
+                        {
+                            UserType = 2;
+                        }
+                        else if (user.F_RoleId == 59)
+                        {
+                            UserType = 3;
+                        }
                         else
                         {
                             UserType = 1;
@@ -507,18 +515,27 @@ namespace CallCenterApi.Interface.Controllers.weixin
                         {
                             uwhere = sql += $" and F_CreateBy like '%" + ua.F_UserCode + "%'";
                         }
-                        sql += $" and F_State in(" + (int)EnumWorkOrderState.neworder + "," + (int)EnumWorkOrderState.reassign + ")" + " " + uwhere;
+                        sql += $" and F_State in(" + (int)EnumWorkOrderState.neworder + "," + (int)EnumWorkOrderState.reback + "," + (int)EnumWorkOrderState.abreback + ","+(int)EnumWorkOrderState.reassign+ ")" + " " + uwhere;
                         //    sql +=  "and T_Wo_WorkOrder.F_ID in (" + GetBackWorkOrderID(ua.F_UserCode) + ") ";
                         break;
                     case 1://已审核
                         if (ro.F_RoleCode == "DQJL" || ro.F_RoleCode == "FGSJL")
                         {
-                            sql += $"  and T_Wo_WorkOrder.F_ID in ( " + GetApprovedOrderID  ( ua .F_UserCode ) + ") "; ;
+                            if (GetApprovedOrderID(ua.F_UserCode)!="")
+                            {
+                                sql += $"  and F_ID in ( " + GetApprovedOrderID(ua.F_UserCode) + ") "; ;
+                            }
+                            else
+                            {
+                                return Error("暂无工单");
+                            }
+                            
                         }
                         else
                         {
                           sql += $" and F_CreateBy like '%" + ua.F_UserCode + "%'"; 
-                         sql += $"  and T_Wo_WorkOrder.F_ID in ( " + GetApprovedOrderID() + ") "; ;
+
+                          sql += $"  and F_ID in ( " + GetApprovedOrderID() + ") "; ;
                         }
                         sql += $" and F_State in(" + (int)EnumWorkOrderState.neworder + "," + (int)EnumWorkOrderState.reassign + ")" + " " ;
 
@@ -652,7 +669,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
                     case 9://待接单
                         if (GetDJDWorkOrderID(ua.F_UserCode) != "")
                         {
-                            sql += $" and F_State=" + (int)EnumWorkOrderState.assign + $"  and T_Wo_WorkOrder.F_ID in ( " + GetDJDWorkOrderID(ua.F_UserCode) + ") "; ;
+                            sql += $" and F_State in(" + (int)EnumWorkOrderState.assign+ "," + (int)EnumWorkOrderState.reassign+ "," + (int)EnumWorkOrderState.reback + "," + (int)EnumWorkOrderState.abreback + ")"+ $"  and T_Wo_WorkOrder.F_ID in ( " + GetDJDWorkOrderID(ua.F_UserCode) + ") "; ;
                         }
                         else
                         {
@@ -819,8 +836,38 @@ namespace CallCenterApi.Interface.Controllers.weixin
             return Error("OpenId不能为空");
         }
         /// <summary>
+        /// 填写超时原因
+        /// </summary>
+        /// <param name="input"></param>
+        /// <returns></returns>
+        [WechatActionFilter]
+        public ActionResult Reasontimeout(string OpenId, long orderid, string cont)
+        {
+            if (!string.IsNullOrEmpty(OpenId))
+            {
+                var ua = userAccountBLL.GetModelList(" F_WxOpenId='" + OpenId + "'").FirstOrDefault();
+                if (ua != null)
+                {
+                    Model.T_Wo_WorkOrder model = woBLL .GetModel(orderid);
+                    //验证信息
+                    if (model != null)
+                    {
+                        model.F_Reasontimeout = cont;
+                        bool n = woBLL.Update(model);
+                        if (n)
+                            return Success("填写成功");
+                        else
+                            return Error("填写失败！");
+                    }
+                    return Error("工单不存在");
+                }
+            }
+            return Error("无操作权限");
+        }
+        /// <summary>
         /// 审核工单
         /// </summary>
+        [WechatActionFilter]
         public bool Approval(string OpenId, long orderid, string AuditCont, Model.T_Sys_UserAccount nowUser, Model.T_Wo_WorkOrder model,float overtime = 0, int sms = 0,int IsAudit = 0, int AuditState = 0)
         {
             bool res=true ;
@@ -1088,8 +1135,8 @@ namespace CallCenterApi.Interface.Controllers.weixin
 
             string str = string.Empty;
             #region 查询自己名下未审批的工单列表
-            var itemlast = itembll.GetModelList(" isnull(F_IsUsed,'0')='0' and F_OptType=" + (int)EnumItemOpt.audit + " and "
-                    + "F_WoState in(" + (int)EnumWorkOrderState.neworder + "," + (int)EnumWorkOrderState.reassign + ") and F_NextUser='" + ua.F_UserCode  + "' "
+            var itemlast = itembll.GetModelList(" isnull(F_IsUsed,'0')='0' and F_OptType in(" + (int)EnumItemOpt.audit +","+(int)EnumItemOpt.reback + "," + (int)EnumItemOpt.abreback + ")"+ " and "
+                    + "F_WoState in(" + (int)EnumWorkOrderState.neworder + "," + (int)EnumWorkOrderState.reassign + "," + (int)EnumWorkOrderState.reback + "," + (int)EnumWorkOrderState.abreback + ") and F_NextUser='" + ua.F_UserCode  + "' "
                 + "" + " ");
 
             foreach (var it in itemlast)
@@ -1142,8 +1189,8 @@ namespace CallCenterApi.Interface.Controllers.weixin
             #endregion
             if (F_RoleCode == "DQJL")
             {
-                var itemlasts = itembll.GetModelList(" isnull(F_IsUsed,'0')='0' and F_OptType=" + (int)EnumItemOpt.audit + " and "
-                  + "F_WoState in(" + (int)EnumWorkOrderState.neworder + "," + (int)EnumWorkOrderState.reassign + ") and F_NextUser in ( " + GetDeptment(ua) + ") "
+                var itemlasts = itembll.GetModelList(" isnull(F_IsUsed,'0')='0' and F_OptType in(" + (int)EnumItemOpt.audit + "," + (int)EnumItemOpt.reback + "," + (int)EnumItemOpt.abreback+")" + " and "
+                  + "F_WoState in(" + (int)EnumWorkOrderState.neworder + "," + (int)EnumWorkOrderState.reassign + "," + (int)EnumWorkOrderState.reback + "," + (int)EnumWorkOrderState.abreback + ") and F_NextUser in ( " + GetDeptment(ua) + ") "
               + "" + " ");
                 foreach (var it in itemlasts)
                 {
@@ -1194,8 +1241,8 @@ namespace CallCenterApi.Interface.Controllers.weixin
         {
             string str = string.Empty;
 
-            str = "select F_WoID from T_Wo_WorkOrderItem_New where and F_OptType=" + (int)EnumItemOpt.reaudit
-               + "and F_CreateUser='" + user + "'  "//
+            str = "select F_WoID from T_Wo_WorkOrderItem_New where  F_OptType=" + (int)EnumItemOpt.reaudit
+               + " and F_CreateUser=" + user + "  "//
                  ;
             return str;
         }
@@ -1208,7 +1255,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
         {
             string str = string.Empty;
 
-            str = "select F_WoID from T_Wo_WorkOrderItem_New where and F_OptType=" + (int)EnumItemOpt.reaudit
+            str = "select F_WoID from T_Wo_WorkOrderItem_New where  F_OptType=" + (int)EnumItemOpt.reaudit
              //
                  ;
             return str;
@@ -1453,9 +1500,16 @@ namespace CallCenterApi.Interface.Controllers.weixin
                     model.F_AuditBy = model1[i].F_AuditBy;//审核人
                     model.F_AuditOn = model1[i].F_AuditOn;//审核时间
                     model.F_AuditCont = model1[i].F_AuditCont;//审核内容
-                         model.RemainingTime = TimeToOver(model1[i].F_ID);
-                       model.F_IsOver = model1[i].F_IsOver;
-                        var deptmodel = departmentBLL.GetModel(ua.F_DeptId);
+                   model.RemainingTime = TimeToOver(model1[i].F_ID, model1[i].F_limit );
+                    if (TimeToOver(model1[i].F_ID, model1[i].F_limit ) < 0)
+                    {
+                        model.F_IsOver = 1;
+                    }
+                    else
+                    {
+                        model.F_IsOver = model1[i].F_IsOver;
+                    }
+                    var deptmodel = departmentBLL.GetModel(ua.F_DeptId);
                         if (deptmodel != null)
                         {
                             model.F_Deptid = deptmodel.F_DeptId;
@@ -1476,11 +1530,10 @@ namespace CallCenterApi.Interface.Controllers.weixin
         /// </summary>
         /// <param name="id"></param>
         /// <returns></returns>
-        private float TimeToOver(int id)
+        private float TimeToOver(int id,int limit)
         {
             var itemlasts = itembll.GetModelList("  F_ItemType=" + (int)EnumItemType.deal + " and  F_WoID=" + id + " ");
             string time1 = "", time2 = ""; int x = 0, y = 0;
-            float time = 0;
             if (itemlasts.Count > 0)
             {
                 for (int i = 0; i < itemlasts.Count; i++)
@@ -1491,7 +1544,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
                         {
                             x = i;
                             time1 = itemlasts[i].F_CreateTime.ToString();
-                            time = float.Parse(itemlasts[i].F_LimitTime);
+                         
                         }
                         if (itemlasts[i].F_WoState == 10)
                         {
@@ -1507,13 +1560,13 @@ namespace CallCenterApi.Interface.Controllers.weixin
                         if (x > y)
                         {
                             float a = (DateTime.Parse(time2) - DateTime.Parse(time1)).Hours;
-                            float b = time - a;
+                            float b = limit - a;
                             return b;
                         }
                         else
                         {
                             float a = (DateTime.Now - DateTime.Parse(time1)).Hours;
-                            float b = time - a;
+                            float b = limit - a;
                             return b;
                         }
                     }
@@ -1525,7 +1578,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
                 else if (time1 != "")
                 {
                     float a = (DateTime.Now - DateTime.Parse(time1)).Hours;
-                    float b = time - a;
+                    float b = limit - a;
                     return b;
                 }
                 else
@@ -1799,23 +1852,25 @@ namespace CallCenterApi.Interface.Controllers.weixin
 
             if (type == 1)
             {
-                model.F_State = input.F_State;//工单状态
-                model.F_CreateOn = input.F_CreateOn;//添加时间
-                model.F_CreateBy = input.F_CreateBy;//添加人
+                model.F_State = model.F_State;//工单状态
+                model.F_CreateOn = model.F_CreateOn;//添加时间
+                model.F_CreateBy = model.F_CreateBy;//添加人
                 model.F_UpdateBy = usercode;//修改人工号
                 model.F_UpdateOn = DateTime.Now;//修改人工号
                 if (input.F_UpdateCount != null)
                 {
-                    model.F_UpdateCount = input.F_UpdateCount + 1;//修改次数
+                    model.F_UpdateCount = model.F_UpdateCount + 1;//修改次数
                 }
                 else
                 {
                     model.F_UpdateCount = 1;//修改次数
                 }
+                    model.F_limit = model.F_limit;
             }
             else
             {
-                model.F_State = (int)EnumWorkOrderState.neworder;
+                model.F_limit = 0;
+               model.F_State = (int)EnumWorkOrderState.neworder;
                 model.F_CreateBy = usercode;
                 model.F_CreateOn = DateTime.Now;
             }
@@ -1843,7 +1898,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
         /// </summary>
         /// <returns></returns>
         [WechatActionFilter]
-        public ActionResult Add(WorkOrderNewInput input,float overtime = 0, int sms = 0)                     
+        public ActionResult Add(WorkOrderNewInput input,int  overtime = 0, int sms = 0)                     
         {
           
             if (!string.IsNullOrEmpty (input.F_WxOpenId ))
@@ -1888,7 +1943,10 @@ namespace CallCenterApi.Interface.Controllers.weixin
                     var model = new Model.T_Wo_WorkOrder();
                     #region 保存客户基本信息
                     model = inputtoobj(ua,model, input, 2);
-                  
+                 if (model .F_Source =="3")
+                {
+                    model.F_State =(int)EnumWorkOrderState.customers;
+                }
                     #endregion
                     long n = woBLL.Add(model);
                     if (n > 0)
@@ -2001,10 +2059,9 @@ namespace CallCenterApi.Interface.Controllers.weixin
         ///  <param name="clid">指派人</param>
         /// </summary>
         /// <returns></returns>
-        [Authority]
         [WechatActionFilter]
         public ActionResult AssignWorkOrder(string OpenId, long orderid, string cont, WorkOrdeDeptment deptment, int isvisit = 1,
-            float overtime = 0, int sms = 0, int clbm = 0, int clid = 0,int isApprovalp=0, int hclbm = 0, int hclid = 0)
+            int  overtime = 0, int sms = 0, int clbm = 0, int clid = 0,int isApprovalp=0, int hclbm = 0, int hclid = 0)
         {
 
             if (!string.IsNullOrEmpty(OpenId))
@@ -2105,7 +2162,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
         /// <summary>
         /// 转派工单
         /// </summary>
-        public bool AssignWO(Model.T_Sys_UserAccount nowUser, Model.T_Wo_WorkOrder model, WorkOrderNewInput input, string cont, int clbm = 0, int clid = 0, float overtime = 0, int sms = 0, int isApprovalp = 0,int hclbm = 0, int hclid = 0, string creat = "")
+        public bool AssignWO(Model.T_Sys_UserAccount nowUser, Model.T_Wo_WorkOrder model, WorkOrderNewInput input, string cont, int clbm = 0, int clid = 0, int  overtime = 0, int sms = 0, int isApprovalp = 0,int hclbm = 0, int hclid = 0, string creat = "")
         {
             string touser = ""; string tousername = "";
             #region 获取接收人
@@ -2189,6 +2246,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
                 //工单完结要更新工单的状态
                 //   model.F_DealBy = touser;
                 model.F_State = wostate;
+                model.F_limit = overtime;
                 //处理内容
                 if (!string.IsNullOrEmpty(cont))
                     model.F_DealContent += cont + "；";
@@ -2368,100 +2426,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
                 return Error("无操作权限！");
             }
         }
-        /// <summary>
-        /// 获取催办工单列表
-        /// </summary>
-        /// <returns></returns>
-        [WechatActionFilter]
-        public ActionResult GetUrgeList(string  OpenId,string code, string cusname, string keywords, string cusphone, string companyname, string province, string city,
-            string country, string township, string touser, int source = -1, int type = 0, int state = -1, int pageindex = 1, int pagesize = 10)
-        {
-
-            if (!string.IsNullOrEmpty(OpenId))
-            {
-                var ua = userAccountBLL.GetModelList(" F_WxOpenId='" + OpenId + "'").FirstOrDefault();
-                string sql = " and F_IsDelete=0 and F_State != " + (int)EnumWorkOrderState.finish;
-
-                DataTable dt = new DataTable();
-                #region 筛选条件
-                if (type > 0 && type < 5)//工单类型
-                    sql += $" and F_Type=" + type;
-                if (state >= 0)//工单状态
-                    sql += $" and F_State=" + state;
-                if (source >= 0)//工单状态
-                    sql += $" and F_Source=" + source;
-                if (!string.IsNullOrWhiteSpace(touser))//参与人
-                    sql += $" and F_DealBy like '%" + touser.Trim() + "%'";
-                if (!string.IsNullOrWhiteSpace(code))//工单编号
-                    sql += $" and F_WorkOrderCode like '%" + code.Trim() + "%'";
-                if (!string.IsNullOrWhiteSpace(cusname))//客户姓名
-                    sql += $" and F_CusName like '%" + cusname.Trim() + "%'";
-                if (!string.IsNullOrWhiteSpace(keywords))//关键字搜索
-                    sql += $"  and F_WorkOrderCode like '%" + keywords.Trim() + "%' or F_CusName like '%" + keywords.Trim() + "%'or F_CusPhone like '%" + keywords.Trim() + "%'  ";
-                if (!string.IsNullOrWhiteSpace(cusphone))//客户电话
-                    sql += $" and F_CusPhone like '%" + cusphone.Trim() + "%'";
-                if (!string.IsNullOrWhiteSpace(companyname))//公司名称
-                    sql += $" and F_CompanyName like '%" + companyname.Trim() + "%'";
-                if (!string.IsNullOrWhiteSpace(province))//省
-                    sql += $" and F_IncidentProvince like '%" + province.Trim() + "%'";
-                if (!string.IsNullOrWhiteSpace(province))//市
-                    sql += $" and F_IncidentCity like '%" + city.Trim() + "%'";
-                if (!string.IsNullOrWhiteSpace(province))//县
-                    sql += $" and F_IncidentCountry like '%" + country.Trim() + "%'";
-                if (!string.IsNullOrWhiteSpace(province))//乡
-                    sql += $" and F_IncidentTownship like '%" + township.Trim() + "%'";
-                #endregion
-                int recordCount = 0;
-                if (!string.IsNullOrWhiteSpace(sql))
-                {
-
-                    dt = BLL.PagerBLL.GetListPager(
-                        "T_Wo_WorkOrder",
-                        "F_ID",
-                        "*",
-                        sql,
-                       "ORDER BY T_Wo_WorkOrder.F_ID desc",
-                        pagesize,
-                        pageindex,
-                        true,
-                        out recordCount);
-                    dt.Columns.Add("CBCount", typeof(int));
-                    foreach (DataRow dr in dt.Rows)
-                    {
-                        var list = itembll.GetList(" F_WoID ='" + dr["ID"].ToString() + "' and F_ItemType=" + (int)EnumItemType.urge).Tables[0];
-                        dr["CBCount"] = list.Rows.Count;
-                    }
-                    List<Model.T_Wo_WorkOrder> modlelist = new BLL.T_Wo_WorkOrder().DataTableToList(dt);
-                    List<WorkOrderNewInput> Input = modeltooip(modlelist,ua );
-                    if (Input != null)
-                    {
-                        var obj = new
-                        {
-                            state = "success",
-                            message = "成功",
-                            rows = Input,
-                            total = recordCount
-                        };
-                        return Content(obj.ToJson());
-                    }
-                    else
-                    {
-                        return Success("暂无工单"); ;
-                    }
-
-                }
-                else
-                {
-                    return Success("暂无工单"); ;
-                }
-            }
-            else
-            {
-                return Error("无操作权限！");
-            }
-
-        }
-        /// <summary>
+      
         /// 是否超时
         /// </summary>
         /// <param name="id"></param>
@@ -2535,47 +2500,12 @@ namespace CallCenterApi.Interface.Controllers.weixin
             }
             return true;
         }
-        /// <summary>
-        /// 更新工单
-        /// </summary>
-        private bool Refresh()
-        {
-            int type = 0;
-            var modlelist = woBLL .GetModelList(" F_IsDelete=0" + " and F_State in(" + (int)EnumWorkOrderState.dealing + "," + (int)EnumWorkOrderState.receive + "," +
-                (int)EnumWorkOrderState.assign + "," + (int)EnumWorkOrderState.reback + "," + (int)EnumWorkOrderState.abreback + ")");
-            if (modlelist.Count > 0)
-            {
-                foreach (var it in modlelist)
-                {
-
-                    if (TimeforOver(it.F_ID))
-                    {
-                        type = 0;
-                    }
-                    else
-                    {
-                        type = 1;
-                    }
-                    if (type != it.F_IsOver)
-                    {
-                        it.F_IsOver = type;
-                        bool n = woBLL .Update(it);
-                        if (!n)
-                        {
-                            return false;
-                        }
-                    }
-                }
-
-            }
-            return true;
-
-        }
+   
         /// <summary>
         /// 接单 - 确认工单
         /// </summary>
         /// <returns></returns>
-        [Authority]
+     
         [WechatActionFilter]
         public ActionResult SureWorkOrder(long orderid, string OpenId)
         {
@@ -2607,7 +2537,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
         /// </summary>
         /// <param name="input"></param>
         /// <returns></returns>
-        [Authority]
+    
         [WechatActionFilter]
         public ActionResult HigApprovalOrder(string OpenId, long orderid,string cont)
         {
@@ -2703,11 +2633,11 @@ namespace CallCenterApi.Interface.Controllers.weixin
         /// 工单处理
         /// </summary>
         /// <returns></returns>
-        [Authority]
+       
         [WechatActionFilter]
         public ActionResult DealWorkOrder(string OpenId,long orderid, string cont, WorkOrdeDeptment deptment, string dealType,
-       string uncont = "",
-     int isvisit = 1, int isover = 0)
+         string uncont = "",
+        int isvisit = 1, int isover = 0)
         {
             if (!string.IsNullOrEmpty(OpenId))
             {
@@ -2791,99 +2721,77 @@ namespace CallCenterApi.Interface.Controllers.weixin
             return Error("无操作权限！");
         }
         /// <summary>
-        /// 退回工单
+        /// 更新工单
         /// </summary>
-        /// <param name="input"></param>
-        /// <returns></returns>
-        [Authority]
-        [WechatActionFilter]
-        public ActionResult BackWorkOrder(string OpenId,long orderid, string cont, int type = 0)
-        {//办理人员和监管可以退回工单
-            if (!string.IsNullOrEmpty(OpenId))
+        private bool Refresh()
+        {
+            int type = 0;
+            var modlelist = woBLL .GetModelList(" F_IsDelete=0" + "and F_IsOver=0" + " and F_State in(" + (int)EnumWorkOrderState.dealing + "," + (int)EnumWorkOrderState.receive + "," +
+                (int)EnumWorkOrderState.assign + "," + (int)EnumWorkOrderState.reback + "," + (int)EnumWorkOrderState.abreback + ")");
+            if (modlelist.Count > 0)
             {
-                var ua = userAccountBLL.GetModelList(" F_WxOpenId='" + OpenId + "'").FirstOrDefault();
-                //河南心连心化学工业集团股份有限公司-系统维护管理员(8000)指派工单给 李波(80324),张绍申(80325),杜爱国(80326)，说明：无
-              
-                if (ua != null)
+                foreach (var it in modlelist)
                 {
-                    Model.T_Wo_WorkOrder model = woBLL .GetModel(orderid);
-                    //验证信息
-                    if (model != null)
+
+                    if (TimeforOver(it.F_ID))
                     {
-                        var res = BackWO(ua, model, cont, type);
-                        if (res)
-                            return Success("退回成功");
-                        else
-                            return Error("退回失败！");
+                        type = 0;
                     }
-                    return Error("工单不存在");
-                }
-            }
-            return Error("无操作权限");
-        }
-        /// <summary>
-        /// 工单回访
-        /// </summary>
-        /// <param name="input"></param>
-        /// <returns></returns>
-        [Authority]
-        [WechatActionFilter]
-        public ActionResult ReturnvisitOrder(string OpenId, long orderid, string cont, string reason, string call, int isover = 0)
-        {
-            if (!string.IsNullOrEmpty(OpenId))
-            {
-                var ua = userAccountBLL.GetModelList(" F_WxOpenId='" + OpenId + "'").FirstOrDefault();
-                if (ua != null)
-                {
-                    Model.T_Wo_WorkOrder model = woBLL .GetModel(orderid);
-                    //验证信息
-                    if (model != null)
+                    else
                     {
-                        var res = Retu(ua, model, cont, reason, call,isover );
-                        if (res)
-                            return Success("回访成功");
-                        else
-                            return Error("回访失败！");
+                        type = 1;
+                    }
+                    if (type != it.F_IsOver)
+                    {
+                        it.F_IsOver = type;
+                        bool n = woBLL.Update(it);
+                        if (!n)
+                        {
+                            return false;
+                        }
                     }
-                    return Error("工单不存在");
                 }
+
             }
-            return Error("无操作权限");
+            return true;
+
         }
         /// <summary>
-        /// 工单完结
+        /// 退回工单
         /// </summary>
         /// <param name="input"></param>
         /// <returns></returns>
-        [Authority]
+
         [WechatActionFilter]
-        public ActionResult EndOrder(string OpenId,long orderid, int isover = 0)
-        {
+        public ActionResult BackWorkOrder(string OpenId,long orderid, string cont, int type = 0)
+        {//办理人员和监管可以退回工单
             if (!string.IsNullOrEmpty(OpenId))
             {
                 var ua = userAccountBLL.GetModelList(" F_WxOpenId='" + OpenId + "'").FirstOrDefault();
+                //河南心连心化学工业集团股份有限公司-系统维护管理员(8000)指派工单给 李波(80324),张绍申(80325),杜爱国(80326)，说明：无
+              
                 if (ua != null)
                 {
                     Model.T_Wo_WorkOrder model = woBLL .GetModel(orderid);
                     //验证信息
                     if (model != null)
                     {
-                        var res = Overorder(ua, model, isover);
+                        var res = BackWO(ua, model, cont, type);
                         if (res)
-                            return Success("完结成功");
+                            return Success("退回成功");
                         else
-                            return Error("完结失败！");
+                            return Error("退回失败！");
                     }
                     return Error("工单不存在");
                 }
             }
             return Error("无操作权限");
         }
+      
         /// <summary>
-        ///延期工单
+        ///申请延期
         /// </summary>
         /// <returns></returns>
-        [Authority]
         [WechatActionFilter]
         public ActionResult DelayWorkOrder(string OpenId,long orderid, string cont, float limit = 0)
         {
@@ -2909,87 +2817,12 @@ namespace CallCenterApi.Interface.Controllers.weixin
 
         }
         /// <summary>
-        /// 催办工单
-        /// </summary>
-        /// <returns></returns>
-        [WechatActionFilter]
-        public ActionResult AddWorkOrderRemind(string OpenId,long orderid, string cont)
-        {
-            if (!string.IsNullOrEmpty(OpenId))
-            {
-                var ua = userAccountBLL.GetModelList(" F_WxOpenId='" + OpenId + "'").FirstOrDefault();
-                if (ua != null)
-                {
-                    Model.T_Wo_WorkOrder model = woBLL .GetModel(orderid);
-                    if (model != null)
-                    {
-                        var res = RemindWO(ua, model, cont);
-                        if (res)
-                            return Success("催办成功！");
-                        else
-                            return Error("操作失败！");
-                    }
-                    return Error("工单不存在！");
-                }
-            }
-            return Error("无操作权限！");
-        }
-        /// <summary>
-        /// 催办工单
-        /// </summary>
-        public bool RemindWO(Model.T_Sys_UserAccount nowUser, Model.T_Wo_WorkOrder model, string cont)
-        {
-            var itemlast = itembll.GetModelList(" F_ItemType=" + (int)EnumItemType.deal + " and  F_WoID='" + model.F_ID + "' and F_IsUsed=0 order by F_CreateTime desc").FirstOrDefault();
-            #region 接收人
-            int todept = 0; string touser = "";
-            if (itemlast != null)
-            {
-                touser = itemlast.F_NextUser;
-                todept = itemlast.F_NextDept.Value;
-                if (string.IsNullOrWhiteSpace(touser))
-                    touser = itemlast.F_CreateUser;
-                #region 读取被催办人部门
-                if (todept == 0 && !string.IsNullOrWhiteSpace(touser))
-                {
-                    var tomodel = userAccountBLL .GetModel(touser);
-                    if (tomodel != null)
-                        todept = tomodel.F_DeptId;
-                }
-                #endregion
-                #region 读取当前登录人部门
-                string deptname = "";
-                var deptmodel = departmentBLL.GetModel(nowUser.F_DeptId);
-                if (deptmodel != null)
-                {
-                    deptname = deptmodel.F_DeptName + "-";
-                }
-                #endregion
-                var content = deptname + nowUser.F_UserName + "(" + nowUser.F_UserCode + ")催办工单，催办说明：" + cont;
-                long itemid = AddLog(model.F_ID, model.F_State.Value, content, (int)EnumItemType.urge, (int)EnumItemOpt.urge, touser, todept, nowUser, int.Parse(itemlast.F_LimitTime), int.Parse(itemlast.F_IsSMS.ToString()));
-                if (itemid > 0)
-                {
-                    if (!string.IsNullOrWhiteSpace(touser))
-                    {
-                        sendsysmsg(model, nowUser, touser, Int32.Parse(itemid.ToString()), "催办");
-                        var tousers = userAccountBLL .GetModel(touser);
-                        if (tousers != null && !string.IsNullOrWhiteSpace(tousers.F_WxOpenId))
-                        {
-                            sendwxmsg(model, tousers.F_WxOpenId, nowUser, "催办");
-                        }
-                    }
-                    return true;
-                }
-            }
-            return false;
-            #endregion
-        }
-        /// <summary>
-        /// 延期工单
+        /// 申请延期
         /// </summary>
         public bool DeWO(Model.T_Sys_UserAccount nowUser, Model.T_Wo_WorkOrder model, string cont, float limit)
         {
             #region 工单处理
-            int sms = 0; int wostate = 0; int optbut = 0; float time = 0;
+            int sms = 0; int wostate = 0;
             var itemlasts = itembll.GetModelList("  F_ItemType=" + (int)EnumItemType.deal + " and  F_WoID=" + model.F_ID + " ");
             if (itemlasts.Count > 0)
             {
@@ -2998,13 +2831,13 @@ namespace CallCenterApi.Interface.Controllers.weixin
                     if (it.F_WoState == 1)
                     {
                         sms = int.Parse(it.F_IsSMS.ToString());
-                        time = float.Parse(it.F_LimitTime);
                     }
                     itembll.Update(it);
                     wostate = int.Parse(it.F_WoState.ToString());
-                    optbut = int.Parse(it.F_OptType.ToString());
+                  
                 }
             }
+            int optbut = (int)EnumItemOpt.Delay;
             #region 读取当前登录人部门
             string deptname = "";
             var deptmodel = departmentBLL.GetModel(nowUser.F_DeptId);
@@ -3019,7 +2852,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
             var itemlast = itembll.GetModelList(" F_ItemType=" + (int)EnumItemType.deal + " and  F_WoID='" + model.F_ID + "' and F_NextUser='" + nowUser.F_UserCode + "' order by F_CreateTime desc").FirstOrDefault();
             if (itemlast != null)
                 touser = itemlast.F_CreateUser;
-            var itemid = AddLog((int)model.F_ID, wostate, content, (int)EnumItemType.deal, optbut, touser, 0, nowUser, limit + time, sms);
+            var itemid = AddLog((int)model.F_ID, wostate, content, (int)EnumItemType.deal, optbut, touser, 0, nowUser, limit + model .F_limit , sms);
 
             #endregion
 
@@ -3031,7 +2864,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
         public bool BackWO(Model.T_Sys_UserAccount nowUser, Model.T_Wo_WorkOrder model, string cont, int type)
         {
             #region 工单处理
-            int overtime = 0, sms = 0;
+            int sms = 0;
             var itemlasts = itembll.GetModelList("  F_ItemType=" + (int)EnumItemType.deal + " and  F_WoID=" + model.F_ID + " ");
             if (itemlasts.Count > 0)
             {
@@ -3039,7 +2872,6 @@ namespace CallCenterApi.Interface.Controllers.weixin
                 {
                     if (it.F_WoState == 1)
                     {
-                        overtime = int.Parse(it.F_LimitTime);
                         sms = int.Parse(it.F_IsSMS.ToString());
                     }
                 }
@@ -3067,7 +2899,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
             var itemlast = itembll.GetModelList(" F_ItemType=" + (int)EnumItemType.deal + " and  F_WoID='" + model.F_ID + "' and F_NextUser='" + nowUser.F_UserCode + "' order by F_CreateTime desc").FirstOrDefault();
             if (itemlast != null)
                 touser = itemlast.F_CreateUser;
-            var itemid = AddLog((int)model.F_ID, wostate, content, (int)EnumItemType.deal, optbut, touser, 0, nowUser, overtime, sms);
+            var itemid = AddLog((int)model.F_ID, wostate, content, (int)EnumItemType.deal, optbut, touser, 0, nowUser, model .F_limit , sms);
             if (itemid > 0)
             {
                 #region 处理工单
@@ -3099,146 +2931,12 @@ namespace CallCenterApi.Interface.Controllers.weixin
             #endregion
         }
         /// <summary>
-        /// 回访工单
-        /// </summary>
-        public bool Retu(Model.T_Sys_UserAccount nowUser, Model.T_Wo_WorkOrder model, string cont, string reason, string call, int isover = 0)
-        {
-            #region 工单处理
-            int overtime = 0, sms = 0;
-            var itemlasts = itembll.GetModelList("  F_ItemType=" + (int)EnumItemType.visit + " and  F_WoID=" + model.F_ID + " ");
-            if (itemlasts.Count > 0)
-            {
-                foreach (var it in itemlasts)
-                {
-                    if (it.F_WoState == 1)
-                    {
-                        overtime = int.Parse(it.F_LimitTime);
-                        sms = int.Parse(it.F_IsSMS.ToString());
-                    }
-                }
-            }
-            var opt = "回访";
-            int optbut = (int)EnumItemOpt.visit;
-            int wostate = (int)EnumWorkOrderState.evaluate;
-            if (isover == 0)
-            {
-                wostate = (int)EnumWorkOrderState.finish;
-            }
-            #region 读取当前登录人部门
-            string deptname = "";
-            var deptmodel = departmentBLL.GetModel(nowUser.F_DeptId);
-            if (deptmodel != null)
-            {
-                deptname = deptmodel.F_DeptName + "-";
-            }
-            #endregion
-            var content = deptname + nowUser.F_UserName + "(" + nowUser.F_UserCode + ")" + opt + "工单:回访结果：" + cont + " , " + "工单:呼叫结果：" + call;
-
-            var touser = "";
-            var itemlast = itembll.GetModelList(" F_ItemType=" + (int)EnumItemType.deal + " and  F_WoID='" + model.F_ID + "' and F_NextUser='" + nowUser.F_UserCode + "' order by F_CreateTime desc").FirstOrDefault();
-            if (itemlast != null)
-                touser = itemlast.F_CreateUser;
-            var itemid = AddLog((int)model.F_ID, wostate, content, (int)EnumItemType.evaluate, optbut, touser, 0, nowUser, overtime, sms);
-            if (itemid > 0)
-            {
-                #region 处理工单
-                model.F_State = wostate ;
-                model.F_VisitOn = DateTime.Now;
-                model.F_VisitResult = cont;
-                model.F_VisitReason = reason;
-                model.F_Callresults = call;
-                woBLL .Update(model);
-                #endregion
-                #region 推送消息
-                #region 向上一级操作人员推送消息
-                if (!string.IsNullOrWhiteSpace(touser) && touser != nowUser.F_UserCode)
-                {//排除上一级指派人是自己
-                    sendsysmsg(model, nowUser, touser, (int)itemid, opt);
-                    var lastUser = userAccountBLL .GetModel(touser);
-                    if (lastUser != null && !string.IsNullOrEmpty(lastUser.F_WxOpenId))
-                        sendwxmsg(model, lastUser.F_WxOpenId, nowUser, opt);
-                }
-                #endregion
-                #endregion
-                return true;
-            }
-            else
-                return false;
-            #endregion
-        }
-        /// <summary>
-        /// 完结工单
-        /// </summary>
-        public bool Overorder(Model.T_Sys_UserAccount nowUser, Model.T_Wo_WorkOrder model, int isOver = 0)
-        {
-            #region 工单处理
-            int overtime = 0, sms = 0;
-            var itemlasts = itembll.GetModelList("  F_ItemType=" + (int)EnumItemType.visit + " and  F_WoID=" + model.F_ID + " ");
-            if (itemlasts.Count > 0)
-            {
-                foreach (var it in itemlasts)
-                {
-                    if (it.F_WoState == 1)
-                    {
-                        overtime = int.Parse(it.F_LimitTime);
-                        sms = int.Parse(it.F_IsSMS.ToString());
-                    }
-                }
-            }
-            var opt = "完结";
-            int optbut = (int)EnumItemOpt.end;
-            int wostate = (int)EnumWorkOrderState.evaluate;
-            if (isOver == 0)
-            {
-                wostate = (int)EnumWorkOrderState.finish;
-            }
-
-            #region 读取当前登录人部门
-            string deptname = "";
-            var deptmodel = departmentBLL.GetModel(nowUser.F_DeptId);
-            if (deptmodel != null)
-            {
-                deptname = deptmodel.F_DeptName + "-";
-            }
-            #endregion
-            var content = deptname + nowUser.F_UserName + "(" + nowUser.F_UserCode + ")" + opt + "完结工单";
-
-            var touser = "";
-            var itemlast = itembll.GetModelList(" F_ItemType=" + (int)EnumItemType.deal + " and  F_WoID='" + model.F_ID + "' and F_NextUser='" + nowUser.F_UserCode + "' order by F_CreateTime desc").FirstOrDefault();
-            if (itemlast != null)
-                touser = itemlast.F_CreateUser;
-            var itemid = AddLog((int)model.F_ID, wostate, content, (int)EnumItemType.deal, optbut, touser, 0, nowUser, overtime, sms);
-            if (itemid > 0)
-            {
-                #region 处理工单
-                model.F_VisitOn = DateTime.Now;
-                model.F_State = wostate;
-                woBLL .Update(model);
-                #endregion
-                #region 推送消息
-                #region 向上一级操作人员推送消息
-                if (!string.IsNullOrWhiteSpace(touser) && touser != nowUser.F_UserCode)
-                {//排除上一级指派人是自己
-                    sendsysmsg(model, nowUser, touser, (int)itemid, opt);
-                    var lastUser = userAccountBLL .GetModel(touser);
-                    if (lastUser != null && !string.IsNullOrEmpty(lastUser.F_WxOpenId))
-                        sendwxmsg(model, lastUser.F_WxOpenId, nowUser, opt);
-                }
-                #endregion
-                #endregion
-                return true;
-            }
-            else
-                return false;
-            #endregion
-        }
-        /// <summary>
         /// 处理工单
         /// </summary>
         public bool DealWO(Model.T_Sys_UserAccount nowUser, Model.T_Wo_WorkOrder model, WorkOrderNewInput input, string cont, int isover = 0, string dealType = "", string uncont = "")
         {
             #region 工单处理
-            int overtime = 0, sms = 0;
+            int sms = 0;
             var itemlasts = itembll.GetModelList("  F_ItemType=" + (int)EnumItemType.deal + " and  F_WoID=" + model.F_ID + " ");
             if (itemlasts.Count > 0)
             {
@@ -3246,7 +2944,6 @@ namespace CallCenterApi.Interface.Controllers.weixin
                 {
                     if (it.F_WoState == 1)
                     {
-                        overtime = int.Parse(it.F_LimitTime);
                         sms = int.Parse(it.F_IsSMS.ToString());
                     }
                 }
@@ -3281,7 +2978,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
             if (!string.IsNullOrEmpty(cont))
                 optcont = "，处理内容：" + cont;
             var content = deptname + nowUser.F_UserName + "(" + nowUser.F_UserCode + ")" + opt + "工单" + optcont;
-            var itemid = AddLog(model.F_ID, wostate, content, (int)EnumItemType.deal, optbut, "", 0, nowUser, overtime, sms);
+            var itemid = AddLog(model.F_ID, wostate, content, (int)EnumItemType.deal, optbut, "", 0, nowUser, model .F_limit , sms);
             if (itemid > 0)
             {
                 #region 处理工单
@@ -3290,6 +2987,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
                 //处理内容
                 if (!string.IsNullOrEmpty(cont))
                     model.F_DealContent += cont + "；";
+                model.F_DealTime = DateTime.Now;
                 InToworkModel(model, input);
                 woBLL .Update(model);
                 #endregion

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Models/Enum/EnumWorkOrderState.cs

@@ -35,6 +35,10 @@ namespace CallCenterApi.Interface.Models.Enum
         reassign,
         [Description("导入工单")]
         usedimport,
+        [Description("微信客户")]
+        customers,
+        [Description("微信未通过")]
+        recustomers,
     }
     /// <summary>
     /// 工单记录类型枚举
@@ -88,6 +92,9 @@ namespace CallCenterApi.Interface.Models.Enum
         [Description("已审核")]
         reaudit,
         [Description("回访")]
-        visit
+        visit,
+        [Description("延期")]
+        Delay
+
     }
 }

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

@@ -183,7 +183,7 @@ namespace CallCenterApi.Interface.Models.Input
         /// </summary>
         public string F_SalesPhone { set; get; }
         /// <summary>
-        /// 产品
+        /// 品牌
         /// </summary>
         public string F_Brands { set; get; }
 
@@ -732,6 +732,20 @@ namespace CallCenterApi.Interface.Models.Input
         {
             get;set;
         }
+        ///// <summary>
+        ///// 延期时限
+        ///// </summary>
+        public int  DelayTimelimit
+        {
+            get; set;
+        }
+        ///// <summary>
+        ///// 超时原因
+        ///// </summary>
+        public string F_Reasontimeout
+        {
+            get; set;
+        }
     }
 }
 public class Questions
@@ -1117,7 +1131,7 @@ public class WorkOrderComplaint
 public class Prescription
 {
     /// <summary>
-    /// 时间
+    /// 创建时间
     /// </summary>
     public string CreatOn { get; set; }
     /// <summary>

codegit/CallCenterApi/CallCenterApi.Model/T_Wo_WorkOrder.cs

@@ -95,6 +95,25 @@ namespace CallCenterApi.Model
         private string _f_wxopenid;
         private string _f_callresults;
         private string _f_highopinions;
+        private int _f_limit;
+        private string _f_reasontimeout_;
+
+        /// <summary>
+        /// 超时时限
+        /// </summary>
+        public int F_limit
+        {
+            set { _f_limit = value; }
+            get { return _f_limit; }
+        }
+        /// <summary>
+        /// 超时原因
+        /// </summary>
+        public string F_Reasontimeout
+        {
+            set { _f_reasontimeout_ = value; }
+            get { return _f_reasontimeout_; }
+        }
         /// <summary>
         /// 高层处理意见
         /// </summary>