字典项分组，新增跟进记录

codegit/CallCenterApi/CallCenterApi.BLL/CallCenterApi.BLL.csproj

@@ -47,6 +47,7 @@
     <Compile Include="PagerBLL.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="telloc_users.cs" />
+    <Compile Include="T_Bus_Follow.cs" />
     <Compile Include="T_Bus_Operation.cs" />
     <Compile Include="T_Bus_RemindRecord.cs" />
     <Compile Include="T_Bus_WorkOrder.cs" />

codegit/CallCenterApi/CallCenterApi.BLL/T_Bus_Follow.cs

@@ -0,0 +1,145 @@
+using System;
+using System.Data;
+using System.Collections.Generic;
+using CallCenterApi.Model;
+namespace CallCenterApi.BLL
+{
+    /// <summary>
+    /// T_Bus_Follow
+    /// </summary>
+    public partial class T_Bus_Follow
+    {
+        private readonly CallCenterApi.DAL.T_Bus_Follow dal = new CallCenterApi.DAL.T_Bus_Follow();
+        public T_Bus_Follow()
+        { }
+        #region  BasicMethod
+        /// <summary>
+        /// 是否存在该记录
+        /// </summary>
+        public bool Exists(int F_Id)
+        {
+            return dal.Exists(F_Id);
+        }
+
+        /// <summary>
+        /// 增加一条数据
+        /// </summary>
+        public int Add(CallCenterApi.Model.T_Bus_Follow model)
+        {
+            return dal.Add(model);
+        }
+
+        /// <summary>
+        /// 更新一条数据
+        /// </summary>
+        public bool Update(CallCenterApi.Model.T_Bus_Follow model)
+        {
+            return dal.Update(model);
+        }
+
+        /// <summary>
+        /// 删除一条数据
+        /// </summary>
+        public bool Delete(int F_Id)
+        {
+
+            return dal.Delete(F_Id);
+        }
+        /// <summary>
+        /// 删除一条数据
+        /// </summary>
+        public bool DeleteList(string F_Idlist)
+        {
+            return dal.DeleteList(F_Idlist);
+        }
+
+        /// <summary>
+        /// 得到一个对象实体
+        /// </summary>
+        public CallCenterApi.Model.T_Bus_Follow GetModel(int F_Id)
+        {
+
+            return dal.GetModel(F_Id);
+        }
+
+        /// <summary>
+        /// 获得数据列表
+        /// </summary>
+        public DataSet GetList(string strWhere)
+        {
+            return dal.GetList(strWhere);
+        }
+        /// <summary>
+        /// 获得前几行数据
+        /// </summary>
+        public DataSet GetList(int Top, string strWhere, string filedOrder)
+        {
+            return dal.GetList(Top, strWhere, filedOrder);
+        }
+        /// <summary>
+        /// 获得数据列表
+        /// </summary>
+        public List<CallCenterApi.Model.T_Bus_Follow> GetModelList(string strWhere)
+        {
+            DataSet ds = dal.GetList(strWhere);
+            return DataTableToList(ds.Tables[0]);
+        }
+        /// <summary>
+        /// 获得数据列表
+        /// </summary>
+        public List<CallCenterApi.Model.T_Bus_Follow> DataTableToList(DataTable dt)
+        {
+            List<CallCenterApi.Model.T_Bus_Follow> modelList = new List<CallCenterApi.Model.T_Bus_Follow>();
+            int rowsCount = dt.Rows.Count;
+            if (rowsCount > 0)
+            {
+                CallCenterApi.Model.T_Bus_Follow model;
+                for (int n = 0; n < rowsCount; n++)
+                {
+                    model = dal.DataRowToModel(dt.Rows[n]);
+                    if (model != null)
+                    {
+                        modelList.Add(model);
+                    }
+                }
+            }
+            return modelList;
+        }
+
+        /// <summary>
+        /// 获得数据列表
+        /// </summary>
+        public DataSet GetAllList()
+        {
+            return GetList("");
+        }
+
+        /// <summary>
+        /// 分页获取数据列表
+        /// </summary>
+        public int GetRecordCount(string strWhere)
+        {
+            return dal.GetRecordCount(strWhere);
+        }
+        /// <summary>
+        /// 分页获取数据列表
+        /// </summary>
+        public DataSet GetListByPage(string strWhere, string orderby, int startIndex, int endIndex)
+        {
+            return dal.GetListByPage(strWhere, orderby, startIndex, endIndex);
+        }
+        /// <summary>
+        /// 分页获取数据列表
+        /// </summary>
+        //public DataSet GetList(int PageSize,int PageIndex,string strWhere)
+        //{
+        //return dal.GetList(PageSize,PageIndex,strWhere);
+        //}
+
+        #endregion  BasicMethod
+        #region  ExtensionMethod
+
+        #endregion  ExtensionMethod
+    }
+}
+

codegit/CallCenterApi/CallCenterApi.BLL/T_Sys_DictionaryBase.cs

@@ -1,10 +1,7 @@
 using System;
-using System.Collections.Generic;
 using System.Data;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
+using System.Collections.Generic;
+using CallCenterApi.Model;
 namespace CallCenterApi.BLL
 {
     /// <summary>
@@ -12,22 +9,22 @@ namespace CallCenterApi.BLL
     /// </summary>
     public partial class T_Sys_DictionaryBase
     {
-        private readonly DAL.T_Sys_DictionaryBase dal = new DAL.T_Sys_DictionaryBase();
+        private readonly CallCenterApi.DAL.T_Sys_DictionaryBase dal = new CallCenterApi.DAL.T_Sys_DictionaryBase();
         public T_Sys_DictionaryBase()
         { }
         #region  BasicMethod
         /// <summary>
         /// 是否存在该记录
         /// </summary>
-        public bool Exists(string F_DictionaryFlag)
+        public bool Exists(int F_Id)
         {
-            return dal.Exists(F_DictionaryFlag);
+            return dal.Exists(F_Id);
         }
 
         /// <summary>
         /// 增加一条数据
         /// </summary>
-        public bool Add(Model.T_Sys_DictionaryBase model)
+        public int Add(CallCenterApi.Model.T_Sys_DictionaryBase model)
         {
             return dal.Add(model);
         }
@@ -35,7 +32,7 @@ namespace CallCenterApi.BLL
         /// <summary>
         /// 更新一条数据
         /// </summary>
-        public bool Update(Model.T_Sys_DictionaryBase model)
+        public bool Update(CallCenterApi.Model.T_Sys_DictionaryBase model)
         {
             return dal.Update(model);
         }
@@ -43,26 +40,26 @@ namespace CallCenterApi.BLL
         /// <summary>
         /// 删除一条数据
         /// </summary>
-        public bool Delete(string F_DictionaryFlag)
+        public bool Delete(int F_Id)
         {
 
-            return dal.Delete(F_DictionaryFlag);
+            return dal.Delete(F_Id);
         }
         /// <summary>
         /// 删除一条数据
         /// </summary>
-        public bool DeleteList(string F_DictionaryFlaglist)
+        public bool DeleteList(string F_Idlist)
         {
-            return dal.DeleteList(F_DictionaryFlaglist);
+            return dal.DeleteList(F_Idlist);
         }
 
         /// <summary>
         /// 得到一个对象实体
         /// </summary>
-        public Model.T_Sys_DictionaryBase GetModel(string F_DictionaryFlag)
+        public CallCenterApi.Model.T_Sys_DictionaryBase GetModel(int F_Id)
         {
 
-            return dal.GetModel(F_DictionaryFlag);
+            return dal.GetModel(F_Id);
         }
 
         /// <summary>
@@ -82,7 +79,7 @@ namespace CallCenterApi.BLL
         /// <summary>
         /// 获得数据列表
         /// </summary>
-        public List<Model.T_Sys_DictionaryBase> GetModelList(string strWhere)
+        public List<CallCenterApi.Model.T_Sys_DictionaryBase> GetModelList(string strWhere)
         {
             DataSet ds = dal.GetList(strWhere);
             return DataTableToList(ds.Tables[0]);
@@ -90,13 +87,13 @@ namespace CallCenterApi.BLL
         /// <summary>
         /// 获得数据列表
         /// </summary>
-        public List<Model.T_Sys_DictionaryBase> DataTableToList(DataTable dt)
+        public List<CallCenterApi.Model.T_Sys_DictionaryBase> DataTableToList(DataTable dt)
         {
-            List<Model.T_Sys_DictionaryBase> modelList = new List<Model.T_Sys_DictionaryBase>();
+            List<CallCenterApi.Model.T_Sys_DictionaryBase> modelList = new List<CallCenterApi.Model.T_Sys_DictionaryBase>();
             int rowsCount = dt.Rows.Count;
             if (rowsCount > 0)
             {
-                Model.T_Sys_DictionaryBase model;
+                CallCenterApi.Model.T_Sys_DictionaryBase model;
                 for (int n = 0; n < rowsCount; n++)
                 {
                     model = dal.DataRowToModel(dt.Rows[n]);
@@ -131,7 +128,13 @@ namespace CallCenterApi.BLL
         {
             return dal.GetListByPage(strWhere, orderby, startIndex, endIndex);
         }
-
+        /// <summary>
+        /// 分页获取数据列表
+        /// </summary>
+        //public DataSet GetList(int PageSize,int PageIndex,string strWhere)
+        //{
+        //return dal.GetList(PageSize,PageIndex,strWhere);
+        //}
 
         #endregion  BasicMethod
         #region  ExtensionMethod
@@ -139,3 +142,4 @@ namespace CallCenterApi.BLL
         #endregion  ExtensionMethod
     }
 }
+

codegit/CallCenterApi/CallCenterApi.DAL/CallCenterApi.DAL.csproj

@@ -47,6 +47,7 @@
     <Compile Include="PagerDAL.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="telloc_users.cs" />
+    <Compile Include="T_Bus_Follow.cs" />
     <Compile Include="T_Bus_Operation.cs" />
     <Compile Include="T_Bus_RemindRecord.cs" />
     <Compile Include="T_Bus_WorkOrder.cs" />

codegit/CallCenterApi/CallCenterApi.DAL/T_Bus_Follow.cs

@@ -0,0 +1,380 @@
+using System;
+using System.Data;
+using System.Text;
+using System.Data.SqlClient;
+using CallCenterApi.DB;
+
+namespace CallCenterApi.DAL
+{
+    /// <summary>
+    /// 数据访问类:T_Bus_Follow
+    /// </summary>
+    public partial class T_Bus_Follow
+    {
+        public T_Bus_Follow()
+        { }
+        #region  BasicMethod
+        /// <summary>
+        /// 是否存在该记录
+        /// </summary>
+        public bool Exists(int F_Id)
+        {
+            StringBuilder strSql = new StringBuilder();
+            strSql.Append("select count(1) from T_Bus_Follow");
+            strSql.Append(" where F_Id=@F_Id");
+            SqlParameter[] parameters = {
+                    new SqlParameter("@F_Id", SqlDbType.Int,4)
+            };
+            parameters[0].Value = F_Id;
+
+            return DbHelperSQL.Exists(strSql.ToString(), parameters);
+        }
+
+
+        /// <summary>
+        /// 增加一条数据
+        /// </summary>
+        public int Add(CallCenterApi.Model.T_Bus_Follow model)
+        {
+            StringBuilder strSql = new StringBuilder();
+            strSql.Append("insert into T_Bus_Follow(");
+            strSql.Append("F_WorkOrderId,F_Title,F_Content,F_Remark,F_File,F_State,F_CreateUser,F_CreateTime,F_IsDelete,F_DeleteUser,F_DeleteTime)");
+            strSql.Append(" values (");
+            strSql.Append("@F_WorkOrderId,@F_Title,@F_Content,@F_Remark,@F_File,@F_State,@F_CreateUser,@F_CreateTime,@F_IsDelete,@F_DeleteUser,@F_DeleteTime)");
+            strSql.Append(";select @@IDENTITY");
+            SqlParameter[] parameters = {
+                    new SqlParameter("@F_WorkOrderId", SqlDbType.VarChar,50),
+                    new SqlParameter("@F_Title", SqlDbType.NVarChar,500),
+                    new SqlParameter("@F_Content", SqlDbType.NVarChar,-1),
+                    new SqlParameter("@F_Remark", SqlDbType.NVarChar,-1),
+                    new SqlParameter("@F_File", SqlDbType.VarChar,500),
+                    new SqlParameter("@F_State", SqlDbType.Int,4),
+                    new SqlParameter("@F_CreateUser", SqlDbType.VarChar,50),
+                    new SqlParameter("@F_CreateTime", SqlDbType.DateTime),
+                    new SqlParameter("@F_IsDelete", SqlDbType.Int,4),
+                    new SqlParameter("@F_DeleteUser", SqlDbType.VarChar,50),
+                    new SqlParameter("@F_DeleteTime", SqlDbType.DateTime)};
+            parameters[0].Value = model.F_WorkOrderId;
+            parameters[1].Value = model.F_Title;
+            parameters[2].Value = model.F_Content;
+            parameters[3].Value = model.F_Remark;
+            parameters[4].Value = model.F_File;
+            parameters[5].Value = model.F_State;
+            parameters[6].Value = model.F_CreateUser;
+            parameters[7].Value = model.F_CreateTime;
+            parameters[8].Value = model.F_IsDelete;
+            parameters[9].Value = model.F_DeleteUser;
+            parameters[10].Value = model.F_DeleteTime;
+
+            object obj = DbHelperSQL.GetSingle(strSql.ToString(), parameters);
+            if (obj == null)
+            {
+                return 0;
+            }
+            else
+            {
+                return Convert.ToInt32(obj);
+            }
+        }
+        /// <summary>
+        /// 更新一条数据
+        /// </summary>
+        public bool Update(CallCenterApi.Model.T_Bus_Follow model)
+        {
+            StringBuilder strSql = new StringBuilder();
+            strSql.Append("update T_Bus_Follow set ");
+            strSql.Append("F_WorkOrderId=@F_WorkOrderId,");
+            strSql.Append("F_Title=@F_Title,");
+            strSql.Append("F_Content=@F_Content,");
+            strSql.Append("F_Remark=@F_Remark,");
+            strSql.Append("F_File=@F_File,");
+            strSql.Append("F_State=@F_State,");
+            strSql.Append("F_CreateUser=@F_CreateUser,");
+            strSql.Append("F_CreateTime=@F_CreateTime,");
+            strSql.Append("F_IsDelete=@F_IsDelete,");
+            strSql.Append("F_DeleteUser=@F_DeleteUser,");
+            strSql.Append("F_DeleteTime=@F_DeleteTime");
+            strSql.Append(" where F_Id=@F_Id");
+            SqlParameter[] parameters = {
+                    new SqlParameter("@F_WorkOrderId", SqlDbType.VarChar,50),
+                    new SqlParameter("@F_Title", SqlDbType.NVarChar,500),
+                    new SqlParameter("@F_Content", SqlDbType.NVarChar,-1),
+                    new SqlParameter("@F_Remark", SqlDbType.NVarChar,-1),
+                    new SqlParameter("@F_File", SqlDbType.VarChar,500),
+                    new SqlParameter("@F_State", SqlDbType.Int,4),
+                    new SqlParameter("@F_CreateUser", SqlDbType.VarChar,50),
+                    new SqlParameter("@F_CreateTime", SqlDbType.DateTime),
+                    new SqlParameter("@F_IsDelete", SqlDbType.Int,4),
+                    new SqlParameter("@F_DeleteUser", SqlDbType.VarChar,50),
+                    new SqlParameter("@F_DeleteTime", SqlDbType.DateTime),
+                    new SqlParameter("@F_Id", SqlDbType.Int,4)};
+            parameters[0].Value = model.F_WorkOrderId;
+            parameters[1].Value = model.F_Title;
+            parameters[2].Value = model.F_Content;
+            parameters[3].Value = model.F_Remark;
+            parameters[4].Value = model.F_File;
+            parameters[5].Value = model.F_State;
+            parameters[6].Value = model.F_CreateUser;
+            parameters[7].Value = model.F_CreateTime;
+            parameters[8].Value = model.F_IsDelete;
+            parameters[9].Value = model.F_DeleteUser;
+            parameters[10].Value = model.F_DeleteTime;
+            parameters[11].Value = model.F_Id;
+
+            int rows = DbHelperSQL.ExecuteSql(strSql.ToString(), parameters);
+            if (rows > 0)
+            {
+                return true;
+            }
+            else
+            {
+                return false;
+            }
+        }
+
+        /// <summary>
+        /// 删除一条数据
+        /// </summary>
+        public bool Delete(int F_Id)
+        {
+
+            StringBuilder strSql = new StringBuilder();
+            strSql.Append("delete from T_Bus_Follow ");
+            strSql.Append(" where F_Id=@F_Id");
+            SqlParameter[] parameters = {
+                    new SqlParameter("@F_Id", SqlDbType.Int,4)
+            };
+            parameters[0].Value = F_Id;
+
+            int rows = DbHelperSQL.ExecuteSql(strSql.ToString(), parameters);
+            if (rows > 0)
+            {
+                return true;
+            }
+            else
+            {
+                return false;
+            }
+        }
+        /// <summary>
+        /// 批量删除数据
+        /// </summary>
+        public bool DeleteList(string F_Idlist)
+        {
+            StringBuilder strSql = new StringBuilder();
+            strSql.Append("delete from T_Bus_Follow ");
+            strSql.Append(" where F_Id in (" + F_Idlist + ")  ");
+            int rows = DbHelperSQL.ExecuteSql(strSql.ToString());
+            if (rows > 0)
+            {
+                return true;
+            }
+            else
+            {
+                return false;
+            }
+        }
+
+
+        /// <summary>
+        /// 得到一个对象实体
+        /// </summary>
+        public CallCenterApi.Model.T_Bus_Follow GetModel(int F_Id)
+        {
+
+            StringBuilder strSql = new StringBuilder();
+            strSql.Append("select  top 1 F_Id,F_WorkOrderId,F_Title,F_Content,F_Remark,F_File,F_State,F_CreateUser,F_CreateTime,F_IsDelete,F_DeleteUser,F_DeleteTime from T_Bus_Follow ");
+            strSql.Append(" where F_Id=@F_Id");
+            SqlParameter[] parameters = {
+                    new SqlParameter("@F_Id", SqlDbType.Int,4)
+            };
+            parameters[0].Value = F_Id;
+
+            CallCenterApi.Model.T_Bus_Follow model = new CallCenterApi.Model.T_Bus_Follow();
+            DataSet ds = DbHelperSQL.Query(strSql.ToString(), parameters);
+            if (ds.Tables[0].Rows.Count > 0)
+            {
+                return DataRowToModel(ds.Tables[0].Rows[0]);
+            }
+            else
+            {
+                return null;
+            }
+        }
+
+
+        /// <summary>
+        /// 得到一个对象实体
+        /// </summary>
+        public CallCenterApi.Model.T_Bus_Follow DataRowToModel(DataRow row)
+        {
+            CallCenterApi.Model.T_Bus_Follow model = new CallCenterApi.Model.T_Bus_Follow();
+            if (row != null)
+            {
+                if (row["F_Id"] != null && row["F_Id"].ToString() != "")
+                {
+                    model.F_Id = int.Parse(row["F_Id"].ToString());
+                }
+                if (row["F_WorkOrderId"] != null)
+                {
+                    model.F_WorkOrderId = row["F_WorkOrderId"].ToString();
+                }
+                if (row["F_Title"] != null)
+                {
+                    model.F_Title = row["F_Title"].ToString();
+                }
+                if (row["F_Content"] != null)
+                {
+                    model.F_Content = row["F_Content"].ToString();
+                }
+                if (row["F_Remark"] != null)
+                {
+                    model.F_Remark = row["F_Remark"].ToString();
+                }
+                if (row["F_File"] != null)
+                {
+                    model.F_File = row["F_File"].ToString();
+                }
+                if (row["F_State"] != null && row["F_State"].ToString() != "")
+                {
+                    model.F_State = int.Parse(row["F_State"].ToString());
+                }
+                if (row["F_CreateUser"] != null)
+                {
+                    model.F_CreateUser = row["F_CreateUser"].ToString();
+                }
+                if (row["F_CreateTime"] != null && row["F_CreateTime"].ToString() != "")
+                {
+                    model.F_CreateTime = DateTime.Parse(row["F_CreateTime"].ToString());
+                }
+                if (row["F_IsDelete"] != null && row["F_IsDelete"].ToString() != "")
+                {
+                    model.F_IsDelete = int.Parse(row["F_IsDelete"].ToString());
+                }
+                if (row["F_DeleteUser"] != null)
+                {
+                    model.F_DeleteUser = row["F_DeleteUser"].ToString();
+                }
+                if (row["F_DeleteTime"] != null && row["F_DeleteTime"].ToString() != "")
+                {
+                    model.F_DeleteTime = DateTime.Parse(row["F_DeleteTime"].ToString());
+                }
+            }
+            return model;
+        }
+
+        /// <summary>
+        /// 获得数据列表
+        /// </summary>
+        public DataSet GetList(string strWhere)
+        {
+            StringBuilder strSql = new StringBuilder();
+            strSql.Append("select F_Id,F_WorkOrderId,F_Title,F_Content,F_Remark,F_File,F_State,F_CreateUser,F_CreateTime,F_IsDelete,F_DeleteUser,F_DeleteTime ");
+            strSql.Append(" FROM T_Bus_Follow ");
+            if (strWhere.Trim() != "")
+            {
+                strSql.Append(" where " + strWhere);
+            }
+            return DbHelperSQL.Query(strSql.ToString());
+        }
+
+        /// <summary>
+        /// 获得前几行数据
+        /// </summary>
+        public DataSet GetList(int Top, string strWhere, string filedOrder)
+        {
+            StringBuilder strSql = new StringBuilder();
+            strSql.Append("select ");
+            if (Top > 0)
+            {
+                strSql.Append(" top " + Top.ToString());
+            }
+            strSql.Append(" F_Id,F_WorkOrderId,F_Title,F_Content,F_Remark,F_File,F_State,F_CreateUser,F_CreateTime,F_IsDelete,F_DeleteUser,F_DeleteTime ");
+            strSql.Append(" FROM T_Bus_Follow ");
+            if (strWhere.Trim() != "")
+            {
+                strSql.Append(" where " + strWhere);
+            }
+            strSql.Append(" order by " + filedOrder);
+            return DbHelperSQL.Query(strSql.ToString());
+        }
+
+        /// <summary>
+        /// 获取记录总数
+        /// </summary>
+        public int GetRecordCount(string strWhere)
+        {
+            StringBuilder strSql = new StringBuilder();
+            strSql.Append("select count(1) FROM T_Bus_Follow ");
+            if (strWhere.Trim() != "")
+            {
+                strSql.Append(" where " + strWhere);
+            }
+            object obj = DbHelperSQL.GetSingle(strSql.ToString());
+            if (obj == null)
+            {
+                return 0;
+            }
+            else
+            {
+                return Convert.ToInt32(obj);
+            }
+        }
+        /// <summary>
+        /// 分页获取数据列表
+        /// </summary>
+        public DataSet GetListByPage(string strWhere, string orderby, int startIndex, int endIndex)
+        {
+            StringBuilder strSql = new StringBuilder();
+            strSql.Append("SELECT * FROM ( ");
+            strSql.Append(" SELECT ROW_NUMBER() OVER (");
+            if (!string.IsNullOrEmpty(orderby.Trim()))
+            {
+                strSql.Append("order by T." + orderby);
+            }
+            else
+            {
+                strSql.Append("order by T.F_Id desc");
+            }
+            strSql.Append(")AS Row, T.*  from T_Bus_Follow T ");
+            if (!string.IsNullOrEmpty(strWhere.Trim()))
+            {
+                strSql.Append(" WHERE " + strWhere);
+            }
+            strSql.Append(" ) TT");
+            strSql.AppendFormat(" WHERE TT.Row between {0} and {1}", startIndex, endIndex);
+            return DbHelperSQL.Query(strSql.ToString());
+        }
+
+        /*
+		/// <summary>
+		/// 分页获取数据列表
+		/// </summary>
+		public DataSet GetList(int PageSize,int PageIndex,string strWhere)
+		{
+			SqlParameter[] parameters = {
+					new SqlParameter("@tblName", SqlDbType.VarChar, 255),
+					new SqlParameter("@fldName", SqlDbType.VarChar, 255),
+					new SqlParameter("@PageSize", SqlDbType.Int),
+					new SqlParameter("@PageIndex", SqlDbType.Int),
+					new SqlParameter("@IsReCount", SqlDbType.Bit),
+					new SqlParameter("@OrderType", SqlDbType.Bit),
+					new SqlParameter("@strWhere", SqlDbType.VarChar,1000),
+					};
+			parameters[0].Value = "T_Bus_Follow";
+			parameters[1].Value = "F_Id";
+			parameters[2].Value = PageSize;
+			parameters[3].Value = PageIndex;
+			parameters[4].Value = 0;
+			parameters[5].Value = 0;
+			parameters[6].Value = strWhere;	
+			return DbHelperSQL.RunProcedure("UP_GetRecordByPage",parameters,"ds");
+		}*/
+
+        #endregion  BasicMethod
+        #region  ExtensionMethod
+
+        #endregion  ExtensionMethod
+    }
+}
+

codegit/CallCenterApi/CallCenterApi.DAL/T_Sys_Department.cs

@@ -35,15 +35,15 @@ namespace CallCenterApi.DAL
 
 
         /// <summary>
-        /// 增加一条数据
-        /// </summary>
-        public int Add(Model.T_Sys_Department model)
+		/// 增加一条数据
+		/// </summary>
+		public int Add(CallCenterApi.Model.T_Sys_Department model)
         {
             StringBuilder strSql = new StringBuilder();
             strSql.Append("insert into T_Sys_Department(");
-            strSql.Append("F_DeptCode,F_ParentName,F_ParentId,F_ParentCode,F_DeptName,F_State,F_Layer,F_Type,F_Sort,F_Remark,F_Telephone,F_Mobile,F_OtherPhone,F_Email,F_Header)");
+            strSql.Append("F_DeptCode,F_ParentName,F_ParentId,F_ParentCode,F_DeptName,F_State,F_Layer,F_Type,F_Sort,F_Remark,F_Telephone,F_Mobile,F_OtherPhone,F_Email,F_Header,F_GroupCode)");
             strSql.Append(" values (");
-            strSql.Append("@F_DeptCode,@F_ParentName,@F_ParentId,@F_ParentCode,@F_DeptName,@F_State,@F_Layer,@F_Type,@F_Sort,@F_Remark,@F_Telephone,@F_Mobile,@F_OtherPhone,@F_Email,@F_Header)");
+            strSql.Append("@F_DeptCode,@F_ParentName,@F_ParentId,@F_ParentCode,@F_DeptName,@F_State,@F_Layer,@F_Type,@F_Sort,@F_Remark,@F_Telephone,@F_Mobile,@F_OtherPhone,@F_Email,@F_Header,@F_GroupCode)");
             strSql.Append(";select @@IDENTITY");
             SqlParameter[] parameters = {
                     new SqlParameter("@F_DeptCode", SqlDbType.VarChar,50),
@@ -60,7 +60,8 @@ namespace CallCenterApi.DAL
                     new SqlParameter("@F_Mobile", SqlDbType.VarChar,50),
                     new SqlParameter("@F_OtherPhone", SqlDbType.VarChar,50),
                     new SqlParameter("@F_Email", SqlDbType.VarChar,50),
-                    new SqlParameter("@F_Header", SqlDbType.Int,4)};
+                    new SqlParameter("@F_Header", SqlDbType.Int,4),
+                    new SqlParameter("@F_GroupCode", SqlDbType.VarChar,50)};
             parameters[0].Value = model.F_DeptCode;
             parameters[1].Value = model.F_ParentName;
             parameters[2].Value = model.F_ParentId;
@@ -76,6 +77,7 @@ namespace CallCenterApi.DAL
             parameters[12].Value = model.F_OtherPhone;
             parameters[13].Value = model.F_Email;
             parameters[14].Value = model.F_Header;
+            parameters[15].Value = model.F_GroupCode;
 
             object obj = DbHelperSQL.GetSingle(strSql.ToString(), parameters);
             if (obj == null)
@@ -90,7 +92,7 @@ namespace CallCenterApi.DAL
         /// <summary>
         /// 更新一条数据
         /// </summary>
-        public bool Update(Model.T_Sys_Department model)
+        public bool Update(CallCenterApi.Model.T_Sys_Department model)
         {
             StringBuilder strSql = new StringBuilder();
             strSql.Append("update T_Sys_Department set ");
@@ -108,7 +110,8 @@ namespace CallCenterApi.DAL
             strSql.Append("F_Mobile=@F_Mobile,");
             strSql.Append("F_OtherPhone=@F_OtherPhone,");
             strSql.Append("F_Email=@F_Email,");
-            strSql.Append("F_Header=@F_Header");
+            strSql.Append("F_Header=@F_Header,");
+            strSql.Append("F_GroupCode=@F_GroupCode");
             strSql.Append(" where F_DeptId=@F_DeptId");
             SqlParameter[] parameters = {
                     new SqlParameter("@F_DeptCode", SqlDbType.VarChar,50),
@@ -126,6 +129,7 @@ namespace CallCenterApi.DAL
                     new SqlParameter("@F_OtherPhone", SqlDbType.VarChar,50),
                     new SqlParameter("@F_Email", SqlDbType.VarChar,50),
                     new SqlParameter("@F_Header", SqlDbType.Int,4),
+                    new SqlParameter("@F_GroupCode", SqlDbType.VarChar,50),
                     new SqlParameter("@F_DeptId", SqlDbType.Int,4)};
             parameters[0].Value = model.F_DeptCode;
             parameters[1].Value = model.F_ParentName;
@@ -142,7 +146,8 @@ namespace CallCenterApi.DAL
             parameters[12].Value = model.F_OtherPhone;
             parameters[13].Value = model.F_Email;
             parameters[14].Value = model.F_Header;
-            parameters[15].Value = model.F_DeptId;
+            parameters[15].Value = model.F_GroupCode;
+            parameters[16].Value = model.F_DeptId;
 
             int rows = DbHelperSQL.ExecuteSql(strSql.ToString(), parameters);
             if (rows > 0)
@@ -206,7 +211,7 @@ namespace CallCenterApi.DAL
         {
 
             StringBuilder strSql = new StringBuilder();
-            strSql.Append("select TOP 1 F_DeptId,F_DeptCode,(SELECT B.F_DeptName FROM T_Sys_Department B WHERE B.F_DeptId=A.F_ParentId) AS F_ParentName,F_ParentId,F_ParentCode,F_DeptName,F_State,F_Layer,F_Type,F_Sort,F_Remark,F_Telephone,F_Mobile,F_OtherPhone,F_Email,F_Header from T_Sys_Department  A");
+            strSql.Append("select TOP 1 *,(SELECT B.F_DeptName FROM T_Sys_Department B WHERE B.F_DeptId=A.F_ParentId) AS F_ParentName from T_Sys_Department  A");
             strSql.Append(" where F_DeptId=@F_DeptId");
             SqlParameter[] parameters = {
                     new SqlParameter("@F_DeptId", SqlDbType.Int,4)
@@ -298,6 +303,10 @@ namespace CallCenterApi.DAL
                 {
                     model.F_Header = int.Parse(row["F_Header"].ToString());
                 }
+                if (row["F_GroupCode"] != null)
+                {
+                    model.F_GroupCode = row["F_GroupCode"].ToString();
+                }
             }
             return model;
         }
@@ -308,8 +317,7 @@ namespace CallCenterApi.DAL
         public DataSet GetList(string strWhere)
         {
             StringBuilder strSql = new StringBuilder();
-            strSql.Append("select F_DeptId,F_DeptCode,F_ParentName,F_ParentId,F_ParentCode,F_DeptName,F_State,F_Layer,F_Type,F_Sort,F_Remark,F_Telephone,F_Mobile,F_OtherPhone,F_Email,F_Header ");
-            strSql.Append(" FROM T_Sys_Department ");
+            strSql.Append("select * FROM T_Sys_Department ");
             if (strWhere.Trim() != "")
             {
                 strSql.Append(" where " + strWhere);
@@ -328,8 +336,8 @@ namespace CallCenterApi.DAL
             {
                 strSql.Append(" top " + Top.ToString());
             }
-            strSql.Append(" F_DeptId,F_DeptCode,F_ParentName,F_ParentId,F_ParentCode,F_DeptName,F_State,F_Layer,F_Type,F_Sort,F_Remark,F_Telephone,F_Mobile,F_OtherPhone,F_Email,F_Header ");
-            strSql.Append(" FROM T_Sys_Department ");
+            
+            strSql.Append(" * FROM T_Sys_Department ");
             if (strWhere.Trim() != "")
             {
                 strSql.Append(" where " + strWhere);

codegit/CallCenterApi/CallCenterApi.DAL/T_Sys_DictionaryBase.cs

@@ -1,15 +1,12 @@
-using CallCenterApi.DB;
-using System;
-using System.Collections.Generic;
+using System;
 using System.Data;
-using System.Data.SqlClient;
-using System.Linq;
 using System.Text;
-using System.Threading.Tasks;
+using System.Data.SqlClient;
+using CallCenterApi.DB;
 
 namespace CallCenterApi.DAL
 {
-    // <summary>
+    /// <summary>
     /// 数据访问类:T_Sys_DictionaryBase
     /// </summary>
     public partial class T_Sys_DictionaryBase
@@ -17,18 +14,18 @@ namespace CallCenterApi.DAL
         public T_Sys_DictionaryBase()
         { }
         #region  BasicMethod
-
         /// <summary>
         /// 是否存在该记录
         /// </summary>
-        public bool Exists(string F_DictionaryFlag)
+        public bool Exists(int F_Id)
         {
             StringBuilder strSql = new StringBuilder();
             strSql.Append("select count(1) from T_Sys_DictionaryBase");
-            strSql.Append(" where F_DictionaryFlag=@F_DictionaryFlag ");
+            strSql.Append(" where F_Id=@F_Id");
             SqlParameter[] parameters = {
-                    new SqlParameter("@F_DictionaryFlag", SqlDbType.VarChar,50)         };
-            parameters[0].Value = F_DictionaryFlag;
+                    new SqlParameter("@F_Id", SqlDbType.Int,4)
+            };
+            parameters[0].Value = F_Id;
 
             return DbHelperSQL.Exists(strSql.ToString(), parameters);
         }
@@ -37,58 +34,67 @@ namespace CallCenterApi.DAL
         /// <summary>
         /// 增加一条数据
         /// </summary>
-        public bool Add(Model.T_Sys_DictionaryBase model)
+        public int Add(CallCenterApi.Model.T_Sys_DictionaryBase model)
         {
             StringBuilder strSql = new StringBuilder();
             strSql.Append("insert into T_Sys_DictionaryBase(");
-            strSql.Append("F_DictionaryFlag,F_DictionaryName,F_Sort,F_Describe,F_State)");
+            strSql.Append("F_DictionaryFlag,F_DictionaryName,F_Sort,F_Describe,F_State,F_GroupCode)");
             strSql.Append(" values (");
-            strSql.Append("@F_DictionaryFlag,@F_DictionaryName,@F_Sort,@F_Describe,@F_State)");
+            strSql.Append("@F_DictionaryFlag,@F_DictionaryName,@F_Sort,@F_Describe,@F_State,@F_GroupCode)");
+            strSql.Append(";select @@IDENTITY");
             SqlParameter[] parameters = {
                     new SqlParameter("@F_DictionaryFlag", SqlDbType.VarChar,50),
                     new SqlParameter("@F_DictionaryName", SqlDbType.VarChar,50),
                     new SqlParameter("@F_Sort", SqlDbType.Int,4),
                     new SqlParameter("@F_Describe", SqlDbType.VarChar,100),
-                    new SqlParameter("@F_State", SqlDbType.VarChar,20)};
+                    new SqlParameter("@F_State", SqlDbType.Bit,1),
+                    new SqlParameter("@F_GroupCode", SqlDbType.VarChar,50)};
             parameters[0].Value = model.F_DictionaryFlag;
             parameters[1].Value = model.F_DictionaryName;
             parameters[2].Value = model.F_Sort;
             parameters[3].Value = model.F_Describe;
             parameters[4].Value = model.F_State;
+            parameters[5].Value = model.F_GroupCode;
 
-            int rows = DbHelperSQL.ExecuteSql(strSql.ToString(), parameters);
-            if (rows > 0)
+            object obj = DbHelperSQL.GetSingle(strSql.ToString(), parameters);
+            if (obj == null)
             {
-                return true;
+                return 0;
             }
             else
             {
-                return false;
+                return Convert.ToInt32(obj);
             }
         }
         /// <summary>
         /// 更新一条数据
         /// </summary>
-        public bool Update(Model.T_Sys_DictionaryBase model)
+        public bool Update(CallCenterApi.Model.T_Sys_DictionaryBase model)
         {
             StringBuilder strSql = new StringBuilder();
             strSql.Append("update T_Sys_DictionaryBase set ");
+            strSql.Append("F_DictionaryFlag=@F_DictionaryFlag,");
             strSql.Append("F_DictionaryName=@F_DictionaryName,");
             strSql.Append("F_Sort=@F_Sort,");
             strSql.Append("F_Describe=@F_Describe,");
-            strSql.Append("F_State=@F_State");
-            strSql.Append(" where F_DictionaryFlag=@F_DictionaryFlag ");
+            strSql.Append("F_State=@F_State,");
+            strSql.Append("F_GroupCode=@F_GroupCode");
+            strSql.Append(" where F_Id=@F_Id");
             SqlParameter[] parameters = {
+                    new SqlParameter("@F_DictionaryFlag", SqlDbType.VarChar,50),
                     new SqlParameter("@F_DictionaryName", SqlDbType.VarChar,50),
                     new SqlParameter("@F_Sort", SqlDbType.Int,4),
                     new SqlParameter("@F_Describe", SqlDbType.VarChar,100),
-                    new SqlParameter("@F_State", SqlDbType.VarChar,20),
-                    new SqlParameter("@F_DictionaryFlag", SqlDbType.VarChar,50)};
-            parameters[0].Value = model.F_DictionaryName;
-            parameters[1].Value = model.F_Sort;
-            parameters[2].Value = model.F_Describe;
-            parameters[3].Value = model.F_State;
-            parameters[4].Value = model.F_DictionaryFlag;
+                    new SqlParameter("@F_State", SqlDbType.Bit,1),
+                    new SqlParameter("@F_GroupCode", SqlDbType.VarChar,50),
+                    new SqlParameter("@F_Id", SqlDbType.Int,4)};
+            parameters[0].Value = model.F_DictionaryFlag;
+            parameters[1].Value = model.F_DictionaryName;
+            parameters[2].Value = model.F_Sort;
+            parameters[3].Value = model.F_Describe;
+            parameters[4].Value = model.F_State;
+            parameters[5].Value = model.F_GroupCode;
+            parameters[6].Value = model.F_Id;
 
             int rows = DbHelperSQL.ExecuteSql(strSql.ToString(), parameters);
             if (rows > 0)
@@ -104,15 +110,16 @@ namespace CallCenterApi.DAL
         /// <summary>
         /// 删除一条数据
         /// </summary>
-        public bool Delete(string F_DictionaryFlag)
+        public bool Delete(int F_Id)
         {
 
             StringBuilder strSql = new StringBuilder();
             strSql.Append("delete from T_Sys_DictionaryBase ");
-            strSql.Append(" where F_DictionaryFlag=@F_DictionaryFlag ");
+            strSql.Append(" where F_Id=@F_Id");
             SqlParameter[] parameters = {
-                    new SqlParameter("@F_DictionaryFlag", SqlDbType.VarChar,50)         };
-            parameters[0].Value = F_DictionaryFlag;
+                    new SqlParameter("@F_Id", SqlDbType.Int,4)
+            };
+            parameters[0].Value = F_Id;
 
             int rows = DbHelperSQL.ExecuteSql(strSql.ToString(), parameters);
             if (rows > 0)
@@ -127,11 +134,11 @@ namespace CallCenterApi.DAL
         /// <summary>
         /// 批量删除数据
         /// </summary>
-        public bool DeleteList(string F_DictionaryFlaglist)
+        public bool DeleteList(string F_Idlist)
         {
             StringBuilder strSql = new StringBuilder();
             strSql.Append("delete from T_Sys_DictionaryBase ");
-            strSql.Append(" where F_DictionaryFlag in (" + F_DictionaryFlaglist + ")  ");
+            strSql.Append(" where F_Id in (" + F_Idlist + ")  ");
             int rows = DbHelperSQL.ExecuteSql(strSql.ToString());
             if (rows > 0)
             {
@@ -147,17 +154,18 @@ namespace CallCenterApi.DAL
         /// <summary>
         /// 得到一个对象实体
         /// </summary>
-        public Model.T_Sys_DictionaryBase GetModel(string F_DictionaryFlag)
+        public CallCenterApi.Model.T_Sys_DictionaryBase GetModel(int F_Id)
         {
 
             StringBuilder strSql = new StringBuilder();
-            strSql.Append("select  top 1 F_DictionaryFlag,F_DictionaryName,F_Sort,F_Describe,F_State from T_Sys_DictionaryBase ");
-            strSql.Append(" where F_DictionaryFlag=@F_DictionaryFlag ");
+            strSql.Append("select  top 1 F_Id,F_DictionaryFlag,F_DictionaryName,F_Sort,F_Describe,F_State,F_GroupCode from T_Sys_DictionaryBase ");
+            strSql.Append(" where F_Id=@F_Id");
             SqlParameter[] parameters = {
-                    new SqlParameter("@F_DictionaryFlag", SqlDbType.VarChar,50)         };
-            parameters[0].Value = F_DictionaryFlag;
+                    new SqlParameter("@F_Id", SqlDbType.Int,4)
+            };
+            parameters[0].Value = F_Id;
 
-            Model.T_Sys_DictionaryBase model = new Model.T_Sys_DictionaryBase();
+            CallCenterApi.Model.T_Sys_DictionaryBase model = new CallCenterApi.Model.T_Sys_DictionaryBase();
             DataSet ds = DbHelperSQL.Query(strSql.ToString(), parameters);
             if (ds.Tables[0].Rows.Count > 0)
             {
@@ -173,11 +181,15 @@ namespace CallCenterApi.DAL
         /// <summary>
         /// 得到一个对象实体
         /// </summary>
-        public Model.T_Sys_DictionaryBase DataRowToModel(DataRow row)
+        public CallCenterApi.Model.T_Sys_DictionaryBase DataRowToModel(DataRow row)
         {
-            Model.T_Sys_DictionaryBase model = new Model.T_Sys_DictionaryBase();
+            CallCenterApi.Model.T_Sys_DictionaryBase model = new CallCenterApi.Model.T_Sys_DictionaryBase();
             if (row != null)
             {
+                if (row["F_Id"] != null && row["F_Id"].ToString() != "")
+                {
+                    model.F_Id = int.Parse(row["F_Id"].ToString());
+                }
                 if (row["F_DictionaryFlag"] != null)
                 {
                     model.F_DictionaryFlag = row["F_DictionaryFlag"].ToString();
@@ -190,15 +202,25 @@ namespace CallCenterApi.DAL
                 {
                     model.F_Sort = int.Parse(row["F_Sort"].ToString());
                 }
-                if (row["F_Describe"] != null)  
+                if (row["F_Describe"] != null)
                 {
                     model.F_Describe = row["F_Describe"].ToString();
                 }
-                if (row["F_State"] != null && row["F_State"] != DBNull.Value)
+                if (row["F_State"] != null && row["F_State"].ToString() != "")
+                {
+                    if ((row["F_State"].ToString() == "1") || (row["F_State"].ToString().ToLower() == "true"))
+                    {
+                        model.F_State = true;
+                    }
+                    else
+                    {
+                        model.F_State = false;
+                    }
+                }
+                if (row["F_GroupCode"] != null)
                 {
-                    model.F_State = Convert.ToBoolean(row["F_State"]);
+                    model.F_GroupCode = row["F_GroupCode"].ToString();
                 }
-                else { model.F_State = false; }
             }
             return model;
         }
@@ -209,7 +231,7 @@ namespace CallCenterApi.DAL
         public DataSet GetList(string strWhere)
         {
             StringBuilder strSql = new StringBuilder();
-            strSql.Append("select F_DictionaryFlag,F_DictionaryName,F_Sort,F_Describe,F_State ");
+            strSql.Append("select F_Id,F_DictionaryFlag,F_DictionaryName,F_Sort,F_Describe,F_State,F_GroupCode ");
             strSql.Append(" FROM T_Sys_DictionaryBase ");
             if (strWhere.Trim() != "")
             {
@@ -229,7 +251,7 @@ namespace CallCenterApi.DAL
             {
                 strSql.Append(" top " + Top.ToString());
             }
-            strSql.Append(" F_DictionaryFlag,F_DictionaryName,F_Sort,F_Describe,F_State ");
+            strSql.Append(" F_Id,F_DictionaryFlag,F_DictionaryName,F_Sort,F_Describe,F_State,F_GroupCode ");
             strSql.Append(" FROM T_Sys_DictionaryBase ");
             if (strWhere.Trim() != "")
             {
@@ -274,7 +296,7 @@ namespace CallCenterApi.DAL
             }
             else
             {
-                strSql.Append("order by T.F_DictionaryFlag desc");
+                strSql.Append("order by T.F_Id desc");
             }
             strSql.Append(")AS Row, T.*  from T_Sys_DictionaryBase T ");
             if (!string.IsNullOrEmpty(strWhere.Trim()))
@@ -286,7 +308,30 @@ namespace CallCenterApi.DAL
             return DbHelperSQL.Query(strSql.ToString());
         }
 
-
+        /*
+		/// <summary>
+		/// 分页获取数据列表
+		/// </summary>
+		public DataSet GetList(int PageSize,int PageIndex,string strWhere)
+		{
+			SqlParameter[] parameters = {
+					new SqlParameter("@tblName", SqlDbType.VarChar, 255),
+					new SqlParameter("@fldName", SqlDbType.VarChar, 255),
+					new SqlParameter("@PageSize", SqlDbType.Int),
+					new SqlParameter("@PageIndex", SqlDbType.Int),
+					new SqlParameter("@IsReCount", SqlDbType.Bit),
+					new SqlParameter("@OrderType", SqlDbType.Bit),
+					new SqlParameter("@strWhere", SqlDbType.VarChar,1000),
+					};
+			parameters[0].Value = "T_Sys_DictionaryBase";
+			parameters[1].Value = "F_Id";
+			parameters[2].Value = PageSize;
+			parameters[3].Value = PageIndex;
+			parameters[4].Value = 0;
+			parameters[5].Value = 0;
+			parameters[6].Value = strWhere;	
+			return DbHelperSQL.RunProcedure("UP_GetRecordByPage",parameters,"ds");
+		}*/
 
         #endregion  BasicMethod
         #region  ExtensionMethod
@@ -294,3 +339,4 @@ namespace CallCenterApi.DAL
         #endregion  ExtensionMethod
     }
 }
+

codegit/CallCenterApi/CallCenterApi.DAL/T_Sys_DictionaryValue.cs

@@ -1,11 +1,8 @@
-using CallCenterApi.DB;
-using System;
-using System.Collections.Generic;
+using System;
 using System.Data;
-using System.Data.SqlClient;
-using System.Linq;
 using System.Text;
-using System.Threading.Tasks;
+using System.Data.SqlClient;
+using CallCenterApi.DB;
 
 namespace CallCenterApi.DAL
 {
@@ -37,13 +34,13 @@ namespace CallCenterApi.DAL
         /// <summary>
         /// 增加一条数据
         /// </summary>
-        public int Add(Model.T_Sys_DictionaryValue model)
+        public int Add(CallCenterApi.Model.T_Sys_DictionaryValue model)
         {
             StringBuilder strSql = new StringBuilder();
             strSql.Append("insert into T_Sys_DictionaryValue(");
-            strSql.Append("F_DictionaryFlag,F_ValueCode,F_Name,F_Sort,F_Describe,F_State)");
+            strSql.Append("F_DictionaryFlag,F_ValueCode,F_Name,F_Sort,F_Describe,F_State,F_GroupCode)");
             strSql.Append(" values (");
-            strSql.Append("@F_DictionaryFlag,@F_ValueCode,@F_Name,@F_Sort,@F_Describe,@F_State)");
+            strSql.Append("@F_DictionaryFlag,@F_ValueCode,@F_Name,@F_Sort,@F_Describe,@F_State,@F_GroupCode)");
             strSql.Append(";select @@IDENTITY");
             SqlParameter[] parameters = {
                     new SqlParameter("@F_DictionaryFlag", SqlDbType.VarChar,50),
@@ -51,13 +48,15 @@ namespace CallCenterApi.DAL
                     new SqlParameter("@F_Name", SqlDbType.VarChar,50),
                     new SqlParameter("@F_Sort", SqlDbType.Int,4),
                     new SqlParameter("@F_Describe", SqlDbType.VarChar,-1),
-                    new SqlParameter("@F_State", SqlDbType.VarChar,50)};
+                    new SqlParameter("@F_State", SqlDbType.Bit,1),
+                    new SqlParameter("@F_GroupCode", SqlDbType.VarChar,50)};
             parameters[0].Value = model.F_DictionaryFlag;
             parameters[1].Value = model.F_ValueCode;
             parameters[2].Value = model.F_Name;
             parameters[3].Value = model.F_Sort;
             parameters[4].Value = model.F_Describe;
             parameters[5].Value = model.F_State;
+            parameters[6].Value = model.F_GroupCode;
 
             object obj = DbHelperSQL.GetSingle(strSql.ToString(), parameters);
             if (obj == null)
@@ -72,7 +71,7 @@ namespace CallCenterApi.DAL
         /// <summary>
         /// 更新一条数据
         /// </summary>
-        public bool Update(Model.T_Sys_DictionaryValue model)
+        public bool Update(CallCenterApi.Model.T_Sys_DictionaryValue model)
         {
             StringBuilder strSql = new StringBuilder();
             strSql.Append("update T_Sys_DictionaryValue set ");
@@ -81,7 +80,8 @@ namespace CallCenterApi.DAL
             strSql.Append("F_Name=@F_Name,");
             strSql.Append("F_Sort=@F_Sort,");
             strSql.Append("F_Describe=@F_Describe,");
-            strSql.Append("F_State=@F_State");
+            strSql.Append("F_State=@F_State,");
+            strSql.Append("F_GroupCode=@F_GroupCode");
             strSql.Append(" where F_DictionaryValueId=@F_DictionaryValueId");
             SqlParameter[] parameters = {
                     new SqlParameter("@F_DictionaryFlag", SqlDbType.VarChar,50),
@@ -89,7 +89,8 @@ namespace CallCenterApi.DAL
                     new SqlParameter("@F_Name", SqlDbType.VarChar,50),
                     new SqlParameter("@F_Sort", SqlDbType.Int,4),
                     new SqlParameter("@F_Describe", SqlDbType.VarChar,-1),
-                    new SqlParameter("@F_State", SqlDbType.VarChar,50),
+                    new SqlParameter("@F_State", SqlDbType.Bit,1),
+                    new SqlParameter("@F_GroupCode", SqlDbType.VarChar,50),
                     new SqlParameter("@F_DictionaryValueId", SqlDbType.Int,4)};
             parameters[0].Value = model.F_DictionaryFlag;
             parameters[1].Value = model.F_ValueCode;
@@ -97,7 +98,8 @@ namespace CallCenterApi.DAL
             parameters[3].Value = model.F_Sort;
             parameters[4].Value = model.F_Describe;
             parameters[5].Value = model.F_State;
-            parameters[6].Value = model.F_DictionaryValueId;
+            parameters[6].Value = model.F_GroupCode;
+            parameters[7].Value = model.F_DictionaryValueId;
 
             int rows = DbHelperSQL.ExecuteSql(strSql.ToString(), parameters);
             if (rows > 0)
@@ -157,18 +159,18 @@ namespace CallCenterApi.DAL
         /// <summary>
         /// 得到一个对象实体
         /// </summary>
-        public Model.T_Sys_DictionaryValue GetModel(int F_DictionaryValueId)
+        public CallCenterApi.Model.T_Sys_DictionaryValue GetModel(int F_DictionaryValueId)
         {
 
             StringBuilder strSql = new StringBuilder();
-            strSql.Append("select  top 1 F_DictionaryValueId,F_DictionaryFlag,F_ValueCode,F_Name,F_Sort,F_Describe,F_State from T_Sys_DictionaryValue ");
+            strSql.Append("select  top 1 F_DictionaryValueId,F_DictionaryFlag,F_ValueCode,F_Name,F_Sort,F_Describe,F_State,F_GroupCode from T_Sys_DictionaryValue ");
             strSql.Append(" where F_DictionaryValueId=@F_DictionaryValueId");
             SqlParameter[] parameters = {
                     new SqlParameter("@F_DictionaryValueId", SqlDbType.Int,4)
             };
             parameters[0].Value = F_DictionaryValueId;
 
-            Model.T_Sys_DictionaryValue model = new Model.T_Sys_DictionaryValue();
+            CallCenterApi.Model.T_Sys_DictionaryValue model = new CallCenterApi.Model.T_Sys_DictionaryValue();
             DataSet ds = DbHelperSQL.Query(strSql.ToString(), parameters);
             if (ds.Tables[0].Rows.Count > 0)
             {
@@ -184,9 +186,9 @@ namespace CallCenterApi.DAL
         /// <summary>
         /// 得到一个对象实体
         /// </summary>
-        public Model.T_Sys_DictionaryValue DataRowToModel(DataRow row)
+        public CallCenterApi.Model.T_Sys_DictionaryValue DataRowToModel(DataRow row)
         {
-            Model.T_Sys_DictionaryValue model = new Model.T_Sys_DictionaryValue();
+            CallCenterApi.Model.T_Sys_DictionaryValue model = new CallCenterApi.Model.T_Sys_DictionaryValue();
             if (row != null)
             {
                 if (row["F_DictionaryValueId"] != null && row["F_DictionaryValueId"].ToString() != "")
@@ -213,9 +215,20 @@ namespace CallCenterApi.DAL
                 {
                     model.F_Describe = row["F_Describe"].ToString();
                 }
-                if (row["F_State"] != null && row["F_State"] != DBNull.Value)
+                if (row["F_State"] != null && row["F_State"].ToString() != "")
                 {
-                    model.F_State = Convert.ToBoolean(row["F_State"]);
+                    if ((row["F_State"].ToString() == "1") || (row["F_State"].ToString().ToLower() == "true"))
+                    {
+                        model.F_State = true;
+                    }
+                    else
+                    {
+                        model.F_State = false;
+                    }
+                }
+                if (row["F_GroupCode"] != null)
+                {
+                    model.F_GroupCode = row["F_GroupCode"].ToString();
                 }
             }
             return model;
@@ -227,7 +240,7 @@ namespace CallCenterApi.DAL
         public DataSet GetList(string strWhere)
         {
             StringBuilder strSql = new StringBuilder();
-            strSql.Append("select F_DictionaryValueId,F_DictionaryFlag,F_ValueCode,F_Name,F_Sort,F_Describe,F_State ");
+            strSql.Append("select F_DictionaryValueId,F_DictionaryFlag,F_ValueCode,F_Name,F_Sort,F_Describe,F_State,F_GroupCode ");
             strSql.Append(" FROM T_Sys_DictionaryValue ");
             if (strWhere.Trim() != "")
             {
@@ -247,7 +260,7 @@ namespace CallCenterApi.DAL
             {
                 strSql.Append(" top " + Top.ToString());
             }
-            strSql.Append(" F_DictionaryValueId,F_DictionaryFlag,F_ValueCode,F_Name,F_Sort,F_Describe,F_State ");
+            strSql.Append(" F_DictionaryValueId,F_DictionaryFlag,F_ValueCode,F_Name,F_Sort,F_Describe,F_State,F_GroupCode ");
             strSql.Append(" FROM T_Sys_DictionaryValue ");
             if (strWhere.Trim() != "")
             {
@@ -304,6 +317,30 @@ namespace CallCenterApi.DAL
             return DbHelperSQL.Query(strSql.ToString());
         }
 
+        /*
+		/// <summary>
+		/// 分页获取数据列表
+		/// </summary>
+		public DataSet GetList(int PageSize,int PageIndex,string strWhere)
+		{
+			SqlParameter[] parameters = {
+					new SqlParameter("@tblName", SqlDbType.VarChar, 255),
+					new SqlParameter("@fldName", SqlDbType.VarChar, 255),
+					new SqlParameter("@PageSize", SqlDbType.Int),
+					new SqlParameter("@PageIndex", SqlDbType.Int),
+					new SqlParameter("@IsReCount", SqlDbType.Bit),
+					new SqlParameter("@OrderType", SqlDbType.Bit),
+					new SqlParameter("@strWhere", SqlDbType.VarChar,1000),
+					};
+			parameters[0].Value = "T_Sys_DictionaryValue";
+			parameters[1].Value = "F_DictionaryValueId";
+			parameters[2].Value = PageSize;
+			parameters[3].Value = PageIndex;
+			parameters[4].Value = 0;
+			parameters[5].Value = 0;
+			parameters[6].Value = strWhere;	
+			return DbHelperSQL.RunProcedure("UP_GetRecordByPage",parameters,"ds");
+		}*/
 
         #endregion  BasicMethod
         #region  ExtensionMethod
@@ -311,3 +348,4 @@ namespace CallCenterApi.DAL
         #endregion  ExtensionMethod
     }
 }
+

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/AreaController.cs

@@ -25,7 +25,13 @@ namespace CallCenterApi.Interface.Controllers
             int userId = CurrentUser.UserData.F_UserId;
             Model.T_Sys_UserAccount userModel = new BLL.T_Sys_UserAccount().GetModel(userId);
 
-            DataTable dt = areaBLL.GetList(0, "F_GroupCode = '" + userModel.groupcode + "'", " F_Sort").Tables[0];
+            string where = " F_IsDelete=0 ";
+            if (!string.IsNullOrEmpty(userModel.groupcode))
+            {
+                where += " and F_GroupCode = '" + userModel.groupcode + "'";
+            }
+
+            DataTable dt = areaBLL.GetList(0, where, " F_Sort asc").Tables[0];
             return Success("加载成功", dt);
         }
 
@@ -38,7 +44,13 @@ namespace CallCenterApi.Interface.Controllers
             int userId = CurrentUser.UserData.F_UserId;
             Model.T_Sys_UserAccount userModel = new BLL.T_Sys_UserAccount().GetModel(userId);
 
-            DataTable dt = areaBLL.GetList(" isnull(F_ParentId,0)='" + id + "' and F_GroupCode = '" + userModel.groupcode + "' and F_State=0 ").Tables[0];
+            string where = " isnull(F_ParentId,0)='" + id + "' and F_IsDelete=0 ";
+            if (!string.IsNullOrEmpty(userModel.groupcode))
+            {
+                where += " and F_GroupCode = '" + userModel.groupcode + "'";
+            }
+
+            DataTable dt = areaBLL.GetList(0, where, " F_Sort asc").Tables[0];
             return Success("列表加载成功", dt);
         }
 
@@ -77,7 +89,7 @@ namespace CallCenterApi.Interface.Controllers
             Model.T_Sys_Area dModel = new Model.T_Sys_Area();
             if (id == 0)
             {
-                var list = areaBLL.GetModelList(" F_Id='" + id + "' and F_AreaName='" + name + "' ");
+                var list = areaBLL.GetModelList(" F_Id='" + id + "' and F_AreaName='" + name + "' and F_IsDelete=0 ");
                 if (list.Count > 0)
                 {
                     return Error("已经存在此区域");
@@ -104,7 +116,7 @@ namespace CallCenterApi.Interface.Controllers
                 dModel = areaBLL.GetModel(id);
                 if (dModel != null)
                 {
-                    var list = areaBLL.GetModelList(" F_Id='" + id + "' and F_AreaName='" + name + "' and F_Id!='" + id + "' ");
+                    var list = areaBLL.GetModelList(" F_Id='" + id + "' and F_AreaName='" + name + "' and F_Id!='" + id + "' and F_IsDelete=0 ");
                     if (list.Count > 0)
                     {
                         return Error("已经存在此区域");

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/DepartmentController.cs

@@ -11,7 +11,7 @@ using System.Web.Mvc;
 
 namespace CallCenterApi.Interface.Controllers
 {
-    //[Authority]
+    [Authority]
     public class DepartmentController : BaseController
     {
         private BLL.T_Sys_Department departmentBLL = new BLL.T_Sys_Department();
@@ -24,8 +24,15 @@ namespace CallCenterApi.Interface.Controllers
         {
             if (Request.IsAuthenticated)
             {
-                DataTable dt = new DataTable();
-                dt = new BLL.T_Sys_Department().GetList(" F_State=1 ").Tables[0];
+                //int userId = CurrentUser.UserData.F_UserId;
+                //Model.T_Sys_UserAccount userModel = new BLL.T_Sys_UserAccount().GetModel(userId);
+                string where = "F_State='1'";
+                //if (!string.IsNullOrEmpty(userModel.groupcode))
+                //{
+                //    where += " and F_GroupCode = '" + userModel.groupcode + "'";
+                //}
+
+                DataTable dt = departmentBLL.GetList(0, where, " F_Sort asc").Tables[0];
                 return Success("加载成功", dt);
             }
             return NoToken("未知错误，请重新登录");
@@ -67,6 +74,9 @@ namespace CallCenterApi.Interface.Controllers
             ActionResult res = NoToken("未知错误，请重新登录");
             if (Request.IsAuthenticated)
             {
+                //int userId = CurrentUser.UserData.F_UserId;
+                //Model.T_Sys_UserAccount userModel = new BLL.T_Sys_UserAccount().GetModel(userId);
+
                 string pcode = "";
                 Model.T_Sys_Department dModel = new Model.T_Sys_Department();
                 dModel.F_ParentId = input.PId;
@@ -81,6 +91,7 @@ namespace CallCenterApi.Interface.Controllers
                 dModel.F_Sort = input.Sort;
                 dModel.F_DeptName = input.DeptName;
                 dModel.F_State = 1;
+                //dModel.F_GroupCode = userModel.groupcode;
                 int id = departmentBLL.Add(dModel);
                 if (id> 0)
                 {
@@ -109,6 +120,7 @@ namespace CallCenterApi.Interface.Controllers
                 Model.T_Sys_Department dModel = dBLL.GetModel(input.DeptId);
                 if (dModel == null)
                     return Error("获取信息失败");
+
                 dModel.F_ParentId = input.PId;
                 if (input.PId != 0)
                 {
@@ -159,8 +171,17 @@ namespace CallCenterApi.Interface.Controllers
         {
             if (Request.IsAuthenticated)
             {
+                //int userId = CurrentUser.UserData.F_UserId;
+                //Model.T_Sys_UserAccount userModel = new BLL.T_Sys_UserAccount().GetModel(userId);
+
                 DataTable dt = new DataTable();
-                dt = new BLL.T_Sys_Department().GetList(" F_State=1 and F_ParentId=" + pId).Tables[0];
+                string where = " isnull(F_ParentId,0)='" + pId + "' and F_State=1 ";
+                //if (!string.IsNullOrEmpty(userModel.groupcode))
+                //{
+                //    where += " and F_GroupCode = '" + userModel.groupcode + "'";
+                //}
+                dt = new BLL.T_Sys_Department().GetList(0, where, " F_Sort asc").Tables[0];
+
                 List<Model.TreeModel> modelList = BindTree(dt, "0");
 
                 if (modelList != null) {

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/DictionaryController.cs

@@ -12,7 +12,7 @@ using System.Web.Mvc;
 
 namespace CallCenterApi.Interface.Controllers
 {
-    
+    [Authority]
     public class DictionaryController : BaseController
     {
         private BLL.T_Sys_DictionaryBase dictionaryBaseBLL = new BLL.T_Sys_DictionaryBase();
@@ -26,14 +26,21 @@ namespace CallCenterApi.Interface.Controllers
         /// <returns></returns>
         public ActionResult GetList(FilterDictionary filter)
         {
-            ActionResult res = NoToken("未知错误，请重新登录");
             if (Request.IsAuthenticated)
             {
                 var sql = " and F_State=1 ";
+                int userId = CurrentUser.UserData.F_UserId;
+                Model.T_Sys_UserAccount userModel = new BLL.T_Sys_UserAccount().GetModel(userId);
+
+                if (!string.IsNullOrEmpty(userModel.groupcode))
+                {
+                    sql += " and F_GroupCode = '" + userModel.groupcode + "'";
+                }
+
                 var recordCount = 0;
                 var dt = BLL.PagerBLL.GetListPager(
                   "T_Sys_DictionaryBase",
-                  "F_DictionaryFlag",
+                  "F_Id",
                   "*",
                   sql,
                   "ORDER BY F_Sort ",
@@ -46,39 +53,40 @@ namespace CallCenterApi.Interface.Controllers
                 {
                     rows = modelList.Select(x => new
                     {
+                        id = x.F_Id,
                         name = x.F_DictionaryName,
                         flag = x.F_DictionaryFlag,
                         sort = x.F_Sort
                     }),
                     total = recordCount
                 };
-                res = Content(obj.ToJson());
+                return Content(obj.ToJson());
             }
-            return res;
+            return NoToken("未知错误，请重新登录");
         }
 
         /// <summary>
         /// 获取字典
         /// </summary>
-        /// <param name="dicFlag"></param>
+        /// <param name="id"></param>
         /// <returns></returns>
-        public ActionResult GetDic(string dicFlag)
+        public ActionResult GetDic(int id)
         {
-            ActionResult res = NoToken("未知错误，请重新登录");
             if (Request.IsAuthenticated)
             {
-                Model.T_Sys_DictionaryBase baseModel = dictionaryBaseBLL.GetModel(dicFlag);
+                Model.T_Sys_DictionaryBase baseModel = dictionaryBaseBLL.GetModel(id);
                 if (baseModel != null)
-                    res = Success("加载字典成功", new
+                    return Success("加载字典成功", new
                     {
+                        id = baseModel.F_Id,
                         name = baseModel.F_DictionaryName,
                         flag = baseModel.F_DictionaryFlag,
                         sort = baseModel.F_Sort
                     });
                 else
-                    res = Error("加载字典失败");
+                    return Error("加载字典失败");
             }
-            return res;
+            return NoToken("未知错误，请重新登录");
         }
         //[Authority]
         /// <summary>
@@ -88,26 +96,29 @@ namespace CallCenterApi.Interface.Controllers
         /// <returns></returns>
         public ActionResult AddDic(DictionaryBaseInput input)
         {
-            ActionResult res = NoToken("未知错误，请重新登录");
             if (Request.IsAuthenticated)
             {
+                int userId = CurrentUser.UserData.F_UserId;
+                Model.T_Sys_UserAccount userModel = new BLL.T_Sys_UserAccount().GetModel(userId);
+
                 Model.T_Sys_DictionaryBase orderModel = new Model.T_Sys_DictionaryBase();
                 BLL.T_Sys_DictionaryBase orderBll = new BLL.T_Sys_DictionaryBase();
-                var model = orderBll.GetModel(input.DicFlag.Trim());
-                if (model != null)
+                var list = orderBll.GetList(" F_DictionaryFlag='" + input.DicFlag.Trim() + "' and F_GroupCode='" + userModel.groupcode + "'").Tables[0];
+                if (list.Rows.Count >0)
                     return Error("字典标志已存在");
                 orderModel.F_DictionaryFlag = input.DicFlag;
                 orderModel.F_DictionaryName = input.Name;
                 orderModel.F_Describe = input.Remark;
                 orderModel.F_State = true;
                 orderModel.F_Sort = input.Sort;
+                orderModel.F_GroupCode = userModel.groupcode;
 
-                if (orderBll.Add(orderModel))
-                    res = Success("字典添加成功");
+                if (orderBll.Add(orderModel)>0)
+                    return Success("字典添加成功");
                 else
-                    res = Error("字典添加失败");
+                    return Error("字典添加失败");
             }
-            return res;
+            return NoToken("未知错误，请重新登录");
         }
 
         //[Authority]
@@ -118,11 +129,10 @@ namespace CallCenterApi.Interface.Controllers
         /// <returns></returns>
         public ActionResult EditDic(DictionaryBaseInput input)
         {
-            ActionResult res = NoToken("未知错误，请重新登录");
             if (Request.IsAuthenticated)
             {
                 BLL.T_Sys_DictionaryBase orderBll = new BLL.T_Sys_DictionaryBase();
-                Model.T_Sys_DictionaryBase orderModel = orderBll.GetModel(input.DicFlag.Trim());
+                Model.T_Sys_DictionaryBase orderModel = orderBll.GetModel(input.DicId);
                 if (orderModel == null)
                     return Error("字典对象不存在");
                 orderModel.F_DictionaryFlag = input.DicFlag;
@@ -130,11 +140,11 @@ namespace CallCenterApi.Interface.Controllers
                 orderModel.F_Describe = input.Remark;
                 orderModel.F_Sort = input.Sort;
                 if (orderBll.Update(orderModel))
-                    res = Success("字典添加成功");
+                    return Success("字典添加成功");
                 else
-                    res = Error("字典添加失败");
+                    return Error("字典添加失败");
             }
-            return res;
+            return NoToken("未知错误，请重新登录");
         }
 
         //[Authority]
@@ -145,7 +155,6 @@ namespace CallCenterApi.Interface.Controllers
         /// <returns></returns>
         public ActionResult DelDic(string[] ids)
         {
-            ActionResult res = NoToken("未知错误，请重新登录");
             if (Request.IsAuthenticated)
             {
                 if (ids == null || ids.Length <= 0)
@@ -156,11 +165,11 @@ namespace CallCenterApi.Interface.Controllers
                     sb.Append("'" + item + "',");
                 }
                 if (new BLL.T_Sys_DictionaryBase().DeleteList(sb.ToString().Trim(',')))
-                    res = Success("删除成功");
+                    return Success("删除成功");
                 else
-                    res = Error("删除失败");
+                    return Error("删除失败");
             }
-            return res;
+            return NoToken("未知错误，请重新登录");
         }
         #endregion
 
@@ -169,13 +178,18 @@ namespace CallCenterApi.Interface.Controllers
         //获取字典值列表
         public ActionResult GetDicValueList(FilterDictionary filter)
         {
-             ActionResult res = NoToken("未知错误，请重新登录");
             if (Request.IsAuthenticated)
             {
-                string sql = "";
-                DataTable dt = new DataTable();
+                var sql = " and F_State=1 ";
+                int userId = CurrentUser.UserData.F_UserId;
+                Model.T_Sys_UserAccount userModel = new BLL.T_Sys_UserAccount().GetModel(userId);
 
+                if (!string.IsNullOrEmpty(userModel.groupcode))
+                {
+                    sql += " and F_GroupCode = '" + userModel.groupcode + "'";
+                }
 
+                DataTable dt = new DataTable();
 
                 if (!string.IsNullOrWhiteSpace(filter.Id))
                 {
@@ -210,38 +224,42 @@ namespace CallCenterApi.Interface.Controllers
                     total = recordCount
                 };
 
-                res = Content(obj.ToJson());
+                return Content(obj.ToJson());
             }
-            return res;
+            return NoToken("未知错误，请重新登录");
         }
 
         //获取字典值列表
         public ActionResult GetDicValueListByFlag(string flag)
         {
-            ActionResult res = NoToken("未知错误，请重新登录");
             if (Request.IsAuthenticated)
             {
+                var sql = "  F_DictionaryFlag='" + flag + "' and F_State=1 ";
+                int userId = CurrentUser.UserData.F_UserId;
+                Model.T_Sys_UserAccount userModel = new BLL.T_Sys_UserAccount().GetModel(userId);
 
-                DataTable dt = new DataTable();
+                if (!string.IsNullOrEmpty(userModel.groupcode))
+                {
+                    sql += " and F_GroupCode = '" + userModel.groupcode + "'";
+                }
 
-                dt = new BLL.T_Sys_DictionaryValue().GetList(" F_DictionaryFlag='" + flag + "' and F_State=1 ").Tables[0];
+                DataTable dt = new BLL.T_Sys_DictionaryValue().GetList(0, sql, " F_Sort asc").Tables[0];
 
-                res = Success("列表加载成功", dt);
+                return Success("列表加载成功", dt);
             }
-            return res;
+            return NoToken("未知错误，请重新登录");
         }
 
         //加载字典值
         public ActionResult GetDicValue(int dicValueId = 0)
         {
-            ActionResult res = NoToken("未知错误，请重新登录");
             if (Request.IsAuthenticated)
             {
                 if (dicValueId <= 0)
                     return Error("字典值标识传输失败");
                 Model.T_Sys_DictionaryValue valueModel = dictionaryValueBLL.GetModel(dicValueId);
                 if (valueModel != null)
-                    res = Success("加载字典值成功", new
+                    return Success("加载字典值成功", new
                     {
                         id = valueModel.F_DictionaryValueId,
                         dicflag = valueModel.F_DictionaryFlag,
@@ -250,18 +268,21 @@ namespace CallCenterApi.Interface.Controllers
                         sort = valueModel.F_Sort,
                     });
                 else
-                    res = Error("加载字典值失败");
+                    return Error("加载字典值失败");
             }
-            return res;
+            return NoToken("未知错误，请重新登录");
         }
 
         //[Authority]
         //添加字典值
         public ActionResult AddDicValue(DictionaryValueInput input)
         {
-            ActionResult res = NoToken("未知错误，请重新登录");
             if (Request.IsAuthenticated)
             {
+
+                int userId = CurrentUser.UserData.F_UserId;
+                Model.T_Sys_UserAccount userModel = new BLL.T_Sys_UserAccount().GetModel(userId);
+
                 Model.T_Sys_DictionaryValue orderModel = new Model.T_Sys_DictionaryValue();
                 BLL.T_Sys_DictionaryValue orderBll = new BLL.T_Sys_DictionaryValue();
 
@@ -271,20 +292,19 @@ namespace CallCenterApi.Interface.Controllers
                 orderModel.F_ValueCode = "";
                 orderModel.F_DictionaryFlag = input.DicFlag;
                 orderModel.F_Sort = input.Sort;
-
+                orderModel.F_GroupCode = userModel.groupcode;
 
                 if (orderBll.Add(orderModel) > 0)
-                    res = Success("字典值添加成功");
+                    return Success("字典值添加成功");
                 else
-                    res = Error("字典值添加失败");
+                    return Error("字典值添加失败");
             }
-            return res;
+            return NoToken("未知错误，请重新登录");
         }
         ////[Authority]
         //编辑字典值
         public ActionResult EditDicValue(DictionaryValueInput input)
         {
-            ActionResult res = NoToken("未知错误，请重新登录");
             if (Request.IsAuthenticated)
             {
                 if (input.DicVid <= 0)
@@ -299,33 +319,28 @@ namespace CallCenterApi.Interface.Controllers
                 orderModel.F_DictionaryFlag = input.DicFlag;
                 orderModel.F_Sort = input.Sort;
                 if (orderBll.Update(orderModel))
-                    res = Success("字典值编辑成功");
+                    return Success("字典值编辑成功");
                 else
-                    res = Error("字典值编辑失败");
+                    return Error("字典值编辑失败");
             }
-            return res;
+            return NoToken("未知错误，请重新登录");
         }
         //[Authority]
         //删除字典值
         public ActionResult DelDicValue(string[] ids)
         {
-            ActionResult res = NoToken("未知错误，请重新登录");
             if (Request.IsAuthenticated)
             {
                 if (ids == null || ids.Length <= 0)
                     return Error("获取参数失败");
                 var idStr = string.Join(",", ids);
                 if (new BLL.T_Sys_DictionaryValue().DeleteList(idStr))
-                    res = Success("删除成功");
+                    return Success("删除成功");
                 else
-                    res = Error("删除失败");
+                    return Error("删除失败");
             }
-            return res;
+            return NoToken("未知错误，请重新登录");
         }
         #endregion
-
-
-
-
     }
 }

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

@@ -152,7 +152,8 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 }
                 if (strkey.Trim() != "" && strkey != "undefined")
                 {
-                    sql += " and F_Content like '%" + strkey + "%' ";
+                    sql += " and (F_Content like '%" + strkey + "%' or F_Name like '%" + strkey + "%' or F_Province like '%" + strkey + "%' or F_City like '%" 
+                        + strkey + "%' or F_CreateUser like '%" + strkey + "%' or F_VIPPhone like '%" + strkey + "%') ";
                 }
                 if (strworkid.Trim() != "" && strworkid != "undefined")
                 {
@@ -198,7 +199,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     pagesize = Convert.ToInt32(strpagesize);
                 }
 
-                string cols = "*,dbo.GetUserName(F_CreateUser) as UserName,dbo.GetDictionaryName(F_Type) as TypeName,dbo.GetDictionaryName(F_Source) as SourceName";
+                string cols = "*,dbo.GetUserName(F_CreateUser) as UserName,dbo.GetDictionaryName(F_Type) as TypeName,dbo.GetDictionaryName(F_SmallType) as SmallTypeName,dbo.GetDictionaryName(F_Source) as SourceName";
 
                 if (isdc > 0)
                 {
@@ -271,7 +272,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
 
             if (!string.IsNullOrEmpty(strworkorderid))
             {
-                string sql = "select *,dbo.GetUserName(F_CreateUser) as UserName,dbo.GetDictionaryName(F_Type) as TypeName,"
+                string sql = "select *,dbo.GetUserName(F_CreateUser) as UserName,dbo.GetDictionaryName(F_Type) as TypeName,dbo.GetDictionaryName(F_SmallType) as SmallTypeName,"
                     + "dbo.GetDictionaryName(F_Source) as SourceName  from T_Bus_WorkOrder where F_WorkOrderId ='" + strworkorderid + "'";
                 var dt = DbHelperSQL.Query(sql).Tables[0];
                 if (dt.Rows.Count > 0)
@@ -311,6 +312,17 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     }
                     #endregion
 
+                    #region 跟进信息
+                    string gjsql = "select *,dbo.GetUserName(F_CreateUser) as UserName from T_Bus_Follow "
+                        + "where F_State=1 and F_IsDelete=0 and F_WorkOrderId ='" + strworkorderid + "'";
+
+                    var gjdt = DbHelperSQL.Query(gjsql).Tables[0];
+                    if (configfj != null)
+                    {
+                        gjdt = BindFileData(gjdt, configfj.F_ParamValue);
+                    }
+                    #endregion
+
                     #region 办理过程
                     string gcsql = "select *,dbo.GetUserName(F_CreateUser) as UserName "
                                     + "from T_Bus_Operation where F_IsDelete=0 and F_WorkOrderId ='" + strworkorderid + "'";
@@ -342,7 +354,8 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     {
                         data = dt,
                         cbdata = cbdt,
-                        gcdata = gcdt
+                        gcdata = gcdt,
+                        gjdata = gjdt
                     };
                     return Success("获取成功", obj);
                 }
@@ -385,8 +398,8 @@ namespace CallCenterApi.Interface.Controllers.workorder
             string buydate = RequestString.GetFormString("buydate");
             //购买地点
             string buyaddress = RequestString.GetFormString("buyaddress");
-            //产品类别
-            string producttype = RequestString.GetFormString("producttype");
+            ////产品类别
+            //string producttype = RequestString.GetFormString("producttype");
             //生产日期
             string productdate = RequestString.GetFormString("productdate");
             //生产批号
@@ -405,6 +418,10 @@ namespace CallCenterApi.Interface.Controllers.workorder
             string files = RequestString.GetFormString("files");
             //类型
             int type = RequestString.GetInt("type", 0);
+            //子类型
+            int smalltype = RequestString.GetInt("smalltype", 0);
+            //产品类别
+            int producttype = RequestString.GetInt("producttype", 0);
             //来源
             int source = RequestString.GetInt("source", 0);
             //是否寄回
@@ -431,6 +448,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
 
                 modelT_Bus_WorkOrder.F_Source = source;//信息来源
                 modelT_Bus_WorkOrder.F_Type = type;//信息类别
+                modelT_Bus_WorkOrder.F_SmallType = smalltype;//信息子类别
                 modelT_Bus_WorkOrder.F_CusName = cusname;//投诉人姓名
                 modelT_Bus_WorkOrder.F_CusSex = cussex;//性别
                 modelT_Bus_WorkOrder.F_CusPhone = cusphone;//来电号码
@@ -535,8 +553,8 @@ namespace CallCenterApi.Interface.Controllers.workorder
             string buydate = RequestString.GetFormString("buydate");
             //购买地点
             string buyaddress = RequestString.GetFormString("buyaddress");
-            //产品类别
-            string producttype = RequestString.GetFormString("producttype");
+            ////产品类别
+            //string producttype = RequestString.GetFormString("producttype");
             //生产批号
             string batchnumber = RequestString.GetFormString("batchnumber");
             //使用日期
@@ -553,6 +571,10 @@ namespace CallCenterApi.Interface.Controllers.workorder
             string files = RequestString.GetFormString("files");
             //类型
             int type = RequestString.GetInt("type", 0);
+            //子类型
+            int smalltype = RequestString.GetInt("smalltype", 0);
+            //产品类别
+            int producttype = RequestString.GetInt("producttype", 0);
             //来源
             int source = RequestString.GetInt("source", 0);
             //是否寄回
@@ -583,6 +605,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
 
                     modelT_Bus_WorkOrder.F_Source = source;//信息来源
                     modelT_Bus_WorkOrder.F_Type = type;//信息类别
+                    modelT_Bus_WorkOrder.F_SmallType = smalltype;//信息子类别
                     modelT_Bus_WorkOrder.F_CusName = cusname;//投诉人姓名
                     modelT_Bus_WorkOrder.F_CusSex = cussex;//性别
                     modelT_Bus_WorkOrder.F_CusPhone = cusphone;//来电号码
@@ -723,6 +746,63 @@ namespace CallCenterApi.Interface.Controllers.workorder
         }
 
         /// <summary>
+        /// 跟进工单
+        /// </summary>
+        /// <returns></returns>
+        public ActionResult FllowWorkOrder()
+        {
+            int userId = CurrentUser.UserData.F_UserId;
+            Model.T_Sys_UserAccount userModel = userBLL.GetModel(userId);
+
+            string workorderid = RequestString.GetFormString("workid");
+            string title = RequestString.GetFormString("title");
+            string content = RequestString.GetFormString("content");
+            string files = RequestString.GetFormString("files");
+
+            Model.T_Bus_WorkOrder modelT_Bus_WorkOrder = workorderBLL.GetModel(workorderid);
+            if (modelT_Bus_WorkOrder != null)
+            {
+                using (TransactionScope trans = new TransactionScope())
+                {
+                    #region 插入督办记录
+                    Model.T_Bus_Follow modelT_Bus_Follow = new Model.T_Bus_Follow();
+                    modelT_Bus_Follow.F_WorkOrderId = modelT_Bus_WorkOrder.F_WorkOrderId;
+                    modelT_Bus_Follow.F_Title = title;
+                    modelT_Bus_Follow.F_Content = content;
+                    modelT_Bus_Follow.F_File = files;
+                    modelT_Bus_Follow.F_State = 1;
+                    modelT_Bus_Follow.F_IsDelete = 0;
+                    modelT_Bus_Follow.F_CreateUser = userModel.F_UserCode;
+                    modelT_Bus_Follow.F_CreateTime = DateTime.Now;
+
+                    new BLL.T_Bus_Follow().Add(modelT_Bus_Follow);
+                    #endregion
+
+                    #region 插入操作记录
+                    Model.T_Bus_Operation oper = new Model.T_Bus_Operation();
+                    oper.F_WorkOrderId = modelT_Bus_WorkOrder.F_WorkOrderId;
+                    oper.F_State = modelT_Bus_WorkOrder.F_State;
+
+                    string userinfo = userModel.F_UserName + "(" + userModel.F_UserCode + ")";
+                    oper.F_Message = userinfo + " 跟进了工单";
+                    oper.F_CreateUser = userModel.F_UserCode;
+                    oper.F_CreateTime = DateTime.Now;
+                    oper.F_IsDelete = 0;
+
+                    new BLL.T_Bus_Operation().Add(oper);
+                    #endregion
+
+                    trans.Complete();
+                }
+                return Success("操作成功");
+            }
+            else
+            {
+                return Error("操作失败");
+            }
+        }
+
+        /// <summary>
         /// 处理工单
         /// </summary>
         /// <returns></returns>

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

@@ -7,6 +7,7 @@ namespace CallCenterApi.Interface.Models.Input
 {
     public class DictionaryBaseInput
     {
+        public int DicId { get; set; }
         public string DicFlag { get; set; }
         public string Name { get; set; }
         public int Sort { get; set; } = 0;
@@ -21,7 +22,5 @@ namespace CallCenterApi.Interface.Models.Input
         public string DicvName { get; set; }
         public int Sort { get; set; } = 0;
         public string DicDes { get; set; }
-
-
     }
 }

codegit/CallCenterApi/CallCenterApi.Model/CallCenterApi.Model.csproj

@@ -51,6 +51,7 @@
     <Compile Include="QCModel.cs" />
     <Compile Include="telloc_users.cs" />
     <Compile Include="TreeModel.cs" />
+    <Compile Include="T_Bus_Follow.cs" />
     <Compile Include="T_Bus_Operation.cs" />
     <Compile Include="T_Bus_RemindRecord.cs" />
     <Compile Include="T_Bus_WorkOrder.cs" />

codegit/CallCenterApi/CallCenterApi.Model/T_Bus_Follow.cs

@@ -0,0 +1,125 @@
+using System;
+namespace CallCenterApi.Model
+{
+    /// <summary>
+    /// T_Bus_Follow:实体类(属性说明自动提取数据库字段的描述信息)
+    /// </summary>
+    [Serializable]
+    public partial class T_Bus_Follow
+    {
+        public T_Bus_Follow()
+        { }
+        #region Model
+        private int _f_id;
+        private string _f_workorderid;
+        private string _f_title;
+        private string _f_content;
+        private string _f_remark;
+        private string _f_file;
+        private int? _f_state;
+        private string _f_createuser;
+        private DateTime? _f_createtime;
+        private int? _f_isdelete;
+        private string _f_deleteuser;
+        private DateTime? _f_deletetime;
+        /// <summary>
+        /// 
+        /// </summary>
+        public int F_Id
+        {
+            set { _f_id = value; }
+            get { return _f_id; }
+        }
+        /// <summary>
+        /// 
+        /// </summary>
+        public string F_WorkOrderId
+        {
+            set { _f_workorderid = value; }
+            get { return _f_workorderid; }
+        }
+        /// <summary>
+        /// 
+        /// </summary>
+        public string F_Title
+        {
+            set { _f_title = value; }
+            get { return _f_title; }
+        }
+        /// <summary>
+        /// 
+        /// </summary>
+        public string F_Content
+        {
+            set { _f_content = value; }
+            get { return _f_content; }
+        }
+        /// <summary>
+        /// 
+        /// </summary>
+        public string F_Remark
+        {
+            set { _f_remark = value; }
+            get { return _f_remark; }
+        }
+        /// <summary>
+        /// 
+        /// </summary>
+        public string F_File
+        {
+            set { _f_file = value; }
+            get { return _f_file; }
+        }
+        /// <summary>
+        /// 
+        /// </summary>
+        public int? F_State
+        {
+            set { _f_state = value; }
+            get { return _f_state; }
+        }
+        /// <summary>
+        /// 
+        /// </summary>
+        public string F_CreateUser
+        {
+            set { _f_createuser = value; }
+            get { return _f_createuser; }
+        }
+        /// <summary>
+        /// 
+        /// </summary>
+        public DateTime? F_CreateTime
+        {
+            set { _f_createtime = value; }
+            get { return _f_createtime; }
+        }
+        /// <summary>
+        /// 
+        /// </summary>
+        public int? F_IsDelete
+        {
+            set { _f_isdelete = value; }
+            get { return _f_isdelete; }
+        }
+        /// <summary>
+        /// 
+        /// </summary>
+        public string F_DeleteUser
+        {
+            set { _f_deleteuser = value; }
+            get { return _f_deleteuser; }
+        }
+        /// <summary>
+        /// 
+        /// </summary>
+        public DateTime? F_DeleteTime
+        {
+            set { _f_deletetime = value; }
+            get { return _f_deletetime; }
+        }
+        #endregion Model
+
+    }
+}
+

codegit/CallCenterApi/CallCenterApi.Model/T_Bus_WorkOrder.cs

@@ -16,6 +16,7 @@ namespace CallCenterApi.Model
         private string _f_cusname;
         private string _f_cussex;
         private int? _f_type;
+        private int? _f_smalltype;
         private string _f_content;
         private string _f_file;
         private int? _f_source;
@@ -23,7 +24,7 @@ namespace CallCenterApi.Model
         private string _f_productdate;
         private string _f_buydate;
         private string _f_buyaddress;
-        private string _f_producttype;
+        private int? _f_producttype;
         private string _f_batchnumber;
         private string _f_userdate;
         private int? _f_isback;
@@ -94,7 +95,7 @@ namespace CallCenterApi.Model
             get { return _f_cussex; }
         }
         /// <summary>
-        /// 原因
+        /// 工单类型
         /// </summary>
         public int? F_Type
         {
@@ -102,6 +103,14 @@ namespace CallCenterApi.Model
             get { return _f_type; }
         }
         /// <summary>
+        /// 工单类型子类型
+        /// </summary>
+        public int? F_SmallType
+        {
+            set { _f_smalltype = value; }
+            get { return _f_smalltype; }
+        }
+        /// <summary>
         /// 事件描述
         /// </summary>
         public string F_Content
@@ -160,7 +169,7 @@ namespace CallCenterApi.Model
         /// <summary>
         /// 产品类别
         /// </summary>
-        public string F_ProductType
+        public int? F_ProductType
         {
             set { _f_producttype = value; }
             get { return _f_producttype; }

codegit/CallCenterApi/CallCenterApi.Model/T_Sys_Department.cs

@@ -1,9 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
 namespace CallCenterApi.Model
 {
     /// <summary>
@@ -31,8 +26,9 @@ namespace CallCenterApi.Model
         private string _f_otherphone;
         private string _f_email;
         private int? _f_header;
+        private string _f_groupcode;
         /// <summary>
-        /// 
+        /// 部门自增ID
         /// </summary>
         public int F_DeptId
         {
@@ -40,7 +36,7 @@ namespace CallCenterApi.Model
             get { return _f_deptid; }
         }
         /// <summary>
-        /// 
+        /// 对接系统的ID
         /// </summary>
         public string F_DeptCode
         {
@@ -56,7 +52,7 @@ namespace CallCenterApi.Model
             get { return _f_parentname; }
         }
         /// <summary>
-        /// 
+        /// 父节点ID
         /// </summary>
         public int F_ParentId
         {
@@ -72,7 +68,7 @@ namespace CallCenterApi.Model
             get { return _f_parentcode; }
         }
         /// <summary>
-        /// 
+        /// 部门名称
         /// </summary>
         public string F_DeptName
         {
@@ -80,7 +76,7 @@ namespace CallCenterApi.Model
             get { return _f_deptname; }
         }
         /// <summary>
-        /// 
+        /// 状态
         /// </summary>
         public int? F_State
         {
@@ -104,7 +100,7 @@ namespace CallCenterApi.Model
             get { return _f_type; }
         }
         /// <summary>
-        /// 
+        /// 排序编号
         /// </summary>
         public int? F_Sort
         {
@@ -159,6 +155,16 @@ namespace CallCenterApi.Model
             set { _f_header = value; }
             get { return _f_header; }
         }
+        /// <summary>
+        /// 
+        /// </summary>
+        public string F_GroupCode
+        {
+            set { _f_groupcode = value; }
+            get { return _f_groupcode; }
+        }
         #endregion Model
+
     }
 }
+

codegit/CallCenterApi/CallCenterApi.Model/T_Sys_DictionaryBase.cs

@@ -1,25 +1,30 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
 namespace CallCenterApi.Model
 {
     /// <summary>
-	/// T_Sys_DictionaryBase:实体类(属性说明自动提取数据库字段的描述信息)
-	/// </summary>
-	[Serializable]
+    /// T_Sys_DictionaryBase:实体类(属性说明自动提取数据库字段的描述信息)
+    /// </summary>
+    [Serializable]
     public partial class T_Sys_DictionaryBase
     {
         public T_Sys_DictionaryBase()
         { }
         #region Model
+        private int _f_id;
         private string _f_dictionaryflag;
         private string _f_dictionaryname;
         private int? _f_sort;
         private string _f_describe;
         private bool _f_state;
+        private string _f_groupcode;
+        /// <summary>
+        /// 
+        /// </summary>
+        public int F_Id
+        {
+            set { _f_id = value; }
+            get { return _f_id; }
+        }
         /// <summary>
         /// 
         /// </summary>
@@ -60,6 +65,16 @@ namespace CallCenterApi.Model
             set { _f_state = value; }
             get { return _f_state; }
         }
+        /// <summary>
+        /// 
+        /// </summary>
+        public string F_GroupCode
+        {
+            set { _f_groupcode = value; }
+            get { return _f_groupcode; }
+        }
         #endregion Model
+
     }
 }
+

codegit/CallCenterApi/CallCenterApi.Model/T_Sys_DictionaryValue.cs

@@ -1,9 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
 namespace CallCenterApi.Model
 {
     /// <summary>
@@ -22,6 +17,7 @@ namespace CallCenterApi.Model
         private int? _f_sort;
         private string _f_describe;
         private bool _f_state;
+        private string _f_groupcode;
         /// <summary>
         /// 
         /// </summary>
@@ -78,6 +74,16 @@ namespace CallCenterApi.Model
             set { _f_state = value; }
             get { return _f_state; }
         }
+        /// <summary>
+        /// 
+        /// </summary>
+        public string F_GroupCode
+        {
+            set { _f_groupcode = value; }
+            get { return _f_groupcode; }
+        }
         #endregion Model
+
     }
 }
+