1

codegit/CallCenterApi/CallCenterApi.BLL/T_Sys_MobileData.cs

@@ -79,9 +79,10 @@ namespace CallCenterApi.BLL
         /// <summary>
         /// 获得前几行数据
         /// </summary>
-        public DataSet GetList(int Top, string strWhere, string filedOrder)
+        public List<CallCenterApi.Model.T_Sys_MobileData> GetList(int Top, string strWhere, string filedOrder)
         {
-            return dal.GetList(Top, strWhere, filedOrder);
+            DataSet ds =dal.GetList(Top, strWhere, filedOrder);
+            return DataTableToList(ds.Tables[0]);
         }
         /// <summary>
         /// 获得数据列表

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Configs/system.config

@@ -48,4 +48,9 @@
   <add key="APPKEY" value="yihHAcpaiP9eUNkHjO2nu" />
   <!-- 设置个推MASTERSECRET -->
   <add key="MASTERSECRET" value="HOpwGC8dOoAvSmurJYF5N9" />
+
+  <!-- 设置归属地查询AccessKeyID -->
+  <add key="AccessKeyID" value="LTAI5t74YpfDp5ULqyR78bPy" />
+  <!-- 设置归属地查询AccessKeySecret -->
+  <add key="AccessKeySecret" value="elRaejiGbEEp3SMy9uNNR2QkLd9ZjF" />
 </appSettings>

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

@@ -352,7 +352,7 @@ namespace CallCenterApi.Interface.Controllers
         }
         //[Authority]
         //用户列表
-        public ActionResult GetList(FilterUserAccount filter)
+        public ActionResult GetList(FilterUserAccount filter,int isdc=0)
         {
             if (Request.IsAuthenticated)
             {
@@ -410,64 +410,85 @@ namespace CallCenterApi.Interface.Controllers
                     sth = "F_RoleId asc";
                 }
                 sql += "and (F_See!='5' or  F_See is null)";
-              
-                int recordCount = 0;
-                dt = BLL.PagerBLL.GetListPager(
-                                        "T_Sys_UserAccount",
-                                        "F_UserId",
-                                        "*",
-                                        sql,
-                                        "ORDER BY "+ sth + " ",
-                                        filter.PageSize,
-                                        filter.PageIndex,
-                                        true,
-                                        out recordCount);
-
-                List<Model.UserAccount> modelList = new BLL.UserAccount().DataTableToList(dt);
-                var obj = new
+              if (isdc>0)
                 {
-                    rows = modelList.Select(x => new
+                    var dtdc = DbHelperSQL.Query(" select  F_UserId 用户编号, F_UserCode 坐席工号,F_UserName 用户名称," +
+                        "F_SexFlag 性别,F_Mobile 手机号,F_CreateOn 添加时间,F_LastActiveTime 最后登录时间, " +
+                        " (select  F_RoleName  from T_Sys_RoleInfo where F_RoleId =a.F_RoleId ) 用户角色," +
+                         " (select F_DeptName   from T_Sys_Department  where F_DeptId  =a.F_DeptId ) 部门," +
+                          " F_WorkNumber 工号" +
+                        "from T_Sys_UserAccount a WITH(NOLOCK) where 1=1 " + sql + "ORDER BY"+ sth).Tables[0];
+                    var msg = new NPOIHelper().ExportToExcel("工单列表", dtdc);
+                    if (msg == "")
                     {
-                        F_UserId = x.F_UserId,
-                        F_UserCode = x.F_UserCode,
-                        F_ExtensionNumber = x.F_ExtensionNumber,
-                        F_UserName = x.F_UserName,
-                        F_GroupName = x.F_GroupName,
-                        F_DeptId = x.F_DeptId,
-                        F_RoleId = x.F_RoleId,
-                        F_GroupId = x.F_GroupId,
-                        F_SeatFlag = x.F_SeatFlag,
-                        F_SeatRight = x.F_SeatRight,
-                        F_SeatLevel = x.F_SeatLevel,
-                        F_SexFlag = x.F_SexFlag,
-                        F_RemindFlag = x.F_RemindFlag,
-                        F_Remark = x.F_Remark,
-                        F_Telephone = x.F_Telephone,
-                        F_Mobile = x.F_Mobile,
-                        F_HomePhone = x.F_HomePhone,
-                        F_Birthday = x.F_Birthday,
-                        F_CreateOn = x.F_CreateOn,
-                        F_CancelOn = x.F_CancelOn,
-                        F_DeleteFlag = x.F_DeleteFlag,
-                        F_APPOnFlag = x.F_APPOnFlag,
-                        F_LastActiveTime = x.F_LastActiveTime,
-                        F_See = x.F_See,
-                        F_HJType = x.F_HJType,
-                        F_PId = x.F_PId,
-                        F_TmId = x.F_TmId,
-                        F_RoleName = x.F_RoleName,
-                        F_DeptName = x.F_DeptName,
-                        F_WorkNumber = x.F_WorkNumber,
-                        F_Post = x.F_Post,
-                        //F_WXNo=x.F_WXNo,
-                        F_SeatGroup = x.F_SeartGroup
-                    }),
-                    total = recordCount
-                };
+                        return Success("导出成功");
+                    }
+                    else
+                    {
+                        return Error("导出失败");
+                    }
+                }
+              else
+                {
+                    int recordCount = 0;
+                    dt = BLL.PagerBLL.GetListPager(
+                                            "T_Sys_UserAccount",
+                                            "F_UserId",
+                                            "*",
+                                            sql,
+                                            "ORDER BY " + sth + " ",
+                                            filter.PageSize,
+                                            filter.PageIndex,
+                                            true,
+                                            out recordCount);
 
-                dt.Clear();
-                dt.Dispose();
-                return Content(obj.ToJson());
+                    List<Model.UserAccount> modelList = new BLL.UserAccount().DataTableToList(dt);
+                    var obj = new
+                    {
+                        rows = modelList.Select(x => new
+                        {
+                            F_UserId = x.F_UserId,
+                            F_UserCode = x.F_UserCode,
+                            F_ExtensionNumber = x.F_ExtensionNumber,
+                            F_UserName = x.F_UserName,
+                            F_GroupName = x.F_GroupName,
+                            F_DeptId = x.F_DeptId,
+                            F_RoleId = x.F_RoleId,
+                            F_GroupId = x.F_GroupId,
+                            F_SeatFlag = x.F_SeatFlag,
+                            F_SeatRight = x.F_SeatRight,
+                            F_SeatLevel = x.F_SeatLevel,
+                            F_SexFlag = x.F_SexFlag,
+                            F_RemindFlag = x.F_RemindFlag,
+                            F_Remark = x.F_Remark,
+                            F_Telephone = x.F_Telephone,
+                            F_Mobile = x.F_Mobile,
+                            F_HomePhone = x.F_HomePhone,
+                            F_Birthday = x.F_Birthday,
+                            F_CreateOn = x.F_CreateOn,
+                            F_CancelOn = x.F_CancelOn,
+                            F_DeleteFlag = x.F_DeleteFlag,
+                            F_APPOnFlag = x.F_APPOnFlag,
+                            F_LastActiveTime = x.F_LastActiveTime,
+                            F_See = x.F_See,
+                            F_HJType = x.F_HJType,
+                            F_PId = x.F_PId,
+                            F_TmId = x.F_TmId,
+                            F_RoleName = x.F_RoleName,
+                            F_DeptName = x.F_DeptName,
+                            F_WorkNumber = x.F_WorkNumber,
+                            F_Post = x.F_Post,
+                            //F_WXNo=x.F_WXNo,
+                            F_SeatGroup = x.F_SeartGroup
+                        }),
+                        total = recordCount
+                    };
+
+                    dt.Clear();
+                    dt.Dispose();
+                    return Content(obj.ToJson());
+                }
+               
            //   return ;
             }
             return NoToken("未知错误，请重新登录");
@@ -592,7 +613,10 @@ namespace CallCenterApi.Interface.Controllers
                 {
                     return Error("手机号不能为空");
                 }
-               
+                if (string.IsNullOrEmpty(input.Username))
+                {
+                    return Error("用户名不能为空");
+                }
                 Model.T_Sys_UserAccount userAccountModel = new Model.T_Sys_UserAccount();
                 //员工工号不能重复
                 var user = new BLL.T_Sys_UserAccount().GetModelList("F_UserName='" + input.Username + "' and F_Mobile='" + input.Mobile + "'");

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

@@ -396,7 +396,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
         /// </summary>
         /// <returns></returns>
         /// F_Duplicate  1咨询2投诉6抽检
-        public ActionResult GetList(string starttime, string endtime, string keywords, string area, string offce, string dealTimely,int CJ=0, int see=0, int state = -1, int pageindex = 1, int pagesize = 10,int Processing=0,int isdc=0)
+        public ActionResult GetList(string starttime, string endtime, string keywords, string area, string offce, string dealTimely,int CJ=0, int see=0, int state = -1, int pageindex = 1, int pagesize = 10,int Processing=0,int isdc=0, int comprehensive = -1)
         {
             int userId = CurrentUser.UserData.F_UserId;
             if (userId != 0)
@@ -425,8 +425,14 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 }
                 else
                 {
-                    if (state != 11)
-                        sql += $" and (F_Type=" + 2 + "or (F_Duplicate in(2,0)and F_Type=3))";
+                    if (comprehensive < 0)
+                    {
+                        if (state != 11)
+                        {
+                            sql += $" and (F_Type=" + 2 + "or (F_Duplicate in(2,0)and F_Type=3))";
+                        }
+                    }
+                      
                 }
                 if (!string.IsNullOrEmpty(dealTimely))//重要级别
                 {
@@ -651,15 +657,18 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 }
                 else
                 {
-                    sql += RetuSql(ro, see, ua);
-
-                    if (ro.F_RoleCode == "YWY" || ro.F_RoleCode == "ZG")
-                    {
-                        sql += "AND F_Notifications ='" + ua.F_UserCode + "'";
-                    }
-                    if (ro.F_RoleCode == "QTJS")
+                    if (comprehensive < 0)
                     {
-                        sql += "AND F_CreateUser='"+ua .F_UserCode +"'";
+                        sql += RetuSql(ro, see, ua);
+
+                        if (ro.F_RoleCode == "YWY" || ro.F_RoleCode == "ZG")
+                        {
+                            sql += "AND F_Notifications ='" + ua.F_UserCode + "'";
+                        }
+                        if (ro.F_RoleCode == "QTJS")
+                        {
+                            sql += "AND F_CreateUser='" + ua.F_UserCode + "'";
+                        }
                     }
                 }
                 if (ro.F_RoleCode == "DS")//电商角色