自定义客户字段

坐席工作报表自定义导出

CallCenterApi/CallCenterApi.DAL/T_Sys_UserAccount.cs

@@ -165,7 +165,10 @@ namespace CallCenterApi.DAL
             strSql.Append("F_DeptCode=@F_DeptCode,");
             strSql.Append("F_WXNo=@F_WXNo,");
             strSql.Append("F_SeartGroupID=@F_SeartGroupID,");
-            strSql.Append("F_SeartGroup=@F_SeartGroup");
+            strSql.Append("F_StartTime1=@F_StartTime1,");
+            strSql.Append("F_StartTime2=@F_StartTime2, ");
+            strSql.Append("F_EndTime1=@F_EndTime1, ");
+            strSql.Append("F_EndTime2=@F_EndTime2 ");
             strSql.Append(" where F_UserId=@F_UserId");
             SqlParameter[] parameters = {
                     new SqlParameter("@F_UserCode", SqlDbType.VarChar,50),
@@ -199,6 +202,10 @@ namespace CallCenterApi.DAL
                     new SqlParameter("@F_WXNo", SqlDbType.NVarChar,50),
                     new SqlParameter("@F_SeartGroupID", SqlDbType.Int,4),
                     new SqlParameter("@F_SeartGroup", SqlDbType.NVarChar,50),
+                    new SqlParameter("@F_StartTime1",  SqlDbType.DateTime),
+                    new SqlParameter("@F_StartTime2",  SqlDbType.DateTime),
+                    new SqlParameter("@F_EndTime1",  SqlDbType.DateTime),
+                    new SqlParameter("@F_EndTime2", SqlDbType.DateTime),
                     new SqlParameter("@F_UserId", SqlDbType.Int,4)};
             parameters[0].Value = model.F_UserCode;
             parameters[1].Value = model.F_Password;
@@ -231,7 +238,11 @@ namespace CallCenterApi.DAL
             parameters[28].Value = model.F_WXNo;
             parameters[29].Value = model.F_SeartGroupID;
             parameters[30].Value = model.F_SeartGroup;
-            parameters[31].Value = model.F_UserId;
+            parameters[31].Value = model.StartTime1;
+            parameters[32].Value = model.StartTime2;
+            parameters[33].Value = model.EndTime1;
+            parameters[34].Value = model.EndTime2;
+            parameters[35].Value = model.F_UserId;
 
             int rows = DbHelperSQL.ExecuteSql(strSql.ToString(), parameters);
             if (rows > 0)
@@ -308,11 +319,11 @@ namespace CallCenterApi.DAL
         /// <summary>
         /// 登录得到一个对象实体
         /// </summary>
-        public Model.T_Sys_UserAccount LoginGetModel(string F_UserCode,string F_Password)
+        public Model.T_Sys_UserAccount LoginGetModel(string F_UserCode, string F_Password)
         {
 
             StringBuilder strSql = new StringBuilder();
-            strSql.Append("select  top 1 F_UserId,F_UserCode,F_Password,F_ExtensionNumber,F_UserName,F_DeptId,F_RoleId,F_GroupId,F_SeatFlag,F_SeatRight,F_SeatLevel,F_SexFlag,F_RemindFlag,F_Remark,F_Telephone,F_Mobile,F_HomePhone,F_Birthday,F_CreateOn,F_CancelOn,F_DeleteFlag,F_APPOnFlag,F_LastActiveTime,F_See,F_HJType,F_PId,F_TmId,F_WorkNumber,F_DeptCode,F_WXNo,F_SeartGroupID,F_SeartGroup from T_Sys_UserAccount ");
+            strSql.Append("select  top 1 F_UserId,F_UserCode,F_Password,F_ExtensionNumber,F_UserName,F_DeptId,F_RoleId,F_GroupId,F_SeatFlag,F_SeatRight,F_SeatLevel,F_SexFlag,F_RemindFlag,F_Remark,F_Telephone,F_Mobile,F_HomePhone,F_Birthday,F_CreateOn,F_CancelOn,F_DeleteFlag,F_APPOnFlag,F_LastActiveTime,F_See,F_HJType,F_PId,F_TmId,F_WorkNumber,F_DeptCode,F_WXNo,F_SeartGroupID,F_SeartGroup,F_StartTime1,F_StartTime2,F_EndTime1,F_EndTime2  from T_Sys_UserAccount ");
             strSql.Append(" where F_UserCode=@F_UserCode and F_Password=@F_Password and  F_DeleteFlag=0");
             SqlParameter[] parameters = {
                     new SqlParameter("@F_UserCode", SqlDbType.VarChar,50),
@@ -340,7 +351,7 @@ namespace CallCenterApi.DAL
         {
 
             StringBuilder strSql = new StringBuilder();
-            strSql.Append("select  top 1 F_UserId,F_UserCode,F_ExtensionNumber,F_UserName,F_Password,F_DeptId,F_RoleId,F_GroupId,F_SeatFlag,F_SeatRight,F_SeatLevel,F_SexFlag,F_RemindFlag,F_Remark,F_Telephone,F_Mobile,F_HomePhone,F_Birthday,F_CreateOn,F_CancelOn,F_DeleteFlag,F_APPOnFlag,F_LastActiveTime,F_See,F_HJType,F_PId,F_TmId,F_WorkNumber,F_DeptCode,F_WXNo,F_SeartGroupID,F_SeartGroup from T_Sys_UserAccount ");
+            strSql.Append("select  top 1 F_UserId,F_UserCode,F_ExtensionNumber,F_UserName,F_Password,F_DeptId,F_RoleId,F_GroupId,F_SeatFlag,F_SeatRight,F_SeatLevel,F_SexFlag,F_RemindFlag,F_Remark,F_Telephone,F_Mobile,F_HomePhone,F_Birthday,F_CreateOn,F_CancelOn,F_DeleteFlag,F_APPOnFlag,F_LastActiveTime,F_See,F_HJType,F_PId,F_TmId,F_WorkNumber,F_DeptCode,F_WXNo,F_SeartGroupID,F_SeartGroup,F_StartTime1,F_StartTime2,F_EndTime1,F_EndTime2  from T_Sys_UserAccount ");
             strSql.Append(" where F_UserCode=@F_UserCode");
             SqlParameter[] parameters = {
                     new SqlParameter("@F_UserCode", SqlDbType.VarChar,50)
@@ -366,7 +377,7 @@ namespace CallCenterApi.DAL
         {
 
             StringBuilder strSql = new StringBuilder();
-            strSql.Append("select  top 1 F_UserId,F_UserCode,F_Password,F_ExtensionNumber,F_UserName,F_DeptId,F_RoleId,F_GroupId,F_SeatFlag,F_SeatRight,F_SeatLevel,F_SexFlag,F_RemindFlag,F_Remark,F_Telephone,F_Mobile,F_HomePhone,F_Birthday,F_CreateOn,F_CancelOn,F_DeleteFlag,F_APPOnFlag,F_LastActiveTime,F_See,F_HJType,F_PId,F_TmId,F_WorkNumber,F_DeptCode,F_WXNo,F_SeartGroupID,F_SeartGroup from T_Sys_UserAccount ");
+            strSql.Append("select  top 1 F_UserId,F_UserCode,F_Password,F_ExtensionNumber,F_UserName,F_DeptId,F_RoleId,F_GroupId,F_SeatFlag,F_SeatRight,F_SeatLevel,F_SexFlag,F_RemindFlag,F_Remark,F_Telephone,F_Mobile,F_HomePhone,F_Birthday,F_CreateOn,F_CancelOn,F_DeleteFlag,F_APPOnFlag,F_LastActiveTime,F_See,F_HJType,F_PId,F_TmId,F_WorkNumber,F_DeptCode,F_WXNo,F_SeartGroupID,F_SeartGroup,F_StartTime1,F_StartTime2,F_EndTime1,F_EndTime2 from T_Sys_UserAccount ");
             strSql.Append(" where F_UserId=@F_UserId");
             SqlParameter[] parameters = {
                     new SqlParameter("@F_UserId", SqlDbType.Int,4)
@@ -385,8 +396,8 @@ namespace CallCenterApi.DAL
             }
         }
 
-       
-      
+
+
 
         /// <summary>
         /// 得到一个对象实体
@@ -408,7 +419,7 @@ namespace CallCenterApi.DAL
                 {
                     model.F_Password = row["F_Password"].ToString();
                 }
-                
+
                 if (row["F_ExtensionNumber"] != null)
                 {
                     model.F_ExtensionNumber = row["F_ExtensionNumber"].ToString();
@@ -546,6 +557,10 @@ namespace CallCenterApi.DAL
                 {
                     model.F_SeartGroup = row["F_SeartGroup"].ToString();
                 }
+                model.StartTime1 = row["F_StartTime1"] == DBNull.Value ? null : (DateTime?)DateTime.Parse(row["F_StartTime1"].ToString());
+                model.StartTime2 = row["F_StartTime2"] == DBNull.Value ? null : (DateTime?)DateTime.Parse(row["F_StartTime2"].ToString());
+                model.EndTime1 = row["F_EndTime1"] == DBNull.Value ? null : (DateTime?)DateTime.Parse(row["F_EndTime1"].ToString());
+                model.EndTime2 = row["F_EndTime2"] == DBNull.Value ? null : (DateTime?)DateTime.Parse(row["F_EndTime2"].ToString());
             }
             return model;
         }
@@ -582,7 +597,7 @@ namespace CallCenterApi.DAL
         public DataSet GetList(string strWhere)
         {
             StringBuilder strSql = new StringBuilder();
-            strSql.Append("select F_UserId,F_UserCode,F_Password,F_ExtensionNumber,F_UserName,F_DeptId,F_RoleId,F_GroupId,F_SeatFlag,F_SeatRight,F_SeatLevel,F_SexFlag,F_RemindFlag,F_Remark,F_Telephone,F_Mobile,F_HomePhone,F_Birthday,F_CreateOn,F_CancelOn,F_DeleteFlag,F_APPOnFlag,F_LastActiveTime,F_See,F_HJType,F_PId,F_TmId,F_WorkNumber,F_DeptCode,F_WXNo,F_SeartGroupID,F_SeartGroup ");
+            strSql.Append("select F_UserId,F_UserCode,F_Password,F_ExtensionNumber,F_UserName,F_DeptId,F_RoleId,F_GroupId,F_SeatFlag,F_SeatRight,F_SeatLevel,F_SexFlag,F_RemindFlag,F_Remark,F_Telephone,F_Mobile,F_HomePhone,F_Birthday,F_CreateOn,F_CancelOn,F_DeleteFlag,F_APPOnFlag,F_LastActiveTime,F_See,F_HJType,F_PId,F_TmId,F_WorkNumber,F_DeptCode,F_WXNo,F_SeartGroupID,F_SeartGroup,F_StartTime1,F_StartTime2,F_EndTime1,F_EndTime2  ");
             strSql.Append(" FROM T_Sys_UserAccount ");
             if (strWhere.Trim() != "")
             {

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

@@ -312,6 +312,7 @@
     <Compile Include="Models\Filter\FilterUserAccount.cs" />
     <Compile Include="Models\Filter\FilterProduct.cs" />
     <Compile Include="Models\Input\BanCallOutInput.cs" />
+    <Compile Include="Models\Input\CallInTimeInput.cs" />
     <Compile Include="Models\Input\CallNumberInput.cs" />
     <Compile Include="Models\Input\CallPlanInput.cs" />
     <Compile Include="Models\Input\CategoryInput.cs" />

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

@@ -556,5 +556,35 @@ namespace CallCenterApi.Interface.Controllers
             return res;
         }
 
+
+        public ActionResult UpdateCallInTime(CallInTimeInput input)
+        {
+            var model = sysUserAccountBll.GetModel(CurrentUser.UserData.F_UserId);
+            if (model == null)
+                return Error("当前用户不存在");
+            model.StartTime1 = input.StartTime1;
+            model.EndTime1 = input.EndTime1;
+            model.StartTime2 = input.StartTime2;
+            model.EndTime1 = input.EndTime1;
+            if (sysUserAccountBll.Update(model))
+                return Success("修改成功");
+            return Error("修改失败");
+        }
+
+        public ActionResult GetCallInTime(CallInTimeInput input)
+        {
+            var model = sysUserAccountBll.GetModel(CurrentUser.UserData.F_UserId);
+            if (model == null)
+                return Error("当前用户不存在");
+
+            return Success("获取成功", new
+            {
+                starttime1 = model.StartTime1,
+                starttime2 = model.StartTime2,
+                endtime1 = model.EndTime1,
+                endtime2 = model.EndTime2
+            });
+        }
+
     }
 }

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/callout/CallPlanController.cs

@@ -906,7 +906,7 @@ namespace CallCenterApi.Interface.Controllers.callout
                 {
                     if (deptCode.Replace("|0|1|", "").Length > 0)
                     {
-                        sql += " and DeptId in (select F_DeptId from T_Sys_Department where F_DeptCode like '" + deptCode + "%') ";
+                        sql += $" and DeptId in (select F_ParentId from T_Sys_Department where F_DeptId={deptid}) ";
                     }
                 }
             }

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/customer/CustomerController.cs

@@ -186,6 +186,7 @@ namespace CallCenterApi.Interface.Controllers.customer
         public ActionResult AddCustomer(CustomerInput input)
         {
             Model.T_Cus_CustomerBase model = new Model.T_Cus_CustomerBase();
+            Model.T_Cus_CustomerExpand expand = new Model.T_Cus_CustomerExpand();
             BLL.T_Cus_CustomerBase bll = new BLL.T_Cus_CustomerBase();
             if (!string.IsNullOrWhiteSpace(input.Id))
             {
@@ -199,11 +200,55 @@ namespace CallCenterApi.Interface.Controllers.customer
                 model.F_PhoneNum2 = input.PhoneNum2;
                 model.F_AddAgentId = CurrentUser.UserData.F_UserId;
                 model.F_DeptId = CurrentUser.UserData.F_DeptId;
-
-
-
                 if (bll.Add(model) > 0)
-                    return Success("新增成功！");
+                {
+                    #region 自定义字段
+                    expand.F_StrExpand1 = input.F_StrExpand1;
+                    expand.F_StrExpand2 = input.F_StrExpand2;
+                    expand.F_StrExpand3 = input.F_StrExpand3;
+                    expand.F_StrExpand4 = input.F_StrExpand4;
+                    expand.F_StrExpand5 = input.F_StrExpand5;
+                    expand.F_StrExpand6 = input.F_StrExpand6;
+                    expand.F_StrExpand7 = input.F_StrExpand7;
+                    expand.F_StrExpand8 = input.F_StrExpand8;
+                    expand.F_StrExpand9 = input.F_StrExpand9;
+                    expand.F_StrExpand1 = input.F_StrExpand1;
+                    expand.F_StrExpand11 = input.F_StrExpand11;
+                    expand.F_StrExpand12 = input.F_StrExpand12;
+                    expand.F_StrExpand13 = input.F_StrExpand13;
+                    expand.F_StrExpand14 = input.F_StrExpand14;
+                    expand.F_StrExpand15 = input.F_StrExpand15;
+                    expand.F_StrExpand16 = input.F_StrExpand16;
+                    expand.F_StrExpand17 = input.F_StrExpand17;
+                    expand.F_StrExpand18 = input.F_StrExpand18;
+                    expand.F_StrExpand19 = input.F_StrExpand19;
+                    expand.F_StrExpand20 = input.F_StrExpand20;
+                    expand.F_StrExpand21 = input.F_StrExpand21;
+                    expand.F_StrExpand22 = input.F_StrExpand22;
+                    expand.F_StrExpand23 = input.F_StrExpand23;
+                    expand.F_StrExpand24 = input.F_StrExpand24;
+                    expand.F_StrExpand25 = input.F_StrExpand25;
+                    expand.F_StrExpand26 = input.F_StrExpand26;
+                    expand.F_StrExpand27 = input.F_StrExpand27;
+                    expand.F_StrExpand28 = input.F_StrExpand28;
+                    expand.F_StrExpand29 = input.F_StrExpand29;
+                    expand.F_StrExpand30 = input.F_StrExpand30;
+                    expand.F_StrExpand31 = input.F_StrExpand31;
+                    expand.F_StrExpand32 = input.F_StrExpand32;
+                    expand.F_StrExpand33 = input.F_StrExpand33;
+                    expand.F_StrExpand34 = input.F_StrExpand34;
+                    expand.F_StrExpand35 = input.F_StrExpand35;
+                    expand.F_StrExpand36 = input.F_StrExpand36;
+                    expand.F_StrExpand37 = input.F_StrExpand37;
+                    expand.F_StrExpand38 = input.F_StrExpand38;
+                    expand.F_StrExpand39 = input.F_StrExpand39;
+                    expand.F_StrExpand40 = input.F_StrExpand40;
+                    #endregion
+                    if (customerExpandBLL.Add(expand))
+                        return Success("新增成功！");
+                    return Error("自定义字段添加失败！");
+                }
+
                 return Error("新增失败！");
 
             }
@@ -220,7 +265,54 @@ namespace CallCenterApi.Interface.Controllers.customer
             model.F_PhoneNum1 = input.PhoneNum1;
             model.F_PhoneNum2 = input.PhoneNum2;
             if (bll.Update(model))
-                return Success("修改成功！");
+            {
+                #region 自定义字段
+                expand.F_StrExpand1 = string.IsNullOrWhiteSpace(input.F_StrExpand1) ? expand.F_StrExpand1 : input.F_StrExpand1;
+                expand.F_StrExpand2 = string.IsNullOrWhiteSpace(input.F_StrExpand2) ? expand.F_StrExpand2 : input.F_StrExpand2;
+                expand.F_StrExpand3 = string.IsNullOrWhiteSpace(input.F_StrExpand3) ? expand.F_StrExpand3 : input.F_StrExpand3;
+                expand.F_StrExpand4 = string.IsNullOrWhiteSpace(input.F_StrExpand4) ? expand.F_StrExpand4 : input.F_StrExpand4;
+                expand.F_StrExpand5 = string.IsNullOrWhiteSpace(input.F_StrExpand5) ? expand.F_StrExpand5 : input.F_StrExpand5;
+                expand.F_StrExpand6 = string.IsNullOrWhiteSpace(input.F_StrExpand6) ? expand.F_StrExpand6 : input.F_StrExpand6;
+                expand.F_StrExpand7 = string.IsNullOrWhiteSpace(input.F_StrExpand7) ? expand.F_StrExpand7 : input.F_StrExpand7;
+                expand.F_StrExpand8 = string.IsNullOrWhiteSpace(input.F_StrExpand8) ? expand.F_StrExpand8 : input.F_StrExpand8;
+                expand.F_StrExpand9 = string.IsNullOrWhiteSpace(input.F_StrExpand9) ? expand.F_StrExpand9 : input.F_StrExpand9;
+                expand.F_StrExpand1 = string.IsNullOrWhiteSpace(input.F_StrExpand1) ? expand.F_StrExpand1 : input.F_StrExpand1;
+                expand.F_StrExpand11 = string.IsNullOrWhiteSpace(input.F_StrExpand11) ? expand.F_StrExpand11 : input.F_StrExpand11;
+                expand.F_StrExpand12 = string.IsNullOrWhiteSpace(input.F_StrExpand12) ? expand.F_StrExpand12 : input.F_StrExpand12;
+                expand.F_StrExpand13 = string.IsNullOrWhiteSpace(input.F_StrExpand13) ? expand.F_StrExpand13 : input.F_StrExpand13;
+                expand.F_StrExpand14 = string.IsNullOrWhiteSpace(input.F_StrExpand14) ? expand.F_StrExpand14 : input.F_StrExpand14;
+                expand.F_StrExpand15 = string.IsNullOrWhiteSpace(input.F_StrExpand15) ? expand.F_StrExpand15 : input.F_StrExpand15;
+                expand.F_StrExpand16 = string.IsNullOrWhiteSpace(input.F_StrExpand16) ? expand.F_StrExpand16 : input.F_StrExpand16;
+                expand.F_StrExpand17 = string.IsNullOrWhiteSpace(input.F_StrExpand17) ? expand.F_StrExpand17 : input.F_StrExpand17;
+                expand.F_StrExpand18 = string.IsNullOrWhiteSpace(input.F_StrExpand18) ? expand.F_StrExpand18 : input.F_StrExpand18;
+                expand.F_StrExpand19 = string.IsNullOrWhiteSpace(input.F_StrExpand19) ? expand.F_StrExpand19 : input.F_StrExpand19;
+                expand.F_StrExpand20 = string.IsNullOrWhiteSpace(input.F_StrExpand20) ? expand.F_StrExpand20 : input.F_StrExpand20;
+                expand.F_StrExpand21 = string.IsNullOrWhiteSpace(input.F_StrExpand21) ? expand.F_StrExpand21 : input.F_StrExpand21;
+                expand.F_StrExpand22 = string.IsNullOrWhiteSpace(input.F_StrExpand22) ? expand.F_StrExpand22 : input.F_StrExpand22;
+                expand.F_StrExpand23 = string.IsNullOrWhiteSpace(input.F_StrExpand23) ? expand.F_StrExpand23 : input.F_StrExpand23;
+                expand.F_StrExpand24 = string.IsNullOrWhiteSpace(input.F_StrExpand24) ? expand.F_StrExpand24 : input.F_StrExpand24;
+                expand.F_StrExpand25 = string.IsNullOrWhiteSpace(input.F_StrExpand25) ? expand.F_StrExpand25 : input.F_StrExpand25;
+                expand.F_StrExpand26 = string.IsNullOrWhiteSpace(input.F_StrExpand26) ? expand.F_StrExpand26 : input.F_StrExpand26;
+                expand.F_StrExpand27 = string.IsNullOrWhiteSpace(input.F_StrExpand27) ? expand.F_StrExpand27 : input.F_StrExpand27;
+                expand.F_StrExpand28 = string.IsNullOrWhiteSpace(input.F_StrExpand28) ? expand.F_StrExpand28 : input.F_StrExpand28;
+                expand.F_StrExpand29 = string.IsNullOrWhiteSpace(input.F_StrExpand29) ? expand.F_StrExpand29 : input.F_StrExpand29;
+                expand.F_StrExpand30 = string.IsNullOrWhiteSpace(input.F_StrExpand30) ? expand.F_StrExpand30 : input.F_StrExpand30;
+                expand.F_StrExpand31 = string.IsNullOrWhiteSpace(input.F_StrExpand31) ? expand.F_StrExpand31 : input.F_StrExpand31;
+                expand.F_StrExpand32 = string.IsNullOrWhiteSpace(input.F_StrExpand32) ? expand.F_StrExpand32 : input.F_StrExpand32;
+                expand.F_StrExpand33 = string.IsNullOrWhiteSpace(input.F_StrExpand33) ? expand.F_StrExpand33 : input.F_StrExpand33;
+                expand.F_StrExpand34 = string.IsNullOrWhiteSpace(input.F_StrExpand34) ? expand.F_StrExpand34 : input.F_StrExpand34;
+                expand.F_StrExpand35 = string.IsNullOrWhiteSpace(input.F_StrExpand35) ? expand.F_StrExpand35 : input.F_StrExpand35;
+                expand.F_StrExpand36 = string.IsNullOrWhiteSpace(input.F_StrExpand36) ? expand.F_StrExpand36 : input.F_StrExpand36;
+                expand.F_StrExpand37 = string.IsNullOrWhiteSpace(input.F_StrExpand37) ? expand.F_StrExpand37 : input.F_StrExpand37;
+                expand.F_StrExpand38 = string.IsNullOrWhiteSpace(input.F_StrExpand38) ? expand.F_StrExpand38 : input.F_StrExpand38;
+                expand.F_StrExpand39 = string.IsNullOrWhiteSpace(input.F_StrExpand39) ? expand.F_StrExpand39 : input.F_StrExpand39;
+                expand.F_StrExpand40 = string.IsNullOrWhiteSpace(input.F_StrExpand40) ? expand.F_StrExpand40 : input.F_StrExpand40;
+                #endregion
+                if (customerExpandBLL.Update(expand))
+                    return Success("修改成功！");
+                return Error("自定义字段修改失败！");
+            }
+
             return Error("修改失败！");
         }
 
@@ -228,7 +320,7 @@ namespace CallCenterApi.Interface.Controllers.customer
         /// 删除客户
         /// </summary>
         /// <param name="ids"></param>
-        /// <returns></returns>
+        /// <returns></returns> 
         public ActionResult DelCustomer(string[] ids)
         {
             if (ids != null && ids.Length > 0)

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/customer/CustomerFieldController.cs

@@ -17,7 +17,7 @@ namespace CallCenterApi.Interface.Controllers.customer
 
 
         /// <summary>
-        /// 系统字段+自定义字段列表
+        /// 右侧系统字段+已选择的自定义字段列表
         /// </summary>
         /// <param name="filter"></param>
         /// <returns></returns>
@@ -55,6 +55,11 @@ namespace CallCenterApi.Interface.Controllers.customer
         //    return Success("", model);
         //}
 
+        /// <summary>
+        /// 添加选中的自定义字段 / 修改已选中的自定义字段
+        /// </summary>
+        /// <param name="input"></param>
+        /// <returns></returns>
         public ActionResult CreateOrUpdate(CustomerFieldInput input)
         {
             Model.T_Cus_CustomerField model = new Model.T_Cus_CustomerField();
@@ -94,6 +99,11 @@ namespace CallCenterApi.Interface.Controllers.customer
             return Error("参数错误");
         }
 
+        /// <summary>
+        /// 删除已选中的自定义字段
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
         public ActionResult Delete(int id)
         {
             if (customerFieldBLL.Delete(id))
@@ -101,9 +111,14 @@ namespace CallCenterApi.Interface.Controllers.customer
             return Error("删除成功");
         }
 
+        /// <summary>
+        /// 左侧所有自定义字段
+        /// </summary>
+        /// <param name="filter"></param>
+        /// <returns></returns>
         public ActionResult GetEntity(FilterExcelTmp filter)
         {
-            var sql = "  and F_DBTableName='T_Cus_CustomerExpand' ";
+            var sql = "  and F_DBTableName='T_Cus_CustomerExpand' and F_AttributeId not in (select F_FieldId from T_Cus_CustomerField where F_FieldType=1) ";
 
             if (filter.Type > 0)
             {

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/report/ZuoXiWorkTotalController.cs

@@ -12,25 +12,20 @@ namespace CallCenterApi.Interface.Controllers.report
 {
     public class ZuoXiWorkTotalController : BaseController
     {
+        private readonly BLL.T_Sys_UserAccount userAccountBLL = new BLL.T_Sys_UserAccount();
+        private List<string> str = new List<string>() { "公司","部门", "坐席工号", "坐席姓名", "角色", "固话号码",
+                             "呼入电话数", "接通量", "接通率", "呼入通话分钟数",
+                             "呼出电话数", "呼通量", "呼通率", "呼出通话分钟数",
+                             "坐席登录次数", "登录时长分钟数", "工作时长分钟数", "平均每天工作小时数", "休息时长分钟数", "质检平均成绩"
+            };
+
         //坐席工作统计
         //获取表头
         public ActionResult GetColumnList()
         {
             ActionResult res = NoToken("未知错误，请重新登录");
 
-            //String[] str = { "部门", "坐席", "坐席工号","角色" ,"呼入电话数", "坐席接通量", "呼损量"
-            //            ,"接通率","呼损率","平均排队时间","接听通话次数","通话分钟数","通话秒数"
-            //            ,"平均接听通话秒数","平均振铃秒数","呼入占有率","用户评价","坐席登录次数"
-            //            ,"登录时长分钟数","工作时长分钟数","平均每天工作时长（小时）","平均操作分钟数"
-            //            ,"置忙次数","休息时长分钟数","平均每天休息时长（小时）"
-            //            ,"置忙平均休息分钟数","质检平均成绩"
-            //    };
 
-            string[] str = { "公司","部门", "坐席工号", "坐席姓名", "角色", "固话号码",
-                             "呼入电话数", "接通量", "接通率", "呼入通话分钟数",
-                             "呼出电话数", "呼通量", "呼通率", "呼出通话分钟数",
-                             "坐席登录次数", "登录时长分钟数", "工作时长分钟数", "平均每天工作时长（小时）", "休息时长分钟数", "质检平均成绩"
-            };
             res = Success("获取坐席工作统计表头成功", str);
 
             return res;
@@ -43,364 +38,30 @@ namespace CallCenterApi.Interface.Controllers.report
 
             DataTable dtNew = new DataTable();
             dtNew = getData(stime, endtime, dpt, dayss, usercode, extensionnumber);
-            #region
-            //#region
-            //DataColumn dc1 = new DataColumn("部门");
-            //DataColumn dc2 = new DataColumn("坐席");
-            //DataColumn dc3 = new DataColumn("坐席工号");
-            //DataColumn dc4 = new DataColumn("呼入电话数");
-            //DataColumn dc5 = new DataColumn("坐席接通量");
-            //DataColumn dc6 = new DataColumn("呼损量");
-            //DataColumn dc7 = new DataColumn("接通率");
-            //DataColumn dc8 = new DataColumn("呼损率");
-            //DataColumn dc9 = new DataColumn("平均排队时间");
-            //DataColumn dc10 = new DataColumn("接听通话次数");
-            //DataColumn dc11 = new DataColumn("通话分钟数");
-            //DataColumn dc12 = new DataColumn("通话秒数");
-            //DataColumn dc13 = new DataColumn("平均接听通话秒数");
-            //DataColumn dc14 = new DataColumn("平均振铃秒数");
-            //DataColumn dc15 = new DataColumn("呼入占有率");
-            //DataColumn dc16 = new DataColumn("用户评价");
-            //DataColumn dc17 = new DataColumn("坐席登录次数");
-            //DataColumn dc18 = new DataColumn("登录时长分钟数");
-            //DataColumn dc19 = new DataColumn("工作时长分钟数");
-            //DataColumn dc20 = new DataColumn("平均每天工作时长");
-            //DataColumn dc21 = new DataColumn("平均操作分钟数");
-            //DataColumn dc22 = new DataColumn("置忙次数");
-            //DataColumn dc23 = new DataColumn("休息时长分钟数");
-            //DataColumn dc24 = new DataColumn("平均每天休息时长");
-            //DataColumn dc25 = new DataColumn("置忙平均休息分钟数");
-            //DataColumn dc26 = new DataColumn("质检平均成绩");
-
-            //dtNew.Columns.Add(dc1);
-            //dtNew.Columns.Add(dc2);
-            //dtNew.Columns.Add(dc3);
-            //dtNew.Columns.Add(dc4);
-            //dtNew.Columns.Add(dc5);
-            //dtNew.Columns.Add(dc6);
-            //dtNew.Columns.Add(dc7);
-            //dtNew.Columns.Add(dc8);
-            //dtNew.Columns.Add(dc9);
-            //dtNew.Columns.Add(dc10);
-            //dtNew.Columns.Add(dc11);
-            //dtNew.Columns.Add(dc12);
-            //dtNew.Columns.Add(dc13);
-            //dtNew.Columns.Add(dc14);
-            //dtNew.Columns.Add(dc15);
-            //dtNew.Columns.Add(dc16);
-            //dtNew.Columns.Add(dc17);
-            //dtNew.Columns.Add(dc18);
-            //dtNew.Columns.Add(dc19);
-            //dtNew.Columns.Add(dc20);
-            //dtNew.Columns.Add(dc21);
-            //dtNew.Columns.Add(dc22);
-            //dtNew.Columns.Add(dc23);
-            //dtNew.Columns.Add(dc24);
-            //dtNew.Columns.Add(dc25);
-            //dtNew.Columns.Add(dc26);
-            //#endregion
-            //int days = 30;
-            //string sqltimeCallRecords = "";
-            //string strsqlcall = "";
-            //if (stime != null && stime.Trim() != "")
-            //{
-            //    sqltimeCallRecords += " and CONVERT(varchar , TimeAlerting, 120)>=CONVERT(varchar , '" + stime.Trim() + " 00:00:01', 120) ";
-            //    strsqlcall += " and CONVERT(varchar , BeginTime, 120)>=CONVERT(varchar , '" + stime.Trim() + " 00:00:01', 120) ";
-            //}
-            //if (endtime != null && endtime.Trim() != "")
-            //{
-            //    sqltimeCallRecords += " and CONVERT(varchar , TimeAlerting, 120)<=CONVERT(varchar , '" + endtime.Trim() + " 23:59:59', 120) ";
-            //    strsqlcall += " and CONVERT(varchar , BeginTime, 120)<=CONVERT(varchar , '" + endtime.Trim() + " 23:59:59', 120) ";
-            //}
-            //if (dayss != null && dayss.Trim() != "")
-            //{
-            //    days = int.Parse(dayss.Trim());
-            //}
-            //#region
-            //int ijtcs = 0;//接听通话次数 
-            //int ithms = 0;//通话秒数
-            //int izlms = 0;//振铃秒数
-            //int ipjjtms = 0;//平均接听秒数
-            //int ipjzlms = 0;//平均振铃秒数
-            //double ihrzyl = 0.00;//呼入占有率
-            //int izxdlcs = 0;//坐席登录次数
-            //int idlsc = 0;//登录时长
-            //int iWorktime = 0;//工作时长
-            //int izmcs = 0;//置忙次数
-            //int ixxsc = 0;//休息时长
-            //int ipjczsc = 0;//平均操作时长
-            //int ipjzmxxsc = 0;//平均置忙休息时长
-
-
-            //int itrunkct = 0;//总数
-            //int itrunkjj = 0;//总接听
-            //int itrunkhs = 0;//呼损量
-            //int itrunkpjsc = 0;//平均排队时间
-            //double itrunkjtl = 0.00;//接通率
-            //double itrunkhsl = 0.00;//互损率
-            //double itrunkpjpd = 0.00;//平均排队
-            //#endregion
-            //DataTable dtdpt = null;
-            //if (dpt != null && dpt.Trim() != "")
-            //{
-            //    dtdpt = DbHelperSQL.Query("select F_DeptId,F_DeptName,F_Remark from  T_Sys_Department where F_ParentId!=0 and F_DeptId=" + dpt).Tables[0];
-            //}
-            //else
-            //{
-            //    dtdpt = DbHelperSQL.Query("select F_DeptId,F_DeptName,F_Remark from  T_Sys_Department where F_ParentId!=0").Tables[0];
-            //}
-            //if (dtdpt != null && dtdpt.Rows.Count > 0)
-            //{
-            //    foreach (DataRow dr in dtdpt.Rows)
-            //    {   
-            //        DataTable dt = new DataTable();
-            //        string sql = "SELECT F_UserCode,F_UserName,F_WorkNumber,F_UserId FROM T_Sys_UserAccount where f_seatFlag=1 and F_DeptId=" + dr["F_DeptId"] + " and F_WorkNumber!='' order by  F_WorkNumber asc";
-            //        dt = DbHelperSQL.Query(sql).Tables[0];
-            //        for (int i = 0; i < dt.Rows.Count; i++)
-            //        {
-            //            if (!string.IsNullOrEmpty(dt.Rows[i]["F_WorkNumber"].ToString()))
-            //            {
-            //                DataRow drNew = dtNew.NewRow();
-            //                drNew["部门"] = dr["F_DeptName"].ToString();
-            //                drNew["坐席"] = dt.Rows[i]["F_UserName"].ToString();
-            //                drNew["坐席工号"] = dt.Rows[i]["F_WorkNumber"].ToString();
-            //                if (i == 0)
-            //                {//呼入电话
-
-            //                    string strsql = "";
-            //                    if (stime != null && stime.Trim() != "")
-            //                    {
-            //                        strsql += " and CONVERT(varchar , TimeCallIn, 120)>=CONVERT(varchar , '" + stime.Trim() + " 00:00:01', 120) ";
-            //                    }
-            //                    if (endtime != null && endtime.Trim() != "")
-            //                    {
-            //                        strsql += " and CONVERT(varchar , TimeCallIn, 120)<=CONVERT(varchar , '" + endtime.Trim() + " 23:59:59', 120) ";
-            //                    }
-
-            //                    DataTable dtTrunk = DbHelperSQL.Query("select COUNT(*) as ct,SUM(DATEDIFF(Second,timewantagent,timeconnected)) as dd from rep_trunk_call_in where AgentID='" + dt.Rows[i]["F_UserCode"].ToString() + "' " + strsql).Tables[0];
-            //                    DataTable dtcall = DbHelperSQL.Query("select COUNT(*) as ct,(select COUNT(*) from T_Call_CallRecords where CallState=1 and CallType=0 and  UserCode='" + dt.Rows[i]["F_UserCode"].ToString() + "' " + strsqlcall + ") as jt from T_Call_CallRecords where CallType=0 and UserCode='" + dt.Rows[i]["F_UserCode"].ToString() + "' " + strsqlcall).Tables[0];
-
-            //                    if (dtcall != null && dtcall.Rows.Count > 0)
-            //                    {
-            //                        if (dtcall.Rows[0]["ct"].ToString() != "")
-            //                        {
-            //                            itrunkct = int.Parse(dtcall.Rows[0]["ct"].ToString());
-            //                        }
-            //                        else
-            //                        {
-            //                            itrunkct = 0;
-            //                        }
-            //                        if (dtcall.Rows[0]["jt"].ToString() != "")
-            //                        {
-            //                            itrunkjj = int.Parse(dtcall.Rows[0]["jt"].ToString());
-            //                        }
-            //                        else
-            //                        {
-            //                            itrunkjj = 0;
-            //                        }
-            //                        if (dtTrunk.Rows.Count > 0 && dtTrunk.Rows[0]["dd"].ToString() != "")
-            //                        {
-            //                            itrunkpjsc = int.Parse(dtTrunk.Rows[0]["dd"].ToString());
-            //                        }
-            //                        else
-            //                        {
-            //                            itrunkpjsc = 0;
-            //                        }
-            //                    }
-            //                    itrunkhs = itrunkct - itrunkjj;
-            //                    if (itrunkct != 0)
-            //                    {
-            //                        itrunkjtl = itrunkjj / double.Parse(itrunkct.ToString());
-            //                        itrunkhsl = itrunkhs / double.Parse(itrunkct.ToString());
-            //                        itrunkpjpd = itrunkpjsc / double.Parse(itrunkct.ToString());
-            //                    }
-            //                    else
-            //                    {
-            //                        itrunkjtl = 0.00;
-            //                        itrunkhsl = 0.00;
-            //                        itrunkpjpd = 0.00;
-            //                    }
-            //                    drNew["呼入电话数"] = itrunkct;
-            //                    drNew["坐席接通量"] = itrunkjj;
-            //                    drNew["呼损量"] = itrunkhs;
-            //                    drNew["接通率"] = (itrunkjtl * 100).ToString("0.00") + "%";
-            //                    drNew["呼损率"] = (itrunkhsl * 100).ToString("0.00") + "%";
-            //                    drNew["平均排队时间"] = itrunkpjpd.ToString("0.00");
-
-            //                }
-            //                else
-            //                {
-            //                    drNew["呼入电话数"] = "0";
-            //                    drNew["坐席接通量"] = "0";
-            //                    drNew["呼损量"] = "0";
-            //                    drNew["接通率"] = "0.00" + "%";
-            //                    drNew["呼损率"] = "0.00" + "%";
-            //                    drNew["平均排队时间"] = "0.00";
-            //                }
-
-
-            //                DataTable dtext = DbHelperSQL.Query("select COUNT(*) as ct,SUM(PeriodTalking) as sc,SUM(PeriodAlerting) as pa from rep_ext_call_in where CalleeAgentID=" + dt.Rows[i]["F_WorkNumber"] + " " + sqltimeCallRecords).Tables[0];
-            //                DataTable dtCallEvey = DbHelperSQL.Query("select COUNT(*) as ct,SUM(TalkLongTime) as sc from T_Call_CallRecords where CallState=1 and  userid=" + dt.Rows[i]["F_UserId"] + " " + strsqlcall).Tables[0];
-            //                if (dtCallEvey != null && dtCallEvey.Rows.Count > 0)
-            //                {
-            //                    if (dtCallEvey.Rows[0]["ct"].ToString() != "")
-            //                    {
-            //                        ijtcs = int.Parse(dtCallEvey.Rows[0]["ct"].ToString());//接听次数
-            //                    }
-            //                    else
-            //                    {
-            //                        ijtcs = 0;
-            //                    }
-            //                    if (dtCallEvey.Rows[0]["sc"].ToString() != "")
-            //                    {
-            //                        ithms = int.Parse(dtCallEvey.Rows[0]["sc"].ToString());//通话秒数
-            //                    }
-            //                    else
-            //                    {
-            //                        ithms = 0;
-            //                    }
-            //                    if (dtext.Rows[0]["pa"].ToString() != "")
-            //                    {
-            //                        izlms = int.Parse(dtext.Rows[0]["pa"].ToString());//振铃秒数
-            //                    }
-            //                    else
-            //                    {
-            //                        izlms = 0;
-            //                    }
-            //                }
-            //                drNew["接听通话次数"] = ijtcs.ToString();
-            //                drNew["通话分钟数"] = (ithms / 60).ToString();
-            //                drNew["通话秒数"] = ithms.ToString();
-
-            //                if (ijtcs != 0)
-            //                {
-            //                    ipjjtms = ithms / ijtcs;//平均接通秒数
-            //                    ipjzlms = izlms / ijtcs;//平均振铃秒数
-            //                }
-            //                else
-            //                {
-            //                    ipjjtms = 0;//平均接通秒数
-            //                    ipjzlms = 0;//平均振铃秒数
-            //                }
-            //                drNew["平均接听通话秒数"] = ipjjtms.ToString();
-            //                drNew["平均振铃秒数"] = ipjzlms.ToString();
-
-            //                //坐席登录次数
-            //                DataTable dtAgent = DbHelperSQL.Query("select COUNT(*) as dl,SUM(LoginTimes) as dlsc,SUM(reposenum) as zm,SUM(ReposeTimes) as xx from rep_agent_detail where AgentId=" + dt.Rows[i]["F_WorkNumber"] + " " + sqltimeCallRecords.Replace("TimeAlerting", "TimeLogin")).Tables[0];
-            //                if (dtAgent != null && dtAgent.Rows.Count > 0)
-            //                {
-            //                    if (dtAgent.Rows[0]["dl"] != null && dtAgent.Rows[0]["dl"].ToString() != "")
-            //                    {
-            //                        izxdlcs = int.Parse(dtAgent.Rows[0]["dl"].ToString());//登录次数
-            //                    }
-            //                    else
-            //                    {
-            //                        izxdlcs = 0;
-            //                    }
-            //                    if (dtAgent.Rows[0]["dlsc"] != null && dtAgent.Rows[0]["dlsc"].ToString() != "")
-            //                    {
-            //                        idlsc = int.Parse(dtAgent.Rows[0]["dlsc"].ToString());//登录时长
-            //                    }
-            //                    else
-            //                    {
-            //                        idlsc = 0;
-            //                    }
-            //                    if (dtAgent.Rows[0]["zm"] != null && dtAgent.Rows[0]["zm"].ToString() != "")
-            //                    {
-            //                        izmcs = int.Parse(dtAgent.Rows[0]["zm"].ToString());//置忙次数
-            //                    }
-            //                    else
-            //                    {
-            //                        izmcs = 0;
-            //                    }
-            //                    if (dtAgent.Rows[0]["xx"] != null && dtAgent.Rows[0]["xx"].ToString() != "")
-            //                    {
-            //                        ixxsc = int.Parse(dtAgent.Rows[0]["xx"].ToString());//休息时长
-            //                    }
-            //                    else
-            //                    {
-            //                        ixxsc = 0;
-            //                    }
-
-            //                }
-            //                iWorktime = idlsc - ixxsc;//工作时长
-            //                if (izxdlcs != 0)
-            //                {
-            //                    ipjczsc = iWorktime / izxdlcs;//平均操作秒数
-            //                }
-            //                else
-            //                {
-            //                    ipjczsc = 0;
-            //                }
-            //                if (izmcs != 0)
-            //                {
-            //                    ipjzmxxsc = ixxsc / izmcs;//置忙平均操作时长
-            //                }
-            //                else
-            //                {
-            //                    ipjzmxxsc = 0;
-            //                }
-
-            //                //呼入占有率
-            //                if (iWorktime != 0)
-            //                {
-            //                    ihrzyl = ithms / Convert.ToDouble(iWorktime);
-            //                }
-            //                else
-            //                {
-            //                    ihrzyl = 0.00;
-            //                }
-            //                drNew["呼入占有率"] = (ihrzyl * 100).ToString("0.00") + "%";
-            //                //用户评价
-
-            //                object obj = DbHelperSQL.GetSingle("select count(*) from T_Call_CallRecords where MYD is not null and CallState=1 and userid=" + dt.Rows[i]["F_UserId"] + strsqlcall);
-            //                string myd = "";
-            //                if (obj != null)
-            //                {
-            //                    myd = obj.ToString();
-            //                }
-            //                drNew["用户评价"] = myd;
-            //                drNew["坐席登录次数"] = izxdlcs.ToString();
-            //                drNew["登录时长分钟数"] = (idlsc / 60).ToString();
-            //                drNew["工作时长分钟数"] = (iWorktime / 60).ToString();
-            //                drNew["平均每天工作时长"] = Math.Round((double.Parse(iWorktime.ToString()) / 60 / 60 / days), 2).ToString();
-            //                drNew["平均操作分钟数"] = (ipjczsc / 60).ToString();
-            //                drNew["置忙次数"] = izmcs.ToString();
-            //                drNew["休息时长分钟数"] = (ixxsc / 60).ToString();
-            //                drNew["平均每天休息时长"] = Math.Round((double.Parse(ixxsc.ToString()) / 60 / 60 / days), 2).ToString();
-            //                drNew["置忙平均休息分钟数"] = (ipjzmxxsc / 60).ToString();
-
-            //                DataSet dszj = DbHelperSQL.Query("select convert(int,SUM(f_qcscore)) as fs,COUNT(*) as fsct from T_Call_CallRecords where F_QCState=1 and UserId=" + dt.Rows[i]["F_UserId"] + strsqlcall);
-            //                int zfs = 0;
-            //                if (dszj != null && dszj.Tables.Count > 0)
-            //                {
-            //                    DataTable dtzj = dszj.Tables[0];
-            //                    if (dtzj.Rows.Count > 0 && dtzj.Rows[0]["fs"].ToString() != "" && dtzj.Rows[0]["fsct"].ToString() != "")
-            //                    {
-            //                        zfs = Convert.ToInt32(dtzj.Rows[0]["fs"].ToString()) / int.Parse(dtzj.Rows[0]["fsct"].ToString());
-            //                    }
-            //                }
-            //                drNew["质检平均成绩"] = zfs.ToString();
-
-            //                dtNew.Rows.Add(drNew);
-            //            }
-            //        }
-            //    }
-            //}
-            #endregion
             res = Success("获取坐席工作统计数据成功", dtNew);
 
             return res;
         }
 
-        //导出数据
-        public ActionResult ExptList(string stime, string endtime, string dpt, string dayss)
+        /// <summary>
+        /// 导出数据
+        /// </summary>
+        /// <param name="stime">开始时间</param>
+        /// <param name="endtime">结束时间</param>
+        /// <param name="dpt">部门</param>
+        /// <param name="dayss">天数</param>
+        /// <param name="indexs">未选中导出的字段索引数组</param>
+        /// <returns></returns>
+        public ActionResult ExptList(string stime, string endtime, string dpt, string dayss, string indexstr = "")
         {
             ActionResult res = NoToken("未知错误，请重新登录");
             if (Request.IsAuthenticated)
             {
                 NPOIHelper npoi = new NPOIHelper();
-                DataTable dt = getData(stime, endtime, dpt, dayss);
+                List<int> indexs = new List<int>();
+                if (!string.IsNullOrWhiteSpace(indexstr))
+                    indexs.AddRange(indexstr.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries).ToList().Select(x => Convert.ToInt32(x)));
+                DataTable dt = getData(stime, endtime, dpt, dayss, "", "", indexs);
                 if (npoi.ExportToExcel("坐席工作数据", dt) == "")
                 {
                     return Success("导出成功");
@@ -413,88 +74,19 @@ namespace CallCenterApi.Interface.Controllers.report
             return res;
         }
 
-        private DataTable getData(string stime, string endtime, string dpt, string dayss, string _usercode = "", string extensionnumber = "")
+        private DataTable getData(string stime, string endtime, string dpt, string dayss, string _usercode = "", string extensionnumber = "", List<int> indexs = null)
         {
             DataTable dtNew = new DataTable();
+            var columns = dtNew.Columns;
             #region
-            dtNew.Columns.AddRange(new DataColumn[] {
-                 new DataColumn("公司"),
-                 new DataColumn("部门"),
-                 new DataColumn("坐席工号"),
-                 new DataColumn("坐席姓名"),
-                 new DataColumn("角色"),
-                 new DataColumn("固话号码"),
-                 new DataColumn("呼入电话数"),
-                 new DataColumn("接通量"),
-                 new DataColumn("接通率"),
-                 new DataColumn("呼入通话分钟数"),
-                 new DataColumn("呼出电话数"),
-                 new DataColumn("呼通量"),
-                 new DataColumn("呼通率"),
-                 new DataColumn("呼出通话分钟数"),
-                 new DataColumn("坐席登录次数"),
-                 new DataColumn("登录时长分钟数"),
-                 new DataColumn("工作时长分钟数"),
-                 new DataColumn("平均每天工作时长"),
-                 new DataColumn("休息时长分钟数"),
-                 new DataColumn("质检平均成绩")
-            });
-
-            //DataColumn dc1 = new DataColumn("部门");
-            //DataColumn dc2 = new DataColumn("坐席");
-            //DataColumn dc3 = new DataColumn("坐席工号");
-            //DataColumn dc3_ = new DataColumn("角色");
-            //DataColumn dc4 = new DataColumn("呼入电话数");
-            //DataColumn dc5 = new DataColumn("坐席接通量");
-            //DataColumn dc6 = new DataColumn("呼损量");
-            //DataColumn dc7 = new DataColumn("接通率");
-            //DataColumn dc8 = new DataColumn("呼损率");
-            //DataColumn dc9 = new DataColumn("平均排队时间");
-            //DataColumn dc10 = new DataColumn("接听通话次数");
-            //DataColumn dc11 = new DataColumn("通话分钟数");
-            //DataColumn dc12 = new DataColumn("通话秒数");
-            //DataColumn dc13 = new DataColumn("平均接听通话秒数");
-            //DataColumn dc14 = new DataColumn("平均振铃秒数");
-            //DataColumn dc15 = new DataColumn("呼入占有率");
-            //DataColumn dc16 = new DataColumn("用户评价");
-            //DataColumn dc17 = new DataColumn("坐席登录次数");
-            //DataColumn dc18 = new DataColumn("登录时长分钟数");
-            //DataColumn dc19 = new DataColumn("工作时长分钟数");
-            //DataColumn dc20 = new DataColumn("平均每天工作时长");
-            //DataColumn dc21 = new DataColumn("平均操作分钟数");
-            //DataColumn dc22 = new DataColumn("置忙次数");
-            //DataColumn dc23 = new DataColumn("休息时长分钟数");
-            //DataColumn dc24 = new DataColumn("平均每天休息时长");
-            //DataColumn dc25 = new DataColumn("置忙平均休息分钟数");
-            //DataColumn dc26 = new DataColumn("质检平均成绩");
-
-            //dtNew.Columns.Add(dc1);
-            //dtNew.Columns.Add(dc2);
-            //dtNew.Columns.Add(dc3);
-            //dtNew.Columns.Add(dc3_);
-            //dtNew.Columns.Add(dc4);
-            //dtNew.Columns.Add(dc5);
-            //dtNew.Columns.Add(dc6);
-            //dtNew.Columns.Add(dc7);
-            //dtNew.Columns.Add(dc8);
-            //dtNew.Columns.Add(dc9);
-            //dtNew.Columns.Add(dc10);
-            //dtNew.Columns.Add(dc11);
-            //dtNew.Columns.Add(dc12);
-            //dtNew.Columns.Add(dc13);
-            //dtNew.Columns.Add(dc14);
-            //dtNew.Columns.Add(dc15);
-            //dtNew.Columns.Add(dc16);
-            //dtNew.Columns.Add(dc17);
-            //dtNew.Columns.Add(dc18);
-            //dtNew.Columns.Add(dc19);
-            //dtNew.Columns.Add(dc20);
-            //dtNew.Columns.Add(dc21);
-            //dtNew.Columns.Add(dc22);
-            //dtNew.Columns.Add(dc23);
-            //dtNew.Columns.Add(dc24);
-            //dtNew.Columns.Add(dc25);
-            //dtNew.Columns.Add(dc26);
+
+
+            for (int i = 0; i < str.Count(); i++)
+            {
+                if (!indexs.Contains(i))
+                    dtNew.Columns.Add(new DataColumn(str[i]));
+            }
+
             #endregion
             int days = 30;
             string sqltimeCallRecords = "";
@@ -603,34 +195,26 @@ namespace CallCenterApi.Interface.Controllers.report
             {
                 dtdpt = DbHelperSQL.Query("select t1.F_DeptId,t1.F_DeptName,t1.F_Remark,t2.F_DeptName as ParentName from  T_Sys_Department t1 left join T_Sys_Department t2 ON t1.F_ParentId=t2.F_DeptId where t1.F_ParentId!=0" + deptSQL).Tables[0];
             }
-            //if (dtdpt != null && dtdpt.Rows.Count > 0)
-            //{
+
+            string sql = $"SELECT F_UserCode,F_UserName,F_WorkNumber,F_ExtensionNumber,F_UserId,F_DeptId,T_Sys_RoleInfo.F_RoleName FROM T_Sys_UserAccount left join T_Sys_RoleInfo on T_Sys_RoleInfo.F_RoleId=T_Sys_UserAccount.F_RoleId where f_seatFlag=1 and  F_WorkNumber!='' {usercodeSQL} order by  F_WorkNumber asc";
+            var userAccountList = DbHelperSQL.Query(sql).Tables[0];
+
             foreach (DataRow dr in dtdpt.Rows)
             {
-                DataTable dt = new DataTable();
-                string sql = $"SELECT F_UserCode,F_UserName,F_WorkNumber,F_ExtensionNumber,F_UserId,T_Sys_RoleInfo.F_RoleName FROM T_Sys_UserAccount left join T_Sys_RoleInfo on T_Sys_RoleInfo.F_RoleId=T_Sys_UserAccount.F_RoleId where f_seatFlag=1 and F_DeptId={dr["F_DeptId"]} and F_WorkNumber!='' {usercodeSQL} order by  F_WorkNumber asc";
-                dt = DbHelperSQL.Query(sql).Tables[0];
-                for (int i = 0; i < dt.Rows.Count; i++)
+                //string sql = $"SELECT F_UserCode,F_UserName,F_WorkNumber,F_ExtensionNumber,F_UserId,T_Sys_RoleInfo.F_RoleName FROM T_Sys_UserAccount left join T_Sys_RoleInfo on T_Sys_RoleInfo.F_RoleId=T_Sys_UserAccount.F_RoleId where f_seatFlag=1 and F_DeptId={dr["F_DeptId"]} and F_WorkNumber!='' {usercodeSQL} order by  F_WorkNumber asc";
+                //dt = DbHelperSQL.Query(sql).Tables[0];
+                var arr = userAccountList.Select($"F_DeptId={dr["F_DeptId"]}");
+                for (int i = 0; i < arr.Length; i++)
                 {
-                    if (!string.IsNullOrEmpty(dt.Rows[i]["F_WorkNumber"].ToString()))
+                    if (!string.IsNullOrEmpty(arr[i]["F_WorkNumber"].ToString()))
                     {
                         DataRow drNew = dtNew.NewRow();
-                        //drNew["部门"] = dr["F_DeptName"].ToString();
-                        //drNew["坐席"] = dt.Rows[i]["F_UserName"].ToString();
-                        //drNew["坐席工号"] = dt.Rows[i]["F_WorkNumber"].ToString();
-                        //drNew["角色"] = dt.Rows[i]["F_RoleName"].ToString();
-                        drNew["公司"] = dr["ParentName"].ToString();
-                        drNew["部门"] = dr["F_DeptName"].ToString();
-                        drNew["坐席工号"] = $"{dt.Rows[i]["F_WorkNumber"].ToString()}";
-                        drNew["坐席姓名"] = $"{dt.Rows[i]["F_UserName"].ToString()}";
-                        drNew["角色"] = dt.Rows[i]["F_RoleName"].ToString();
-                        drNew["固话号码"] = dt.Rows[i]["F_ExtensionNumber"].ToString();
-
-                        //if (i == 0)
-                        //{//呼入电话
-
-
-
+                        if (columns.Contains("公司")) { drNew["公司"] = dr["ParentName"].ToString(); }
+                        if (columns.Contains("部门")) { drNew["部门"] = dr["F_DeptName"].ToString(); }
+                        if (columns.Contains("坐席工号")) { drNew["坐席工号"] = $"{arr[i]["F_WorkNumber"].ToString()}"; }
+                        if (columns.Contains("坐席姓名")) { drNew["坐席姓名"] = $"{arr[i]["F_UserName"].ToString()}"; }
+                        if (columns.Contains("角色")) { drNew["角色"] = arr[i]["F_RoleName"].ToString(); }
+                        if (columns.Contains("固话号码")) { drNew["固话号码"] = arr[i]["F_ExtensionNumber"].ToString(); }
 
                         #region 呼入
 
@@ -645,9 +229,9 @@ namespace CallCenterApi.Interface.Controllers.report
                         }
 
                         //ct=总呼入/呼出次数？   dd=总等待时长
-                        DataTable dtTrunk = DbHelperSQL.Query("select COUNT(*) as ct,SUM(DATEDIFF(Second,timewantagent,timeconnected)) as dd from rep_trunk_call_in where AgentID='" + dt.Rows[i]["F_UserCode"].ToString() + "' " + strsql).Tables[0];
+                        DataTable dtTrunk = DbHelperSQL.Query("select COUNT(*) as ct,SUM(DATEDIFF(Second,timewantagent,timeconnected)) as dd from rep_trunk_call_in where AgentID='" + arr[i]["F_UserCode"].ToString() + "' " + strsql).Tables[0];
                         //ct=总呼入次数？   jt=总呼入接通数
-                        DataTable dtcall = DbHelperSQL.Query("select COUNT(*) as ct,(select COUNT(*) from T_Call_CallRecords where CallState=1 and CallType=0 and  UserCode='" + dt.Rows[i]["F_UserCode"].ToString() + "' " + strsqlcall + ") as jt from T_Call_CallRecords where CallType=0 and UserCode='" + dt.Rows[i]["F_UserCode"].ToString() + "' " + strsqlcall).Tables[0];
+                        DataTable dtcall = DbHelperSQL.Query("select COUNT(*) as ct,(select COUNT(*) from T_Call_CallRecords where CallState=1 and CallType=0 and  UserCode='" + arr[i]["F_UserCode"].ToString() + "' " + strsqlcall + ") as jt from T_Call_CallRecords where CallType=0 and UserCode='" + arr[i]["F_UserCode"].ToString() + "' " + strsqlcall).Tables[0];
 
                         if (dtcall != null && dtcall.Rows.Count > 0)
                         {
@@ -699,33 +283,15 @@ namespace CallCenterApi.Interface.Controllers.report
                             itrunkhsl = 0.00;
                             itrunkpjpd = 0.00;
                         }
-                        //drNew["呼入电话数"] = itrunkct;
-                        //drNew["坐席接通量"] = itrunkjj;
-                        //drNew["呼损量"] = itrunkhs;
-                        //drNew["接通率"] = (itrunkjtl * 100).ToString("0.00") + "%";
-                        //drNew["呼损率"] = (itrunkhsl * 100).ToString("0.00") + "%";
-                        //drNew["平均排队时间"] = itrunkpjpd.ToString("0.00");
-
-
-                        drNew["呼入电话数"] = itrunkct;
-                        drNew["接通量"] = itrunkjj;
-                        drNew["接通率"] = (itrunkjtl * 100).ToString("0.00") + "%";
-
-                        //}
-                        //else
-                        //{
-                        //    drNew["呼入电话数"] = "0";
-                        //    drNew["坐席接通量"] = "0";
-                        //    drNew["呼损量"] = "0";
-                        //    drNew["接通率"] = "0.00" + "%";
-                        //    drNew["呼损率"] = "0.00" + "%";
-                        //    drNew["平均排队时间"] = "0.00";
-                        //}
+                        if (columns.Contains("呼入电话数")) { drNew["呼入电话数"] = itrunkct; }
+                        if (columns.Contains("接通量")) { drNew["接通量"] = itrunkjj; }
+                        if (columns.Contains("接通率")) { drNew["接通率"] = (itrunkjtl * 100).ToString("0.00") + "%"; }
+
 
                         //-- ct=总呼入次数？  sc=总通话时长   pa=总xxx
-                        DataTable dtext = DbHelperSQL.Query("select COUNT(*) as ct,SUM(PeriodTalking) as sc,SUM(PeriodAlerting) as pa from rep_ext_call_in where CalleeAgentID=" + dt.Rows[i]["F_WorkNumber"] + " " + sqltimeCallRecords).Tables[0];
+                        DataTable dtext = DbHelperSQL.Query("select COUNT(*) as ct,SUM(PeriodTalking) as sc,SUM(PeriodAlerting) as pa from rep_ext_call_in where CalleeAgentID=" + arr[i]["F_WorkNumber"] + " " + sqltimeCallRecords).Tables[0];
                         //-- ct=总呼入接通次数？  sc=总通话时长
-                        DataTable dtCallEvey = DbHelperSQL.Query("select COUNT(*) as ct,SUM(TalkLongTime) as sc from T_Call_CallRecords where CallState=1 and  userid=" + dt.Rows[i]["F_UserId"] + " " + strsqlcall).Tables[0];
+                        DataTable dtCallEvey = DbHelperSQL.Query("select COUNT(*) as ct,SUM(TalkLongTime) as sc from T_Call_CallRecords where CallState=1 and  userid=" + arr[i]["F_UserId"] + " " + strsqlcall).Tables[0];
                         if (dtCallEvey != null && dtCallEvey.Rows.Count > 0)
                         {
                             if (dtCallEvey.Rows[0]["ct"].ToString() != "")
@@ -759,31 +325,16 @@ namespace CallCenterApi.Interface.Controllers.report
                                 izlms = 0;
                             }
                         }
-                        //drNew["接听通话次数"] = ijtcs.ToString();
-                        drNew["呼入通话分钟数"] = (ithms / 60).ToString();
-                        //drNew["通话秒数"] = ithms.ToString();
-
-                        //if (ijtcs != 0)
-                        //{
-                        //    ipjjtms = ithms / ijtcs;//平均接通秒数
-                        //    ipjzlms = izlms / ijtcs;//平均振铃秒数
-                        //}
-                        //else
-                        //{
-                        //    ipjjtms = 0;//平均接通秒数
-                        //    ipjzlms = 0;//平均振铃秒数
-                        //}
-                        //drNew["平均接听通话秒数"] = ipjjtms.ToString();
-                        //drNew["平均振铃秒数"] = ipjzlms.ToString();
+                        if (columns.Contains("呼入通话分钟数")) { drNew["呼入通话分钟数"] = (ithms / 60).ToString(); }
 
                         #endregion
 
                         #region 呼出
 
                         //--ct=呼出总次数   st=呼出总通话时长
-                        DataTable dtCallOut = DbHelperSQL.Query($"select count(CallID) as ct,SUM(PeriodTalking) as st from rep_ext_call_out where IsCallOutSucceed = 1 and CallerAgentID ={dt.Rows[i]["F_WorkNumber"].ToString()} {strCallOutSql}").Tables[0];
+                        DataTable dtCallOut = DbHelperSQL.Query($"select count(CallID) as ct,SUM(PeriodTalking) as st from rep_ext_call_out where IsCallOutSucceed = 1 and CallerAgentID ={arr[i]["F_WorkNumber"].ToString()} {strCallOutSql}").Tables[0];
                         //-- ct=呼出接通次数
-                        DataTable dtCallOut2 = DbHelperSQL.Query($"select count(CallID) as ct from rep_ext_call_out where IsCallOutSucceed=1 and CallerAgentID={dt.Rows[i]["F_WorkNumber"].ToString()} {strCallOutSql}  and IsCallOutSucceed=1 ").Tables[0];
+                        DataTable dtCallOut2 = DbHelperSQL.Query($"select count(CallID) as ct from rep_ext_call_out where IsCallOutSucceed=1 and CallerAgentID={arr[i]["F_WorkNumber"].ToString()} {strCallOutSql}  and IsCallOutSucceed=1 ").Tables[0];
 
                         if (dtCallOut.Rows.Count > 0)
                         {
@@ -797,17 +348,17 @@ namespace CallCenterApi.Interface.Controllers.report
 
                         if (callOutCount != 0)
                         {
-                            drNew["呼出电话数"] = callOutCount;
-                            drNew["呼通量"] = callOutJTCount;
-                            drNew["呼通率"] = (callOutJTCount / callOutCount * 100).ToString("0.00") + "%";
-                            drNew["呼出通话分钟数"] = (callOutJTSeconds / 60).ToString();
+                            if (columns.Contains("呼出电话数")) { drNew["呼出电话数"] = callOutCount; }
+                            if (columns.Contains("呼通量")) { drNew["呼通量"] = callOutJTCount; }
+                            if (columns.Contains("呼通率")) { drNew["呼通率"] = (callOutJTCount / callOutCount * 100).ToString("0.00") + "%"; }
+                            if (columns.Contains("呼出通话分钟数")) { drNew["呼出通话分钟数"] = (callOutJTSeconds / 60).ToString(); }
                         }
                         else
                         {
-                            drNew["呼出电话数"] = 0;
-                            drNew["呼通量"] = 0;
-                            drNew["呼通率"] = "0%";
-                            drNew["呼出通话分钟数"] = 0;
+                            if (columns.Contains("呼出电话数")) { drNew["呼出电话数"] = 0; }
+                            if (columns.Contains("呼通量")) { drNew["呼通量"] = 0; }
+                            if (columns.Contains("呼通率")) { drNew["呼通率"] = "0%"; }
+                            if (columns.Contains("呼出通话分钟数")) { drNew["呼出通话分钟数"] = 0; }
                         }
 
                         #endregion
@@ -815,31 +366,8 @@ namespace CallCenterApi.Interface.Controllers.report
                         #region 登录
 
                         #endregion
-
-                        //                 "呼入电话数", "坐席接通量", "接通率", "通话分钟数",
-                        //                 "呼出电话数", "坐席呼通量", "接通率", "呼出分钟数",
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
                         //坐席登录次数
-                        DataTable dtAgent = DbHelperSQL.Query("select COUNT(*) as dl,SUM(LoginTimes) as dlsc,SUM(reposenum) as zm,SUM(ReposeTimes) as xx from rep_agent_detail where AgentId=" + dt.Rows[i]["F_WorkNumber"] + " " + sqltimeCallRecords.Replace("TimeAlerting", "TimeLogin")).Tables[0];
+                        DataTable dtAgent = DbHelperSQL.Query("select COUNT(*) as dl,SUM(LoginTimes) as dlsc,SUM(reposenum) as zm,SUM(ReposeTimes) as xx from rep_agent_detail where AgentId=" + arr[i]["F_WorkNumber"] + " " + sqltimeCallRecords.Replace("TimeAlerting", "TimeLogin")).Tables[0];
                         if (dtAgent != null && dtAgent.Rows.Count > 0)
                         {
                             if (dtAgent.Rows[0]["dl"] != null && dtAgent.Rows[0]["dl"].ToString() != "")
@@ -906,24 +434,18 @@ namespace CallCenterApi.Interface.Controllers.report
                         //drNew["呼入占有率"] = (ihrzyl * 100).ToString("0.00") + "%";
                         //用户评价
 
-                        object obj = DbHelperSQL.GetSingle("select count(*) from T_Call_CallRecords where MYD is not null and CallState=1 and userid=" + dt.Rows[i]["F_UserId"] + strsqlcall);
+                        object obj = DbHelperSQL.GetSingle("select count(*) from T_Call_CallRecords where MYD is not null and CallState=1 and userid=" + arr[i]["F_UserId"] + strsqlcall);
                         string myd = "";
                         if (obj != null)
                         {
                             myd = obj.ToString();
                         }
-                        //drNew["用户评价"] = myd;
-                        drNew["坐席登录次数"] = izxdlcs.ToString();
-                        drNew["登录时长分钟数"] = (idlsc / 60).ToString();
-                        drNew["工作时长分钟数"] = (iWorktime / 60).ToString();
-                        drNew["平均每天工作时长"] = Math.Round((double.Parse(iWorktime.ToString()) / 60 / 60 / days), 2).ToString();
-                        //drNew["平均操作分钟数"] = (ipjczsc / 60).ToString();
-                        //drNew["置忙次数"] = izmcs.ToString();
-                        drNew["休息时长分钟数"] = (ixxsc / 60).ToString();
-                        //drNew["平均每天休息时长"] = Math.Round((double.Parse(ixxsc.ToString()) / 60 / 60 / days), 2).ToString();
-                        //drNew["置忙平均休息分钟数"] = (ipjzmxxsc / 60).ToString();
-
-                        DataSet dszj = DbHelperSQL.Query("select convert(int,SUM(f_qcscore)) as fs,COUNT(*) as fsct from T_Call_CallRecords where F_QCState=1 and UserId=" + dt.Rows[i]["F_UserId"] + strsqlcall);
+                        if (columns.Contains("坐席登录次数")) { drNew["坐席登录次数"] = izxdlcs.ToString(); }
+                        if (columns.Contains("登录时长分钟数")) { drNew["登录时长分钟数"] = (idlsc / 60).ToString(); }
+                        if (columns.Contains("工作时长分钟数")) { drNew["工作时长分钟数"] = (iWorktime / 60).ToString(); }
+                        if (columns.Contains("平均每天工作小时数")) { drNew["平均每天工作小时数"] = Math.Round((double.Parse(iWorktime.ToString()) / 60 / 60 / days), 2).ToString(); }
+                        if (columns.Contains("休息时长分钟数")) { drNew["休息时长分钟数"] = (ixxsc / 60).ToString(); }
+                        DataSet dszj = DbHelperSQL.Query("select convert(int,SUM(f_qcscore)) as fs,COUNT(*) as fsct from T_Call_CallRecords where F_QCState=1 and UserId=" + arr[i]["F_UserId"] + strsqlcall);
                         int zfs = 0;
                         if (dszj != null && dszj.Tables.Count > 0)
                         {
@@ -933,8 +455,10 @@ namespace CallCenterApi.Interface.Controllers.report
                                 zfs = Convert.ToInt32(dtzj.Rows[0]["fs"].ToString()) / int.Parse(dtzj.Rows[0]["fsct"].ToString());
                             }
                         }
-                        drNew["质检平均成绩"] = zfs.ToString();
-
+                        if (columns.Contains("质检平均成绩"))
+                        {
+                            drNew["质检平均成绩"] = zfs.ToString();
+                        }
                         dtNew.Rows.Add(drNew);
                     }
                 }

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/tel/CallrecordsController.cs

@@ -15,6 +15,7 @@ namespace CallCenterApi.Interface.Controllers.tel
 {
     public class CallrecordsController : BaseController
     {
+        private readonly BLL.T_Sys_Department deptBLL = new BLL.T_Sys_Department();
         //获取通话记录列表
         public ActionResult GetList(string phone, string usercode)
         {
@@ -70,9 +71,18 @@ namespace CallCenterApi.Interface.Controllers.tel
                 {
                     sql += " and UserCode='" + usercode + "'";
                 }
-                if (!string.IsNullOrWhiteSpace(dept) && Convert.ToInt32(dept) >= 0)
+                //if (!string.IsNullOrWhiteSpace(dept) && Convert.ToInt32(dept) >= 0)
+                //{
+                //    sql += " and UserCode in (select F_UserCode from T_Sys_UserAccount where F_DeptId=" + dept.Trim() + ")";
+                //}
+
+                if (!string.IsNullOrWhiteSpace(dept))
                 {
-                    sql += " and UserCode in (select F_UserCode from T_Sys_UserAccount where F_DeptId=" + dept.Trim() + ")";
+                    var deptModel = deptBLL.GetModel(!string.IsNullOrWhiteSpace(dept) ? Convert.ToInt32(dept) : 0);
+                    if (deptModel != null)
+                    {
+                        sql += $" and UserCode in (select F_UserCode from T_Sys_UserAccount where F_DeptId in(select F_DeptId from T_Sys_Department where F_DeptCode like '{deptModel.F_DeptCode}%'))";
+                    }
                 }
                 if (phone != null && phone.Trim() != "")
                 {

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Models/Input/CallInTimeInput.cs

@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+
+namespace CallCenterApi.Interface.Models.Input
+{
+    public class CallInTimeInput
+    {
+        public DateTime? StartTime1 { get; set; }
+        public DateTime? EndTime1 { get; set; }
+        public DateTime? StartTime2 { get; set; }
+        public DateTime? EndTime2 { get; set; }
+    }
+}

CallCenterApi/CallCenterApi.Model/T_Sys_UserAccount.cs

@@ -304,13 +304,16 @@ namespace CallCenterApi.Model
             set { _f_seartgroup = value; }
             get { return _f_seartgroup; }
         }
+        public DateTime? StartTime1 { get; set; }
+        public DateTime? EndTime1 { get; set; }
+        public DateTime? StartTime2 { get; set; }
+        public DateTime? EndTime2 { get; set; }
         #endregion Model
 
 
         #region 接口添加字段
         public string depname { get; set; }
         public string zxzname { get; set; }
-
         #endregion
     }
 }