心连心更新

codegit/CallCenterApi/CallCenterAPI.WechatSDK/Models/WxLoginDto.cs

@@ -19,6 +19,10 @@ namespace CallCenterAPI.WechatSDK.Models
         /// 登陆时候用： 1员工端，2业主端
         /// </summary>
         public int UserType { get; set; }
+        /// <summary>
+        /// 1外线2内线
+        /// </summary>
+        public int Flag { get; set; }
         #endregion
     }
 

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

@@ -114,6 +114,7 @@
     <Compile Include="T_Sys_WorkCalendar.cs" />
     <Compile Include="T_Sys_WorkOFFDays.cs" />
     <Compile Include="T_Sys_WorkTimes.cs" />
+    <Compile Include="T_Wo_AnnotationTab.cs" />
     <Compile Include="T_Wo_BusinessManage.cs" />
     <Compile Include="T_Wo_MaterialItems.cs" />
     <Compile Include="T_Wo_MaterialManage.cs" />

codegit/CallCenterApi/CallCenterApi.BLL/T_Wo_AnnotationTab.cs

@@ -0,0 +1,140 @@
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace CallCenterApi.BLL
+{
+    /// <summary>
+    /// T_Wo_AnnotationTab
+    /// </summary>
+    public partial class T_Wo_AnnotationTab
+    {
+        private readonly DAL.T_Wo_AnnotationTab dal = new DAL.T_Wo_AnnotationTab();
+        public T_Wo_AnnotationTab()
+        { }
+        #region  BasicMethod
+        /// <summary>
+        /// 是否存在该记录
+        /// </summary>
+        public bool Exists(int F_Id)
+        {
+            return dal.Exists(F_Id);
+        }
+
+        /// <summary>
+        /// 增加一条数据
+        /// </summary>
+        public int Add(Model.T_Wo_AnnotationTab model)
+        {
+            return dal.Add(model);
+        }
+
+        /// <summary>
+        /// 更新一条数据
+        /// </summary>
+        public bool Update(Model.T_Wo_AnnotationTab 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 Model.T_Wo_AnnotationTab 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<Model.T_Wo_AnnotationTab> GetModelList(string strWhere)
+        {
+            DataSet ds = dal.GetList(strWhere);
+            return DataTableToList(ds.Tables[0]);
+        }
+        /// <summary>
+        /// 获得数据列表
+        /// </summary>
+        public List<Model.T_Wo_AnnotationTab> DataTableToList(DataTable dt)
+        {
+            List<Model.T_Wo_AnnotationTab> modelList = new List<Model.T_Wo_AnnotationTab>();
+            int rowsCount = dt.Rows.Count;
+            if (rowsCount > 0)
+            {
+                Model.T_Wo_AnnotationTab 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);
+        }
+
+        #endregion  BasicMethod
+        #region  ExtensionMethod
+
+        #endregion  ExtensionMethod
+    }
+}

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

@@ -114,6 +114,7 @@
     <Compile Include="T_Sys_WorkCalendar.cs" />
     <Compile Include="T_Sys_WorkOFFDays.cs" />
     <Compile Include="T_Sys_WorkTimes.cs" />
+    <Compile Include="T_Wo_AnnotationTab.cs" />
     <Compile Include="T_Wo_BusinessManage.cs" />
     <Compile Include="T_Wo_MaterialItems.cs" />
     <Compile Include="T_Wo_MaterialManage.cs" />

codegit/CallCenterApi/CallCenterApi.DAL/T_Wo_AnnotationTab.cs

@@ -0,0 +1,321 @@
+using CallCenterApi.DB;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace CallCenterApi.DAL
+{
+    /// <summary>
+    /// 数据访问类:T_Wo_AnnotationTab
+    /// </summary>
+    public partial class T_Wo_AnnotationTab
+    {
+        public T_Wo_AnnotationTab()
+        { }
+        #region  BasicMethod
+        /// <summary>
+        /// 是否存在该记录
+        /// </summary>
+        public bool Exists(int F_Id)
+        {
+            StringBuilder strSql = new StringBuilder();
+            strSql.Append("select count(1) from T_Wo_AnnotationTab");
+            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_Wo_AnnotationTab model)
+        {
+            StringBuilder strSql = new StringBuilder();
+            strSql.Append("insert into T_Wo_AnnotationTab(");
+            strSql.Append("F_Contents,F_AnnotationPerson,F_CreateTime,F_ModifyBy,F_ModifyTime,F_IsDelete,F_Wocode)");
+            strSql.Append(" values (");
+            strSql.Append("@F_Contents,@F_AnnotationPerson,@F_CreateTime,@F_ModifyBy,@F_ModifyTime,@F_IsDelete,@F_Wocode)");
+            strSql.Append(";select @@IDENTITY");
+            SqlParameter[] parameters = {
+                    new SqlParameter("@F_Contents", SqlDbType.NVarChar,200),
+                    new SqlParameter("@F_AnnotationPerson", SqlDbType.VarChar,50),
+                    new SqlParameter("@F_CreateTime", SqlDbType.DateTime),
+                    new SqlParameter("@F_ModifyBy", SqlDbType.VarChar,50),
+                    new SqlParameter("@F_ModifyTime", SqlDbType.DateTime),
+                    new SqlParameter("@F_IsDelete", SqlDbType.Int,4),
+                    new SqlParameter("@F_Wocode", SqlDbType.VarChar,50)};
+            parameters[0].Value = model.F_Contents;
+            parameters[1].Value = model.F_AnnotationPerson;
+            parameters[2].Value = model.F_CreateTime;
+            parameters[3].Value = model.F_ModifyBy;
+            parameters[4].Value = model.F_ModifyTime;
+            parameters[5].Value = model.F_IsDelete;
+            parameters[6].Value = model.F_Wocode;
+
+            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_Wo_AnnotationTab model)
+        {
+            StringBuilder strSql = new StringBuilder();
+            strSql.Append("update T_Wo_AnnotationTab set ");
+            strSql.Append("F_Contents=@F_Contents,");
+            strSql.Append("F_AnnotationPerson=@F_AnnotationPerson,");
+            strSql.Append("F_CreateTime=@F_CreateTime,");
+            strSql.Append("F_ModifyBy=@F_ModifyBy,");
+            strSql.Append("F_ModifyTime=@F_ModifyTime,");
+            strSql.Append("F_IsDelete=@F_IsDelete,");
+            strSql.Append("F_Wocode=@F_Wocode");
+            strSql.Append(" where F_Id=@F_Id");
+            SqlParameter[] parameters = {
+                    new SqlParameter("@F_Contents", SqlDbType.NVarChar,200),
+                    new SqlParameter("@F_AnnotationPerson", SqlDbType.VarChar,50),
+                    new SqlParameter("@F_CreateTime", SqlDbType.DateTime),
+                    new SqlParameter("@F_ModifyBy", SqlDbType.VarChar,50),
+                    new SqlParameter("@F_ModifyTime", SqlDbType.DateTime),
+                    new SqlParameter("@F_IsDelete", SqlDbType.Int,4),
+                    new SqlParameter("@F_Wocode", SqlDbType.VarChar,50),
+                    new SqlParameter("@F_Id", SqlDbType.Int,4)};
+            parameters[0].Value = model.F_Contents;
+            parameters[1].Value = model.F_AnnotationPerson;
+            parameters[2].Value = model.F_CreateTime;
+            parameters[3].Value = model.F_ModifyBy;
+            parameters[4].Value = model.F_ModifyTime;
+            parameters[5].Value = model.F_IsDelete;
+            parameters[6].Value = model.F_Wocode;
+            parameters[7].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_Wo_AnnotationTab ");
+            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_Wo_AnnotationTab ");
+            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_Wo_AnnotationTab GetModel(int F_Id)
+        {
+
+            StringBuilder strSql = new StringBuilder();
+            strSql.Append("select  top 1 F_Id,F_Contents,F_AnnotationPerson,F_CreateTime,F_ModifyBy,F_ModifyTime,F_IsDelete,F_Wocode from T_Wo_AnnotationTab ");
+            strSql.Append(" where F_Id=@F_Id");
+            SqlParameter[] parameters = {
+                    new SqlParameter("@F_Id", SqlDbType.Int,4)
+            };
+            parameters[0].Value = F_Id;
+
+            CallCenterApi.Model.T_Wo_AnnotationTab model = new CallCenterApi.Model.T_Wo_AnnotationTab();
+            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_Wo_AnnotationTab DataRowToModel(DataRow row)
+        {
+            CallCenterApi.Model.T_Wo_AnnotationTab model = new CallCenterApi.Model.T_Wo_AnnotationTab();
+            if (row != null)
+            {
+                if (row["F_Id"] != null && row["F_Id"].ToString() != "")
+                {
+                    model.F_Id = int.Parse(row["F_Id"].ToString());
+                }
+                if (row["F_Contents"] != null)
+                {
+                    model.F_Contents = row["F_Contents"].ToString();
+                }
+                if (row["F_AnnotationPerson"] != null)
+                {
+                    model.F_AnnotationPerson = row["F_AnnotationPerson"].ToString();
+                }
+                if (row["F_CreateTime"] != null && row["F_CreateTime"].ToString() != "")
+                {
+                    model.F_CreateTime = DateTime.Parse(row["F_CreateTime"].ToString());
+                }
+                if (row["F_ModifyBy"] != null)
+                {
+                    model.F_ModifyBy = row["F_ModifyBy"].ToString();
+                }
+                if (row["F_ModifyTime"] != null && row["F_ModifyTime"].ToString() != "")
+                {
+                    model.F_ModifyTime = DateTime.Parse(row["F_ModifyTime"].ToString());
+                }
+                if (row["F_IsDelete"] != null && row["F_IsDelete"].ToString() != "")
+                {
+                    model.F_IsDelete = int.Parse(row["F_IsDelete"].ToString());
+                }
+                if (row["F_Wocode"] != null)
+                {
+                    model.F_Wocode = row["F_Wocode"].ToString();
+                }
+            }
+            return model;
+        }
+
+        /// <summary>
+        /// 获得数据列表
+        /// </summary>
+        public DataSet GetList(string strWhere)
+        {
+            StringBuilder strSql = new StringBuilder();
+            strSql.Append("select F_Id,F_Contents,F_AnnotationPerson,F_CreateTime,F_ModifyBy,F_ModifyTime,F_IsDelete,F_Wocode ");
+            strSql.Append(" FROM T_Wo_AnnotationTab ");
+            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_Contents,F_AnnotationPerson,F_CreateTime,F_ModifyBy,F_ModifyTime,F_IsDelete,F_Wocode ");
+            strSql.Append(" FROM T_Wo_AnnotationTab ");
+            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_Wo_AnnotationTab ");
+            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_Wo_AnnotationTab 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());
+        }
+
+        #endregion  BasicMethod
+        #region  ExtensionMethod
+
+        #endregion  ExtensionMethod
+    }
+}

codegit/CallCenterApi/CallCenterApi.DAL/T_Wo_WorkCopy.cs

@@ -48,18 +48,21 @@ namespace CallCenterApi.DAL
         {
             StringBuilder strSql = new StringBuilder();
             strSql.Append("insert into T_Wo_WorkCopy(");
-            strSql.Append("F_WorkOrderID,F_State,F_CreateBy,F_CreateOn,F_SendCopyUser,F_SendCopyOn,F_Content)");
+            strSql.Append("F_WorkOrderID,F_State,F_CreateBy,F_CreateOn,F_SendCopyUser,F_SendCopyOn,F_Content,F_SendCopyDepts,F_Flag,F_Remark)");
             strSql.Append(" values (");
-            strSql.Append("@F_WorkOrderID,@F_State,@F_CreateBy,@F_CreateOn,@F_SendCopyUser,@F_SendCopyOn,@F_Content)");
+            strSql.Append("@F_WorkOrderID,@F_State,@F_CreateBy,@F_CreateOn,@F_SendCopyUser,@F_SendCopyOn,@F_Content,@F_SendCopyDepts,@F_Flag,@F_Remark)");
             strSql.Append(";select @@IDENTITY");
             SqlParameter[] parameters = {
                     new SqlParameter("@F_WorkOrderID", SqlDbType.Int,4),
                     new SqlParameter("@F_State", SqlDbType.Int,4),
                     new SqlParameter("@F_CreateBy", SqlDbType.NVarChar,50),
                     new SqlParameter("@F_CreateOn", SqlDbType.DateTime),
-                    new SqlParameter("@F_SendCopyUser", SqlDbType.NVarChar,50),
+                    new SqlParameter("@F_SendCopyUser", SqlDbType.NText),
                     new SqlParameter("@F_SendCopyOn", SqlDbType.DateTime),
-                    new SqlParameter("@F_Content", SqlDbType.NVarChar,-1)};
+                    new SqlParameter("@F_Content", SqlDbType.NVarChar,-1),
+                    new SqlParameter("@F_SendCopyDepts", SqlDbType.Int,4),
+                    new SqlParameter("@F_Flag", SqlDbType.Int,4),
+                    new SqlParameter("@F_Remark", SqlDbType.NText)};
             parameters[0].Value = model.F_WorkOrderID;
             parameters[1].Value = model.F_State;
             parameters[2].Value = model.F_CreateBy;
@@ -67,6 +70,9 @@ namespace CallCenterApi.DAL
             parameters[4].Value = model.F_SendCopyUser;
             parameters[5].Value = model.F_SendCopyOn;
             parameters[6].Value = model.F_Content;
+            parameters[7].Value = model.F_SendCopyDepts;
+            parameters[8].Value = model.F_Flag;
+            parameters[9].Value = model.F_Remark;
 
             object obj = DbHelperSQL.GetSingle(strSql.ToString(), parameters);
             if (obj == null)
@@ -91,16 +97,22 @@ namespace CallCenterApi.DAL
             strSql.Append("F_CreateOn=@F_CreateOn,");
             strSql.Append("F_SendCopyUser=@F_SendCopyUser,");
             strSql.Append("F_SendCopyOn=@F_SendCopyOn,");
-            strSql.Append("F_Content=@F_Content");
+            strSql.Append("F_Content=@F_Content,");
+            strSql.Append("F_SendCopyDepts=@F_SendCopyDepts,");
+            strSql.Append("F_Flag=@F_Flag,");
+            strSql.Append("F_Remark=@F_Remark");
             strSql.Append(" where F_ID=@F_ID");
             SqlParameter[] parameters = {
                     new SqlParameter("@F_WorkOrderID", SqlDbType.Int,4),
                     new SqlParameter("@F_State", SqlDbType.Int,4),
                     new SqlParameter("@F_CreateBy", SqlDbType.NVarChar,50),
                     new SqlParameter("@F_CreateOn", SqlDbType.DateTime),
-                    new SqlParameter("@F_SendCopyUser", SqlDbType.NVarChar,50),
+                    new SqlParameter("@F_SendCopyUser", SqlDbType.NText),
                     new SqlParameter("@F_SendCopyOn", SqlDbType.DateTime),
                     new SqlParameter("@F_Content", SqlDbType.NVarChar,-1),
+                    new SqlParameter("@F_SendCopyDepts", SqlDbType.Int,4),
+                    new SqlParameter("@F_Flag", SqlDbType.Int,4),
+                    new SqlParameter("@F_Remark", SqlDbType.NText),
                     new SqlParameter("@F_ID", SqlDbType.Int,4)};
             parameters[0].Value = model.F_WorkOrderID;
             parameters[1].Value = model.F_State;
@@ -109,7 +121,10 @@ namespace CallCenterApi.DAL
             parameters[4].Value = model.F_SendCopyUser;
             parameters[5].Value = model.F_SendCopyOn;
             parameters[6].Value = model.F_Content;
-            parameters[7].Value = model.F_ID;
+            parameters[7].Value = model.F_SendCopyDepts;
+            parameters[8].Value = model.F_Flag;
+            parameters[9].Value = model.F_Remark;
+            parameters[10].Value = model.F_ID;
 
             int rows = DbHelperSQL.ExecuteSql(strSql.ToString(), parameters);
             if (rows > 0)
@@ -121,7 +136,6 @@ namespace CallCenterApi.DAL
                 return false;
             }
         }
-
         /// <summary>
         /// 删除一条数据
         /// </summary>
@@ -173,7 +187,7 @@ namespace CallCenterApi.DAL
         {
 
             StringBuilder strSql = new StringBuilder();
-            strSql.Append("select  top 1 F_ID,F_WorkOrderID,F_State,F_CreateBy,F_CreateOn,F_SendCopyUser,F_SendCopyOn,F_Content from T_Wo_WorkCopy ");
+            strSql.Append("select  top 1 F_ID,F_WorkOrderID,F_State,F_CreateBy,F_CreateOn,F_SendCopyUser,F_SendCopyOn,F_Content,F_SendCopyDepts,F_Flag,F_Remark from T_Wo_WorkCopy ");
             strSql.Append(" where F_ID=@F_ID");
             SqlParameter[] parameters = {
                     new SqlParameter("@F_ID", SqlDbType.Int,4)
@@ -200,40 +214,52 @@ namespace CallCenterApi.DAL
         {
             CallCenterApi.Model.T_Wo_WorkCopy model = new CallCenterApi.Model.T_Wo_WorkCopy();
             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 && row["F_WorkOrderID"].ToString() != "")
-                {
-                    model.F_WorkOrderID = int.Parse(row["F_WorkOrderID"].ToString());
-                }
-                if (row["F_State"] != null && row["F_State"].ToString() != "")
-                {
-                    model.F_State = int.Parse(row["F_State"].ToString());
-                }
-                if (row["F_CreateBy"] != null)
-                {
-                    model.F_CreateBy = row["F_CreateBy"].ToString();
-                }
-                if (row["F_CreateOn"] != null && row["F_CreateOn"].ToString() != "")
-                {
-                    model.F_CreateOn = DateTime.Parse(row["F_CreateOn"].ToString());
-                }
-                if (row["F_SendCopyUser"] != null)
-                {
-                    model.F_SendCopyUser = row["F_SendCopyUser"].ToString();
-                }
-                if (row["F_SendCopyOn"] != null && row["F_SendCopyOn"].ToString() != "")
                 {
-                    model.F_SendCopyOn = DateTime.Parse(row["F_SendCopyOn"].ToString());
+                    if (row["F_ID"] != null && row["F_ID"].ToString() != "")
+                    {
+                        model.F_ID = int.Parse(row["F_ID"].ToString());
+                    }
+                    if (row["F_WorkOrderID"] != null && row["F_WorkOrderID"].ToString() != "")
+                    {
+                        model.F_WorkOrderID = int.Parse(row["F_WorkOrderID"].ToString());
+                    }
+                    if (row["F_State"] != null && row["F_State"].ToString() != "")
+                    {
+                        model.F_State = int.Parse(row["F_State"].ToString());
+                    }
+                    if (row["F_CreateBy"] != null)
+                    {
+                        model.F_CreateBy = row["F_CreateBy"].ToString();
+                    }
+                    if (row["F_CreateOn"] != null && row["F_CreateOn"].ToString() != "")
+                    {
+                        model.F_CreateOn = DateTime.Parse(row["F_CreateOn"].ToString());
+                    }
+                    if (row["F_SendCopyUser"] != null)
+                    {
+                        model.F_SendCopyUser = row["F_SendCopyUser"].ToString();
+                    }
+                    if (row["F_SendCopyOn"] != null && row["F_SendCopyOn"].ToString() != "")
+                    {
+                        model.F_SendCopyOn = DateTime.Parse(row["F_SendCopyOn"].ToString());
+                    }
+                    if (row["F_Content"] != null)
+                    {
+                        model.F_Content = row["F_Content"].ToString();
+                    }
+                    if (row["F_SendCopyDepts"] != null && row["F_SendCopyDepts"].ToString() != "")
+                    {
+                        model.F_SendCopyDepts = int.Parse(row["F_SendCopyDepts"].ToString());
+                    }
+                    if (row["F_Flag"] != null && row["F_Flag"].ToString() != "")
+                    {
+                        model.F_Flag = int.Parse(row["F_Flag"].ToString());
+                    }
+                    if (row["F_Remark"] != null)
+                    {
+                        model.F_Remark = row["F_Remark"].ToString();
+                    }
                 }
-                if (row["F_Content"] != null)
-                {
-                    model.F_Content = row["F_Content"].ToString();
-                }
-            }
             return model;
         }
 
@@ -243,7 +269,7 @@ namespace CallCenterApi.DAL
         public DataSet GetList(string strWhere)
         {
             StringBuilder strSql = new StringBuilder();
-            strSql.Append("select F_ID,F_WorkOrderID,F_State,F_CreateBy,F_CreateOn,F_SendCopyUser,F_SendCopyOn,F_Content ");
+            strSql.Append("select * ");
             strSql.Append(" FROM T_Wo_WorkCopy ");
             if (strWhere.Trim() != "")
             {
@@ -263,7 +289,7 @@ namespace CallCenterApi.DAL
             {
                 strSql.Append(" top " + Top.ToString());
             }
-            strSql.Append(" F_ID,F_WorkOrderID,F_State,F_CreateBy,F_CreateOn,F_SendCopyUser,F_SendCopyOn,F_Content ");
+            strSql.Append(" * ");
             strSql.Append(" FROM T_Wo_WorkCopy ");
             if (strWhere.Trim() != "")
             {
@@ -319,32 +345,6 @@ namespace CallCenterApi.DAL
             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_Wo_WorkCopy";
-			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 CallCenterApi.RunProcedure("UP_GetRecordByPage",parameters,"ds");
-		}*/
-
         #endregion  BasicMethod
         #region  ExtensionMethod
 

codegit/CallCenterApi/CallCenterApi.DAL/T_Wo_WorkOrderItem_New.cs

@@ -41,9 +41,9 @@ namespace CallCenterApi.DAL
         {
             StringBuilder strSql = new StringBuilder();
             strSql.Append("insert into T_Wo_WorkOrderItem_New(");
-            strSql.Append("F_WoID,F_WoState,F_ItemType,F_OptType,F_OptContent,F_NextUser,F_NextDept,F_IsUsed,F_LimitTime,F_IsSMS,F_SMSToUser,F_SMSToPhone,F_SMSContent,F_CreateUser,F_CreateTime,F_LastTime,F_Type)");
+            strSql.Append("F_WoID,F_WoState,F_ItemType,F_OptType,F_OptContent,F_NextUser,F_NextDept,F_IsUsed,F_LimitTime,F_IsSMS,F_SMSToUser,F_SMSToPhone,F_SMSContent,F_CreateUser,F_CreateTime,F_LastTime,F_Type,F_Flag)");
             strSql.Append(" values (");
-            strSql.Append("@F_WoID,@F_WoState,@F_ItemType,@F_OptType,@F_OptContent,@F_NextUser,@F_NextDept,@F_IsUsed,@F_LimitTime,@F_IsSMS,@F_SMSToUser,@F_SMSToPhone,@F_SMSContent,@F_CreateUser,@F_CreateTime,@F_LastTime,@F_Type)");
+            strSql.Append("@F_WoID,@F_WoState,@F_ItemType,@F_OptType,@F_OptContent,@F_NextUser,@F_NextDept,@F_IsUsed,@F_LimitTime,@F_IsSMS,@F_SMSToUser,@F_SMSToPhone,@F_SMSContent,@F_CreateUser,@F_CreateTime,@F_LastTime,@F_Type,@F_Flag)");
             strSql.Append(";select @@IDENTITY");
             SqlParameter[] parameters = {
                     new SqlParameter("@F_WoID", SqlDbType.BigInt,8),
@@ -62,7 +62,8 @@ namespace CallCenterApi.DAL
                     new SqlParameter("@F_CreateUser", SqlDbType.VarChar,50),
                     new SqlParameter("@F_CreateTime", SqlDbType.DateTime),
                     new SqlParameter("@F_LastTime", SqlDbType.DateTime),
-                    new SqlParameter("@F_Type",  SqlDbType.Int,4)
+                    new SqlParameter("@F_Type",  SqlDbType.Int,4),
+                    new SqlParameter("@F_Flag",  SqlDbType.Int,4)
             };
             parameters[0].Value = model.F_WoID;
             parameters[1].Value = model.F_WoState;
@@ -81,6 +82,7 @@ namespace CallCenterApi.DAL
             parameters[14].Value = model.F_CreateTime;
             parameters[15].Value = model.F_LastTime;
             parameters[16].Value = model.F_Type;
+            parameters[17].Value = model.F_Flag;
 
             object obj = DbHelperSQL.GetSingle(strSql.ToString(), parameters);
             if (obj == null)
@@ -115,7 +117,8 @@ namespace CallCenterApi.DAL
             strSql.Append("F_CreateUser=@F_CreateUser,");
             strSql.Append("F_CreateTime=@F_CreateTime,");
             strSql.Append("F_LastTime=@F_LastTime,");
-            strSql.Append("F_Type=@F_Type");
+            strSql.Append("F_Type=@F_Type,"); 
+            strSql.Append("F_Flag=@F_Flag");
             strSql.Append(" where F_ID=@F_ID");
             SqlParameter[] parameters = {
                     new SqlParameter("@F_WoID", SqlDbType.BigInt,8),
@@ -135,7 +138,11 @@ namespace CallCenterApi.DAL
                     new SqlParameter("@F_CreateTime", SqlDbType.DateTime),
                     new SqlParameter("@F_LastTime", SqlDbType.DateTime),
                     new SqlParameter("@F_Type", SqlDbType.Int,4),
-                    new SqlParameter("@F_ID", SqlDbType.BigInt,8)};
+                    new SqlParameter("@F_Flag", SqlDbType.Int,4),
+                    new SqlParameter("@F_ID", SqlDbType.BigInt,8)
+       
+                    
+            };
             parameters[0].Value = model.F_WoID;
             parameters[1].Value = model.F_WoState;
             parameters[2].Value = model.F_ItemType;
@@ -152,8 +159,9 @@ namespace CallCenterApi.DAL
             parameters[13].Value = model.F_CreateUser;
             parameters[14].Value = model.F_CreateTime;
             parameters[15].Value = model.F_LastTime;
-            parameters[16].Value = model.F_Type;
-            parameters[17].Value = model.F_ID;
+            parameters[16].Value = model.F_Type; 
+            parameters[17].Value = model.F_Flag;
+            parameters[18].Value = model.F_ID;
 
             int rows = DbHelperSQL.ExecuteSql(strSql.ToString(), parameters);
             if (rows > 0)
@@ -317,6 +325,10 @@ namespace CallCenterApi.DAL
                 {
                     model.F_Type = int.Parse(row["F_Type"].ToString());
                 }
+                if (row["F_Flag"] != null && row["F_Flag"].ToString() != "")
+                {
+                    model.F_Flag = int.Parse(row["F_Flag"].ToString());
+                }
 
             }
             return model;

codegit/CallCenterApi/CallCenterApi.DB/CallCenterApi.DB.csproj

@@ -45,6 +45,12 @@
     <Compile Include="DbHelperSQL.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\CallCenterCommon\CallCenter.Utility\CallCenter.Utility.csproj">
+      <Project>{4DA219CC-911E-4C81-BB0B-DF5183FD50FF}</Project>
+      <Name>CallCenter.Utility</Name>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

codegit/CallCenterApi/CallCenterApi.DB/DbHelperSQL.cs

@@ -1,4 +1,5 @@
-using System;
+using CallCenter.Utility;
+using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Configuration;
@@ -569,6 +570,7 @@ namespace CallCenterApi.DB
                 }
                 catch (System.Data.SqlClient.SqlException ex)
                 {
+                    LogFactory.GetLogger("SQL").Error(SQLString, ex);
                     throw new Exception(ex.Message);
                 }
                 return ds;
@@ -1010,6 +1012,8 @@ namespace CallCenterApi.DB
                     }
                     catch (System.Data.SqlClient.SqlException ex)
                     {
+                        LogFactory.GetLogger("SQL").Error(SQLString+"|"+ cmdParms.ToDictionary(p => p.ParameterName, p => p.Value?.ToString() ?? "").ToJson()
+, ex);
                         throw new Exception(ex.Message);
                     }
                     return ds;
@@ -1039,6 +1043,8 @@ namespace CallCenterApi.DB
                 catch (System.Data.SqlClient.SqlException ex)
                 {
                     trans.Rollback();
+                    LogFactory.GetLogger("SQL").Error(SQLString + "|" + cmdParms.ToDictionary(p => p.ParameterName, p => p.Value?.ToString() ?? "").ToJson()
+, ex);
                     throw new Exception(ex.Message);
                 }
                 return ds;
@@ -1124,11 +1130,23 @@ namespace CallCenterApi.DB
             using (SqlConnection connection = new SqlConnection(connectionString))
             {
                 DataSet dataSet = new DataSet();
-                connection.Open();
-                SqlDataAdapter sqlDA = new SqlDataAdapter();
-                sqlDA.SelectCommand = BuildQueryCommand(connection, storedProcName, parameters);
-                sqlDA.Fill(dataSet, tableName);
-                connection.Close();
+                try
+                {
+                    connection.Open();
+                    SqlDataAdapter sqlDA = new SqlDataAdapter();
+                    sqlDA.SelectCommand = BuildQueryCommand(connection, storedProcName, parameters);
+                    sqlDA.Fill(dataSet, tableName);
+                }
+                catch (Exception ex)
+                {
+                    LogFactory.GetLogger("SQL-RunProcedure").Error(parameters.ToDictionary(p => p.ParameterName, p => p.Value?.ToString() ?? "").ToJson()
+, ex);
+                    throw ex;
+                }
+                finally
+                {
+                    connection.Close();
+                }
                 return dataSet;
             }
         }
@@ -1311,7 +1329,7 @@ namespace CallCenterApi.DB
                 new SqlParameter("@SqlTable",SqlDbType.VarChar,1000),
                 new SqlParameter("@SqlPK",SqlDbType.VarChar,50),
                 new SqlParameter("@SqlField",SqlDbType.VarChar,1000),
-                new SqlParameter("@SqlWhere",SqlDbType.VarChar,1000),
+                new SqlParameter("@SqlWhere",SqlDbType.VarChar,4000),
                 new SqlParameter("@SqlOrder",SqlDbType.VarChar,200),
                 new SqlParameter("@PageSize",SqlDbType.Int),
                 new SqlParameter("@PageIndex",SqlDbType.Int),

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

@@ -168,6 +168,7 @@
     <Compile Include="App_Start\ErrorAttribute.cs" />
     <Compile Include="App_Start\RouteConfig.cs" />
     <Compile Include="App_Start\WechatActionFilter.cs" />
+    <Compile Include="Controllers\AnnotationController.cs" />
     <Compile Include="Controllers\Base\BaseController.cs" />
     <Compile Include="Controllers\CallOutOptController.cs" />
     <Compile Include="Controllers\callout\CallOutController.cs" />
@@ -331,6 +332,7 @@
   </ItemGroup>
   <ItemGroup>
     <Folder Include="App_Data\" />
+    <Folder Include="Views\Annotation\" />
     <Folder Include="Views\MaterialItems\" />
   </ItemGroup>
   <ItemGroup>

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/AnnotationController.cs

@@ -0,0 +1,182 @@
+using CallCenter.Utility;
+using CallCenterApi.DB;
+using CallCenterApi.Interface.Controllers.Base;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using System.Web;
+using System.Web.Mvc;
+
+namespace CallCenterApi.Interface.Controllers
+{
+    public class AnnotationController : BaseController
+    {
+        // GET: Annotation
+        public ActionResult GetList()
+        {
+            ActionResult res = NoToken("未知错误，请重新登录");
+            string sql = " ";
+            DataTable dt = new DataTable();
+
+            string strpageindex = RequestString.GetQueryString("page");
+            int pageindex = 1;
+            string strpagesize = RequestString.GetQueryString("pagesize");
+            int pagesize = 10;
+            if (strpageindex.Trim() != "")
+            {
+                pageindex = Convert.ToInt32(strpageindex);
+            }
+
+            if (strpagesize.Trim() != "")
+            {
+                pagesize = Convert.ToInt32(strpagesize);
+            }
+            int recordCount = 0;
+            dt = BLL.PagerBLL.GetListPager(
+                "T_Wo_AnnotationTab",
+                "F_Id",
+                "*",
+                sql,
+                "ORDER BY F_Id desc",
+                pagesize,
+                pageindex,
+                true,
+                out recordCount);
+
+            var obj = new
+            {
+                state = "success",
+                message = "成功",
+                rows = dt,
+                total = recordCount
+            };
+
+            res = Content(obj.ToJson());
+
+            return res;
+        }
+        /// <summary>
+        /// 获取详情
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        public ActionResult GetModel(int id)
+        {
+            if (id <= 0)
+                return Error("参数错误");
+            var model = new BLL.T_Wo_AnnotationTab().GetModel(id);
+            return Content(model.ToJson());
+        }
+        /// <summary>
+        ///修改
+        /// </summary>
+        /// <returns></returns>
+        public ActionResult AddAnnotation()
+        {
+            ActionResult res = NoToken("未知错误，请重新登录");
+            if (Request.IsAuthenticated)
+            {
+                int userId = CurrentUser.UserData.F_UserId;
+                if (userId != 0)
+                {
+                    Model.T_Sys_UserAccount ua = new BLL.T_Sys_UserAccount().GetModel(userId);
+                    if (ua != null)
+                    {
+                        int id = RequestString.GetInt("id", 0);
+                        string contents = RequestString.GetFormString("contents");
+                        string wocode = RequestString.GetFormString("wocodes");
+
+
+
+                        Model.T_Wo_AnnotationTab model = new Model.T_Wo_AnnotationTab();
+
+                        if (id == 0)
+                        {
+                            model.F_Contents = contents;
+                            model.F_AnnotationPerson = ua.F_UserCode;
+                            model.F_CreateTime = DateTime.Now;
+                            model.F_Wocode = wocode;
+                            if (new BLL.T_Wo_AnnotationTab().Add(model) > 0)
+                            {
+                                res = Success("注解成功！");
+                            }
+                            else
+                            {
+                                res = Error("注解失败！");
+                            }
+                        }
+                        else
+                        {
+                            model = new BLL.T_Wo_AnnotationTab().GetModel(id);
+                            if (model != null)
+                            {
+                                model.F_Contents = contents;
+                                model.F_ModifyBy = ua.F_UserCode;
+                                model.F_ModifyTime = DateTime.Now;                           
+                                if (new BLL.T_Wo_AnnotationTab().Update(model))
+                                {
+                                    res = Success("修改成功！");
+                                }
+                                else
+                                {
+                                    res = Error("修改失败！");
+                                }
+                            }
+                            else
+                            {
+                                res = Error("修改失败！");
+                            }
+                        }
+                    }
+                }
+
+            }
+            return res;
+        }
+
+
+        /// <summary>
+        /// 删除
+        /// </summary>
+        /// <param name="ids"></param>
+        /// <returns></returns>
+        public ActionResult Delete(string[] ids)
+        {
+            ActionResult res = NoToken("未知错误，请重新登录");
+            if (Request.IsAuthenticated)
+            {
+
+                int userId = CurrentUser.UserData.F_UserId;
+                if (userId != 0)
+                {
+                    Model.T_Sys_UserAccount ua = new BLL.T_Sys_UserAccount().GetModel(userId);
+                    if (ua != null)
+                    {
+                        if (ids != null && ids.Length > 0)
+                        {
+                            string idd = " ";
+                            foreach (string str in ids)
+                            {
+                                idd += str + ",";
+                            }                          
+                            if (!string.IsNullOrEmpty(idd.Trim()))
+                            {
+                                new BLL.T_Wo_AnnotationTab().DeleteList(idd.TrimEnd(','));
+                            }
+                            else
+                            {
+                                res = Error("请选择记录");
+                            }
+                        }
+                        else
+                        {
+                            res = Error("获取参数失败");
+                        }
+                    }
+                }
+            }
+            return res;
+        }
+    }
+}

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

@@ -265,7 +265,7 @@ namespace CallCenterApi.Interface.Controllers
         /// <param name="tab"></param>
         /// <param name="parentid"></param>
         /// <returns></returns>
-        private List<Model.TreeModel> BindAssignTree(DataTable tab, string parentid,int type)
+        private List<Model.TreeModel> BindAssignTree(DataTable tab, string parentid,int type,int flag=0)
         {
             DataTable tab2 = new DataTable();
 
@@ -282,15 +282,41 @@ namespace CallCenterApi.Interface.Controllers
                     model.IconCls = "";//图标
                     model.text = categorylist[i].F_DeptName;
                     model.headerid = categorylist[i].F_Header ?? 0;    //部门权限范围：9全部，1区域，2项目，3期
+                    model.flag = 1;//部门标识
+                    model.islast = 0; //默认不是最后一层
                     string msg = "";
                     if (type ==0)
                     {
                         msg = " and F_Layer=0";
                     }
                     tab2 = new BLL.T_Sys_Department().GetList("F_ParentId=" + currentID + " and F_State=1"+ msg).Tables[0];
-                    if (tab2 != null && tab2.Rows.Count > 0)
+                    if (flag == 1)
+                    {
+                        if (tab2 != null && tab2.Rows.Count > 0)
+                        {
+                            model.children = BindAssignTree(tab2, currentID, type, flag);
+                        }
+                        else
+                        {
+                            model.islast = 1; //最后一层部门标识
+                            model.children = new BLL.T_Sys_UserAccount().GetModelList($" F_DeptId={currentID}").Select(p =>
+                             {
+                                 return new Model.TreeModel
+                                 {
+                                     id = p.F_UserId.ToString(),
+                                     code = p.F_UserCode,
+                                     text = p.F_UserName + "(" + p.F_UserCode + ")",
+                                     flag=2 //人员标识
+                                 };                    
+                             });
+                        }
+                    }
+                    else
                     {
-                        model.children = BindAssignTree(tab2, currentID, type);
+                        if (tab2 != null && tab2.Rows.Count > 0)
+                        {
+                            model.children = BindAssignTree(tab2, currentID, type);
+                        }
                     }
                     modelList.Add(model);
                 }
@@ -307,7 +333,7 @@ namespace CallCenterApi.Interface.Controllers
         /// 获取部门列表
         /// </summary>
         /// <returns></returns>
-        public ActionResult GetAssignDeptList(int pId = 0, string keywords = "",int type=0)
+        public ActionResult GetAssignDeptList(int pId = 0, string keywords = "",int type=0,int flag=0)
         {
             //if (Request.IsAuthenticated)
             //{
@@ -324,7 +350,7 @@ namespace CallCenterApi.Interface.Controllers
             {
                 dt = new BLL.T_Sys_Department().GetList(" F_State=1 and F_DeptId !=2  and F_ParentId=" + pId).Tables[0];
             }
-            List<Model.TreeModel> modelList = BindAssignTree(dt, "0", type);
+            List<Model.TreeModel> modelList = BindAssignTree(dt, "0", type, flag);
             if (modelList != null)
             {
                 if (modelList.Count > 0)

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/IndexController.cs

@@ -537,7 +537,8 @@ namespace CallCenterApi.Interface.Controllers
                         //string yclwhere = $" 1=1 and State =" + (int)EnumWorkOrderState.finish + " and LastDealUser = '" + ua.F_UserCode + "' ";//" 1=1 and State =2 and LastDealUser = '" + ua.F_UserCode + "' ";
                         ////5、我参与的
                         //string wcywhere = $" 1=1 and (CreateUser= '" + ua.F_UserCode + "' or T_Wo_WorkOrder.ID in ( " + woController.GetCYWorkOrderID(ua.F_UserCode) + ")) ";//" 1=1 and  (CreateUser= '" + ua.F_UserCode + "' or WorkOrderID in ( " + woController.GetCYWorkOrderID(ua.F_UserCode) + ")) ";
-                        ////5、超期工单
+                        ////5、
+                        ///工单
                         //string cqwhere = $" 1=1 and DATEADD(DAY,{days},CreateTime) < GETDATE() AND State < " + (int)EnumWorkOrderState.finish + " ";//$" 1=1 and DATEADD(DAY,{days},CreateTime) < GETDATE() AND State < 2  ";
                         ////5、未审核微信工单
                         //string wxwhere = $" 1=1 ";  // ANd Type = (SELECT F_DictionaryValueId FROM dbo.T_Sys_DictionaryValue (NOLOCK) WHERE F_DictionaryFlag = 'GDLY' AND F_Name = '微信')

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/QuestionManageController.cs

@@ -17,10 +17,10 @@ namespace CallCenterApi.Interface.Controllers
         ///获取列表
         /// </summary>
         /// <returns></returns>
-        public ActionResult GetList()
+        public ActionResult GetList(int pid = 0, string type = "")
         {
             ActionResult res = NoToken("未知错误，请重新登录");
-            string sql = " F_IsDelete=0 ";
+            string sql = $" and F_IsDelete=0";
             DataTable dt = new DataTable();
 
             string name = HttpUtility.UrlDecode(RequestString.GetQueryString("name"));
@@ -32,6 +32,18 @@ namespace CallCenterApi.Interface.Controllers
             {
                 sql += " and F_QuestionName like '%" + name + "%'";
             }
+            if (!string.IsNullOrEmpty(type))
+            {
+                sql += $" and F_Type='{type}'";
+            }
+            if (pid > 0)
+            {
+                string idstr = GetQueson(pid);
+                if (!string.IsNullOrEmpty(idstr))
+                {
+                    sql += $" and F_Id in({idstr})";
+                }
+            }
             if (strpageindex.Trim() != "")
             {
                 pageindex = Convert.ToInt32(strpageindex);
@@ -66,6 +78,136 @@ namespace CallCenterApi.Interface.Controllers
             return res;
         }
 
+
+
+        /// <summary>
+        /// 获取工单类别
+        /// </summary>
+        /// <param name="typeid"></param>
+        /// <returns></returns>
+        public string GetQueson(int fid)
+        {
+            string tsql = fid.ToString();
+            string tsql1 = "";
+            string tsql2 = "";
+            var model = new BLL.T_Wo_QuestionManage().GetModel(fid);
+            if (model != null)
+            {
+                if (model.F_Label == "1")
+                {
+                    var glist = new BLL.T_Wo_QuestionManage().GetModelList($"F_ParentId={fid} and F_IsDelete=0 ").Select(p => p.F_Id).ToArray();
+                    if (glist.Count() > 0)
+                    {
+                        tsql1 = string.Join(",", glist);
+
+                        var glist1 = new BLL.T_Wo_QuestionManage().GetModelList($"F_ParentId in ({tsql1}) and F_IsDelete=0").Select(p => p.F_Id).ToArray();
+                        if (glist1.Count() > 0)
+                        {
+                            tsql2 = string.Join(",", glist1);
+                            tsql += "," + tsql1 + "," + tsql2;
+                        }
+                        else
+                        {
+                            tsql += "," + tsql1;
+                        }
+                    }
+                }
+                else if (model.F_Label == "2")
+                {
+                    var glist = new BLL.T_Wo_QuestionManage().GetModelList($"F_ParentId={fid} and F_IsDelete=0").Select(p => p.F_Id).ToArray();
+                    if (glist.Count() > 0)
+                    {
+                        tsql1 = string.Join(",", glist);
+                        tsql += "," + tsql1;
+                    }
+                }
+                return tsql;
+            }
+            else return "";
+        }
+        /// <summary>
+        /// 获取详情
+        /// </summary>
+        /// <param name="fid"></param>
+        /// <returns></returns>
+
+        public ActionResult GetDetail(int fid=0)
+        {
+            if (fid <= 0)
+                return Error("参数错误");
+            string F_ParentName="";
+            var model = new BLL.T_Wo_QuestionManage().GetModel(fid);
+            if (model.F_ParentId > 0)
+            {
+                F_ParentName = new BLL.T_Wo_QuestionManage().GetModel(Convert.ToInt32(model.F_ParentId)).F_QuestionName;
+            }
+
+            var objmodel = new
+            {
+                model=model,
+                F_ParentName= F_ParentName
+
+            };
+            return Success("加载成功", objmodel);
+
+        }
+        /// <summary>
+        /// 获取问题类别
+        /// </summary>
+        /// <param name="pid"></param>
+        /// <param name="keywords"></param>
+        /// <param name="type"></param>
+        /// <returns></returns>
+        public ActionResult GetQuestionList(int pid = 0,string type="")
+        {
+            DataTable dt = new DataTable();
+            List<TreeModel> modelist = new List<TreeModel>();
+            string sql = $"  F_IsDelete=0";
+            if (!string.IsNullOrEmpty(type))
+            {
+                sql += $" and F_Type='{type}'";
+            }
+            List<Model.T_Wo_QuestionManage> questlist = new BLL.T_Wo_QuestionManage().GetModelList(sql);
+            foreach (var item in questlist.Where(p=>p.F_ParentId==0))
+            {
+                TreeModel model = new TreeModel();
+                model.id = item.F_Id.ToString();
+                model.parentid = item.F_ParentId.ToString();
+                model.IconCls = "";//图标
+                model.text = item.F_QuestionName;
+                model.children = BindQuestionTree(questlist,item.F_Id);
+                modelist.Add(model);
+            }
+            return Success("加载成功",modelist);
+           
+        }
+
+        private List<TreeModel> BindQuestionTree(List<Model.T_Wo_QuestionManage> questlist, int parentid=0)
+        {
+            List<TreeModel> modelist = new List<TreeModel>();
+            List<Model.T_Wo_QuestionManage> itemlist = questlist.Where(p => p.F_ParentId == parentid).ToList();
+            if (itemlist.Count > 0 && parentid>0 )
+            {
+                foreach (var item in itemlist)
+                {
+                    TreeModel model = new TreeModel();
+                    model.id = item.F_Id.ToString();
+                    model.parentid = item.F_ParentId.ToString();
+                    model.IconCls = "";//图标
+                    model.text = item.F_QuestionName;
+                    model.children = BindQuestionTree(questlist, item.F_Id);
+                    modelist.Add(model);
+                }
+                return modelist;
+
+            }
+            else
+            {
+                return null;
+            }
+
+        }
+
         /// <summary>
         /// 添加/修改问题
         /// </summary>
@@ -85,7 +227,7 @@ namespace CallCenterApi.Interface.Controllers
                         string content = RequestString.GetFormString("content");
                         string type = RequestString.GetFormString("type");
                         int pid = RequestString.GetInt("pid", 0);
-                        int layer = RequestString.GetInt("layer", 0);
+                        int layer = RequestString.GetInt("layer", 1);
                         string deal = RequestString.GetFormString("deal");
                         string remark = RequestString.GetFormString("remark");
                         string usercode = RequestString.GetFormString("usercode");
@@ -174,6 +316,16 @@ namespace CallCenterApi.Interface.Controllers
                             string idd = " ";
                             foreach (string str in ids)
                             {
+                                var model = new BLL.T_Wo_QuestionManage().GetModel(Convert.ToInt32(str));
+                                if (model != null)
+                                {
+                                    string sqlstr = $" F_ParentId={model.F_Id} and F_IsDelete=0 ";
+                                    var modelson = new BLL.T_Wo_QuestionManage().GetModelList(sqlstr);
+                                    if (modelson.Count > 0)
+                                    {
+                                       return  Error("删除失败，此问题下存在子类问题，请先删除子类问题！");
+                                    }
+                                }
                                 idd += str + ",";
                             }
                             string sql = "update T_Wo_QuestionManage set F_IsDelete=1,F_DeleteBy='" + ua.F_UserCode + "',F_DeleteOn=getdate() where F_Id in(" + idd.TrimEnd(',') + ")";

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

@@ -245,6 +245,7 @@ namespace CallCenterApi.Interface.Controllers
                     F_SeatGroup = userModel.F_SeartGroup,
                     zxzname = zxzModel?.F_Name ?? "",
                     depname = depModel?.F_DeptName ?? "",
+                    flag=userModel.F_Flag
                     //regionId = userModel.RegionId,   //项目id,
                     //regionName = modelRegion?.F_RegionName   //项目名称
                 });
@@ -378,8 +379,8 @@ namespace CallCenterApi.Interface.Controllers
         public ActionResult EditUsers(UserAccountInput input)
         {
             ActionResult res = NoToken("未知错误，请重新登录");
-            //if (Request.IsAuthenticated)
-            //{
+            if (Request.IsAuthenticated)
+            {
                 BLL.T_Sys_UserAccount sysUserAccountBll = new BLL.T_Sys_UserAccount();
                 Model.T_Sys_UserAccount userAccountModel = sysUserAccountBll.GetModelList("  F_UserId = " + input.UserId).FirstOrDefault();
                 if (userAccountModel == null)
@@ -473,8 +474,10 @@ namespace CallCenterApi.Interface.Controllers
                 userAccountModel.F_DeleteFlag = 0;
                 if (input.HjType != null)
                     userAccountModel.F_HJType = input.HjType;
-                #region 20220426 增加用户标识
-                if (input.F_Flag != 0)
+            if (input.F_Flag != 0)
+                userAccountModel.F_Flag = input.F_Flag;//标识(1-负责外线工单处理，2-负责内线工单处理)
+            #region 20220426 增加用户标识
+            if (input.F_Flag != 0)
                     userAccountModel.F_Flag = input.F_Flag;//标识(1-负责外线工单处理，2-负责内线工单处理)
                 #endregion
 
@@ -501,7 +504,7 @@ namespace CallCenterApi.Interface.Controllers
                     else
                         res = Error("编辑失败！");
                 }
-            //}
+            }
             return res;
         }
         //[Authority]

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

@@ -376,19 +376,75 @@ namespace CallCenterApi.Interface.Controllers.customer
         {
             if (!string.IsNullOrWhiteSpace(tel))
             {
+                string Province = "", City="";
+                var model = new object();
                 var sql = $" and  F_LegalPhone  = '" + tel.Trim() + "'";
                 var userModel = new BLL.T_Cus_CustomerBaseNew().GetModelList(" F_IsDelete = 0 " + sql);
-                if (userModel.Count() > 0)
+                if (tel.Trim().Length == 11 && tel.Substring(0, 1) != "0")
                 {
-                    List<CustomerBaseNewInput> Input = modeltooip(userModel);
-                    var model = Input.Last();
+                    BLL.T_Sys_MobileData mobile_Bll = new BLL.T_Sys_MobileData();
+                    Model.T_Sys_MobileData mobileModel = mobile_Bll.GetModelList(" F_MobileNum='" + tel.Substring(0, 7) + "' ").FirstOrDefault();
 
-                    return Success("获取成功", model);
+                    if (mobileModel != null)
+                    {
+                        if (!string.IsNullOrEmpty(mobileModel.F_CityDes))
+                        {
+                            try
+                            {
+                                var CityDes = mobileModel.F_CityDes.Split('-');
+                                Province = CityDes[0].ToString() + "省";
+                                City = CityDes[1].ToString() + "市";
+                            }
+                            catch
+                            {
+
+                            }
+                        }
+                    }
                 }
                 else
                 {
-                    return Success("获取成功");
+                    BLL.T_Sys_TelTitleData numbBll = new BLL.T_Sys_TelTitleData();
+                    List<Model.T_Sys_TelTitleData> mobileModel = numbBll.GetModelList(" 1=1 and F_KeyPhoneNum='" + tel.Substring(0, 4) + "'");
+                    if (mobileModel == null || mobileModel.Count <= 0)
+                    {
+                        mobileModel = numbBll.GetModelList(" 1=1 and F_KeyPhoneNum='" + tel.Substring(0, 3) + "'");
+                    }
+                    if (mobileModel.Count > 0)
+                    {
+                        if (!string.IsNullOrEmpty(mobileModel[0].F_TitleName))
+                        {
+                            try
+                            {
+                                var CityDes = mobileModel[0].F_TitleName.Split('-');
+                                Province = CityDes[0].ToString() ;
+                                City = CityDes[1].ToString();
+                            }
+                            catch
+                            {
+
+                            }
+                        }
+                    }
                 }
+                if (userModel.Count() > 0)
+                {
+                    List<CustomerBaseNewInput> Input = modeltooip(userModel);
+
+                     model = Input.Last();
+                }
+                var obj = new
+                {
+                    model = model,
+                    Province = Province,
+                    City = City
+                };
+                return Success("获取成功", obj);
+                //}
+                //else
+                //{
+                //    return Success("获取成功");
+                //}
             }
             else
             {
@@ -417,7 +473,7 @@ namespace CallCenterApi.Interface.Controllers.customer
                 bool n = cusbll.Update(model);
                 if (n)
                 {
-                    return Success("保存成功！");
+                    return Success("保存成功！",model.F_CustomerId);
                 }
                 else
                     return Error("保存失败！");
@@ -450,7 +506,7 @@ namespace CallCenterApi.Interface.Controllers.customer
                 int n = cusbll.Add(model);
                 if (n > 0)
                 {
-                    return Success("新增成功！");
+                    return Success("新增成功！",n);
                 }
                 else
                     return Error("新增失败！");
@@ -458,6 +514,45 @@ namespace CallCenterApi.Interface.Controllers.customer
             }
 
         }
+
+        /// <summary>
+        /// 通过区县获取关联业务员
+        /// </summary>
+        /// <param name="input"></param>
+        /// <returns></returns>
+        public ActionResult GetCusYWY(int CustomerId = 0)
+        {
+            if (CustomerId == 0)
+                return Error("客户信息不存在！");
+            var model = cusbll.GetModel(CustomerId);
+            if (model == null)
+                return Error("客户不存在");
+            string sql = $" F_DeleteFlag=0";
+            if (!string.IsNullOrWhiteSpace(model.F_AddressCountry))//县
+            {
+                sql += $" and F_Remark like '%{ model.F_AddressCountry.Trim()}%'";
+            }
+            else if (!string.IsNullOrWhiteSpace(model.F_AddressCity))//市
+                sql += $" and F_Remark like '%{model.F_AddressCity.Trim()}%'";
+            else
+                sql += $"and 1!=1 ";
+            var modelist = new BLL.T_Sys_UserAccount().GetModelList(sql);
+            var saleslist = modelist.Where(t => !string.IsNullOrEmpty(t.F_UserCode)).Select(p => new
+            {
+                Salesman = new BLL.T_Sys_Department().GetModel(p.F_DeptId).F_DeptName + "-" + p.F_UserName + "(" + p.F_UserCode + ")",              
+                SalesPhone = p.F_Mobile
+            });
+            var obj = new
+            {
+                state = "success",
+                message = "成功",
+                rows = saleslist.GroupBy(x => x.Salesman).Select(y => y.First()),
+                customername = model.F_Legal,
+                customerphon = model.F_LegalPhone
+
+            };
+            return Content(obj.ToJson());
+        }
         /// <summary>
         /// 添加客户信息
         /// </summary>

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/knowledge/KnowledgeController.cs

@@ -58,7 +58,7 @@ namespace CallCenterApi.Interface.Controllers.knowledge
                 dt = BLL.PagerBLL.GetListPager(
                     "T_RepositoryInformation a",
                     "F_RepositoryId",
-                   "F_CreateName=(select F_UserName  from  T_Sys_UserAccount where F_UserId=a.F_CreateBy),*",
+                   "F_CreateName=(select F_UserName+'('+F_UserCode+')'  from  T_Sys_UserAccount where F_UserId=a.F_CreateBy),*",
                     sql,
                     "ORDER BY F_RepositoryId desc",
                     pagesize,

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

@@ -1252,12 +1252,22 @@ namespace CallCenterApi.Interface.Controllers.report
             { sql += $" and F_Type=" + type; }
             #endregion
             dt.Columns.Add("评分维度");
-            dt.Columns.Add("不满意(5分以下)");
-            dt.Columns.Add("一般(5-6)");
-            dt.Columns.Add("满意(7-8)");
-            dt.Columns.Add("非常满意(9-10)");
+            //dt.Columns.Add("不满意(5分以下)");
+            //dt.Columns.Add("一般(5-6)");
+            //dt.Columns.Add("满意(7-8)");
+            //dt.Columns.Add("非常满意(9-10)");
+            dt.Columns.Add("1分");
+            dt.Columns.Add("2分");
+            dt.Columns.Add("3分");
+            dt.Columns.Add("4分");
+            dt.Columns.Add("5分");
+            dt.Columns.Add("6分");
+            dt.Columns.Add("7分");
+            dt.Columns.Add("8分");
+            dt.Columns.Add("9分");
+            dt.Columns.Add("10分");
             List<string> scorename = new List<string>();
-            scorename.Add("F_NPS");
+            //scorename.Add("F_NPS");
             scorename.Add("F_VisitResultScore");
             scorename.Add("F_EffectiveScore");
             scorename.Add("F_ServiceAttitude");
@@ -1269,22 +1279,22 @@ namespace CallCenterApi.Interface.Controllers.report
                 DataRow drNew = dt.NewRow();
                 switch (i)
                 {
+                    //case 0:
+                    //    drNew["评分维度"] = "NPS得分";
+                    //    break;
                     case 0:
-                        drNew["评分维度"] = "NPS得分";
-                        break;
-                    case 1:
                         drNew["评分维度"] = "处理结果得分";
                         break;
-                    case 2:
+                    case 1:
                         drNew["评分维度"] = "处理时效得分";
                         break;
-                    case 3:
+                    case 2:
                         drNew["评分维度"] = "服务态度得分";
                         break;
-                    case 4:
+                    case 3:
                         drNew["评分维度"] = "产品质量得分";
                         break;
-                    case 5:
+                    case 4:
                         drNew["评分维度"] = "评价结果得分";
                         break;
                 }
@@ -1292,29 +1302,22 @@ namespace CallCenterApi.Interface.Controllers.report
                 {
                     string sqlstr = "";
                     var modellist = new List<Model.T_Wo_WorkOrder>();
-                    switch (j)
-                    {
-                        case 1:
-                            sqlstr = $"{scorename[i]}<5";
-                            modellist = woBLL.GetModelList(" " + sqlstr + sql + " ");
-                            drNew["不满意(5分以下)"] = modellist.Count;
-                            break;
-                        case 2:
-                            sqlstr = $"{scorename[i]} in (5,6)";
-                            modellist = woBLL.GetModelList(" " + sqlstr + sql + " ");
-                            drNew["一般(5-6)"] = modellist.Count;
-                            break;
-                        case 3:
-                            sqlstr = $"{scorename[i]} in (7,8)";
-                            modellist = woBLL.GetModelList(" " + sqlstr + sql + " ");
-                            drNew["满意(7-8)"] = modellist.Count;
-                            break;
-                        case 4:
-                            sqlstr = $"{scorename[i]} in (9,10)";
-                            modellist = woBLL.GetModelList(" " + sqlstr + sql + " ");
-                            drNew["非常满意(9-10)"] = modellist.Count;
-                            break;
-                    }
+                    //switch (j)
+                    //{
+                    //    case 1:
+                    //        sqlstr = $"{scorename[i]}=1";
+                    //        //modellist = woBLL.GetModelList(" " + sqlstr + sql + " ");
+                    //        //drNew["1分"] = modellist.Count;
+                    //        break;
+                    //    case 2:
+                    //        sqlstr = $"{scorename[i]}=2";
+                    //        //modellist = woBLL.GetModelList(" " + sqlstr + sql + " ");
+                    //        //drNew["2分"] = modellist.Count;
+                    //        break;  
+                    //}
+                    sqlstr = $"{scorename[i]}={j}";
+                    modellist = woBLL.GetModelList(" " + sqlstr + sql + " ");
+                    drNew[$"{j}分"] = modellist.Count;
                 }
 
                 dt.Rows.Add(drNew);
@@ -1333,6 +1336,160 @@ namespace CallCenterApi.Interface.Controllers.report
         }
 
 
+        /// <summary>
+        /// 工单满意度打分统计报表查看工单(工单回访)
+        /// </summary>
+        /// <param name="stime"></param>
+        /// <param name="endtime"></param>
+        /// <param name="type"></param>
+        /// <returns></returns>
+        public ActionResult GetVisiteSatisfiedWo(string stime, string endtime, int type = 0, int row = 1, int column = 1,int isdc=0)
+        {
+            string sql = $" and F_IsDelete=0";
+            DataTable dt = new DataTable();
+            #region 筛选条件
+            if (stime != null && stime.Trim() != "")
+            {
+                sql += " and CONVERT(varchar , F_CreateOn, 120)>=CONVERT(varchar , '" + stime.Trim() + " 00:00:01', 120) ";
+            }
+            if (endtime != null && endtime.Trim() != "")
+            {
+                sql += " and CONVERT(varchar , F_CreateOn, 120)<=CONVERT(varchar , '" + endtime.Trim() + " 23:59:59', 120) ";
+            }
+            if (type > 0 && type < 6)//工单类型
+            { sql += $" and F_Type=" + type; }
+            #endregion
+            dt.Columns.Add("序号");
+            dt.Columns.Add("工单编号");
+            dt.Columns.Add("工单内容");
+            dt.Columns.Add("工单类型");
+            List<string> scorename = new List<string>();          
+            string sqlstr = "";
+            switch (row)
+            {
+                case 1:
+                    sqlstr = $"F_NPS={column}";
+                    break;
+                case 2:
+                    sqlstr = $"F_VisitResultScore ={column}";
+                    break;
+                case 3:
+                    sqlstr = $"F_EffectiveScore ={column}";
+                    break;
+                case 4:
+                    sqlstr = $"F_ServiceAttitude ={column}";
+                    break;
+                case 5:
+                    sqlstr = $"F_ProductQuality ={column}";
+                    break;
+                case 6:
+                    sqlstr = $"F_EvaluationResult ={column}";
+                    break;
+            }
+            var modellist = woBLL.GetModelList(" " + sqlstr + sql + " ");
+            if (modellist.Count > 0)
+            {
+                int j = 1;
+                foreach (var item in modellist)
+                {
+                    DataRow drNew = dt.NewRow();
+                    drNew["序号"] = j;
+                    drNew["工单编号"] = item.F_WorkOrderCode;
+                    drNew["工单内容"] = item.F_Description;
+                    if (item.F_Type == "1")
+                    {
+                        drNew["工单类型"] = "咨询";//工单类型:咨询及需求、投诉、抽检、其他(其它手动输入别的点选)
+                    }
+                    else if (item.F_Type == "2")
+                    {
+                        drNew["工单类型"] = "投诉";//工单类型:咨询及需求、投诉、抽检、其他(其它手动输入别的点选)
+                    }
+                    else if (item.F_Type == "3")
+                    {
+                        drNew["工单类型"] = "抽检";//工单类型:咨询及需求、投诉、抽检、其他(其它手动输入别的点选)
+                    }
+                    else if (item.F_Type == "5")
+                    {
+                        drNew["工单类型"] = "业务协办";//工单类型:咨询及需求、投诉、抽检、其他(其它手动输入别的点选)
+                    }
+                    else
+                    {
+                        drNew["工单类型"] = "建议及其他";//工单类型:咨询及需求、投诉、抽检、其他(其它手动输入别的点选)
+                    }
+                    dt.Rows.Add(drNew);
+                    j++;
+                }
+            }
+            if (isdc > 0)
+            {
+                NPOIHelper npoi = new NPOIHelper();
+                if (npoi.ExportToExcel("回访评价打分明细表", dt) == "")
+                {
+                    return Success("导出成功");
+                }
+                else
+                {
+                    return Error("导出失败");
+
+                }
+            }
+            else  return Content(dt.ToJson());
+        }
+
+
+
+        /// <summary>
+        /// 工单满意度NPS打分统计报表(工单回访)
+        /// </summary>
+        /// <param name="stime"></param>
+        /// <param name="endtime"></param>
+        /// <param name="type"></param>
+        /// <returns></returns>
+        public ActionResult GetNPSatisfiedReport(string stime, string endtime, int type = 0)
+        {
+            string sql = $" and F_IsDelete=0";
+            DataTable dt = new DataTable();
+            #region 筛选条件
+            if (stime != null && stime.Trim() != "")
+            {
+                sql += " and CONVERT(varchar , F_CreateOn, 120)>=CONVERT(varchar , '" + stime.Trim() + " 00:00:01', 120) ";
+            }
+            if (endtime != null && endtime.Trim() != "")
+            {
+                sql += " and CONVERT(varchar , F_CreateOn, 120)<=CONVERT(varchar , '" + endtime.Trim() + " 23:59:59', 120) ";
+            }
+            if (type > 0 && type < 6)//工单类型
+            { sql += $" and F_Type=" + type; }
+            #endregion
+            dt.Columns.Add("评分维度");
+            dt.Columns.Add("1分");
+            dt.Columns.Add("2分");
+            dt.Columns.Add("3分");
+            dt.Columns.Add("4分");
+            dt.Columns.Add("5分");
+            dt.Columns.Add("6分");
+            dt.Columns.Add("7分");
+            dt.Columns.Add("8分");
+            dt.Columns.Add("9分");
+            dt.Columns.Add("10分");
+            List<string> scorename = new List<string>();
+            //scorename.Add("F_NPS");
+            int resultscore = 0, effectscore = 0, servicescore = 0, qualityscore = 0, npscore = 0, evaluatscore = 0;
+            DataRow drNew = dt.NewRow();
+            drNew["评分维度"] = "NPS得分";
+            for (int j = 1; j < dt.Columns.Count; j++)
+            {
+                string sqlstr = "";
+                var modellist = new List<Model.T_Wo_WorkOrder>();
+                sqlstr = $"F_NPS={j}";
+                modellist = woBLL.GetModelList(" " + sqlstr + sql + " ");
+                drNew[$"{j}分"] = modellist.Count;
+            }
+            dt.Rows.Add(drNew);
+            return Content(dt.ToJson());
+        }
+
+
 
         private int workercount(int i ,  List<Model .T_Wo_WorkOrder> workerlist, List<Model.T_Wo_QuestionManage> ConsultingNeedslist, List<Model.T_Wo_QuestionManage> Complaintlist, List<Model.T_Wo_QuestionManage> SpotChecklist)
         {
@@ -2696,7 +2853,7 @@ namespace CallCenterApi.Interface.Controllers.report
             string sqloverdue = "";
             sqloverdue += "";
             #region 退换货的工单按未超期处理 20220302
-            sql += $" and  F_ID not in (select F_ID from T_Wo_WorkOrder where F_SC_PreliminaryOpinion  in ('退货', '换货'))";
+            sql += $" and  F_ID not in (select F_ID from T_Wo_WorkOrder where F_SC_PreliminaryOpinion='退换货')";
             #endregion
             var modlelist = workOrder.GetModelList(sql + sqloverdue + "and F_IsOver=1  " + time);
             Template templatee = new Template();

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

@@ -945,11 +945,16 @@ namespace CallCenterApi.Interface.Models.Input
         /// </summary>
         public decimal? F_MaterialFee { get; set; }
         /// <summary>
-        /// 事件原因
+        /// 事件原因-外线
         /// </summary>
         public string F_EventReason { get; set; }
 
         /// <summary>
+        /// 事件原因-内线
+        /// </summary>
+        public string F_EventReason2 { get; set; }
+
+        /// <summary>
         /// 处理结果打分
         /// </summary>
         public int? F_VisitResultScore { get; set; }
@@ -972,7 +977,7 @@ namespace CallCenterApi.Interface.Models.Input
         /// <summary>
         /// 评价结果
         /// </summary>
-        public int? F_EvaluationResult { get; set; }
+        public decimal? F_EvaluationResult { get; set; }
 
         /// <summary>
         /// 抽检类-样品邮寄单号
@@ -983,6 +988,27 @@ namespace CallCenterApi.Interface.Models.Input
         /// </summary>
         public string F_ExpressName { get; set; }
 
+        /// <summary>
+        /// 工艺
+        /// </summary>
+        public string F_WorkmanShip { get; set; }
+        /// <summary>
+        /// 原料及厂家
+        /// </summary>
+        public string F_Manufacturers { get; set; }
+        /// <summary>
+        /// 该批次生产数量
+        /// </summary>
+        public int? F_ProductionNum { get; set; }
+        /// <summary>
+        /// 司机电话号码
+        /// </summary>
+        public string F_DrivePhone { get; set; }
+        /// <summary>
+        /// 处理结果-内线
+        /// </summary>
+        public string SuperiorOpinion2 { get; set; }
+
         #region 多物料
         public List<T_Wo_MaterialItems> MaterialItems { get; set; }
         #endregion

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

@@ -120,6 +120,7 @@
     <Compile Include="T_Sys_WorkCalendar.cs" />
     <Compile Include="T_Sys_WorkOFFDays.cs" />
     <Compile Include="T_Sys_WorkTimes.cs" />
+    <Compile Include="T_Wo_AnnotationTab.cs" />
     <Compile Include="T_Wo_BusinessManage.cs" />
     <Compile Include="T_Wo_MaterialItems.cs" />
     <Compile Include="T_Wo_MaterialManage.cs" />

codegit/CallCenterApi/CallCenterApi.Model/T_Wo_AnnotationTab.cs

@@ -0,0 +1,93 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace CallCenterApi.Model
+{
+    /// <summary>
+    /// T_Wo_AnnotationTab:实体类(属性说明自动提取数据库字段的描述信息)
+    /// </summary>
+    [Serializable]
+    public partial class T_Wo_AnnotationTab
+    {
+        public T_Wo_AnnotationTab()
+        { }
+        #region Model
+        private int _f_id;
+        private string _f_contents;
+        private string _f_annotationperson;
+        private DateTime? _f_createtime;
+        private string _f_modifyby;
+        private DateTime? _f_modifytime;
+        private int? _f_isdelete = 0;
+        private string _f_wocode;
+        /// <summary>
+        /// 
+        /// </summary>
+        public int F_Id
+        {
+            set { _f_id = value; }
+            get { return _f_id; }
+        }
+        /// <summary>
+        /// 注解内容
+        /// </summary>
+        public string F_Contents
+        {
+            set { _f_contents = value; }
+            get { return _f_contents; }
+        }
+        /// <summary>
+        /// 注解人
+        /// </summary>
+        public string F_AnnotationPerson
+        {
+            set { _f_annotationperson = value; }
+            get { return _f_annotationperson; }
+        }
+        /// <summary>
+        /// 注解时间
+        /// </summary>
+        public DateTime? F_CreateTime
+        {
+            set { _f_createtime = value; }
+            get { return _f_createtime; }
+        }
+        /// <summary>
+        /// 修改人
+        /// </summary>
+        public string F_ModifyBy
+        {
+            set { _f_modifyby = value; }
+            get { return _f_modifyby; }
+        }
+        /// <summary>
+        /// 修改时间
+        /// </summary>
+        public DateTime? F_ModifyTime
+        {
+            set { _f_modifytime = value; }
+            get { return _f_modifytime; }
+        }
+        /// <summary>
+        /// 是否删除
+        /// </summary>
+        public int? F_IsDelete
+        {
+            set { _f_isdelete = value; }
+            get { return _f_isdelete; }
+        }
+        /// <summary>
+        /// 工单id
+        /// </summary>
+        public string F_Wocode
+        {
+            set { _f_wocode = value; }
+            get { return _f_wocode; }
+        }
+        #endregion Model
+
+    }
+}

codegit/CallCenterApi/CallCenterApi.Model/T_Wo_WorkCopy.cs

@@ -19,6 +19,9 @@ namespace CallCenterApi.Model
         private string _f_sendcopyuser;
         private DateTime? _f_sendcopyon;
         private string _f_content;
+        private int? _f_sendcopydepts;
+        private int? _f_flag;
+        private string _f_remark;
         /// <summary>
         /// 
         /// </summary>
@@ -28,7 +31,7 @@ namespace CallCenterApi.Model
             get { return _f_id; }
         }
         /// <summary>
-        /// 工单id
+        /// 
         /// </summary>
         public int? F_WorkOrderID
         {
@@ -60,7 +63,7 @@ namespace CallCenterApi.Model
             get { return _f_createon; }
         }
         /// <summary>
-        /// 抄送人id
+        /// 抄送人(多人)
         /// </summary>
         public string F_SendCopyUser
         {
@@ -68,7 +71,7 @@ namespace CallCenterApi.Model
             get { return _f_sendcopyuser; }
         }
         /// <summary>
-        /// 抄送时间
+        /// 
         /// </summary>
         public DateTime? F_SendCopyOn
         {
@@ -76,13 +79,37 @@ namespace CallCenterApi.Model
             get { return _f_sendcopyon; }
         }
         /// <summary>
-        /// 抄送内容
+        /// 
         /// </summary>
         public string F_Content
         {
             set { _f_content = value; }
             get { return _f_content; }
         }
+        /// <summary>
+        /// 抄送部门
+        /// </summary>
+        public int? F_SendCopyDepts
+        {
+            set { _f_sendcopydepts = value; }
+            get { return _f_sendcopydepts; }
+        }
+        /// <summary>
+        /// 0 抄送到部门下某些的人；1抄送到部门下的所有人
+        /// </summary>
+        public int? F_Flag
+        {
+            set { _f_flag = value; }
+            get { return _f_flag; }
+        }
+        /// <summary>
+        /// 
+        /// </summary>
+        public string F_Remark
+        {
+            set { _f_remark = value; }
+            get { return _f_remark; }
+        }
         #endregion Model
 
     }

codegit/CallCenterApi/CallCenterApi.Model/T_Wo_WorkOrder.cs

@@ -123,7 +123,10 @@ namespace CallCenterApi.Model
         private int? _f_serviceattitude;
         private int? _f_productquality;
         private int? _f_nps;
-        private int? _f_evaluationresult;
+        private decimal? _f_evaluationresult;
+        private string _f_workmanship;
+        private string _f_manufacturers;
+        private int? _f_productionnum;
         public string F_Annotation
         {
             set { _f_annotation = value; }
@@ -1004,11 +1007,60 @@ namespace CallCenterApi.Model
         /// <summary>
         /// 评价结果
         /// </summary>
-        public int? F_EvaluationResult
+        public decimal? F_EvaluationResult
         {
             set { _f_evaluationresult = value; }
             get { return _f_evaluationresult; }
         }
+
+        /// <summary>
+		/// 工艺
+		/// </summary>
+		public string F_WorkmanShip
+        {
+            set { _f_workmanship = value; }
+            get { return _f_workmanship; }
+        }
+        /// <summary>
+        /// 原料及厂家
+        /// </summary>
+        public string F_Manufacturers
+        {
+            set { _f_manufacturers = value; }
+            get { return _f_manufacturers; }
+        }
+        /// <summary>
+        /// 该批次生产数量
+        /// </summary>
+        public int? F_ProductionNum
+        {
+            set { _f_productionnum = value; }
+            get { return _f_productionnum; }
+        }
+
+        /// <summary>
+        /// 处理结果-外线
+        /// </summary>
+        public string F_SuperiorOpinion { get; set; }
+
+        /// <summary>
+        /// 司机电话
+        /// </summary>
+        public string F_DrivePhone { get; set; }
+
+        /// <summary>
+        /// 处理结果-内线
+        /// </summary>
+        public string F_SuperiorOpinion2 { get; set; }
+        /// <summary>
+        /// 问题原因-内线
+        /// </summary>
+        public string F_EventReason2 { get; set; }
+        /// <summary>
+        /// 1单线外2单线内3双线
+        /// </summary>
+        public int F_Flag { get; set; }
+
         #endregion Model
 
         #region 多物料

codegit/CallCenterApi/CallCenterApi.Model/T_Wo_WorkOrderItem_New.cs

@@ -177,6 +177,10 @@ namespace CallCenterApi.Model
             set { _f_type = value; }
             get { return _f_type; }
         }
+        /// <summary>
+        /// 1单线外2单线内3双线
+        /// </summary>
+        public int F_Flag { get; set; }
         #endregion Model
 
     }

codegit/CallCenterApi/CallCenterApi.Model/TreeModel.cs

@@ -45,11 +45,17 @@ namespace CallCenterApi.Model
             get { return _text; }
         }
         private List<TreeModel> _children;
-        public List<TreeModel> children
+        //public List<TreeModel> children
+        //{
+        //    set { _children = value; }
+        //    get { return _children; }
+        //}
+        public IEnumerable<TreeModel> children
         {
-            set { _children = value; }
-            get { return _children; }
+            get; set;
         }
+        public int flag { get; set; } //1部门，2人员
+        public int islast { get; set; }//是否最后一层
         private int _headerid;
         /// <summary>
         /// 树节点显示文本

codegit/CallCenterCommon/CallCenter.Utility/CallCenter.Utility.csproj

@@ -120,12 +120,6 @@
   <ItemGroup>
     <WCFMetadata Include="Service References\" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\CallCenterApi\CallCenterApi.DB\CallCenterApi.DB.csproj">
-      <Project>{ae933bfc-b06c-4fe8-a352-0ce16db082d7}</Project>
-      <Name>CallCenterApi.DB</Name>
-    </ProjectReference>
-  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.