提交更新

web/BaseCallCenter.BLL/COM/T_Com_Class.cs

@@ -143,6 +143,11 @@ namespace YTSoft.BaseCallCenter.BLL
         {
             return dal.GetTreeJsonModel(parentId, type);
         }
+
+        public TreeNodeModel GetTreeJsonModelTurn(string usercode)
+        {
+            return dal.GetTreeJsonModelTurn(usercode);
+        }
         #endregion  ExtensionMethod
     }
 }

web/BaseCallCenter.BLL/T_Sys_Department.cs

@@ -148,6 +148,14 @@ namespace YTSoft.BaseCallCenter.BLL
             return dal.GetDepartmentJsonModel(parentId, AddUser);
         }
 
+        /// <summary>
+        /// 转单部门节点
+        /// </summary>
+        public TreeNodeModel GetDepartmentJsonModelTrun(int parentId, string key = "")
+        {
+            return dal.GetDepartmentJsonModelTurn(parentId, key);
+        }
+
 
         /// <summary>
         /// 得到一个对象实体

web/BaseCallCenter.BLL/YTSoft.BaseCallCenter.BLL.csproj

@@ -166,6 +166,9 @@
   <ItemGroup>
     <None Include="app.config" />
   </ItemGroup>
+  <ItemGroup>
+    <Folder Include="User\" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

web/BaseCallCenter.DAL/COM/T_Com_Class.cs

@@ -204,6 +204,27 @@ namespace YTSoft.BaseCallCenter.DAL
             }
         }
 
+        public YTSoft.BaseCallCenter.Model.T_Com_Class GetModelByWhere(string where)
+        {
+
+            StringBuilder strSql = new StringBuilder();
+            strSql.Append("select  top 1 Classid,Classcode,Classname,Parentid,Parentcode,ParentName,Sort,iconClose,iconOpen,Describe,Remark,typeid from T_Com_Class ");
+            if (!string.IsNullOrEmpty(where))
+            {
+                strSql.Append(" where " + where);
+            }
+
+            DataSet ds = DbHelperSQL.Query(strSql.ToString());
+            if (ds.Tables[0].Rows.Count > 0)
+            {
+                return DataRowToModel(ds.Tables[0].Rows[0]);
+            }
+            else
+            {
+                return null;
+            }
+        }
+
 
         /// <summary>
         /// 得到一个对象实体
@@ -458,6 +479,98 @@ namespace YTSoft.BaseCallCenter.DAL
 
         }
 
+
+
+
+
+        /// <summary>
+        ///  获得当前节点下的所有子集以tree的格式
+        /// </summary>
+        public TreeNodeModel GetTreeJsonModelTurn(string usercode)
+        {
+            // Classid,Classcode,Classname,Parentid,Parentcode,ParentName,Sort,iconClose,iconOpen,Describe,Remark,typeid
+            TreeNodeModel returnModel = new TreeNodeModel();
+            DataSet ds = null;
+            TreeNodeModel model = new TreeNodeModel();
+            Model.T_Com_Class modelclass = GetModelByWhere(string.Format("parentid=(select Classid from T_Com_Class where  Classname='常用人员' and parentid=0) and Remark='{0}'",usercode));
+            if (modelclass != null)
+            {
+                ds = GetList(string.Format("typeid={0} Or parentid={0} Order by sort desc", modelclass.Classid));
+
+                List<TreeNodeModel> modelList = new List<TreeNodeModel>();
+                model.id = modelclass.Classid;
+                model.name = "常用名单";
+                model.code = modelclass.Classid;
+                model.iconClose = "../../Content/layui/zTree/v3/css/zTreeStyle/img/diy/1_close.png";
+                model.iconOpen = "../../Content/layui/zTree/v3/css/zTreeStyle/img/diy/1_open.png";
+                model.open = "true";
+                model.IsOrPrivate = 0;
+                model.children = modelList;
+
+            }
+            else
+            {
+                List<TreeNodeModel> modelList = new List<TreeNodeModel>();
+                model.id = 0;
+                model.name = "常用名单";
+                model.code = 0;
+                model.iconClose = "../../Content/layui/zTree/v3/css/zTreeStyle/img/diy/1_close.png";
+                model.iconOpen = "../../Content/layui/zTree/v3/css/zTreeStyle/img/diy/1_open.png";
+                model.open = "true";
+                model.IsOrPrivate = 0;
+                model.children = null;
+              
+            }
+
+
+
+
+            if (ds != null && ds.Tables.Count > 0 && ds.Tables[0].Rows.Count > 0)
+            {
+                returnModel = GetTreeModelTurn(ds.Tables[0], model);
+            }
+            else
+            {
+                returnModel = model;
+            }
+
+            return returnModel;
+        }
+
+
+        /// <summary>
+        /// 获取chlid
+        /// </summary>
+        /// <param name="table">数据结合</param>
+        /// <param name="model">当前model</param>
+        /// <returns></returns>
+        public TreeNodeModel GetTreeModelTurn(DataTable table, TreeNodeModel model)
+        {
+            DataRow[] rows = table.Select("Parentid=" + model.id);
+            if (rows != null && rows.Length > 0)
+            {
+                foreach (DataRow row in rows)
+                {
+
+                    List<TreeNodeModel> modelList = new List<TreeNodeModel>();
+                    TreeNodeModel childModel = new TreeNodeModel();
+                    childModel.id = int.Parse(row["Classid"].ToString());
+                    childModel.name = row["Classname"].ToString();
+                    childModel.code = row["Remark"].ToInt32();
+                    childModel.iconClose = "../../Content/layui/zTree/v3/css/zTreeStyle/img/diy/1_close.png";
+                    childModel.iconOpen = "../../Content/layui/zTree/v3/css/zTreeStyle/img/diy/1_open.png";
+                    childModel.open = "false";
+                    childModel.IsOrPrivate = 1;
+                    childModel.children = modelList;
+                    model.children.Add(childModel);
+                    GetTreeModelTurn(table, childModel);
+                }
+            }
+
+            return model;
+
+        }
+
         #endregion
     }
 }

web/BaseCallCenter.DAL/Order/T_Wo_WorkOrderBase.cs

@@ -1474,7 +1474,7 @@ F_SERVICETYPE,F_DECLARATIONTIME,F_SERVICENATURE,F_SERVICEWAY,F_RETURNVISITMAN,F_
                 {
                     //转单
                     model.F_WORKORDERSTATEID = 1;
-                    if (model.F_REQUESTSERVICETIME == null)
+                    if (model.F_REQUESTSERVICETIME.HasValue&& model.F_REQUESTSERVICETIME.Value.Year==1)
                     {
                         model.F_REQUESTSERVICETIME = null;
                     }
@@ -1484,7 +1484,16 @@ F_SERVICETYPE,F_DECLARATIONTIME,F_SERVICENATURE,F_SERVICEWAY,F_RETURNVISITMAN,F_
                         historyModel.F_OPTDATE = DateTime.Now;
                         historyModel.F_WORKORDERSTATEID = 0;
                         historyModel.F_StateName = "未处理";
-                        historyModel.NeedReplayTime = model.F_REQUESTSERVICETIME;
+                        if (model.F_REQUESTSERVICETIME.HasValue)
+                        {
+                            historyModel.NeedReplayTime = model.F_REQUESTSERVICETIME.Value.AddDays(1).AddSeconds(-1);
+                        }
+                        else
+                        {
+                            historyModel.NeedReplayTime = model.F_REQUESTSERVICETIME;
+                        }
+                       
+
                         historyId = InsertWorkOrderHistoryModel(historyModel);
                     }
                     historyId = model.HistoryOrderList.Count;

web/BaseCallCenter.DAL/Order/T_Wo_WorkOrderNotice.cs

@@ -220,7 +220,7 @@ namespace YTSoft.BaseCallCenter.DAL
 
             StringBuilder strSql = new StringBuilder();
             strSql.Append(" update T_Wo_WorkOrderNotice ");
-            strSql.Append(" set NoticeState=0,DZNumber=DZNumber+1 ");
+            strSql.Append(" set NoticeState=0  ");
             strSql.Append(" where OrderId=@OrderId;");
             SqlParameter[] parameters = {
                     new SqlParameter("@OrderId",orderid)

web/BaseCallCenter.DAL/Report/ReportDAL.cs

@@ -64,7 +64,7 @@ namespace YTSoft.BaseCallCenter.DAL
         {
             StringBuilder strSql = new StringBuilder();
             strSql.Append("SELECT  CallState,COUNT(CallState) as num  FROM T_Call_CallRecords  ");
-            strSql.Append(" where CallType=0  AND ( RingLongTime>3 OR CallState=1) ");
+            strSql.Append(" where CallType=0  AND ( RingLongTime>15 OR CallState=1) ");
             strSql.Append(" and CONVERT(varchar(100), BeginTime, 8)>='08:30:00' ");
             strSql.Append(" and CONVERT(varchar(100), BeginTime, 8)<='20:00:00' ");
             if (!string.IsNullOrEmpty(startDate))
@@ -103,6 +103,7 @@ namespace YTSoft.BaseCallCenter.DAL
             StringBuilder strSql = new StringBuilder();
             strSql.Append("SELECT COUNT(1) num,t.CallState FROM   ");
             strSql.Append(" (SELECT CASE   ");
+
             //未转派 超时0
             strSql.Append("  WHEN F_SENTORDERTIME IS NULL AND DATEDIFF(minute, DATEADD(day,1,F_CREATEDATE),  GETDATE())> 0  THEN 0   ");
             //未转派 未超时1

web/BaseCallCenter.DAL/T_Sys_Department.cs

@@ -438,7 +438,7 @@ namespace YTSoft.BaseCallCenter.DAL
                 {
                     List<TreeNodeModel> modelList = new List<TreeNodeModel>();
                     model.id = 0;
-                    model.name = "部门列表";
+                    model.name = "郑州地铁";
                     model.code = 0;
                     model.iconClose = "../../Content/layui/zTree/v3/css/zTreeStyle/img/diy/1_close.png";
                     model.iconOpen = "../../Content/layui/zTree/v3/css/zTreeStyle/img/diy/1_open.png";
@@ -513,18 +513,39 @@ namespace YTSoft.BaseCallCenter.DAL
         }
 
 
-
         /// <summary>
         ///  获得当前节点下的所有子集以tree的格式
         /// </summary>
-        public TreeNodeModel GetDepartmentJsonModeldic(int parentId, bool AddUser = false)
+        public TreeNodeModel GetDepartmentJsonModelTurn(int parentId, string key = "")
         {
             TreeNodeModel returnModel = new TreeNodeModel();
             StringBuilder strSql = new StringBuilder();
-            strSql.Append("select * ");
-            strSql.Append(" FROM T_Sys_Department  order by F_Sort asc");
+            strSql.Append("SELECT * FROM T_Sys_Department ");
+            if (!string.IsNullOrEmpty(key))
+            {
+                strSql.AppendFormat("WHERE (F_DeptName  LIKE '%{0}%' OR F_DeptId IN(SELECT F_DeptId FROM dbo.T_Sys_UserAccount WHERE F_UserName LIKE '%{0}%'))", key);
+            }
+            strSql.Append(" order by F_Sort asc");
 
             DataSet ds = DbHelperSQL.Query(strSql.ToString());
+            if (ds != null && ds.Tables.Count > 0 && ds.Tables[0].Rows.Count > 0&& !string.IsNullOrEmpty(key))
+            {
+
+                string strlist = "0";
+                foreach (DataRow row in ds.Tables[0].Rows)
+                {
+                    strlist += ",";
+                    strlist += row["F_DeptId"];
+                    strlist += ",";
+                    strlist += row["F_ParentId"];
+                }
+                strSql.Clear();
+                strSql.Append("SELECT * FROM T_Sys_Department ");
+                strSql.AppendFormat("WHERE  F_DeptId IN({0})", strlist);
+
+                strSql.Append(" order by F_Sort asc");
+                ds = DbHelperSQL.Query(strSql.ToString());
+            }
 
             if (ds != null && ds.Tables.Count > 0 && ds.Tables[0].Rows.Count > 0)
             {
@@ -533,14 +554,14 @@ namespace YTSoft.BaseCallCenter.DAL
                 {
                     List<TreeNodeModel> modelList = new List<TreeNodeModel>();
                     model.id = 0;
-                    model.name = "常用人员";
+                    model.name = "郑州地铁";
                     model.code = 0;
                     model.iconClose = "../../Content/layui/zTree/v3/css/zTreeStyle/img/diy/1_close.png";
                     model.iconOpen = "../../Content/layui/zTree/v3/css/zTreeStyle/img/diy/1_open.png";
                     model.open = "true";
                     model.children = modelList;
                 }
-                returnModel = GetTreeModel(ds.Tables[0], model, AddUser);
+                returnModel = GetTreeModelTurnDept(ds.Tables[0], model, key);
 
             }
             return returnModel;
@@ -553,7 +574,7 @@ namespace YTSoft.BaseCallCenter.DAL
         /// <param name="table">数据结合</param>
         /// <param name="model">当前model</param>
         /// <returns></returns>
-        public TreeNodeModel GetTreeModeldic(DataTable table, TreeNodeModel model, bool AddUser)
+        public TreeNodeModel GetTreeModelTurnDept(DataTable table, TreeNodeModel model, string key = "")
         {
             DataRow[] rows = table.Select("F_ParentId=" + model.code);
             if (rows != null && rows.Length > 0)
@@ -565,17 +586,25 @@ namespace YTSoft.BaseCallCenter.DAL
                     childModel.id = int.Parse(row["F_DeptId"].ToString());
                     childModel.name = row["F_DeptName"].ToString();
                     childModel.code = int.Parse(row["F_DeptId"].ToString());
-                    childModel.iconClose = "../../Content/layui/zTree/v3/css/zTreeStyle/img/diy/1_close.png";
-                    childModel.iconOpen = "../../Content/layui/zTree/v3/css/zTreeStyle/img/diy/1_open.png";
+                    if (model.code==0)
+                    {
+                        childModel.iconClose = "../../Content/layui/zTree/v3/css/zTreeStyle/img/diy/1_close.png";
+                        childModel.iconOpen = "../../Content/layui/zTree/v3/css/zTreeStyle/img/diy/1_open.png";                       
+                    }
+                    else
+                    {
+                        childModel.iconClose = "../../Content/layui/zTree/v3/css/zTreeStyle/img/diy/2_close.png";
+                        childModel.iconOpen = "../../Content/layui/zTree/v3/css/zTreeStyle/img/diy/2_close.png";
+                    }
                     //childModel.iconClose = row["F_Header"].ToMyString();
                     //childModel.iconOpen = childModel.iconClose + ".png";
                     childModel.open = "true";
                     childModel.children = modelList;
                     model.children.Add(childModel);
-                    GetTreeModel(table, childModel, AddUser);
+                    GetTreeModelTurnDept(table, childModel, key);
                 }
             }
-            else if (AddUser)
+            else if (model.name.Contains(key) || string.IsNullOrEmpty(key))
             {
                 StringBuilder strSql = new StringBuilder();
                 strSql.Append("select * ");
@@ -603,6 +632,34 @@ namespace YTSoft.BaseCallCenter.DAL
 
                 }
             }
+            else
+            {
+                StringBuilder strSql = new StringBuilder();
+                strSql.Append("select * ");
+                strSql.AppendFormat(" FROM T_Sys_UserAccount where F_DeptId={0} AND F_UserName LIKE '%{1}%'", model.code,key);
+
+                DataSet ds = DbHelperSQL.Query(strSql.ToString());
+
+                if (ds != null && ds.Tables.Count > 0 && ds.Tables[0].Rows.Count > 0)
+                {
+
+                    foreach (DataRow row in ds.Tables[0].Rows)
+                    {
+                        List<TreeNodeModel> modelList = new List<TreeNodeModel>();
+                        TreeNodeModel childModel = new TreeNodeModel();
+                        childModel.id = int.Parse(row["F_UserId"].ToString());
+                        childModel.name = row["F_UserName"].ToString();
+                        childModel.code = int.Parse(row["F_UserId"].ToString());
+                        childModel.iconClose = "../../Content/layui/zTree/v3/css/zTreeStyle/img/diy/1_close.png";
+                        childModel.iconOpen = "../../Content/layui/zTree/v3/css/zTreeStyle/img/diy/1_open.png";
+                        childModel.open = "false";
+                        childModel.IsOrPrivate = 1;
+                        childModel.children = modelList;
+                        model.children.Add(childModel);
+                    }
+
+                }
+            }
             return model;
 
         }

web/BaseCallCenter.DAL/T_Wo_WorkOrderHistory.cs

@@ -73,6 +73,7 @@ namespace YTSoft.BaseCallCenter.DAL
             strSql.Append("F_OPTBTNID=@F_OPTBTNID,");
             strSql.Append("F_INSTANCEID=@F_INSTANCEID,");
             strSql.Append("F_TASKFLAG=@F_TASKFLAG,");
+            strSql.Append("ReplayTime=@ReplayTime,");
             strSql.Append("F_StateName=@F_StateName");
             strSql.Append(" where F_HISTORYID=@F_HISTORYID");
             SqlParameter[] parameters = {
@@ -86,7 +87,10 @@ namespace YTSoft.BaseCallCenter.DAL
 					new SqlParameter("@F_INSTANCEID", SqlDbType.Int,4),
 					new SqlParameter("@F_TASKFLAG", SqlDbType.Int,4),
 					new SqlParameter("@F_HISTORYID", SqlDbType.Int,4),
-                    new SqlParameter("@F_StateName", SqlDbType.VarChar,50)};
+                    new SqlParameter("@F_StateName", SqlDbType.VarChar,50),
+                    new SqlParameter("@ReplayTime", SqlDbType.DateTime)
+
+            };
             parameters[0].Value = model.F_WORKORDERSTATEID;
             parameters[1].Value = model.F_OPTUSERID;
             parameters[2].Value = model.F_OPTDATE;
@@ -98,6 +102,7 @@ namespace YTSoft.BaseCallCenter.DAL
             parameters[8].Value = model.F_TASKFLAG;
             parameters[9].Value = model.F_HISTORYID;
             parameters[10].Value = model.F_StateName;
+            parameters[11].Value = model.ReplayTime;
 
             int rows = DbHelperSQL.ExecuteSql(strSql.ToString(), parameters);
             if (rows > 0)

web/BaseCallCenter.DAL/YTSoft.BaseCallCenter.DAL.csproj

@@ -169,6 +169,9 @@
   <ItemGroup>
     <None Include="app.config" />
   </ItemGroup>
+  <ItemGroup>
+    <Folder Include="User\" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

web/BaseCallCenter.Model/YTSoft.BaseCallCenter.Model.csproj

@@ -165,6 +165,9 @@
   <ItemGroup>
     <None Include="app.config" />
   </ItemGroup>
+  <ItemGroup>
+    <Folder Include="User\" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.