大屏修改

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/CallCenterApi.Interface.csproj

@@ -82,7 +82,7 @@
     </Reference>
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\Newtonsoft.Json.10.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <HintPath>..\..\..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="NPOI, Version=2.3.0.0, Culture=neutral, PublicKeyToken=0df73ec7942b34e1, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
@@ -100,6 +100,9 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\packages\NPOI.2.3.0\lib\net40\NPOI.OpenXmlFormats.dll</HintPath>
     </Reference>
+    <Reference Include="qcloudsms_csharp, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\qcloud.qcloudsms_csharp.0.1.6\lib\net40\qcloudsms_csharp.dll</HintPath>
+    </Reference>
     <Reference Include="Senparc.Weixin, Version=4.12.3.31913, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>Lib\Senparc.Weixin.dll</HintPath>
@@ -109,6 +112,7 @@
       <HintPath>Lib\Senparc.Weixin.MP.dll</HintPath>
     </Reference>
     <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="System.Net" />
     <Reference Include="System.Net.Http" />
     <Reference Include="System.Net.Http.WebRequest" />
     <Reference Include="System.Web.DynamicData" />
@@ -318,9 +322,11 @@
     <None Include="Properties\PublishProfiles\XiXianSZCG_API.pubxml" />
     <None Include="Web.Debug.config">
       <DependentUpon>Web.config</DependentUpon>
+      <SubType>Designer</SubType>
     </None>
     <None Include="Web.Release.config">
       <DependentUpon>Web.config</DependentUpon>
+      <SubType>Designer</SubType>
     </None>
   </ItemGroup>
   <ItemGroup>
@@ -391,6 +397,7 @@
     <Folder Include="Views\VisitRecords\" />
     <Folder Include="Views\VisitReport\" />
     <Folder Include="Views\VisitTelphone\" />
+    <Folder Include="Views\Web\" />
     <Folder Include="Views\WoBill\" />
     <Folder Include="Views\WOReport\" />
     <Folder Include="Views\Workcalendar\" />

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/CallCenterApi.Interface.csproj.user

@@ -11,6 +11,14 @@
     <NameOfLastUsedPublishProfile>sycw</NameOfLastUsedPublishProfile>
     <ProjectView>ShowAllFiles</ProjectView>
     <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
+    <Use64BitIISExpress />
+    <IISExpressSSLPort />
+    <IISExpressAnonymousAuthentication />
+    <IISExpressWindowsAuthentication />
+    <IISExpressUseClassicPipelineMode />
+    <UseGlobalApplicationHostFile />
+    <Controller_SelectedScaffolderID>MvcControllerEmptyScaffolder</Controller_SelectedScaffolderID>
+    <Controller_SelectedScaffolderCategoryPath>root/Controller</Controller_SelectedScaffolderCategoryPath>
   </PropertyGroup>
   <ProjectExtensions>
     <VisualStudio>

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Configs/system.config

@@ -19,22 +19,27 @@
   <!-- 设置邮箱主机 -->
   <add key="MailHost" value="smtp.ym.163.com" />
   <!-- ================== 3：微信配置参数 ================== -->
+     <!--新乡心连心-->
+ <add key="WechatAppid" value="wxeb3e1e01c493e5be" />
+  <add key="WechatAppsecret" value="653b03c7845240cdb43b28385321d50f" />
   <!--加一测试-->
-  <add key="WechatAppid" value="wx0d67bbb5666ec226" />
-  <add key="WechatAppsecret" value="be4785fa9866f2b380cd18999785baa3" />
+ <!-- <add key="WechatAppid" value="wx0d67bbb5666ec226" />
+  <add key="WechatAppsecret" value="be4785fa9866f2b380cd18999785baa3" />-->
+  
   <!-- 设置微信TemplateId 	工单进度提醒 -->
-  <add key="TemplateId" value="cQ7F1ePjEsOl7ntBEV_BV4OQoFcoU5Zh69S2qmyZrW4" />
+<!-- <add key="TemplateId" value="cQ7F1ePjEsOl7ntBEV_BV4OQoFcoU5Zh69S2qmyZrW4" /> --> 
   <!-- 设置微信 消息跳转url MessageUrl -->
-  <add key="MessageUrl" value="http://jiayi.800100.net/sycw/index.html?menucode=GDXQ" />
+<!-- <add key="MessageUrl" value="http://jiayi.800100.net/sycw/index.html?menucode=GDXQ" /> --> 
   <!-- ================== 4：公司名称中需截取掉的字符串 ================== -->
   <add key="keystring" value="有限公司,公司,科技,网络,信息,河南,河南省,洛阳,洛阳市,郑州,郑州市,南阳,南阳市,新乡,新乡市,有限、商贸、市"/>
   <!-- ================== 5：IVR文件上传FTP配置参数 ================== -->
   <!-- 设置FTP -->
-  <add key="ftp" value="192.168.4.18" />
+  <add key="ftp" value="10.11.202.223" />
   <!-- 设置账户名 -->
   <add key="account" value="bingbing" />
   <!-- 设置密码 -->
   <add key="password" value="Bing123456" />
   <!-- 文件保存位置 -->
   <add key="saveloc" value="\upload_wav\" />
+  
 </appSettings>

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

@@ -0,0 +1,385 @@
+using CallCenter.Utility;
+using CallCenterApi.Common;
+using CallCenterApi.Interface.Controllers.Base;
+using CallCenterApi.Interface.Models.Input;
+using CallCenterApi.Model;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.IO;
+using System.Linq;
+using System.Web;
+using System.Web.Mvc;
+
+namespace CallCenterApi.Interface.Controllers.customer
+{
+    public class RegionCategoryController : BaseController
+    {
+        private BLL.T_RegionCategory regionBLL = new BLL.T_RegionCategory();
+
+        /// <summary>
+        /// 获取省市县乡镇
+        /// </summary>
+        /// <returns></returns>
+        public ActionResult GetAllList(int F_Layer, string F_RegionName = "")
+        {
+            int F_RegionId = 0;
+            if (F_RegionName!= "")
+            {
+                Model.T_RegionCategory userModel = regionBLL.GetModel(F_RegionName);
+                if (userModel !=null )
+                {
+                    F_RegionId = userModel.F_RegionId;
+                }
+                else
+                {
+                    return Success("获取失败，内容为空");
+                }
+            }
+            var entityJson = new BLL.T_RegionCategory().GetModelList("F_Layer = " + F_Layer + "AND F_ParentId=" + F_RegionId + "order by F_Sort" );
+         
+            if (entityJson.Count > 0)
+            {
+                return Success("加载成功", entityJson);
+            }
+            else
+            {
+                return Success("获取失败，内容为空");
+            }
+        }
+        /// <summary>
+        /// 导入excel
+        /// </summary>
+        /// <returns></returns>
+        public ActionResult ImportExcel(int F_Layer, string F_RegionName="")
+        {
+            string userscode = CurrentUser.UserData.F_UserCode;
+            HttpPostedFile _upFile = RequestString.GetFile("upFile");
+            if (_upFile != null)
+            {
+                int headrow = 0;
+                #region 上传文件
+                string filepath = "";
+                string datepath = DateTime.Now.ToString("yyyyMMddHHMMss");
+                string aLastName = Path.GetExtension(_upFile.FileName);
+                string oriname = Path.GetFileNameWithoutExtension(_upFile.FileName);
+                if (aLastName != ".xls" && aLastName != ".xlsx")
+                {
+                    return Error("文件类型错误，请选择Excel文件");
+                }
+                string newpath = datepath + "_" + _upFile.FileName;
+                if (!Directory.Exists(Server.MapPath(this.Request.ApplicationPath + "\\ExcelData")))
+                {
+                    Directory.CreateDirectory(Server.MapPath(this.Request.ApplicationPath + "\\ExcelData"));
+                }
+                filepath = this.Request.ApplicationPath + "/ExcelData/" + newpath;
+                string PhysicalPath = Server.MapPath(filepath);
+                _upFile.SaveAs(PhysicalPath);
+                #endregion
+                #region 添加附件日志
+                Model.T_Sys_Accessories model_T_Sys_Accessories = new Model.T_Sys_Accessories();
+                model_T_Sys_Accessories.F_AddTime = DateTime.Now;//上传时间
+                model_T_Sys_Accessories.F_FileName = newpath;//附件名称
+                model_T_Sys_Accessories.F_FileType = aLastName;//附件类型
+                model_T_Sys_Accessories.F_FileUrl = filepath;//附件地址
+                model_T_Sys_Accessories.F_UserCode = userscode;//上传人  
+                model_T_Sys_Accessories.F_OriName = oriname;
+                int fid = new BLL.T_Sys_Accessories().Add(model_T_Sys_Accessories);
+                #endregion
+                NPOIHelper np = new NPOIHelper();
+                DataTable dt = np.ExcelToTable(_upFile, headrow);
+                string msg = string.Empty;
+                if (dt == null || dt.Rows.Count == 0)
+                    return Error("文件没有数据");
+                else
+                {
+                    foreach (DataRow dr in dt.Rows)
+                    {
+                        #region 数据入库
+                        headrow = headrow + 1;
+
+                        if (dr["地区名称"].ToString() != "" )
+                        {
+                           
+                            Model.T_RegionCategory dModel = new Model.T_RegionCategory();
+                            dModel.F_RegionName = dr["地区名称"].ToString();//地区名称
+                            dModel.F_Layer = F_Layer;
+                            if (F_RegionName != "")
+                            {
+                                Model.T_RegionCategory userModel = regionBLL.GetModel(F_RegionName);
+                                if (userModel != null)
+                                {
+                                    dModel.F_ParentId = userModel.F_RegionId;
+                                }
+                                else
+                                {
+                                    dModel.F_ParentId = 0;
+                                }
+                            }
+                            dModel.F_CreateBy = int .Parse (userscode);
+                            dModel.F_CreateOn = DateTime.Now;
+                            dModel.F_DeleteFlag = 0;
+                            dModel.F_Sort = 0;
+                            var res = regionBLL.Add(dModel);
+                            if (res > 0)
+                            {
+                                addoptlog(userscode, DTRequest.GetIP(), EnumOpt.import.ToString(), res.ToString(), "导入成功,导入的文件为：" + newpath + ",当前为第" + headrow + "行");
+                            }
+                            else
+                            {
+
+                                msg = msg + "第" + headrow + "行，导入失败<br>";
+                            }
+                        }
+                        else
+                            msg = msg + "第" + headrow + "行，地区名称为空或格式不正确，未导入<br>";
+                        #endregion
+                    }
+                    if (string.IsNullOrEmpty(msg))
+                        return Success("导入成功 ");
+                    else
+                        return Error(msg);
+                }
+
+            }
+            return Error("文件不能为空");
+        }
+        /// <summary>
+        /// 操作日志
+        /// </summary>
+        /// <param name="usercode">操作人工号</param>
+        /// <param name="ip">操作人IP</param>
+        /// <param name="optcode">操作编号</param>
+        /// <param name="optid">操作id</param>
+        /// <param name="des">操作描述</param>
+        private void addoptlog(string usercode, string ip, string optcode, string optid, string des)
+        {
+            new BLL.T_Sys_OperateLogs().AddOptLog("地区管理", usercode, ip, des, optcode, "T_RegionCategory", optid);
+        }
+
+        /// <summary>
+        /// 获取地市
+        /// </summary>
+        /// <param name="deptId"></param>
+        /// <returns></returns>
+        public ActionResult GetRegion(int deptId = 0)
+        {
+            if (Request.IsAuthenticated)
+            {
+                BLL.T_RegionCategory dBLL = new BLL.T_RegionCategory();
+                Model.T_RegionCategory dModel = dBLL.GetModel(deptId);
+                if (dModel != null)
+                    return Success("获取地市信息成功", dModel);
+                return Error("获取地市信息失败");
+            }
+            return NoToken("未知错误，请重新登录");
+        }
+
+        /// <summary>
+        /// 添加地市
+        /// </summary>
+        /// <param name="input"></param>
+        /// <returns></returns>
+        [HttpPost]
+        public ActionResult AddRegion(RegionCategoryInput input)
+        {
+          
+                Model.T_RegionCategory dModel = new Model.T_RegionCategory();
+                dModel.F_ParentId = input.F_ParentId;
+                dModel.F_Sort = input.F_Sort;
+                dModel.F_RegionName = input.F_RegionName;
+                dModel.F_DeleteFlag = 0;
+                dModel.F_Layer = input.F_Layer;
+                dModel.F_CreateBy = CurrentUser.UserData.F_UserId;
+                dModel.F_CreateOn = DateTime.Now;
+                if (regionBLL.Add(dModel) > 0)
+                    return Success("添加成功");
+                else
+                    return Success("添加失败");
+           
+        }
+
+        /// <summary>
+        /// 编辑地市
+        /// </summary>
+        /// <param name="input"></param>
+        /// <returns></returns>
+        [HttpPost]
+        public ActionResult EditRegion(RegionCategoryInput input)
+        {
+          
+                if (input.F_RegionId <= 0)
+                    return Error("请选择要编辑的地市");
+                BLL.T_RegionCategory dBLL = new BLL.T_RegionCategory();
+                Model.T_RegionCategory dModel = dBLL.GetModel(input.F_RegionId);
+                if (dModel == null)
+                    return Error("获取信息失败");
+                dModel.F_ParentId = input.F_ParentId;
+                dModel.F_Sort = input.F_Sort;
+                dModel.F_RegionName = input.F_RegionName;
+                dModel.F_Layer = input.F_Layer;
+                dModel.F_ModifyBy = CurrentUser.UserData.F_UserId;
+                dModel.F_ModifyOn = DateTime.Now;
+                if (dBLL.Update(dModel))
+                    return Success("编辑成功");
+                return Error("编辑失败");
+         
+        }
+
+        /// <summary>
+        /// 删除地市
+        /// </summary>
+        /// <param name="ids"></param>
+        /// <returns></returns>
+        public ActionResult DelRegion(string[] ids)
+        {
+          
+                if (ids == null || ids.Length <= 0)
+                    return Error("请选择要删除的地市");
+
+                var idStr = string.Join(",", ids);
+                if (string.IsNullOrEmpty(idStr.Trim()))
+                    return Error("请选择要删除的地市");
+
+                if (regionBLL.DeleteList(idStr))
+                    return Success("删除成功");
+                return Error("删除失败");
+        
+        }
+
+        #region 获取地市列表 - 优化前的
+        ///// <summary>
+        ///// 获取地市列表
+        ///// </summary>
+        ///// <returns></returns>
+        //public ActionResult GetRegionList(int pId = 0)
+        //{
+        //    if (Request.IsAuthenticated)
+        //    {
+        //        DataTable dt = new DataTable();
+        //        dt = new BLL.T_RegionCategory().GetList(" F_DeleteFlag=0 and F_ParentId=" + pId).Tables[0];
+        //        List<Model.TreeModel> modelList = BindTree(dt, "0");
+
+        //        if (modelList != null)
+        //        {
+        //            if (modelList.Count > 0)
+        //                return Success("加载成功", modelList);
+        //        }
+        //        return Error("加载失败");
+        //    }
+        //    return NoToken("未知错误，请重新登录");
+        //}
+        ///// <summary>
+        ///// tree  树形地市
+        ///// </summary>
+        ///// <param name="tab"></param>
+        ///// <param name="parentid"></param>
+        ///// <returns></returns>
+        //private List<Model.TreeModel> BindTree(DataTable tab, string parentid)
+        //{
+        //    DataTable tab2 = new DataTable();
+
+        //    if (tab != null && tab.Rows.Count > 0)
+        //    {
+        //        List<Model.T_RegionCategory> categorylist = new BLL.T_RegionCategory().DataTableToList(tab);
+        //        List<Model.TreeModel> modelList = new List<Model.TreeModel>(categorylist.Count);
+        //        for (int i = 0; i < categorylist.Count; i++)
+        //        {
+        //            Model.TreeModel model = new Model.TreeModel();
+        //            string currentID = categorylist[i].F_RegionId.ToString();//当前功能ID
+        //            model.id = currentID;
+        //            model.IconCls = "";//图标
+        //            model.headerid =int .Parse ( categorylist[i].F_Layer.ToString ());
+        //            model.text = categorylist[i].F_RegionName;
+        //            tab2 = new BLL.T_RegionCategory().GetList("F_ParentId=" + currentID + " and F_DeleteFlag=0 order by f_sort").Tables[0];
+        //            if (tab2 != null && tab2.Rows.Count > 0)
+        //            {
+        //                model.children = BindTree(tab2, currentID);
+        //            }
+        //            modelList.Add(model);
+        //        }
+        //        return modelList;
+
+        //    }
+        //    else
+        //    {
+        //        return null;
+        //    }
+
+        //}
+
+        #endregion
+
+
+        public List<T_RegionCategory> list = null;
+        #region 获取地市列表 - 优化后的
+        /// <summary>
+        /// 获取地市列表
+        /// </summary>
+        /// <returns></returns>
+        public ActionResult GetRegionList(int pId = 0)
+        {
+            if (Request.IsAuthenticated)
+            {
+                list = new BLL.T_RegionCategory().GetModelList(" F_DeleteFlag=0 ");
+                var list_p = list.Where(x => x.F_ParentId == pId).ToList();
+                List<Model.TreeModel> modelList = BindTree(list_p, "0");
+
+                if (modelList != null)
+                {
+                    if (modelList.Count > 0)
+                        return Success("加载成功", modelList);
+                }
+                return Error("加载失败");
+            }
+            return NoToken("未知错误，请重新登录");
+        }
+        /// <summary>
+        /// tree  树形地市
+        /// </summary>
+        /// <param name="tab"></param>
+        /// <param name="parentid"></param>
+        /// <returns></returns>
+        private List<Model.TreeModel> BindTree(List<T_RegionCategory> tab, string parentid)
+        {
+            if (tab.Count > 0)
+            {
+                List<Model.TreeModel> modelList = new List<Model.TreeModel>(tab.Count);
+                for (int i = 0; i < tab.Count; i++)
+                {
+                    Model.TreeModel model = new Model.TreeModel();
+                    int F_RegionId = tab[i].F_RegionId;
+                    string currentID = tab[i].F_RegionId.ToString();//当前功能ID
+                    model.id = currentID;
+                    model.IconCls = "";//图标
+<<<<<<< HEAD
+                    if (categorylist[i].F_Layer != null)
+                    {
+                        model.headerid = int.Parse(categorylist[i].F_Layer.ToString());
+                    }
+                    model.text = categorylist[i].F_RegionName;
+                    tab2 = new BLL.T_RegionCategory().GetList("F_ParentId=" + currentID + " and F_DeleteFlag=0 order by f_sort").Tables[0];
+                    if (tab2 != null && tab2.Rows.Count > 0)
+=======
+                    model.headerid = int.Parse(tab[i].F_Layer.ToString());
+                    model.text = tab[i].F_RegionName;
+                    var tab2 = list.Where(x => x.F_ParentId == F_RegionId).OrderByDescending(x=>x.F_Sort).ToList();
+                    if (tab2.Count > 0)
+>>>>>>> 0725543ed68fafd0d18fd9f6dd818d53fc7716a8
+                    {
+                        model.children = BindTree(tab2, currentID);
+                    }
+                    modelList.Add(model);
+                }
+                return modelList;
+
+            }
+            else
+            {
+                return null;
+            }
+
+        }
+        #endregion
+    }
+}

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

@@ -0,0 +1,310 @@
+using CallCenter.Utility;
+using CallCenterApi.Common;
+using CallCenterApi.Interface.Controllers.Base;
+using CallCenterApi.Interface.Models.Input;
+using CallCenterApi.Model;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.IO;
+using System.Linq;
+using System.Web;
+using System.Web.Mvc;
+
+namespace CallCenterApi.Interface.Controllers.customer
+{
+    public class RegionCategoryController : BaseController
+    {
+        private BLL.T_RegionCategory regionBLL = new BLL.T_RegionCategory();
+
+        /// <summary>
+        /// 获取省市县乡镇
+        /// </summary>
+        /// <returns></returns>
+        public ActionResult GetAllList(int F_Layer, string F_RegionName = "")
+        {
+            int F_RegionId = 0;
+            if (F_RegionName!= "")
+            {
+                Model.T_RegionCategory userModel = regionBLL.GetModel(F_RegionName);
+                if (userModel !=null )
+                {
+                    F_RegionId = userModel.F_RegionId;
+                }
+                else
+                {
+                    return Success("获取失败，内容为空");
+                }
+            }
+            var entityJson = new BLL.T_RegionCategory().GetModelList("F_Layer = " + F_Layer + "AND F_ParentId=" + F_RegionId + "order by F_Sort" );
+         
+            if (entityJson.Count > 0)
+            {
+                return Success("加载成功", entityJson);
+            }
+            else
+            {
+                return Success("获取失败，内容为空");
+            }
+        }
+        /// <summary>
+        /// 导入excel
+        /// </summary>
+        /// <returns></returns>
+        public ActionResult ImportExcel(int F_Layer, string F_RegionName="")
+        {
+            string userscode = CurrentUser.UserData.F_UserCode;
+            HttpPostedFile _upFile = RequestString.GetFile("upFile");
+            if (_upFile != null)
+            {
+                int headrow = 0;
+                #region 上传文件
+                string filepath = "";
+                string datepath = DateTime.Now.ToString("yyyyMMddHHMMss");
+                string aLastName = Path.GetExtension(_upFile.FileName);
+                string oriname = Path.GetFileNameWithoutExtension(_upFile.FileName);
+                if (aLastName != ".xls" && aLastName != ".xlsx")
+                {
+                    return Error("文件类型错误，请选择Excel文件");
+                }
+                string newpath = datepath + "_" + _upFile.FileName;
+                if (!Directory.Exists(Server.MapPath(this.Request.ApplicationPath + "\\ExcelData")))
+                {
+                    Directory.CreateDirectory(Server.MapPath(this.Request.ApplicationPath + "\\ExcelData"));
+                }
+                filepath = this.Request.ApplicationPath + "/ExcelData/" + newpath;
+                string PhysicalPath = Server.MapPath(filepath);
+                _upFile.SaveAs(PhysicalPath);
+                #endregion
+                #region 添加附件日志
+                Model.T_Sys_Accessories model_T_Sys_Accessories = new Model.T_Sys_Accessories();
+                model_T_Sys_Accessories.F_AddTime = DateTime.Now;//上传时间
+                model_T_Sys_Accessories.F_FileName = newpath;//附件名称
+                model_T_Sys_Accessories.F_FileType = aLastName;//附件类型
+                model_T_Sys_Accessories.F_FileUrl = filepath;//附件地址
+                model_T_Sys_Accessories.F_UserCode = userscode;//上传人  
+                model_T_Sys_Accessories.F_OriName = oriname;
+                int fid = new BLL.T_Sys_Accessories().Add(model_T_Sys_Accessories);
+                #endregion
+                NPOIHelper np = new NPOIHelper();
+                DataTable dt = np.ExcelToTable(_upFile, headrow);
+                string msg = string.Empty;
+                if (dt == null || dt.Rows.Count == 0)
+                    return Error("文件没有数据");
+                else
+                {
+                    foreach (DataRow dr in dt.Rows)
+                    {
+                        #region 数据入库
+                        headrow = headrow + 1;
+
+                        if (dr["地区名称"].ToString() != "" )
+                        {
+                           
+                            Model.T_RegionCategory dModel = new Model.T_RegionCategory();
+                            dModel.F_RegionName = dr["地区名称"].ToString();//地区名称
+                            dModel.F_Layer = F_Layer;
+                            if (F_RegionName != "")
+                            {
+                                Model.T_RegionCategory userModel = regionBLL.GetModel(F_RegionName);
+                                if (userModel != null)
+                                {
+                                    dModel.F_ParentId = userModel.F_RegionId;
+                                }
+                                else
+                                {
+                                    dModel.F_ParentId = 0;
+                                }
+                            }
+                            dModel.F_CreateBy = int .Parse (userscode);
+                            dModel.F_CreateOn = DateTime.Now;
+                            dModel.F_DeleteFlag = 0;
+                            dModel.F_Sort = 0;
+                            var res = regionBLL.Add(dModel);
+                            if (res > 0)
+                            {
+                                addoptlog(userscode, DTRequest.GetIP(), EnumOpt.import.ToString(), res.ToString(), "导入成功,导入的文件为：" + newpath + ",当前为第" + headrow + "行");
+                            }
+                            else
+                            {
+
+                                msg = msg + "第" + headrow + "行，导入失败<br>";
+                            }
+                        }
+                        else
+                            msg = msg + "第" + headrow + "行，地区名称为空或格式不正确，未导入<br>";
+                        #endregion
+                    }
+                    if (string.IsNullOrEmpty(msg))
+                        return Success("导入成功 ");
+                    else
+                        return Error(msg);
+                }
+
+            }
+            return Error("文件不能为空");
+        }
+        /// <summary>
+        /// 操作日志
+        /// </summary>
+        /// <param name="usercode">操作人工号</param>
+        /// <param name="ip">操作人IP</param>
+        /// <param name="optcode">操作编号</param>
+        /// <param name="optid">操作id</param>
+        /// <param name="des">操作描述</param>
+        private void addoptlog(string usercode, string ip, string optcode, string optid, string des)
+        {
+            new BLL.T_Sys_OperateLogs().AddOptLog("地区管理", usercode, ip, des, optcode, "T_RegionCategory", optid);
+        }
+
+        /// <summary>
+        /// 获取地市
+        /// </summary>
+        /// <param name="deptId"></param>
+        /// <returns></returns>
+        public ActionResult GetRegion(int deptId = 0)
+        {
+            if (Request.IsAuthenticated)
+            {
+                BLL.T_RegionCategory dBLL = new BLL.T_RegionCategory();
+                Model.T_RegionCategory dModel = dBLL.GetModel(deptId);
+                if (dModel != null)
+                    return Success("获取地市信息成功", dModel);
+                return Error("获取地市信息失败");
+            }
+            return NoToken("未知错误，请重新登录");
+        }
+
+        /// <summary>
+        /// 添加地市
+        /// </summary>
+        /// <param name="input"></param>
+        /// <returns></returns>
+        [HttpPost]
+        public ActionResult AddRegion(RegionCategoryInput input)
+        {
+          
+                Model.T_RegionCategory dModel = new Model.T_RegionCategory();
+                dModel.F_ParentId = input.F_ParentId;
+                dModel.F_Sort = input.F_Sort;
+                dModel.F_RegionName = input.F_RegionName;
+                dModel.F_DeleteFlag = 0;
+                dModel.F_Layer = input.F_Layer;
+                dModel.F_CreateBy = CurrentUser.UserData.F_UserId;
+                dModel.F_CreateOn = DateTime.Now;
+                if (regionBLL.Add(dModel) > 0)
+                    return Success("添加成功");
+                else
+                    return Success("添加失败");
+           
+        }
+
+        /// <summary>
+        /// 编辑地市
+        /// </summary>
+        /// <param name="input"></param>
+        /// <returns></returns>
+        [HttpPost]
+        public ActionResult EditRegion(RegionCategoryInput input)
+        {
+          
+                if (input.F_RegionId <= 0)
+                    return Error("请选择要编辑的地市");
+                BLL.T_RegionCategory dBLL = new BLL.T_RegionCategory();
+                Model.T_RegionCategory dModel = dBLL.GetModel(input.F_RegionId);
+                if (dModel == null)
+                    return Error("获取信息失败");
+                dModel.F_ParentId = input.F_ParentId;
+                dModel.F_Sort = input.F_Sort;
+                dModel.F_RegionName = input.F_RegionName;
+                dModel.F_Layer = input.F_Layer;
+                dModel.F_ModifyBy = CurrentUser.UserData.F_UserId;
+                dModel.F_ModifyOn = DateTime.Now;
+                if (dBLL.Update(dModel))
+                    return Success("编辑成功");
+                return Error("编辑失败");
+         
+        }
+
+        /// <summary>
+        /// 删除地市
+        /// </summary>
+        /// <param name="ids"></param>
+        /// <returns></returns>
+        public ActionResult DelRegion(string[] ids)
+        {
+          
+                if (ids == null || ids.Length <= 0)
+                    return Error("请选择要删除的地市");
+
+                var idStr = string.Join(",", ids);
+                if (string.IsNullOrEmpty(idStr.Trim()))
+                    return Error("请选择要删除的地市");
+
+                if (regionBLL.DeleteList(idStr))
+                    return Success("删除成功");
+                return Error("删除失败");
+        
+        }
+
+        /// <summary>
+        /// 获取地市列表
+        /// </summary>
+        /// <returns></returns>
+        public ActionResult GetRegionList(int pId = 0)
+        {
+            if (Request.IsAuthenticated)
+            {
+                DataTable dt = new DataTable();
+                dt = new BLL.T_RegionCategory().GetList(" F_DeleteFlag=0 and F_ParentId=" + pId).Tables[0];
+                List<Model.TreeModel> modelList = BindTree(dt, "0");
+
+                if (modelList != null)
+                {
+                    if (modelList.Count > 0)
+                        return Success("加载成功", modelList);
+                }
+                return Error("加载失败");
+            }
+            return NoToken("未知错误，请重新登录");
+        }
+        /// <summary>
+        /// tree  树形地市
+        /// </summary>
+        /// <param name="tab"></param>
+        /// <param name="parentid"></param>
+        /// <returns></returns>
+        private List<Model.TreeModel> BindTree(DataTable tab, string parentid)
+        {
+            DataTable tab2 = new DataTable();
+
+            if (tab != null && tab.Rows.Count > 0)
+            {
+                List<Model.T_RegionCategory> categorylist = new BLL.T_RegionCategory().DataTableToList(tab);
+                List<Model.TreeModel> modelList = new List<Model.TreeModel>(categorylist.Count);
+                for (int i = 0; i < categorylist.Count; i++)
+                {
+                    Model.TreeModel model = new Model.TreeModel();
+                    string currentID = categorylist[i].F_RegionId.ToString();//当前功能ID
+                    model.id = currentID;
+                    model.IconCls = "";//图标
+                    model.headerid =int .Parse ( categorylist[i].F_Layer.ToString ());
+                    model.text = categorylist[i].F_RegionName;
+                    tab2 = new BLL.T_RegionCategory().GetList("F_ParentId=" + currentID + " and F_DeleteFlag=0 order by f_sort").Tables[0];
+                    if (tab2 != null && tab2.Rows.Count > 0)
+                    {
+                        model.children = BindTree(tab2, currentID);
+                    }
+                    modelList.Add(model);
+                }
+                return modelList;
+
+            }
+            else
+            {
+                return null;
+            }
+
+        }
+    }
+}

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

@@ -0,0 +1,313 @@
+using CallCenter.Utility;
+using CallCenterApi.Common;
+using CallCenterApi.Interface.Controllers.Base;
+using CallCenterApi.Interface.Models.Input;
+using CallCenterApi.Model;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.IO;
+using System.Linq;
+using System.Web;
+using System.Web.Mvc;
+
+namespace CallCenterApi.Interface.Controllers.customer
+{
+    public class RegionCategoryController : BaseController
+    {
+        private BLL.T_RegionCategory regionBLL = new BLL.T_RegionCategory();
+
+        /// <summary>
+        /// 获取省市县乡镇
+        /// </summary>
+        /// <returns></returns>
+        public ActionResult GetAllList(int F_Layer, string F_RegionName = "")
+        {
+            int F_RegionId = 0;
+            if (F_RegionName!= "")
+            {
+                Model.T_RegionCategory userModel = regionBLL.GetModel(F_RegionName);
+                if (userModel !=null )
+                {
+                    F_RegionId = userModel.F_RegionId;
+                }
+                else
+                {
+                    return Success("获取失败，内容为空");
+                }
+            }
+            var entityJson = new BLL.T_RegionCategory().GetModelList("F_Layer = " + F_Layer + "AND F_ParentId=" + F_RegionId + "order by F_Sort" );
+         
+            if (entityJson.Count > 0)
+            {
+                return Success("加载成功", entityJson);
+            }
+            else
+            {
+                return Success("获取失败，内容为空");
+            }
+        }
+        /// <summary>
+        /// 导入excel
+        /// </summary>
+        /// <returns></returns>
+        public ActionResult ImportExcel(int F_Layer, string F_RegionName="")
+        {
+            string userscode = CurrentUser.UserData.F_UserCode;
+            HttpPostedFile _upFile = RequestString.GetFile("upFile");
+            if (_upFile != null)
+            {
+                int headrow = 0;
+                #region 上传文件
+                string filepath = "";
+                string datepath = DateTime.Now.ToString("yyyyMMddHHMMss");
+                string aLastName = Path.GetExtension(_upFile.FileName);
+                string oriname = Path.GetFileNameWithoutExtension(_upFile.FileName);
+                if (aLastName != ".xls" && aLastName != ".xlsx")
+                {
+                    return Error("文件类型错误，请选择Excel文件");
+                }
+                string newpath = datepath + "_" + _upFile.FileName;
+                if (!Directory.Exists(Server.MapPath(this.Request.ApplicationPath + "\\ExcelData")))
+                {
+                    Directory.CreateDirectory(Server.MapPath(this.Request.ApplicationPath + "\\ExcelData"));
+                }
+                filepath = this.Request.ApplicationPath + "/ExcelData/" + newpath;
+                string PhysicalPath = Server.MapPath(filepath);
+                _upFile.SaveAs(PhysicalPath);
+                #endregion
+                #region 添加附件日志
+                Model.T_Sys_Accessories model_T_Sys_Accessories = new Model.T_Sys_Accessories();
+                model_T_Sys_Accessories.F_AddTime = DateTime.Now;//上传时间
+                model_T_Sys_Accessories.F_FileName = newpath;//附件名称
+                model_T_Sys_Accessories.F_FileType = aLastName;//附件类型
+                model_T_Sys_Accessories.F_FileUrl = filepath;//附件地址
+                model_T_Sys_Accessories.F_UserCode = userscode;//上传人  
+                model_T_Sys_Accessories.F_OriName = oriname;
+                int fid = new BLL.T_Sys_Accessories().Add(model_T_Sys_Accessories);
+                #endregion
+                NPOIHelper np = new NPOIHelper();
+                DataTable dt = np.ExcelToTable(_upFile, headrow);
+                string msg = string.Empty;
+                if (dt == null || dt.Rows.Count == 0)
+                    return Error("文件没有数据");
+                else
+                {
+                    foreach (DataRow dr in dt.Rows)
+                    {
+                        #region 数据入库
+                        headrow = headrow + 1;
+
+                        if (dr["地区名称"].ToString() != "" )
+                        {
+                           
+                            Model.T_RegionCategory dModel = new Model.T_RegionCategory();
+                            dModel.F_RegionName = dr["地区名称"].ToString();//地区名称
+                            dModel.F_Layer = F_Layer;
+                            if (F_RegionName != "")
+                            {
+                                Model.T_RegionCategory userModel = regionBLL.GetModel(F_RegionName);
+                                if (userModel != null)
+                                {
+                                    dModel.F_ParentId = userModel.F_RegionId;
+                                }
+                                else
+                                {
+                                    dModel.F_ParentId = 0;
+                                }
+                            }
+                            dModel.F_CreateBy = int .Parse (userscode);
+                            dModel.F_CreateOn = DateTime.Now;
+                            dModel.F_DeleteFlag = 0;
+                            dModel.F_Sort = 0;
+                            var res = regionBLL.Add(dModel);
+                            if (res > 0)
+                            {
+                                addoptlog(userscode, DTRequest.GetIP(), EnumOpt.import.ToString(), res.ToString(), "导入成功,导入的文件为：" + newpath + ",当前为第" + headrow + "行");
+                            }
+                            else
+                            {
+
+                                msg = msg + "第" + headrow + "行，导入失败<br>";
+                            }
+                        }
+                        else
+                            msg = msg + "第" + headrow + "行，地区名称为空或格式不正确，未导入<br>";
+                        #endregion
+                    }
+                    if (string.IsNullOrEmpty(msg))
+                        return Success("导入成功 ");
+                    else
+                        return Error(msg);
+                }
+
+            }
+            return Error("文件不能为空");
+        }
+        /// <summary>
+        /// 操作日志
+        /// </summary>
+        /// <param name="usercode">操作人工号</param>
+        /// <param name="ip">操作人IP</param>
+        /// <param name="optcode">操作编号</param>
+        /// <param name="optid">操作id</param>
+        /// <param name="des">操作描述</param>
+        private void addoptlog(string usercode, string ip, string optcode, string optid, string des)
+        {
+            new BLL.T_Sys_OperateLogs().AddOptLog("地区管理", usercode, ip, des, optcode, "T_RegionCategory", optid);
+        }
+
+        /// <summary>
+        /// 获取地市
+        /// </summary>
+        /// <param name="deptId"></param>
+        /// <returns></returns>
+        public ActionResult GetRegion(int deptId = 0)
+        {
+            if (Request.IsAuthenticated)
+            {
+                BLL.T_RegionCategory dBLL = new BLL.T_RegionCategory();
+                Model.T_RegionCategory dModel = dBLL.GetModel(deptId);
+                if (dModel != null)
+                    return Success("获取地市信息成功", dModel);
+                return Error("获取地市信息失败");
+            }
+            return NoToken("未知错误，请重新登录");
+        }
+
+        /// <summary>
+        /// 添加地市
+        /// </summary>
+        /// <param name="input"></param>
+        /// <returns></returns>
+        [HttpPost]
+        public ActionResult AddRegion(RegionCategoryInput input)
+        {
+          
+                Model.T_RegionCategory dModel = new Model.T_RegionCategory();
+                dModel.F_ParentId = input.F_ParentId;
+                dModel.F_Sort = input.F_Sort;
+                dModel.F_RegionName = input.F_RegionName;
+                dModel.F_DeleteFlag = 0;
+                dModel.F_Layer = input.F_Layer;
+                dModel.F_CreateBy = CurrentUser.UserData.F_UserId;
+                dModel.F_CreateOn = DateTime.Now;
+                if (regionBLL.Add(dModel) > 0)
+                    return Success("添加成功");
+                else
+                    return Success("添加失败");
+           
+        }
+
+        /// <summary>
+        /// 编辑地市
+        /// </summary>
+        /// <param name="input"></param>
+        /// <returns></returns>
+        [HttpPost]
+        public ActionResult EditRegion(RegionCategoryInput input)
+        {
+          
+                if (input.F_RegionId <= 0)
+                    return Error("请选择要编辑的地市");
+                BLL.T_RegionCategory dBLL = new BLL.T_RegionCategory();
+                Model.T_RegionCategory dModel = dBLL.GetModel(input.F_RegionId);
+                if (dModel == null)
+                    return Error("获取信息失败");
+                dModel.F_ParentId = input.F_ParentId;
+                dModel.F_Sort = input.F_Sort;
+                dModel.F_RegionName = input.F_RegionName;
+                dModel.F_Layer = input.F_Layer;
+                dModel.F_ModifyBy = CurrentUser.UserData.F_UserId;
+                dModel.F_ModifyOn = DateTime.Now;
+                if (dBLL.Update(dModel))
+                    return Success("编辑成功");
+                return Error("编辑失败");
+         
+        }
+
+        /// <summary>
+        /// 删除地市
+        /// </summary>
+        /// <param name="ids"></param>
+        /// <returns></returns>
+        public ActionResult DelRegion(string[] ids)
+        {
+          
+                if (ids == null || ids.Length <= 0)
+                    return Error("请选择要删除的地市");
+
+                var idStr = string.Join(",", ids);
+                if (string.IsNullOrEmpty(idStr.Trim()))
+                    return Error("请选择要删除的地市");
+
+                if (regionBLL.DeleteList(idStr))
+                    return Success("删除成功");
+                return Error("删除失败");
+        
+        }
+
+        /// <summary>
+        /// 获取地市列表
+        /// </summary>
+        /// <returns></returns>
+        public ActionResult GetRegionList(int pId = 0)
+        {
+            if (Request.IsAuthenticated)
+            {
+                DataTable dt = new DataTable();
+                dt = new BLL.T_RegionCategory().GetList(" F_DeleteFlag=0 and F_ParentId=" + pId).Tables[0];
+                List<Model.TreeModel> modelList = BindTree(dt, "0");
+
+                if (modelList != null)
+                {
+                    if (modelList.Count > 0)
+                        return Success("加载成功", modelList);
+                }
+                return Error("加载失败");
+            }
+            return NoToken("未知错误，请重新登录");
+        }
+        /// <summary>
+        /// tree  树形地市
+        /// </summary>
+        /// <param name="tab"></param>
+        /// <param name="parentid"></param>
+        /// <returns></returns>
+        private List<Model.TreeModel> BindTree(DataTable tab, string parentid)
+        {
+            DataTable tab2 = new DataTable();
+
+            if (tab != null && tab.Rows.Count > 0)
+            {
+                List<Model.T_RegionCategory> categorylist = new BLL.T_RegionCategory().DataTableToList(tab);
+                List<Model.TreeModel> modelList = new List<Model.TreeModel>(categorylist.Count);
+                for (int i = 0; i < categorylist.Count; i++)
+                {
+                    Model.TreeModel model = new Model.TreeModel();
+                    string currentID = categorylist[i].F_RegionId.ToString();//当前功能ID
+                    model.id = currentID;
+                    model.IconCls = "";//图标
+                    if (categorylist[i].F_Layer != null)
+                    {
+                        model.headerid = int.Parse(categorylist[i].F_Layer.ToString());
+                    }
+                    model.text = categorylist[i].F_RegionName;
+                    tab2 = new BLL.T_RegionCategory().GetList("F_ParentId=" + currentID + " and F_DeleteFlag=0 order by f_sort").Tables[0];
+                    if (tab2 != null && tab2.Rows.Count > 0)
+                    {
+                        model.children = BindTree(tab2, currentID);
+                    }
+                    modelList.Add(model);
+                }
+                return modelList;
+
+            }
+            else
+            {
+                return null;
+            }
+
+        }
+    }
+}

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

@@ -0,0 +1,375 @@
+using CallCenter.Utility;
+using CallCenterApi.Common;
+using CallCenterApi.Interface.Controllers.Base;
+using CallCenterApi.Interface.Models.Input;
+using CallCenterApi.Model;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.IO;
+using System.Linq;
+using System.Web;
+using System.Web.Mvc;
+
+namespace CallCenterApi.Interface.Controllers.customer
+{
+    public class RegionCategoryController : BaseController
+    {
+        private BLL.T_RegionCategory regionBLL = new BLL.T_RegionCategory();
+
+        /// <summary>
+        /// 获取省市县乡镇
+        /// </summary>
+        /// <returns></returns>
+        public ActionResult GetAllList(int F_Layer, string F_RegionName = "")
+        {
+            int F_RegionId = 0;
+            if (F_RegionName!= "")
+            {
+                Model.T_RegionCategory userModel = regionBLL.GetModel(F_RegionName);
+                if (userModel !=null )
+                {
+                    F_RegionId = userModel.F_RegionId;
+                }
+                else
+                {
+                    return Success("获取失败，内容为空");
+                }
+            }
+            var entityJson = new BLL.T_RegionCategory().GetModelList("F_Layer = " + F_Layer + "AND F_ParentId=" + F_RegionId + "order by F_Sort" );
+         
+            if (entityJson.Count > 0)
+            {
+                return Success("加载成功", entityJson);
+            }
+            else
+            {
+                return Success("获取失败，内容为空");
+            }
+        }
+        /// <summary>
+        /// 导入excel
+        /// </summary>
+        /// <returns></returns>
+        public ActionResult ImportExcel(int F_Layer, string F_RegionName="")
+        {
+            string userscode = CurrentUser.UserData.F_UserCode;
+            HttpPostedFile _upFile = RequestString.GetFile("upFile");
+            if (_upFile != null)
+            {
+                int headrow = 0;
+                #region 上传文件
+                string filepath = "";
+                string datepath = DateTime.Now.ToString("yyyyMMddHHMMss");
+                string aLastName = Path.GetExtension(_upFile.FileName);
+                string oriname = Path.GetFileNameWithoutExtension(_upFile.FileName);
+                if (aLastName != ".xls" && aLastName != ".xlsx")
+                {
+                    return Error("文件类型错误，请选择Excel文件");
+                }
+                string newpath = datepath + "_" + _upFile.FileName;
+                if (!Directory.Exists(Server.MapPath(this.Request.ApplicationPath + "\\ExcelData")))
+                {
+                    Directory.CreateDirectory(Server.MapPath(this.Request.ApplicationPath + "\\ExcelData"));
+                }
+                filepath = this.Request.ApplicationPath + "/ExcelData/" + newpath;
+                string PhysicalPath = Server.MapPath(filepath);
+                _upFile.SaveAs(PhysicalPath);
+                #endregion
+                #region 添加附件日志
+                Model.T_Sys_Accessories model_T_Sys_Accessories = new Model.T_Sys_Accessories();
+                model_T_Sys_Accessories.F_AddTime = DateTime.Now;//上传时间
+                model_T_Sys_Accessories.F_FileName = newpath;//附件名称
+                model_T_Sys_Accessories.F_FileType = aLastName;//附件类型
+                model_T_Sys_Accessories.F_FileUrl = filepath;//附件地址
+                model_T_Sys_Accessories.F_UserCode = userscode;//上传人  
+                model_T_Sys_Accessories.F_OriName = oriname;
+                int fid = new BLL.T_Sys_Accessories().Add(model_T_Sys_Accessories);
+                #endregion
+                NPOIHelper np = new NPOIHelper();
+                DataTable dt = np.ExcelToTable(_upFile, headrow);
+                string msg = string.Empty;
+                if (dt == null || dt.Rows.Count == 0)
+                    return Error("文件没有数据");
+                else
+                {
+                    foreach (DataRow dr in dt.Rows)
+                    {
+                        #region 数据入库
+                        headrow = headrow + 1;
+
+                        if (dr["地区名称"].ToString() != "" )
+                        {
+                           
+                            Model.T_RegionCategory dModel = new Model.T_RegionCategory();
+                            dModel.F_RegionName = dr["地区名称"].ToString();//地区名称
+                            dModel.F_Layer = F_Layer;
+                            if (F_RegionName != "")
+                            {
+                                Model.T_RegionCategory userModel = regionBLL.GetModel(F_RegionName);
+                                if (userModel != null)
+                                {
+                                    dModel.F_ParentId = userModel.F_RegionId;
+                                }
+                                else
+                                {
+                                    dModel.F_ParentId = 0;
+                                }
+                            }
+                            dModel.F_CreateBy = int .Parse (userscode);
+                            dModel.F_CreateOn = DateTime.Now;
+                            dModel.F_DeleteFlag = 0;
+                            dModel.F_Sort = 0;
+                            var res = regionBLL.Add(dModel);
+                            if (res > 0)
+                            {
+                                addoptlog(userscode, DTRequest.GetIP(), EnumOpt.import.ToString(), res.ToString(), "导入成功,导入的文件为：" + newpath + ",当前为第" + headrow + "行");
+                            }
+                            else
+                            {
+
+                                msg = msg + "第" + headrow + "行，导入失败<br>";
+                            }
+                        }
+                        else
+                            msg = msg + "第" + headrow + "行，地区名称为空或格式不正确，未导入<br>";
+                        #endregion
+                    }
+                    if (string.IsNullOrEmpty(msg))
+                        return Success("导入成功 ");
+                    else
+                        return Error(msg);
+                }
+
+            }
+            return Error("文件不能为空");
+        }
+        /// <summary>
+        /// 操作日志
+        /// </summary>
+        /// <param name="usercode">操作人工号</param>
+        /// <param name="ip">操作人IP</param>
+        /// <param name="optcode">操作编号</param>
+        /// <param name="optid">操作id</param>
+        /// <param name="des">操作描述</param>
+        private void addoptlog(string usercode, string ip, string optcode, string optid, string des)
+        {
+            new BLL.T_Sys_OperateLogs().AddOptLog("地区管理", usercode, ip, des, optcode, "T_RegionCategory", optid);
+        }
+
+        /// <summary>
+        /// 获取地市
+        /// </summary>
+        /// <param name="deptId"></param>
+        /// <returns></returns>
+        public ActionResult GetRegion(int deptId = 0)
+        {
+            if (Request.IsAuthenticated)
+            {
+                BLL.T_RegionCategory dBLL = new BLL.T_RegionCategory();
+                Model.T_RegionCategory dModel = dBLL.GetModel(deptId);
+                if (dModel != null)
+                    return Success("获取地市信息成功", dModel);
+                return Error("获取地市信息失败");
+            }
+            return NoToken("未知错误，请重新登录");
+        }
+
+        /// <summary>
+        /// 添加地市
+        /// </summary>
+        /// <param name="input"></param>
+        /// <returns></returns>
+        [HttpPost]
+        public ActionResult AddRegion(RegionCategoryInput input)
+        {
+          
+                Model.T_RegionCategory dModel = new Model.T_RegionCategory();
+                dModel.F_ParentId = input.F_ParentId;
+                dModel.F_Sort = input.F_Sort;
+                dModel.F_RegionName = input.F_RegionName;
+                dModel.F_DeleteFlag = 0;
+                dModel.F_Layer = input.F_Layer;
+                dModel.F_CreateBy = CurrentUser.UserData.F_UserId;
+                dModel.F_CreateOn = DateTime.Now;
+                if (regionBLL.Add(dModel) > 0)
+                    return Success("添加成功");
+                else
+                    return Success("添加失败");
+           
+        }
+
+        /// <summary>
+        /// 编辑地市
+        /// </summary>
+        /// <param name="input"></param>
+        /// <returns></returns>
+        [HttpPost]
+        public ActionResult EditRegion(RegionCategoryInput input)
+        {
+          
+                if (input.F_RegionId <= 0)
+                    return Error("请选择要编辑的地市");
+                BLL.T_RegionCategory dBLL = new BLL.T_RegionCategory();
+                Model.T_RegionCategory dModel = dBLL.GetModel(input.F_RegionId);
+                if (dModel == null)
+                    return Error("获取信息失败");
+                dModel.F_ParentId = input.F_ParentId;
+                dModel.F_Sort = input.F_Sort;
+                dModel.F_RegionName = input.F_RegionName;
+                dModel.F_Layer = input.F_Layer;
+                dModel.F_ModifyBy = CurrentUser.UserData.F_UserId;
+                dModel.F_ModifyOn = DateTime.Now;
+                if (dBLL.Update(dModel))
+                    return Success("编辑成功");
+                return Error("编辑失败");
+         
+        }
+
+        /// <summary>
+        /// 删除地市
+        /// </summary>
+        /// <param name="ids"></param>
+        /// <returns></returns>
+        public ActionResult DelRegion(string[] ids)
+        {
+          
+                if (ids == null || ids.Length <= 0)
+                    return Error("请选择要删除的地市");
+
+                var idStr = string.Join(",", ids);
+                if (string.IsNullOrEmpty(idStr.Trim()))
+                    return Error("请选择要删除的地市");
+
+                if (regionBLL.DeleteList(idStr))
+                    return Success("删除成功");
+                return Error("删除失败");
+        
+        }
+
+        #region 获取地市列表 - 优化前的
+        ///// <summary>
+        ///// 获取地市列表
+        ///// </summary>
+        ///// <returns></returns>
+        //public ActionResult GetRegionList(int pId = 0)
+        //{
+        //    if (Request.IsAuthenticated)
+        //    {
+        //        DataTable dt = new DataTable();
+        //        dt = new BLL.T_RegionCategory().GetList(" F_DeleteFlag=0 and F_ParentId=" + pId).Tables[0];
+        //        List<Model.TreeModel> modelList = BindTree(dt, "0");
+
+        //        if (modelList != null)
+        //        {
+        //            if (modelList.Count > 0)
+        //                return Success("加载成功", modelList);
+        //        }
+        //        return Error("加载失败");
+        //    }
+        //    return NoToken("未知错误，请重新登录");
+        //}
+        ///// <summary>
+        ///// tree  树形地市
+        ///// </summary>
+        ///// <param name="tab"></param>
+        ///// <param name="parentid"></param>
+        ///// <returns></returns>
+        //private List<Model.TreeModel> BindTree(DataTable tab, string parentid)
+        //{
+        //    DataTable tab2 = new DataTable();
+
+        //    if (tab != null && tab.Rows.Count > 0)
+        //    {
+        //        List<Model.T_RegionCategory> categorylist = new BLL.T_RegionCategory().DataTableToList(tab);
+        //        List<Model.TreeModel> modelList = new List<Model.TreeModel>(categorylist.Count);
+        //        for (int i = 0; i < categorylist.Count; i++)
+        //        {
+        //            Model.TreeModel model = new Model.TreeModel();
+        //            string currentID = categorylist[i].F_RegionId.ToString();//当前功能ID
+        //            model.id = currentID;
+        //            model.IconCls = "";//图标
+        //            model.headerid =int .Parse ( categorylist[i].F_Layer.ToString ());
+        //            model.text = categorylist[i].F_RegionName;
+        //            tab2 = new BLL.T_RegionCategory().GetList("F_ParentId=" + currentID + " and F_DeleteFlag=0 order by f_sort").Tables[0];
+        //            if (tab2 != null && tab2.Rows.Count > 0)
+        //            {
+        //                model.children = BindTree(tab2, currentID);
+        //            }
+        //            modelList.Add(model);
+        //        }
+        //        return modelList;
+
+        //    }
+        //    else
+        //    {
+        //        return null;
+        //    }
+
+        //}
+
+        #endregion
+
+
+        public List<T_RegionCategory> list = null;
+        #region 获取地市列表 - 优化后的
+        /// <summary>
+        /// 获取地市列表
+        /// </summary>
+        /// <returns></returns>
+        public ActionResult GetRegionList(int pId = 0)
+        {
+            if (Request.IsAuthenticated)
+            {
+                list = new BLL.T_RegionCategory().GetModelList(" F_DeleteFlag=0 ");
+                var list_p = list.Where(x => x.F_ParentId == pId).ToList();
+                List<Model.TreeModel> modelList = BindTree(list_p, "0");
+
+                if (modelList != null)
+                {
+                    if (modelList.Count > 0)
+                        return Success("加载成功", modelList);
+                }
+                return Error("加载失败");
+            }
+            return NoToken("未知错误，请重新登录");
+        }
+        /// <summary>
+        /// tree  树形地市
+        /// </summary>
+        /// <param name="tab"></param>
+        /// <param name="parentid"></param>
+        /// <returns></returns>
+        private List<Model.TreeModel> BindTree(List<T_RegionCategory> tab, string parentid)
+        {
+            if (tab.Count > 0)
+            {
+                List<Model.TreeModel> modelList = new List<Model.TreeModel>(tab.Count);
+                for (int i = 0; i < tab.Count; i++)
+                {
+                    Model.TreeModel model = new Model.TreeModel();
+                    int F_RegionId = tab[i].F_RegionId;
+                    string currentID = tab[i].F_RegionId.ToString();//当前功能ID
+                    model.id = currentID;
+                    model.IconCls = "";//图标
+                    model.headerid = int.Parse(tab[i].F_Layer.ToString());
+                    model.text = tab[i].F_RegionName;
+                    var tab2 = list.Where(x => x.F_ParentId == F_RegionId).OrderByDescending(x=>x.F_Sort).ToList();
+                    if (tab2.Count > 0)
+                    {
+                        model.children = BindTree(tab2, currentID);
+                    }
+                    modelList.Add(model);
+                }
+                return modelList;
+
+            }
+            else
+            {
+                return null;
+            }
+
+        }
+        #endregion
+    }
+}

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

@@ -3003,8 +3003,8 @@ question, int page = 1, int limit = 10)
             }
             else
             {
-                stime = DateTime.Now.AddDays(1 - DateTime.Now.Day).Date.ToString("yyyy-MM-dd");
-                sql += " and CONVERT(varchar , F_CreateOn, 120)>=CONVERT(varchar , '" + stime.Trim() + " 00:00:01', 120) ";
+              //  stime = DateTime.Now.AddDays(1 - DateTime.Now.Day).Date.ToString("yyyy-MM-dd");
+              //  sql += " and CONVERT(varchar , F_CreateOn, 120)>=CONVERT(varchar , '" + stime.Trim() + " 00:00:01', 120) ";
             }
             if (endtime != null && endtime.Trim() != "")
             {
@@ -3012,8 +3012,8 @@ question, int page = 1, int limit = 10)
             }
             else
             {
-                endtime = DateTime.Now.ToString("yyyy-MM-dd");
-                sql += " and CONVERT(varchar , F_CreateOn, 120)<=CONVERT(varchar , '" + endtime.Trim() + " 23:59:59', 120) ";
+              //  endtime = DateTime.Now.ToString("yyyy-MM-dd");
+              //  sql += " and CONVERT(varchar , F_CreateOn, 120)<=CONVERT(varchar , '" + endtime.Trim() + " 23:59:59', 120) ";
             }
           
             var modellist = workOrder.GetModelList(sql);
@@ -3100,9 +3100,10 @@ question, int page = 1, int limit = 10)
                                         worker.F_Responsibility = deptmodel.F_DeptName;
                                     }
                                 }
+
                                 int limit = it.F_limit ;
-                                    if (itemList != null)
-                                  {
+                                if (itemList != null)
+                                {
                                     for (int z = 0; z < itemList.Count; z++)
                                     {
                                         if (itemList[z].F_WoState >= 1)
@@ -3110,86 +3111,50 @@ question, int page = 1, int limit = 10)
                                             if (itemList[z].F_WoState == 1)
                                             {
                                                 x = z;
-                                                timeover = itemList[z ].F_CreateTime.ToString();
-                                             //   limit = int.Parse(itemList[z].F_LimitTime);
+                                                timeover = itemList[z].F_CreateTime.ToString();
+                                                //   limit = int.Parse(itemList[z].F_LimitTime);
                                                 continue;
                                             }
                                         }
                                     }
-                                  for (int z = 0; z < itemList.Count; z++)
-                                    {
-                                        if (itemList[z].F_WoState >= 1)
-                                        {
-                                            if (itemList[z].F_WoState == 10)
-                                            {
-                                                y = z;
-                                                timeover2 = itemList[z].F_CreateTime.ToString();
-                                          //      limit = int.Parse(itemList[z].F_LimitTime);
-                                            }
-                                        }
-                                        if (timeover2 != "")
-                                        {
-                                            if (timeover != "")
-                                            {
-                                                if (x > y)
-                                                {
-                                                    System.TimeSpan id = DateTime.Parse(timeover2) - DateTime.Parse(timeover);
-                                                    double a = id.TotalHours;
-                                                    worker.time = a - limit;
-                                                    timehource.Add((float)worker.time);
-                                                    if (worker.time > 24)
-                                                    {
-                                                        double t = worker.time / 24;
-                                                        double v = worker.time % 24;
-                                                        worker.overtime = string.Format("{0:f0}天{1:f2}h", t, v);
-                                                       
-                                                    }
-                                                    else
-                                                    {
-                                                        worker.overtime = string.Format("{0:f2}h", a - limit);
-                                                    }
-                                                }
-                                                else
-                                                {
-                                                    System.TimeSpan id = DateTime.Now - DateTime.Parse(timeover);
-                                                    double a = id.TotalHours;
+                                 if (it .F_State ==10|| it.F_State == 11)
+                                {
 
-                                                    worker.time = a - limit;
-                                                    timehource.Add((float)worker.time);
-                                                    if (worker.time > 24)
-                                                    {
-                                                        double t = worker.time / 24;
-                                                        double v = worker.time % 24;
-                                                        worker.overtime = string.Format("{0:f0}天{1:f2}h", t, v);
-                                                    }
-                                                    else
-                                                    {
-                                                        worker.overtime = string.Format("{0:f2}h", a - limit);
-                                                    }
+                                    System.TimeSpan id = DateTime.Parse(it .F_DealTime .ToString ()) - DateTime.Parse(timeover);
+                                    double a = id.TotalHours;
+                                    worker.time = a - limit;
+                                    timehource.Add((float)worker.time);
+                                    if (worker.time > 24)
+                                    {
+                                        double t = worker.time / 24;
+                                        double v = worker.time % 24;
+                                        worker.overtime = string.Format("{0:f0}天{1:f2}h", t, v);
 
-                                                }
-                                            }
+                                    }
+                                    else
+                                    {
+                                        worker.overtime = string.Format("{0:f2}h", a - limit);
+                                    }
+                                  }
+                                 else
+                                    {
+                                        System.TimeSpan id = DateTime.Now - DateTime.Parse(timeover);
+                                        double a = id.TotalHours;
 
+                                        worker.time = a - limit;
+                                        timehource.Add((float)worker.time);
+                                        if (worker.time > 24)
+                                        {
+                                            double t = worker.time / 24;
+                                            double v = worker.time % 24;
+                                            worker.overtime = string.Format("{0:f0}天{1:f2}h", t, v);
                                         }
-                                        else if (timeover != "")
+                                        else
                                         {
-                                            System.TimeSpan id = DateTime.Now - DateTime.Parse(timeover);
-                                            double a = id.TotalHours;
-
-                                            worker.time = a - limit;
-                                            timehource.Add((float)worker.time);
-                                            if (worker.time > 24)
-                                            {
-                                                double t = worker.time / 24;
-                                                double v = worker.time % 24;
-                                                worker.overtime = string.Format("{0:f0}天{1:f2}h", t, v);
-                                            }
-                                            else
-                                            {
-                                                worker.overtime = string.Format("{0:f2}h", a - limit);
-                                            }
+                                            worker.overtime = string.Format("{0:f2}h", a - limit);
                                         }
                                     }
+                                 
                                 }
                                 if (it.F_State != 11)
                                     Overdue++;

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Web.config

@@ -17,11 +17,12 @@
     <add key="smssign" value=""/>
   </appSettings>
   <connectionStrings>
-    <add name="ConnectionString" connectionString="Data Source=192.168.4.18;User ID=sa;pwd=800100;Initial Catalog=CallCenter_XinXiangXLX;"/>
+    <!--<add name="ConnectionString" connectionString="Data Source=192.168.4.18;User ID=sa;pwd=800100;Initial Catalog=CallCenter_XinXiangXLX;"/>-->
+  <add name="ConnectionString" connectionString="Data Source=192.168.4.18;User ID=sa;pwd=800100;Initial Catalog=CallCenter_XinXiangXLX;" />
   </connectionStrings>
   <system.web>
     <compilation debug="true" targetFramework="4.5"/>
-    <httpRuntime targetFramework="4.5"/>
+    <httpRuntime targetFramework="4.5" maxRequestLength="20971520" executionTimeout="360000"/>
     <httpModules>
       <add name="ApplicationInsightsWebTracking" type="Microsoft.ApplicationInsights.Web.ApplicationInsightsHttpModule, Microsoft.AI.Web"/>
     </httpModules>

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/bin/CallCenterApi.Interface.dll.config

@@ -17,11 +17,12 @@
     <add key="smssign" value=""/>
   </appSettings>
   <connectionStrings>
-    <add name="ConnectionString" connectionString="Data Source=192.168.4.18;User ID=sa;pwd=800100;Initial Catalog=CallCenter_XinXiangXLX;"/>
+    <!--<add name="ConnectionString" connectionString="Data Source=192.168.4.18;User ID=sa;pwd=800100;Initial Catalog=CallCenter_XinXiangXLX;"/>-->
+  <add name="ConnectionString" connectionString="Data Source=192.168.4.18;User ID=sa;pwd=800100;Initial Catalog=CallCenter_XinXiangXLX;" />
   </connectionStrings>
   <system.web>
     <compilation debug="true" targetFramework="4.5"/>
-    <httpRuntime targetFramework="4.5"/>
+    <httpRuntime targetFramework="4.5" maxRequestLength="20971520" executionTimeout="360000"/>
     <httpModules>
       <add name="ApplicationInsightsWebTracking" type="Microsoft.ApplicationInsights.Web.ApplicationInsightsHttpModule, Microsoft.AI.Web"/>
     </httpModules>

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/obj/Release/Package/PackageTmp/Configs/system.config

@@ -19,22 +19,27 @@
   <!-- 设置邮箱主机 -->
   <add key="MailHost" value="smtp.ym.163.com" />
   <!-- ================== 3：微信配置参数 ================== -->
+     <!--新乡心连心-->
+ <add key="WechatAppid" value="wxeb3e1e01c493e5be" />
+  <add key="WechatAppsecret" value="653b03c7845240cdb43b28385321d50f" />
   <!--加一测试-->
-  <add key="WechatAppid" value="wx0d67bbb5666ec226" />
-  <add key="WechatAppsecret" value="be4785fa9866f2b380cd18999785baa3" />
+ <!-- <add key="WechatAppid" value="wx0d67bbb5666ec226" />
+  <add key="WechatAppsecret" value="be4785fa9866f2b380cd18999785baa3" />-->
+  
   <!-- 设置微信TemplateId 	工单进度提醒 -->
-  <add key="TemplateId" value="cQ7F1ePjEsOl7ntBEV_BV4OQoFcoU5Zh69S2qmyZrW4" />
+<!-- <add key="TemplateId" value="cQ7F1ePjEsOl7ntBEV_BV4OQoFcoU5Zh69S2qmyZrW4" /> --> 
   <!-- 设置微信 消息跳转url MessageUrl -->
-  <add key="MessageUrl" value="http://jiayi.800100.net/sycw/index.html?menucode=GDXQ" />
+<!-- <add key="MessageUrl" value="http://jiayi.800100.net/sycw/index.html?menucode=GDXQ" /> --> 
   <!-- ================== 4：公司名称中需截取掉的字符串 ================== -->
   <add key="keystring" value="有限公司,公司,科技,网络,信息,河南,河南省,洛阳,洛阳市,郑州,郑州市,南阳,南阳市,新乡,新乡市,有限、商贸、市"/>
   <!-- ================== 5：IVR文件上传FTP配置参数 ================== -->
   <!-- 设置FTP -->
-  <add key="ftp" value="192.168.4.18" />
+  <add key="ftp" value="10.11.202.223" />
   <!-- 设置账户名 -->
   <add key="account" value="bingbing" />
   <!-- 设置密码 -->
   <add key="password" value="Bing123456" />
   <!-- 文件保存位置 -->
   <add key="saveloc" value="\upload_wav\" />
+  
 </appSettings>

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/obj/Release/Package/PackageTmp/Web.config

@@ -17,11 +17,12 @@
     <add key="smssign" value="" />
   </appSettings>
   <connectionStrings>
+    <!--<add name="ConnectionString" connectionString="Data Source=192.168.4.18;User ID=sa;pwd=800100;Initial Catalog=CallCenter_XinXiangXLX;"/>-->
     <add name="ConnectionString" connectionString="Data Source=192.168.4.18;User ID=sa;pwd=800100;Initial Catalog=CallCenter_XinXiangXLX;" />
   </connectionStrings>
   <system.web>
     <compilation targetFramework="4.5" />
-    <httpRuntime targetFramework="4.5" />
+    <httpRuntime targetFramework="4.5" maxRequestLength="20971520" executionTimeout="360000" />
     <httpModules>
       <add name="ApplicationInsightsWebTracking" type="Microsoft.ApplicationInsights.Web.ApplicationInsightsHttpModule, Microsoft.AI.Web" />
     </httpModules>

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/obj/Release/Package/PackageTmp/packages.config

@@ -16,5 +16,9 @@
   <package id="Microsoft.AspNet.WebPages.zh-Hans" version="3.2.3" targetFramework="net45" />
   <package id="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" version="1.0.0" targetFramework="net45" />
   <package id="Microsoft.Net.Compilers" version="1.0.0" targetFramework="net45" developmentDependency="true" />
+  <package id="Microsoft.Net.Http" version="2.0.20710.0" targetFramework="net45" />
   <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net45" />
+  <package id="Newtonsoft.Json" version="10.0.3" targetFramework="net45" />
+  <package id="qcloud.qcloudsms_csharp" version="0.1.6" targetFramework="net45" />
+  <package id="System.Net.Http" version="2.0.20710.0" targetFramework="net45" />
 </packages>

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/obj/Release/TransformWebConfig/original/Web.config

@@ -17,11 +17,12 @@
     <add key="smssign" value=""/>
   </appSettings>
   <connectionStrings>
-    <add name="ConnectionString" connectionString="Data Source=192.168.4.18;User ID=sa;pwd=800100;Initial Catalog=CallCenter_XinXiangXLX;"/>
+    <!--<add name="ConnectionString" connectionString="Data Source=192.168.4.18;User ID=sa;pwd=800100;Initial Catalog=CallCenter_XinXiangXLX;"/>-->
+  <add name="ConnectionString" connectionString="Data Source=192.168.4.18;User ID=sa;pwd=800100;Initial Catalog=CallCenter_XinXiangXLX;" />
   </connectionStrings>
   <system.web>
     <compilation debug="true" targetFramework="4.5"/>
-    <httpRuntime targetFramework="4.5"/>
+    <httpRuntime targetFramework="4.5" maxRequestLength="20971520" executionTimeout="360000"/>
     <httpModules>
       <add name="ApplicationInsightsWebTracking" type="Microsoft.ApplicationInsights.Web.ApplicationInsightsHttpModule, Microsoft.AI.Web"/>
     </httpModules>

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/obj/Release/TransformWebConfig/transformed/Web.config

@@ -17,11 +17,12 @@
     <add key="smssign" value="" />
   </appSettings>
   <connectionStrings>
+    <!--<add name="ConnectionString" connectionString="Data Source=192.168.4.18;User ID=sa;pwd=800100;Initial Catalog=CallCenter_XinXiangXLX;"/>-->
     <add name="ConnectionString" connectionString="Data Source=192.168.4.18;User ID=sa;pwd=800100;Initial Catalog=CallCenter_XinXiangXLX;" />
   </connectionStrings>
   <system.web>
     <compilation targetFramework="4.5" />
-    <httpRuntime targetFramework="4.5" />
+    <httpRuntime targetFramework="4.5" maxRequestLength="20971520" executionTimeout="360000" />
     <httpModules>
       <add name="ApplicationInsightsWebTracking" type="Microsoft.ApplicationInsights.Web.ApplicationInsightsHttpModule, Microsoft.AI.Web" />
     </httpModules>

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/packages.config

@@ -16,5 +16,9 @@
   <package id="Microsoft.AspNet.WebPages.zh-Hans" version="3.2.3" targetFramework="net45" />
   <package id="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" version="1.0.0" targetFramework="net45" />
   <package id="Microsoft.Net.Compilers" version="1.0.0" targetFramework="net45" developmentDependency="true" />
+  <package id="Microsoft.Net.Http" version="2.0.20710.0" targetFramework="net45" />
   <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net45" />
+  <package id="Newtonsoft.Json" version="10.0.3" targetFramework="net45" />
+  <package id="qcloud.qcloudsms_csharp" version="0.1.6" targetFramework="net45" />
+  <package id="System.Net.Http" version="2.0.20710.0" targetFramework="net45" />
 </packages>