坐席调整，上下班时间调整，大屏修改

codegit/CallCenterApi/CallCenterApi.BLL/T_Sys_SeatGroup.cs

@@ -52,12 +52,19 @@ namespace CallCenterApi.BLL
         /// <summary>
         /// 得到一个对象实体
         /// </summary>
+        public CallCenterApi.Model.T_Sys_SeatGroup GetModel(string F_ZXZCode)
+        {
+
+            return dal.GetModel(F_ZXZCode);
+        }
+        /// <summary>
+        /// 得到一个对象实体
+        /// </summary>
         public CallCenterApi.Model.T_Sys_SeatGroup GetModel(int F_ZXZID)
         {
 
             return dal.GetModel(F_ZXZID);
         }
-
         /// <summary>
         /// 获得数据列表
         /// </summary>

codegit/CallCenterApi/CallCenterApi.DAL/T_Sys_SeatGroup.cs

@@ -162,6 +162,31 @@ namespace CallCenterApi.DAL
                 return false;
             }
         }
+        /// <summary>
+        /// 得到一个对象实体
+        /// </summary>
+        public CallCenterApi.Model.T_Sys_SeatGroup GetModel(string F_ZXZCode)
+        {
+
+            StringBuilder strSql = new StringBuilder();
+            strSql.Append("select  top 1 F_ZXZID,F_ZXZCode,F_ZXZName,F_IVRKey,F_WHBDKey,F_WHWDKey,F_ZXAtt,F_Des,F_CreateTime,F_CreateBy,F_CreateByName ,F_Region from T_Sys_SeatGroup ");
+            strSql.Append(" where F_ZXZCode=@F_ZXZCode");
+            SqlParameter[] parameters = {
+                    new SqlParameter("@F_ZXZCode", SqlDbType.NVarChar,50)
+            };
+            parameters[0].Value = F_ZXZCode;
+
+            CallCenterApi.Model.T_Sys_SeatGroup model = new CallCenterApi.Model.T_Sys_SeatGroup();
+            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>
@@ -257,7 +282,7 @@ namespace CallCenterApi.DAL
         public DataSet GetList(string strWhere)
         {
             StringBuilder strSql = new StringBuilder();
-            strSql.Append("select F_ZXZID,F_ZXZCode,F_ZXZName,F_IVRKey,F_WHBDKey,F_WHWDKey,F_ZXAtt,F_Des,F_CreateTime,F_CreateBy,F_CreateByName ");
+            strSql.Append("select F_ZXZID,F_ZXZCode,F_ZXZName,F_IVRKey,F_WHBDKey,F_WHWDKey,F_ZXAtt,F_Des,F_CreateTime,F_CreateBy,F_CreateByName,F_Region ");
             strSql.Append(" FROM T_Sys_SeatGroup ");
             if (strWhere.Trim() != "")
             {
@@ -277,7 +302,7 @@ namespace CallCenterApi.DAL
             {
                 strSql.Append(" top " + Top.ToString());
             }
-            strSql.Append(" F_ZXZID,F_ZXZCode,F_ZXZName,F_IVRKey,F_WHBDKey,F_WHWDKey,F_ZXAtt,F_Des,F_CreateTime,F_CreateBy,F_CreateByName ");
+            strSql.Append(" F_ZXZID,F_ZXZCode,F_ZXZName,F_IVRKey,F_WHBDKey,F_WHWDKey,F_ZXAtt,F_Des,F_CreateTime,F_CreateBy,F_CreateByName,F_Region ");
             strSql.Append(" FROM T_Sys_SeatGroup ");
             if (strWhere.Trim() != "")
             {

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

@@ -16,7 +16,23 @@ namespace CallCenterApi.Interface.Controllers.customer
     public class RegionCategoryController : BaseController
     {
         private BLL.T_RegionCategory regionBLL = new BLL.T_RegionCategory();
+        public ActionResult GetProvinces()
+        {
+          //  if (Request.IsAuthenticated)
+          //  {
+                list = new BLL.T_RegionCategory().GetModelList(" F_DeleteFlag=0 ");
+                var list_p = list.Where(x => x.F_ParentId == 0).ToList();
+                List<Model.TreeModel> modelList = BindTreeRegion (list_p, "0");
 
+                if (modelList != null)
+                {
+                    if (modelList.Count > 0)
+                        return Success("加载成功", modelList);
+                }
+                return Error("加载失败");
+          //  }
+          //  return NoToken("未知错误，请重新登录");
+        }
         /// <summary>
         /// 获取省市县乡镇
         /// </summary>
@@ -392,6 +408,76 @@ namespace CallCenterApi.Interface.Controllers.customer
         /// <param name="tab"></param>
         /// <param name="parentid"></param>
         /// <returns></returns>
+        private List<Model.TreeModel> BindTreeRegion(List<T_RegionCategory> tab, string parentid)
+        {
+            if (tab.Count > 0)
+            {
+                List<Model.TreeModel> modelList = new List<Model.TreeModel>(tab.Count);
+                for (int i = 0; i < tab.Count; i++)
+                {
+                    Model.TreeModel model = new Model.TreeModel();
+                    int F_RegionId = tab[i].F_RegionId;
+                    string currentID = tab[i].F_RegionId.ToString();//当前功能ID
+                    model.id = currentID;
+                    model.IconCls = "";//图标
+                    if (tab[i].F_Layer != null)
+                    {
+                        model.headerid = int.Parse(tab[i].F_Layer.ToString());
+                    }
+                    model.text = tab[i].F_RegionName;
+                    var tab2 = list.Where(x => x.F_ParentId == F_RegionId).OrderByDescending(x => x.F_Sort).ToList();
+                    if (tab2.Count >0)
+                    {
+                        model.children = BindRegion(tab2, currentID);
+                    }
+                    modelList.Add(model);
+                }
+                return modelList;
+            }
+            else
+            {
+                return null;
+            }
+        }
+        /// <summary>
+        /// tree  树形地市
+        /// </summary>
+        /// <param name="tab"></param>
+        /// <param name="parentid"></param>
+        /// <returns></returns>
+        private List<Model.TreeModel> BindRegion(List<T_RegionCategory> tab, string parentid)
+        {
+            if (tab.Count > 0)
+            {
+                List<Model.TreeModel> modelList = new List<Model.TreeModel>(tab.Count);
+                for (int i = 0; i < tab.Count; i++)
+                {
+                    Model.TreeModel model = new Model.TreeModel();
+                    int F_RegionId = tab[i].F_RegionId;
+                    string currentID = tab[i].F_RegionId.ToString();//当前功能ID
+                    model.id = currentID;
+                    model.IconCls = "";//图标
+                    if (tab[i].F_Layer != null)
+                    {
+                        model.headerid = int.Parse(tab[i].F_Layer.ToString());
+                    }
+                    model.text = tab[i].F_RegionName;
+                    var tab2 = list.Where(x => x.F_ParentId == F_RegionId).OrderByDescending(x => x.F_Sort).ToList();
+                    modelList.Add(model);
+                }
+                return modelList;
+            }
+            else
+            {
+                return null;
+            }
+        }
+        /// <summary>
+        /// tree  树形地市
+        /// </summary>
+        /// <param name="tab"></param>
+        /// <param name="parentid"></param>
+        /// <returns></returns>
         private List<Model.TreeModel> BindTree(List<T_RegionCategory> tab, string parentid)
         {
             if (tab.Count > 0)

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

@@ -2098,6 +2098,7 @@ question, int page = 1, int limit = 10)
         public class Complainthandling
         {
             public string name;
+            public int  typeid;
             public int number;//数量
             public string ongesttime="0h";//用时最长
             public string minimumtime = "0h";//用时最短
@@ -2933,7 +2934,15 @@ question, int page = 1, int limit = 10)
             string Queststr = "";
             if (questionName!="")
             {
-                Queststr = " select * from T_Wo_QuestionManage where F_IsDelete=0 and F_Label in(3) and F_QuestionName='" + questionName+"'";
+                try
+                {
+                    Queststr = " select * from T_Wo_QuestionManage where F_IsDelete=0 and F_Label in(3) and F_Id='" + questionName + "'";
+                }
+                catch
+                {
+                    Queststr = " select * from T_Wo_QuestionManage where F_IsDelete=0 and F_Label in(3) and F_QuestionName='" + questionName + "'";
+                }
+               
             }
             else
             {
@@ -2997,6 +3006,7 @@ question, int page = 1, int limit = 10)
                     List<float> timehource = new List<float>();
                     Complainthandling model = new Complainthandling();
                     model.name = categorylist[i].F_QuestionName;
+                    model .typeid= categorylist[i].F_Id ;
                     model.number = 0;
                     int Overdue = 0;
                     int EndOverdue = 0;

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/tel/WorkcalendarController.cs

@@ -189,7 +189,7 @@ namespace CallCenterApi.Interface.Controllers.tel
                     {
                         foreach (var iv in GroupIDList)
                         {
-                            Model.T_Sys_SeatGroup sm = new BLL.T_Sys_SeatGroup().GetModel(int.Parse(iv));
+                            Model.T_Sys_SeatGroup sm = new BLL.T_Sys_SeatGroup().GetModel(iv);
                             if (sm != null)
                             {
                                 if (msg!="")
@@ -204,7 +204,7 @@ namespace CallCenterApi.Interface.Controllers.tel
                             }
                         }
                     }
-                    it.F_GroupCode = msg;
+                    it.F_GroupCodeName = msg;
                     WorkTimes.Add(it);
                 }
                
@@ -222,9 +222,12 @@ namespace CallCenterApi.Interface.Controllers.tel
                 {
                     BLL.T_Sys_WorkTimes dBLL = new BLL.T_Sys_WorkTimes();
                     Model.T_Sys_WorkTimes dModel = dBLL.GetModel(int.Parse(id.Trim()));
+                    List<Model.T_Sys_WorkTimes> t_Sys_WorkTimes = new List<Model.T_Sys_WorkTimes>();
+                    t_Sys_WorkTimes.Add(dModel);
+                    List<Model.T_Sys_WorkTimes> Input = modeltooip(t_Sys_WorkTimes);
                     if (dModel != null)
                     {
-                        res = Success("获取成功", dModel);
+                        res = Success("获取成功", Input[0]);
                     }
                     else
                     {

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

@@ -3612,7 +3612,6 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             {
                                 return Error("生产批次号错误，生产日期不能大于当前时间！");
                             }
-
                         }
                         catch
                         {
@@ -4953,7 +4952,6 @@ namespace CallCenterApi.Interface.Controllers.workorder
             {
                 string usercode = CurrentUser.UserData.F_UserCode;
                 Model.T_Sys_UserAccount ua = sysUserAccountBll.GetModel(userId);
-
                 #region 添加验证判断
                 if (!(input.F_Type > 0 && input.F_Type < 5))
                     return Error("工单类型错误！");
@@ -4972,7 +4970,6 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             {
                                 return Error("生产批次号错误，生产日期不能大于当前时间！");
                             }
-
                         }
                         catch
                         {

codegit/CallCenterApi/CallCenterApi.Model/T_Sys_WorkTimes.cs

@@ -67,6 +67,10 @@ namespace CallCenterApi.Model
             set { _f_holidayscode = value; }
             get { return _f_holidayscode; }
         }
+        public string F_GroupCodeName
+        {
+            get;set;
+        }
         /// <summary>
         /// 坐席组
         /// </summary>