给业务员发送短信，地址修改，五个报表，列表修改

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/SMSController.cs

@@ -37,7 +37,21 @@ namespace CallCenterApi.Interface.Controllers
                 return Error ("发送失败，请检查客户电话");
             }
         }
-      
+        public ActionResult SMSSendSalesman(string name, string phone, string cusphone)
+        {
+
+            SmsSingleSenderResult result = SMSSingleshot(cusphone, "您好，刚有客户反馈有关市场业务/产品/农化问题，请你及时联系提供服务。姓名："+ name + "，电话："+ phone + "。");
+
+            if (result != null)
+            {
+                return Success("发送短信", result);
+            }
+            else
+            {
+                return Error("发送失败，请检查客户电话");
+            }
+        }
+
         /// <summary>
         /// 单发短信
         /// </summary>

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/customer/RegionCategoryController.cs

@@ -70,20 +70,23 @@ namespace CallCenterApi.Interface.Controllers.customer
             F_Layer = F_Layer - 1;
             if (!string.IsNullOrEmpty(F_RegionName.Trim()))
             {
-                if (F_Layer == 2)
+                if (F_ParentId>0)
                 {
-                    entityJson1 = regionBLL.GetModel(F_ParentId);
-                }
-                else if (F_Layer == 3)
-                {
-                    entityJson2 = regionBLL.GetModel(F_ParentId);
-                    entityJson1 = regionBLL.GetModel(int.Parse(entityJson2.F_ParentId.ToString()));
-                }
-                else if (F_Layer == 4)
-                {
-                    entityJson3 = regionBLL.GetModel(F_ParentId);
-                    entityJson2 = regionBLL.GetModel(int.Parse(entityJson3.F_ParentId.ToString()));
-                    entityJson1 = regionBLL.GetModel(int.Parse(entityJson2.F_ParentId.ToString()));
+                    if (F_Layer == 2)
+                    {
+                        entityJson1 = regionBLL.GetModel(F_ParentId);
+                    }
+                    else if (F_Layer == 3)
+                    {
+                        entityJson2 = regionBLL.GetModel(F_ParentId);
+                        entityJson1 = regionBLL.GetModel(int.Parse(entityJson2.F_ParentId.ToString()));
+                    }
+                    else if (F_Layer == 4)
+                    {
+                        entityJson3 = regionBLL.GetModel(F_ParentId);
+                        entityJson2 = regionBLL.GetModel(int.Parse(entityJson3.F_ParentId.ToString()));
+                        entityJson1 = regionBLL.GetModel(int.Parse(entityJson2.F_ParentId.ToString()));
+                    }
                 }
             }
             var obj = new

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/report/WOReportController.cs

@@ -797,6 +797,7 @@ namespace CallCenterApi.Interface.Controllers.report
 
             return Success("获取成功", markets);
         }
+
         public class Department
         {
             public string dapatname;
@@ -822,6 +823,108 @@ namespace CallCenterApi.Interface.Controllers.report
             }
             return str;
         }
+        /// <summary>
+        /// 导出部门工单数量表
+        /// </summary>
+        /// <param name="stime"></param>
+        /// <param name="endtime"></param>
+        /// <returns></returns>
+        public ActionResult ExitDepartmentlist(string stime, string endtime)
+        {
+            DataTable dt = new DataTable();
+            string sql = $"  F_IsDelete=0";
+            if (stime != null && stime.Trim() != "")
+            {
+                sql += " and CONVERT(varchar , F_CreateOn, 120)>=CONVERT(varchar , '" + stime.Trim() + " 00:00:01', 120) ";
+            }
+            if (endtime != null && endtime.Trim() != "")
+            {
+                sql += " and CONVERT(varchar , F_CreateOn, 120)<=CONVERT(varchar , '" + endtime.Trim() + " 23:59:59', 120) ";
+            }
+            var tab = new BLL.T_Sys_Department().GetModelList(" F_State=1 and F_Layer=0");
+            List<int> modeldeptid = new List<int>();
+            List<string> modeldeptname = new List<string>();
+            foreach (var it in tab)
+            {
+                if (GetDeptWorkOrderID(it.F_DeptId) > 0)
+                {
+                    modeldeptid.Add(it.F_DeptId);
+                    modeldeptname.Add(it.F_DeptName);
+                }
+            }
+            dt.Columns.Add("部门名称");
+            dt.Columns.Add("待接单");
+            dt.Columns.Add("待处理");
+            dt.Columns.Add("已处理");
+            dt.Columns.Add("超期数量");
+            dt.Columns.Add("满意数量");
+            dt.Columns.Add("不满意数量");
+            
+            for (int i = 0; i < modeldeptid.Count; i++)
+            {
+                DataRow drNew = dt.NewRow();
+                var itemlist = itembll.GetModelList("F_NextDept=" + modeldeptid[i]);
+                drNew["部门名称"] = modeldeptname[i];
+                int pending = 0; int beprocessed = 0; int processed = 0; int Overdue = 0; int satisfied = 0; int dissatisfied = 0;
+                foreach (var it in itemlist)
+                {
+                    if (it.F_IsUsed == 0 && it.F_OptType == 1)
+                    {
+                        pending++;
+                        var Overworkorder = woBLL.GetModelList(sql +"and F_IsOver=1 and F_ID=" + it.F_WoID);
+                        Overdue++;
+                    }
+                    if (it.F_OptType == 2 && it.F_IsUsed == 0)
+                    {
+                        beprocessed++;
+                        var Overworkorder = woBLL.GetModelList(sql + "and F_IsOver=1 and F_ID=" + it.F_WoID);
+                        Overdue++;
+                    }
+                }
+                var user = new BLL.T_Sys_UserAccount().GetModelList("  F_DeptId =" + modeldeptid[i]);
+                foreach (var it in user)
+                {
+                    if (it.F_RoleId == 59)
+                    {
+                        var workorder = woBLL.GetModelList(sql + "and F_State=10 and F_DealBy='" + it.F_UserCode + "'");
+                        processed += workorder.Count;
+                        foreach (var im in workorder)
+                        {
+                            if (im.F_IsOver == 1)
+                                Overdue++;
+                            if (im.F_VisitResult == "满意" || im.F_VisitResult == "非常满意")
+                                satisfied++;
+                            if (im.F_VisitResult == "不满意")
+                                dissatisfied++;
+                        }
+                    }
+                    
+                }
+                drNew["待接单"]  = pending;
+                drNew["待处理"] = beprocessed;
+                drNew["已处理"] = processed;
+                drNew["超期数量"] = Overdue;
+                drNew["满意数量"] = satisfied;
+                drNew["不满意数量"] = dissatisfied;
+                dt.Rows.Add(drNew);
+            }
+            NPOIHelper npoi = new NPOIHelper();
+            if (npoi.ExportToExcel("部门工单数量表", dt) == "")
+            {
+                return Success("导出成功");
+            }
+            else
+            {
+                return Error("导出失败");
+
+            }
+        }
+        /// <summary>
+        /// 部门工单数量表
+        /// </summary>
+        /// <param name="stime"></param>
+        /// <param name="endtime"></param>
+        /// <returns></returns>
         public ActionResult GetDepartmentList(string stime, string endtime)
         {
             string sql = $"  F_IsDelete=0";
@@ -850,19 +953,19 @@ namespace CallCenterApi.Interface.Controllers.report
                 var itemlist = itembll.GetModelList("F_NextDept=" + modeldeptid[i]);
                 Department model = new Department();
                 model.dapatname = modeldeptname[i];
-                int pending = 0;int beprocessed = 0;int processed = 0;int Overdue = 0;
+                int pending = 0;int beprocessed = 0;int processed = 0;int Overdue = 0;int satisfied = 0;int dissatisfied = 0;
                 foreach (var it in itemlist)
                 {
                     if (it .F_IsUsed ==0&&it .F_OptType ==1)
                     {
                         pending++;
-                        var Overworkorder = woBLL.GetModelList("F_IsOver=1 and F_ID="+ it.F_WoID );
+                        var Overworkorder = woBLL.GetModelList(sql +"and F_IsOver=1 and F_ID="+ it.F_WoID );
                         Overdue++;
                     }
                     if (it .F_OptType ==2&& it.F_IsUsed == 0)
                     {
                         beprocessed++;
-                        var Overworkorder = woBLL.GetModelList("F_IsOver=1 and F_ID=" + it.F_WoID);
+                        var Overworkorder = woBLL.GetModelList(sql + "and F_IsOver=1 and F_ID=" + it.F_WoID);
                         Overdue++;
                     }
                 }
@@ -871,26 +974,174 @@ namespace CallCenterApi.Interface.Controllers.report
                 {
                     if (it.F_RoleId == 59)
                     {
-                        var workorder = woBLL.GetModelList("F_State=10 and F_DealBy='" + it.F_UserCode + "'");
+                        var workorder = woBLL.GetModelList(sql + "and F_State=10 and F_DealBy='" + it.F_UserCode + "'");
                         processed += workorder.Count;
-                        var Overworkorder = woBLL.GetModelList("F_IsOver=1 and F_DealBy='" + it.F_UserCode + "'");
-                        Overdue++;
+                        foreach (var im in workorder)
+                        {
+                            if (im .F_IsOver ==1)
+                                Overdue++;
+                            if (im.F_VisitResult == "满意" || im.F_VisitResult == "非常满意")
+                                satisfied++;
+                            if (im.F_VisitResult == "不满意")
+                                dissatisfied++;
+                        }
                     }
                 }
-                //public int processed;//已处理
-                //public int Overdue;//超期
-                //public int satisfied;//满意
-                //public int dissatisfied;//不满意
+                model.pending = pending;
+                model.beprocessed = beprocessed;
+                model.processed = processed;
+                model.Overdue = Overdue;
+                model.satisfied = satisfied;
+                model.dissatisfied = dissatisfied;
+                Departmentlist.Add(model);
             }
-            return null;
+            if (Departmentlist.Count > 0)
+            {
+                for (int j = 0; j < Departmentlist.Count - 1; j++)
+                {
+                    for (int z = 0; z < Departmentlist.Count - 1 - j; z++)
+                    {
+                        if (Departmentlist[z].processed < Departmentlist[z + 1].processed)
+                        {
+                            var temp = Departmentlist[z + 1];
+                            Departmentlist[z + 1] = Departmentlist[z];
+                            Departmentlist[z] = temp;
+                        }
+                    }
+                }
+            }
+            return Success("获取成功", Departmentlist);
         }
+        public class Returnvisit
+        {
+            public string name;
+            public int bevisit;
+            public int visit;
+            public int Overdue;
+            public int satisfied;
+            public int dissatisfied;
+        }
+        /// <summary>
+        /// 导出客户回访数量表
+        /// </summary>
+        /// <param name="stime"></param>
+        /// <param name="endtime"></param>
+        /// <returns></returns>
+        public ActionResult ExitReturnvisitList(string stime, string endtime)
+        {
+            DataTable dt = new DataTable();
+            string sql = $"  F_IsDelete=0";
+            if (stime != null && stime.Trim() != "")
+            {
+                sql += " and CONVERT(varchar , F_CreateOn, 120)>=CONVERT(varchar , '" + stime.Trim() + " 00:00:01', 120) ";
+            }
+            if (endtime != null && endtime.Trim() != "")
+            {
+                sql += " and CONVERT(varchar , F_CreateOn, 120)<=CONVERT(varchar , '" + endtime.Trim() + " 23:59:59', 120) ";
+            }
+            dt.Columns.Add("类别");
+            dt.Columns.Add("待回访");
+            dt.Columns.Add("已回访");
+            dt.Columns.Add("回访总数");
+            dt.Columns.Add("超期数量");
+            dt.Columns.Add("满意数量");
+            dt.Columns.Add("不满意数量");
+            var workordewr = woBLL.GetModelList(sql + "and F_State in(10,11) and F_IsVisit =1");
+            string name = "客户回访"; int bevisit = 0, visit = 0, Overdue = 0, satisfied = 0, dissatisfied = 0; int visitcont = 0;
+            var workorder = woBLL.GetModelList(sql + "and F_State in(10,11)");
+            visitcont = workorder.Count;
+            foreach (var it in workordewr)
+            {
+                if (it.F_State == 10)
+                    bevisit++;
+                if (it.F_State == 11)
+                    visit++;
+                if (it.F_IsOver  == 1)
+                    Overdue++;
+                if (it.F_VisitResult == "满意" || it.F_VisitResult == "非常满意")
+                    satisfied++;
+                if (it.F_VisitResult == "不满意")
+                    dissatisfied++;
+            }
+            var obj = new
+            {
+                name,
+                bevisit,
+                visit,
+                visitcont,
+                Overdue,
+                satisfied,
+                dissatisfied
+            };
+              DataRow drNew = dt.NewRow();
+              drNew["类别"] = name;
+              drNew["待回访"] = bevisit;
+                drNew["已回访"] = visit;
+                drNew["回访总数"] = visitcont;
+                drNew["超期数量"] = Overdue;
+                drNew["满意数量"] = satisfied;
+                drNew["不满意数量"] = dissatisfied;
+                dt.Rows.Add(drNew);
+          
+            NPOIHelper npoi = new NPOIHelper();
+            if (npoi.ExportToExcel("客户回访数量表", dt) == "")
+            {
+                return Success("导出成功");
+            }
+            else
+            {
+                return Error("导出失败");
 
+            }
+        }
+        /// <summary>
+        /// 客户回访数量表
+        /// </summary>
+        /// <param name="stime"></param>
+        /// <param name="endtime"></param>
+        /// <returns></returns>
+        public ActionResult GetReturnvisitList(string stime, string endtime)
+        {
+            string sql = $"  F_IsDelete=0";
+            if (stime != null && stime.Trim() != "")
+            {
+                sql += " and CONVERT(varchar , F_CreateOn, 120)>=CONVERT(varchar , '" + stime.Trim() + " 00:00:01', 120) ";
+            }
+            if (endtime != null && endtime.Trim() != "")
+            {
+                sql += " and CONVERT(varchar , F_CreateOn, 120)<=CONVERT(varchar , '" + endtime.Trim() + " 23:59:59', 120) ";
+            }
+            var workordewr = woBLL.GetModelList(sql + "and F_State in(10,11) and F_IsVisit =1");
+          string name="客户回访"; int bevisit = 0, visit = 0, Overdue = 0, satisfied = 0, dissatisfied = 0;int visitcont = 0;
+            var workorder = woBLL.GetModelList(sql + "and F_State in(10,11)");
+            visitcont = workorder.Count;
+            foreach (var it in workordewr)
+            {
+                if (it.F_State == 10)
+                    bevisit++;
+                if (it.F_State == 11)
+                    visit++;
+                if (it.F_IsOver == 1)
+                    Overdue++;
+                if (it.F_VisitResult == "满意" || it.F_VisitResult == "非常满意")
+                    satisfied++;
+                if (it.F_VisitResult == "不满意")
+                    dissatisfied++;
+            }
+            var obj = new
+            {
+                name,
+                bevisit,
+                visit,
+                visitcont,
+                Overdue,
+                satisfied,
+                dissatisfied
+            };
+            return Success("获取成功", obj
+           );
 
-
-
-
-
-
+        }
 
 
 

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

@@ -3712,8 +3712,6 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     model.F_DealType = model1[i].F_DealType;//处理方式:当即办理、电话转接、网络转办（点选）
                     model.SuperiorOpinion = AssCont(model1[i].F_ID );//上级处理意见
                     #endregion
-
-
                     if (!string .IsNullOrEmpty (model1[i].F_QuestionType) )
                     {
                         try
@@ -3857,6 +3855,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     model.F_AuditOn = model1[i].F_AuditOn;//审核时间
                     model.F_AuditCont = model1[i].F_AuditCont;//审核内容
                     model.DelayTimelimit = DelayTimelimit(model1[i].F_ID, model1[i].F_limit);//申请时限
+                    model.DelayTimename = DelayDeptid(model1[i].F_ID);//申请部门
                     model.F_Reasontimeout= model1[i].F_Reasontimeout;//超时原因
                     Model.T_Sys_UserAccount ua = new T_Sys_UserAccount();
                     if (userId>0)
@@ -3920,10 +3919,37 @@ namespace CallCenterApi.Interface.Controllers.workorder
             var itemlist = itembll.GetModelList("F_WoID="+ id + "and F_OptType="+ (int)EnumItemOpt.Delay+ "and F_ItemType = " + (int)EnumItemType.Delay);
             foreach (var it in itemlist )
             {
+               
                 time = int.Parse(it.F_LimitTime) - limit;
             }
             return time;
         }
+        private string DelayDeptid(int id)
+        {
+            string str = "";
+           
+            var itemlist = itembll.GetModelList("F_WoID=" + id + "and F_OptType=" + (int)EnumItemOpt.Delay + "and F_ItemType = " + (int)EnumItemType.Delay);
+            string usercode="";
+            foreach (var it in itemlist)
+            {
+                usercode = it.F_CreateUser;
+            }
+            
+            if (usercode!="")
+            {
+                Model.T_Sys_UserAccount ua = sysUserAccountBll.GetModel(usercode);
+                if (ua!=null )
+                {
+                    Model.T_Sys_Department dModel = departmentBLL.GetModel(ua.F_DeptId);
+                    if (dModel!=null )
+                    {
+                        str = dModel.F_DeptName;
+                    }
+                    }
+                }
+            
+            return str;
+        }
         /// <summary>
         /// 是否超时
         /// </summary>
@@ -4578,6 +4604,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     modlelist.F_DealTime =DateTime .Now ;// 处理时间
                     modlelist.F_DealContent = input.F_DealContent;//完结内容
                     modlelist.F_DealType = "当即办理";//处理方式:当即办理、电话转接、网络转办
+                    model.F_IsVisit = 0;
                     bool f = workOrder  .Update(modlelist);
                     if (!f )
                     {

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

@@ -773,6 +773,13 @@ namespace CallCenterApi.Interface.Models.Input
             get; set;
         }
         ///// <summary>
+        ///// 延期时限
+        ///// </summary>
+        public string  DelayTimename
+        {
+            get; set;
+        }
+        ///// <summary>
         ///// 超时原因
         ///// </summary>
         public string F_Reasontimeout