心连心修改，bug调整

codegit/CallCenterApi/CallCenterApi.DAL/T_Wo_QuestionManage.cs

@@ -333,7 +333,7 @@ namespace CallCenterApi.DAL
         {
             StringBuilder strSql = new StringBuilder();
             strSql.Append("select * ");
-            strSql.Append(" FROM T_Wo_QuestionManage ");
+                strSql.Append(" FROM T_Wo_QuestionManage ");
             if (strWhere.Trim() != "")
             {
                 strSql.Append(" where " + strWhere);

codegit/CallCenterApi/CallCenterApi.DAL/T_Wo_WorkOrder.cs

@@ -71,7 +71,7 @@ namespace CallCenterApi.DAL
                     new SqlParameter("@F_Description", SqlDbType.NText),
                     new SqlParameter("@F_Files", SqlDbType.NVarChar,-1),
                     new SqlParameter("@F_DealType", SqlDbType.NVarChar,200),
-                    new SqlParameter("@F_CustomerID", SqlDbType.Int,4),
+                    new SqlParameter("@F_CustomerID", SqlDbType.NVarChar,100),
                     new SqlParameter("@F_MaterialID", SqlDbType.NVarChar,200),
                     new SqlParameter("@F_QuestionType", SqlDbType.NVarChar,200),
                     new SqlParameter("@F_BatchNumber", SqlDbType.NVarChar,200),
@@ -347,7 +347,7 @@ namespace CallCenterApi.DAL
                     new SqlParameter("@F_Description", SqlDbType.NText),
                     new SqlParameter("@F_Files", SqlDbType.NVarChar,-1),
                     new SqlParameter("@F_DealType", SqlDbType.NVarChar,200),
-                    new SqlParameter("@F_CustomerID", SqlDbType.Int,4),
+                    new SqlParameter("@F_CustomerID", SqlDbType.NVarChar,100),
             new SqlParameter("@F_MaterialID", SqlDbType.NVarChar,200),
                     new SqlParameter("@F_QuestionType", SqlDbType.NVarChar,200),
                     new SqlParameter("@F_BatchNumber", SqlDbType.NVarChar,200),
@@ -696,7 +696,7 @@ namespace CallCenterApi.DAL
                 }
                 if (row["F_CustomerID"] != null && row["F_CustomerID"].ToString() != "")
                 {
-                    model.F_CustomerID = int.Parse(row["F_CustomerID"].ToString());
+                    model.F_CustomerID = row["F_CustomerID"].ToString();
                 }
                 if (row["F_MaterialID"] != null)
                 {

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

@@ -217,20 +217,31 @@ namespace CallCenterApi.Interface.Controllers
         /// 获取部门列表
         /// </summary>
         /// <returns></returns>
-        public ActionResult GetDeptList(int pId = 0)
+        public ActionResult GetDeptList(int pId = 0,string keywords = "")
         {
             //if (Request.IsAuthenticated)
             //{
             DataTable dt = new DataTable();
-            dt = new BLL.T_Sys_Department().GetList(" F_State=1 and F_ParentId=" + pId).Tables[0];
+            if (keywords != "")
+            {
+                if (keywords.Contains("'"))
+                {
+                    keywords= keywords.Replace("'", "");
+                }
+                dt = new BLL.T_Sys_Department().GetList(" F_State=1" + $" and F_DeptName like '%" + keywords.Trim()+"%'").Tables[0];
+            }
+            else
+            {
+                dt = new BLL.T_Sys_Department().GetList(" F_State=1 and F_ParentId=" + pId).Tables[0];
+            }
             List<Model.TreeModel> modelList = BindTree(dt, "0");
-
             if (modelList != null)
             {
                 if (modelList.Count > 0)
                     return Success("加载成功", modelList);
             }
-            return Error("加载失败");
+
+            return Success(null );
             //}
             //return NoToken("未知错误，请重新登录");
         }

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/RoleInfoController.cs

@@ -17,7 +17,7 @@ namespace CallCenterApi.Interface.Controllers
     {
         private BLL.T_Sys_RoleInfo roleInfoBLL = new BLL.T_Sys_RoleInfo();
         // 获取角色列表
-        public ActionResult GetRoleList(int pageIndex = 1, int pageSize = 10, string code = "", string name = "")
+        public ActionResult GetRoleList(int pageIndex = 1, int pageSize = 100, string code = "", string name = "")
         {
             ActionResult res = NoToken("未知错误，请重新登录");
 

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

@@ -62,6 +62,7 @@ namespace CallCenterApi.Interface.Controllers
                                         out recordCount);
 
                 List<Model.UserAccount> modelList = new BLL.UserAccount().DataTableToList(dt);
+              
                 var obj = new
                 {
                     rows = modelList.Select(x => new
@@ -97,6 +98,7 @@ namespace CallCenterApi.Interface.Controllers
                         F_DeptName = x.F_DeptName,
                         F_WorkNumber = x.F_WorkNumber,
                         //F_WXNo=x.F_WXNo,
+                        F_AreaName = GetModelDeptName(x.F_DeptId),
                         F_SeatGroup = x.F_SeartGroup
                     }),
                     total = recordCount
@@ -111,6 +113,27 @@ namespace CallCenterApi.Interface.Controllers
             }
             return res;
         }
+        private string GetModelDeptName(int deptid)
+        {
+            string str = "";
+            Model.T_Sys_Department dept = departmentBLL.GetModel(deptid);
+            if (dept !=null )
+            {
+                if (dept.F_Layer == 1)
+                {
+                    str = dept.F_DeptName;
+                }
+                else if (dept.F_Layer == 2)
+                {
+                    Model.T_Sys_Department dept1 = departmentBLL.GetModel(dept.F_ParentId);
+                    if (dept1 != null)
+                    {
+                        str = dept1.F_DeptName;
+                    }
+                }
+            }
+            return str;
+        }
         /// <summary>
         /// 获取下一个工号
         /// </summary>

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

@@ -139,7 +139,7 @@ namespace CallCenterApi.Interface.Controllers.customer
             if (!string.IsNullOrWhiteSpace(code))//客户编号
             {
                 if (valcode(code))
-                    sql += " and F_CustomerCode=" + code.Trim() + " ";
+                    sql += " and F_CustomerCode='" + code.Trim() + "'";
                 list = cusbll.GetModelList(sql);
                 if (list.Count > 0)
                 {
@@ -147,16 +147,17 @@ namespace CallCenterApi.Interface.Controllers.customer
                     if (Input != null)
                         return Success("获取成功", Input.FirstOrDefault());
                     else
-                        return Error("没有获取到客户信息，请检查客户编号");
+                        return Success("没有获取到客户信息，请检查客户编号", null );
                 }
                 else
                 {
-                    return Error("没有获取到客户信息，请检查客户编号");
+                    return Success("没有获取到客户信息，请检查客户编号", null);
                 }
             }
             else
             {
-                return Error("参数传输失败");
+                return Success("请输入客户编号", null);
+             
             }
         }
         /// <summary>
@@ -213,13 +214,11 @@ namespace CallCenterApi.Interface.Controllers.customer
                 return Error("参数传输失败");
             }
         }
-        private string  GetIntCode()
+        private string  GetIntCode(int i )
         {
-            string time = DateTime.Now.ToString("hhmmss");
-            Random ran = new Random();
-            int RandKey = ran.Next(100, 999);
-            string timecode = 3 + "" + RandKey + "" + time;
-            return timecode;
+            DateTime times = DateTime.Now.AddMinutes(i);
+            string time = times.ToString("yyMMddhhmm");
+            return time;
         }
         /// <summary>
         /// 添加客户信息
@@ -236,15 +235,24 @@ namespace CallCenterApi.Interface.Controllers.customer
                 if (getunique(0, input.F_CustomerCode))
                     return Error("编号已被占用，请重新输入！");
             }
+            if (string.IsNullOrEmpty(input.F_LegalPhone))
+                return Error("请输入客户电话");
+            if (getunphone(0, input.F_LegalPhone))
+                return Error("已存在该客户请勿重复添加");
+            int i = 0;
             if (string.IsNullOrEmpty(input.F_CustomerCode))
             {
                 while (true)
                 {
-                    if (!getunique(0, GetIntCode()))
+                    if (!getunique(0, GetIntCode(i)))
                     {
-                        input.F_CustomerCode= GetIntCode();
+                        input.F_CustomerCode= GetIntCode(i);
                         break ;
                     }
+                    else
+                    {
+                        i++;
+                    }
                 }
             }
             #endregion
@@ -442,6 +450,19 @@ namespace CallCenterApi.Interface.Controllers.customer
             return count > 0;
         }
         /// <summary>
+        /// 验证客户电话是否唯一
+        /// </summary>
+        private bool getunphone(int id, string phone)
+        {
+            var sql = " F_IsDelete=0 ";
+            sql += "and (F_LegalPhone='" + phone + "')";
+            if (id > 0)
+                sql += " and F_CustomerId<>" + id;
+            var count = cusbll.GetModelList(sql).Count();
+
+            return count > 0;
+        }
+        /// <summary>
         /// 删除客户
         /// </summary>
         /// <param name="ids"></param>
@@ -596,7 +617,7 @@ namespace CallCenterApi.Interface.Controllers.customer
                                 dModel.F_CustomerNature = dr["客户性质"].ToString();
                                 dModel.F_Channel = dr["渠道类型"].ToString();
                                 dModel.F_Credit = dr["信用等级"].ToString();
-                                dModel.F_Legal = dr["法人"].ToString();
+                                dModel.F_Legal = dr["客户"].ToString();
                                     if (!string.IsNullOrEmpty(dr["性别"].ToString()))
                                     {
                                         if (dr["性别"].ToString() == "女")
@@ -609,7 +630,7 @@ namespace CallCenterApi.Interface.Controllers.customer
                                         }
                                     }
                                    
-                                    dModel.F_LegalPhone = dr["法人电话"].ToString();
+                                    dModel.F_LegalPhone = dr["客户电话"].ToString();
                                 dModel.F_AddressProvince = dr["省"].ToString();
                                 dModel.F_AddressCity = dr["市"].ToString();
                                 dModel.F_AddressCountry = dr["县"].ToString();

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

@@ -1256,24 +1256,28 @@ namespace CallCenterApi.Interface.Controllers.report
                 for (int i = 0; i < model1.Count; i++)
                 {
                     Prescription model = new Prescription();
-                    if (!valcode(model1[i].F_CustomerID.ToString(), 10))//验证客户编码为10位纯数字
+                    if (!string .IsNullOrEmpty (model1[i].F_CustomerID))
                     {
-                        Model.T_Cus_CustomerBaseNew cuModel = cusbll.GetModel(model1[i].F_CustomerID.ToString());//通过客户编号获取客户资料
-                        if (cuModel != null)
+                        if (!valcode(model1[i].F_CustomerID, 10))//验证客户编码为10位纯数字
                         {
-                            Model.T_Sys_Department pdModel = departmentBLL.GetModel(cuModel.F_AreaID);//通过公司id获取部门
-                            if (pdModel != null)
+                            Model.T_Cus_CustomerBaseNew cuModel = cusbll.GetModel(model1[i].F_CustomerID);//通过客户编号获取客户资料
+                            if (cuModel != null)
                             {
-                                model.AreaName = pdModel.F_DeptName;//大区名称
+                                Model.T_Sys_Department pdModel = departmentBLL.GetModel(cuModel.F_AreaID);//通过公司id获取部门
+                                if (pdModel != null)
+                                {
+                                    model.AreaName = pdModel.F_DeptName;//大区名称
+                                }
+                                Model.T_Sys_Department pdModel1 = departmentBLL.GetModel(cuModel.F_BranchID);
+                                if (pdModel1 != null)
+                                {
+                                    model.BranchName = pdModel1.F_DeptName;//大区名称
+                                }
+                                model.Brands = cuModel.F_Brands;//品牌
                             }
-                            Model.T_Sys_Department pdModel1 = departmentBLL.GetModel(cuModel.F_BranchID);
-                            if (pdModel1 != null)
-                            {
-                                model.BranchName = pdModel1.F_DeptName;//大区名称
-                            }
-                            model.Brands = cuModel.F_Brands;//品牌
                         }
                     }
+                   
                     if (!string.IsNullOrEmpty(model1[i].F_QuestionType))
                     {
                         Model.T_Wo_QuestionManage Manage = quesBLL.GetModel(model1[i].F_QuestionType);//获取问题类别
@@ -1332,25 +1336,28 @@ namespace CallCenterApi.Interface.Controllers.report
                 for (int i = 0; i < model1.Count; i++)
                 {
                     Questions model = new Questions();
-                    if (!valcode(model1[i].F_CustomerID.ToString(), 10))//验证客户编码为10位纯数字
+                    if (!string .IsNullOrEmpty (model1[i].F_CustomerID))
                     {
-                        Model.T_Cus_CustomerBaseNew cuModel = cusbll.GetModel(model1[i].F_CustomerID.ToString());//通过客户编号获取客户资料
-                        if (cuModel != null)
+                        if (!valcode(model1[i].F_CustomerID, 10))//验证客户编码为10位纯数字
                         {
-                            Model.T_Sys_Department pdModel = departmentBLL.GetModel(cuModel.F_AreaID);//通过公司id获取部门
-                            if (pdModel != null)
-                            {
-                                model.AreaName = pdModel.F_DeptName;
-                            }
-                            Model.T_Sys_Department pdModel1 = departmentBLL.GetModel(cuModel.F_BranchID);
-                            if (pdModel1 != null)
+                            Model.T_Cus_CustomerBaseNew cuModel = cusbll.GetModel(model1[i].F_CustomerID);//通过客户编号获取客户资料
+                            if (cuModel != null)
                             {
-                                model.BranchName = pdModel1.F_DeptName;
+                                Model.T_Sys_Department pdModel = departmentBLL.GetModel(cuModel.F_AreaID);//通过公司id获取部门
+                                if (pdModel != null)
+                                {
+                                    model.AreaName = pdModel.F_DeptName;
+                                }
+                                Model.T_Sys_Department pdModel1 = departmentBLL.GetModel(cuModel.F_BranchID);
+                                if (pdModel1 != null)
+                                {
+                                    model.BranchName = pdModel1.F_DeptName;
+                                }
+                                model.Salesman = cuModel.F_Salesman;
+                                model.Brands = cuModel.F_Brands;
+                                model.Channel = cuModel.F_Channel;
+
                             }
-                            model.Salesman = cuModel.F_Salesman;
-                            model.Brands = cuModel.F_Brands;
-                            model.Channel = cuModel.F_Channel;
-                       
                         }
                     }
                     model .Category = model1[i].F_TS_Category ;
@@ -1404,41 +1411,47 @@ namespace CallCenterApi.Interface.Controllers.report
                 for (int i = 0; i < model1.Count; i++)
                 {
                     WorkOrderComplaint model = new WorkOrderComplaint();
-                    if (!valcode(model1[i].F_CustomerID.ToString(), 10))//验证客户编码为10位纯数字
+                    if (!string .IsNullOrEmpty (model1[i].F_CustomerID))
                     {
-                        model.F_CustomerID = model1[i].F_CustomerID;//客户编码
-                        Model.T_Cus_CustomerBaseNew cuModel = cusbll.GetModel(model1[i].F_CustomerID.ToString());//通过客户编号获取客户资料
-                        if (cuModel != null)
+                        if (!valcode(model1[i].F_CustomerID, 10))//验证客户编码为10位纯数字
                         {
-                            Model.T_Sys_Department pdModel = departmentBLL.GetModel(cuModel.F_AreaID);//通过公司id获取部门
-                            if (pdModel != null)
-                            {
-                                model.F_AreaName = pdModel.F_DeptName;//大区名称
-                            }
-                            Model.T_Sys_Department pdModel1 = departmentBLL.GetModel(cuModel.F_BranchID);
-                            if (pdModel1 != null)
+                            model.F_CustomerID = model1[i].F_CustomerID;//客户编码
+                            Model.T_Cus_CustomerBaseNew cuModel = cusbll.GetModel(model1[i].F_CustomerID);//通过客户编号获取客户资料
+                            if (cuModel != null)
                             {
-                                model.F_BranchName = pdModel1.F_DeptName;//分公司名称
+                                Model.T_Sys_Department pdModel = departmentBLL.GetModel(cuModel.F_AreaID);//通过公司id获取部门
+                                if (pdModel != null)
+                                {
+                                    model.F_AreaName = pdModel.F_DeptName;//大区名称
+                                }
+                                Model.T_Sys_Department pdModel1 = departmentBLL.GetModel(cuModel.F_BranchID);
+                                if (pdModel1 != null)
+                                {
+                                    model.F_BranchName = pdModel1.F_DeptName;//分公司名称
+                                }
+                                model.F_Salesman = cuModel.F_Salesman;//业务员
                             }
-                            model.F_Salesman = cuModel.F_Salesman;//业务员
                         }
                     }
-                    if (!valcode(model1[i].F_MaterialID.ToString(), 11))
+                    if (!string .IsNullOrEmpty (model1[i].F_MaterialID))
                     {
-                        model.F_MaterialID = int.Parse(model1[i].F_MaterialID);//验证物料编码为11位纯数字
-                        Model.T_Wo_MaterialManage maModel = mmBLL.GetModel(model1[i].F_MaterialID.ToString());//通过物料编码获取物料信息
-                        if (maModel != null)
+                        if (!valcode(model1[i].F_MaterialID, 11))
                         {
-                            model.F_MaterialName = maModel.F_MaterialName;//物料名称
-                            model.F_Model = maModel.F_Model;//型号
-                            model.F_Specs = maModel.F_Specs;//规格
-                            model.F_Level1 = maModel.F_Level1;//一级分类
-                            model.F_Level2 = maModel.F_Level2;//二级分类
-                            model.F_Level3 = maModel.F_Level3;//三级分类
-                            model.F_Brand = maModel.F_Brand;//品牌
-                            model.F_MaterialEffect = maModel.F_MaterialEffect;//F_MaterialEffect
-                            model.F_Pipeline = maModel.F_Pipeline;//F_Pipeline
-                            model.F_Craft = maModel.F_Craft;//F_Craft
+                            model.F_MaterialID = int.Parse(model1[i].F_MaterialID);//验证物料编码为11位纯数字
+                            Model.T_Wo_MaterialManage maModel = mmBLL.GetModel(model1[i].F_MaterialID);//通过物料编码获取物料信息
+                            if (maModel != null)
+                            {
+                                model.F_MaterialName = maModel.F_MaterialName;//物料名称
+                                model.F_Model = maModel.F_Model;//型号
+                                model.F_Specs = maModel.F_Specs;//规格
+                                model.F_Level1 = maModel.F_Level1;//一级分类
+                                model.F_Level2 = maModel.F_Level2;//二级分类
+                                model.F_Level3 = maModel.F_Level3;//三级分类
+                                model.F_Brand = maModel.F_Brand;//品牌
+                                model.F_MaterialEffect = maModel.F_MaterialEffect;//F_MaterialEffect
+                                model.F_Pipeline = maModel.F_Pipeline;//F_Pipeline
+                                model.F_Craft = maModel.F_Craft;//F_Craft
+                            }
                         }
                     }
                     if (!string .IsNullOrEmpty(model1[i].F_QuestionType))
@@ -1522,17 +1535,21 @@ namespace CallCenterApi.Interface.Controllers.report
                 for (int i = 0; i < model1.Count; i++)
                 {
                     Product model = new Product();
-                    if (!valcode(model1[i].F_CustomerID.ToString(), 10))//验证客户编码为10位纯数字
+                    if (!string .IsNullOrEmpty (model1[i].F_CustomerID))
                     {
-                     
-                        Model.T_Cus_CustomerBaseNew cuModel = cusbll.GetModel(model1[i].F_CustomerID.ToString());//通过客户编号获取客户资料
-                        if (cuModel != null)
+                        if (!valcode(model1[i].F_CustomerID, 10))//验证客户编码为10位纯数字
                         {
-                            Model.T_Sys_Department pdModel = departmentBLL.GetModel(cuModel.F_AreaID);//通过公司id获取部门
-                           
-                            model.F_Salesman = cuModel.F_Salesman;//业务员
+
+                            Model.T_Cus_CustomerBaseNew cuModel = cusbll.GetModel(model1[i].F_CustomerID);//通过客户编号获取客户资料
+                            if (cuModel != null)
+                            {
+                                Model.T_Sys_Department pdModel = departmentBLL.GetModel(cuModel.F_AreaID);//通过公司id获取部门
+
+                                model.F_Salesman = cuModel.F_Salesman;//业务员
+                            }
                         }
                     }
+                   
                     model.Category = model1[i].F_TS_Category;//产品
                     model.Company = model1[i].F_CompanyName;//客户单位
                     if (!string.IsNullOrEmpty(model1[i].F_BatchNumber))

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

@@ -76,12 +76,12 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 }
                 else
                 {
-                    return Error("获取物料信息失败");
+                    return Success(null );
                 }
             }
             else
             {
-                return Error("获取参数失败");
+                return Success("请输入物料编码", null);
             }
         }
 

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

@@ -146,7 +146,8 @@ namespace CallCenterApi.Interface.Controllers.workorder
         #region 读取问题类别
         public ActionResult GetQuestionNameType(int type = 0, string QuestionName = "")
         {
-            var sql = " F_IsDelete=0";
+            DataTable dt = new DataTable();
+            var sql = "and F_IsDelete=0";
             if (QuestionName != "")
             {
                 var Question = quesBLL.GetModel(QuestionName);
@@ -162,7 +163,34 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 sql += " and F_Type='" + EnumWOType.ConsultingNeeds.ToString() + "'";
             if (type == (int)EnumWOType.SpotCheck)//抽检
                 sql += " and F_Type='" + EnumWOType.SpotCheck.ToString() + "'";
-            DataTable dt = quesBLL.GetList(sql).Tables[0];
+            int recordCount = 0;
+            if (QuestionName==""&& type == (int)EnumWOType.Complaint)
+                {
+                dt = BLL.PagerBLL.GetListPager(
+                       "T_Wo_QuestionManage",
+                       "F_ID",
+                       "*",
+                       sql,
+                       "ORDER BY T_Wo_QuestionManage.F_ID desc",
+                       10000,
+                       1,
+                       true,
+                       out recordCount);
+            }
+            else
+            {
+                dt = BLL.PagerBLL.GetListPager(
+                      "T_Wo_QuestionManage",
+                      "F_ID",
+                      "*",
+                      sql,
+                      "ORDER BY T_Wo_QuestionManage.F_ID ",
+                      10000,
+                      1,
+                      true,
+                      out recordCount);
+            }
+        
             List<Model.TreeModel> modelList = BindTree(dt, "0");
             if (modelList != null)
             {
@@ -173,7 +201,8 @@ namespace CallCenterApi.Interface.Controllers.workorder
         }
         public ActionResult GetQuestionType(int type = 0,int pid=0)
         {
-            var sql = " F_IsDelete=0";
+            DataTable dt = new DataTable();
+            var sql = "and F_IsDelete=0";
                 sql += "  and F_ParentId=" + pid;
             if (type == (int)EnumWOType.Complaint)//投诉
                 sql += " and F_Type='" + EnumWOType.Complaint.ToString() + "'";
@@ -181,7 +210,38 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 sql += " and F_Type='" + EnumWOType.ConsultingNeeds.ToString() + "'";
             if (type == (int)EnumWOType.SpotCheck)//抽检
                 sql += " and F_Type='" + EnumWOType.SpotCheck.ToString() + "'";
-            DataTable dt = quesBLL.GetList(sql).Tables[0];
+            int recordCount = 0;
+            if (pid == 0 && type == (int)EnumWOType.Complaint)
+            {
+                if (!string.IsNullOrWhiteSpace(sql))
+                {
+
+                    dt = BLL.PagerBLL.GetListPager(
+                        "T_Wo_QuestionManage",
+                        "F_ID",
+                        "*",
+                        sql,
+                        "ORDER BY T_Wo_QuestionManage.F_ID desc",
+                        10000,
+                        1,
+                        true,
+                        out recordCount);
+                }
+            }
+            else
+            {
+                dt = BLL.PagerBLL.GetListPager(
+                      "T_Wo_QuestionManage",
+                      "F_ID",
+                      "*",
+                      sql,
+                      "ORDER BY T_Wo_QuestionManage.F_ID ",
+                      10000,
+                      1,
+                      true,
+                      out recordCount);
+            }
+
             List<Model.TreeModel> modelList = BindTree(dt, "0");
             if (modelList != null)
             {

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Models/Enum/EnumWorkOrderState.cs

@@ -39,6 +39,8 @@ namespace CallCenterApi.Interface.Models.Enum
         customers,
         [Description("微信未通过")]
         recustomers,
+        [Description("待审批")]
+        audit,
     }
     /// <summary>
     /// 工单记录类型枚举

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

@@ -162,7 +162,7 @@ namespace CallCenterApi.Interface.Models.Input
         /// <summary>
         /// 客户id
         /// </summary>
-        public int?   F_CustomerID
+        public string    F_CustomerID
         {
             get; set;
         }
@@ -239,7 +239,7 @@ namespace CallCenterApi.Interface.Models.Input
         /// <summary>
         /// 物料id
         /// </summary>
-        public int  F_MaterialID
+        public string   F_MaterialID
         {
             get; set;
         }
@@ -676,6 +676,13 @@ namespace CallCenterApi.Interface.Models.Input
             get; set;
         }
         /// <summary>
+        /// 添加人工号
+        /// </summary>
+        public string F_CreateName
+        {
+            get; set;
+        }
+        /// <summary>
         /// 添加时间
         /// </summary>
         public DateTime? F_CreateOn
@@ -746,6 +753,27 @@ namespace CallCenterApi.Interface.Models.Input
         {
             get; set;
         }
+        ///// <summary>
+        ///// 上级人员
+        ///// </summary>
+        public string F_UserName
+        {
+            get; set;
+        }
+        ///// <summary>
+        ///// 上级人员
+        ///// </summary>
+        public string F_UserCode
+        {
+            get; set;
+        }
+        ///// <summary>
+        ///// 上级部门
+        ///// </summary>
+        public string F_NextDeptName
+        {
+            get; set;
+        }
     }
 }
 public class Questions
@@ -914,7 +942,7 @@ public class WorkOrderComplaint
     /// <summary>
     /// 客户编号
     /// </summary>
-    public int? F_CustomerID
+    public string  F_CustomerID
     {
         get; set;
     }

codegit/CallCenterApi/CallCenterApi.Model/T_Wo_WorkOrder.cs

@@ -26,7 +26,7 @@ namespace CallCenterApi.Model
         private string _f_description;
         private string _f_files;
         private string _f_dealtype;
-        private int? _f_customerid;
+        private string  _f_customerid;
         private string _f_materialid;
         private string _f_questiontype;
         private string _f_batchnumber;
@@ -277,7 +277,7 @@ namespace CallCenterApi.Model
         /// <summary>
         /// 客户id
         /// </summary>
-        public int? F_CustomerID
+        public string  F_CustomerID
         {
             set { _f_customerid = value; }
             get { return _f_customerid; }
@@ -722,6 +722,7 @@ namespace CallCenterApi.Model
             set { _f_createby = value; }
             get { return _f_createby; }
         }
+    
         /// <summary>
         /// 添加时间
         /// </summary>