bug修改

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

@@ -239,6 +239,9 @@ namespace CallCenterApi.Interface.Controllers
                 int userId = CurrentUser.UserData.F_UserId;
                 string usercode = CurrentUser.UserData.F_UserCode;
                 int roleid = CurrentUser.UserData.F_RoleId;
+                Model.T_Sys_UserAccount userModel = new BLL.T_Sys_UserAccount().GetModel(userId);
+                if (userModel == null)
+                    return Error("无操作权限");
                 if (userId != 0)
                 {
                     var date = DateTime.Now;
@@ -246,11 +249,17 @@ namespace CallCenterApi.Interface.Controllers
                     string strMonth = date.ToString("yyyy-MM");
 
                     string uwhere = " 1=1 ";
-                    if (roleid != 17)
-                    {
-                        uwhere += " and UserCode='" + usercode + "' ";
-                    }
-
+               
+                        if (roleid == 17)
+                        {
+                            if (!string.IsNullOrEmpty(userModel.groupcode))
+                            {
+                            uwhere += " and groupcode = '" + userModel.groupcode + "' ";
+                            }
+                        }
+                        else
+                        uwhere += " and UserCode='" + userModel.F_UserCode + "'";
+                  
                     BLL.T_Call_CallRecords bll = new BLL.T_Call_CallRecords();
                     //var dayinlist = bll.GetModelList(uwhere + " and CallType='0' and CONVERT(varchar(10),BeginTime, 23)='" + strDate + "' and CallState='1' ");
                     //var dayoutlist = bll.GetModelList(uwhere + " and CallType='1' and CONVERT(varchar(10),BeginTime, 23)='" + strDate + "' and CallState='1' ");
@@ -379,30 +388,30 @@ namespace CallCenterApi.Interface.Controllers
                         var date = DateTime.Now;//DateTime.Parse("2015-04-14"); //
                         string strDate = date.ToString("yyyy-MM-dd");
                         string strMonth = date.ToString("yyyy-MM");
-
+                       
                         //BLL.T_Wo_WorkOrderBase bll = new BLL.T_Wo_WorkOrderBase();
                         //var list1 = bll.GetList(" F_USERID='" + userId + "' and CONVERT(varchar(10),F_CREATEDATE, 23)='" + strDate + "' and F_WORKORDERSTATEID in (0,8) ").Tables[0];
                         //var list2 = bll.GetList(" F_USERID='" + userId + "' and CONVERT(varchar(10),F_CREATEDATE, 23)='" + strDate + "' and F_WORKORDERSTATEID in (4,5,6,7,9,12,13) ").Tables[0];
                         //var list3 = bll.GetList(" F_USERID='" + userId + "' and CONVERT(char(7),F_CREATEDATE,20)='" + strMonth + "' and F_WORKORDERSTATEID in (0,8) ").Tables[0];
                         //var list4 = bll.GetList(" F_USERID='" + userId + "' and CONVERT(char(7),F_CREATEDATE,20)='" + strMonth + "' and F_WORKORDERSTATEID in (4,5,6,7,9,12,13) ").Tables[0];
 
-                        string uwhere = " 1=1 AND CONVERT(char(7),F_CreateTime,20) = '" + strMonth + "'"; ;
-                        if (userModel.rolecode != "XTGLY")
+                        string uwhere = " 1=1 "; ;
+                        if (!string.IsNullOrEmpty(userModel.groupcode))
                         {
-                            uwhere += " and F_CreateUser='" + userModel.F_UserCode + "' ";
+                            uwhere += " and F_GroupCode = '" + userModel.groupcode + "' ";
                         }
 
-                     
+
                         //var list1 = bll.GetList(uwhere + " and CONVERT(varchar(10),CreateTime, 23)='" + strDate + "' and State =2 and IsDel=0 ").Tables[0];
                         //var list2 = bll.GetList(uwhere + " and CONVERT(varchar(10),CreateTime, 23)='" + strDate + "' and State in (0,1) and IsDel=0 ").Tables[0];
                         //var list3 = bll.GetList(uwhere + " and CONVERT(char(7),CreateTime,20)='" + strMonth + "' and State =2 and IsDel=0 ").Tables[0];
                         //var list4 = bll.GetList(uwhere + " and CONVERT(char(7),CreateTime,20)='" + strMonth + "' and State in (0,1) and IsDel=0 ").Tables[0];
 
                         BLL.T_Bus_WorkOrder bll = new BLL.T_Bus_WorkOrder();
-                        var list1 = bll.GetList(uwhere + " and CONVERT(varchar(10),F_CreateTime, 23)='" + strDate + "' and F_State in(10) and F_IsDelete=0 ").Tables[0];
-                        var list2 = bll.GetList(uwhere + " and CONVERT(varchar(10),F_CreateTime, 23)='" + strDate + "' and F_State in (1,3,4,5,6) and F_IsDelete=0 ").Tables[0];
-                        var list3 = bll.GetList(uwhere + " and CONVERT(char(7),F_CreateTime,20)='" + strMonth + "' and F_State in(10) and F_IsDelete=0 ").Tables[0];
-                        var list4 = bll.GetList(uwhere + " and CONVERT(char(7),F_CreateTime,20)='" + strMonth + "' and F_State in (1,3,4,5,6) and F_IsDelete=0 ").Tables[0];
+                        var list1 = bll.GetList(uwhere + " and CONVERT(varchar(10),F_CreateTime, 23)='" + strDate + "' and F_State in(1) and F_IsDelete=0 ").Tables[0];
+                        var list2 = bll.GetList(uwhere + " and CONVERT(varchar(10),F_CreateTime, 23)='" + strDate + "' and F_State in (0) and F_IsDelete=0 ").Tables[0];
+                        var list3 = bll.GetList(uwhere + " and CONVERT(char(7),F_CreateTime,20)='" + strMonth + "' and F_State in(1) and F_IsDelete=0 ").Tables[0];
+                        var list4 = bll.GetList(uwhere + " and CONVERT(char(7),F_CreateTime,20)='" + strMonth + "' and F_State in (0) and F_IsDelete=0 ").Tables[0];
 
                         var obj = new
                         {
@@ -588,6 +597,10 @@ namespace CallCenterApi.Interface.Controllers
                         #region 权限限制    
                         string sql = "  F_IsDelete=0 ";
                         sql += " and F_CreateUser = '" + ua.F_UserCode + "' ";
+                        if (!string.IsNullOrEmpty(ua.groupcode))
+                        {
+                            sql += " and F_GroupCode = '" + ua.groupcode + "' ";
+                        }
                         #endregion
                         #region 工单各状态下数量
                         BLL.T_Bus_WorkOrder  bll = new BLL.T_Bus_WorkOrder();

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/quality/IndexBaseController.cs

@@ -99,11 +99,11 @@ namespace CallCenterApi.Interface.Controllers.quality
 
                 Model.T_QC_IndexBase dModel = new Model.T_QC_IndexBase();
 
-                if (!string.IsNullOrWhiteSpace(cid.Trim()))
+                if (!string.IsNullOrEmpty(cid))
                 {
                     dModel.F_CategoryId = int.Parse(cid.Trim());
                 }
-                if (!string.IsNullOrWhiteSpace(sort.Trim()))
+                if (!string.IsNullOrEmpty(sort))
                 {
                     if (double.Parse(sort.Trim()) > 100000)
                     {
@@ -112,7 +112,7 @@ namespace CallCenterApi.Interface.Controllers.quality
                     else
                         dModel.F_Sort = Convert.ToInt32(sort.Trim());
                 }
-                if (!string.IsNullOrWhiteSpace(score.Trim()))
+                if (!string.IsNullOrEmpty(score))
                 {
                     if (double .Parse (score.Trim())>100000)
                     {
@@ -121,13 +121,13 @@ namespace CallCenterApi.Interface.Controllers.quality
                     else 
                     dModel.F_Score = Convert.ToInt32(score.Trim());
                 }
-                if (!string.IsNullOrWhiteSpace(title.Trim()))
+                if (!string.IsNullOrEmpty(title))
                 {
-                    dModel.F_Title = WebHelper.UrlDecode(title.Trim());
+                    dModel.F_Title = title.Trim();
                 }
-                if (!string.IsNullOrWhiteSpace(remark.Trim()))
+                if (!string.IsNullOrEmpty(remark))
                 {
-                    dModel.F_Remark = WebHelper.UrlDecode(remark.Trim());
+                    dModel.F_Remark = remark.Trim();
                 }
 
                 dModel.F_CreateOn = DateTime.Now;
@@ -151,7 +151,7 @@ namespace CallCenterApi.Interface.Controllers.quality
         }
 
         //编辑指标
-        public ActionResult EditIndexBase(string id, string cid, string score, string sort, string title, string remark)
+        public ActionResult EditIndexBase(string id, string cid, string title, string remark,string sort, string score)
         {
 
             if (Request.IsAuthenticated)
@@ -163,35 +163,35 @@ namespace CallCenterApi.Interface.Controllers.quality
                     Model.T_QC_IndexBase dModel = dBLL.GetModel(int.Parse(id.Trim()));
                     if (dModel != null)
                     {
-                        if (!string.IsNullOrWhiteSpace(cid.Trim()))
+                        if (!string.IsNullOrEmpty (cid))
                         {
                             dModel.F_CategoryId = int.Parse(cid.Trim());
                         }
-                        if (!string.IsNullOrWhiteSpace(sort.Trim()))
+                        if (!string.IsNullOrEmpty(sort))
                         {
                             if (double.Parse(sort.Trim()) > 100000)
                             {
                                 return Error("排序过大，请重新输入");
                             }
                             else
-                                dModel.F_Sort = Convert.ToInt32(sort.Trim());
+                                dModel.F_Sort = int .Parse(sort.Trim());
                         }
-                        if (!string.IsNullOrWhiteSpace(score.Trim()))
+                        if (!string.IsNullOrEmpty(score))
                         {
-                            if (double.Parse(sort.Trim()) > 100000)
+                            if (double.Parse(score.Trim()) > 100000)
                             {
                                 return Error("分值过大，请重新输入");
                             }
                             else
-                                dModel.F_Score = Convert.ToInt32(score.Trim());
+                                dModel.F_Score = int.Parse(score.Trim());
                         }
-                        if (!string.IsNullOrWhiteSpace(title.Trim()))
+                        if (!string.IsNullOrEmpty(title))
                         {
-                            dModel.F_Title = WebHelper.UrlDecode(title.Trim());
+                            dModel.F_Title = title.Trim();
                         }
-                        if (!string.IsNullOrWhiteSpace(remark.Trim()))
+                        if (!string.IsNullOrEmpty(remark))
                         {
-                            dModel.F_Remark = WebHelper.UrlDecode(remark.Trim());
+                            dModel.F_Remark = remark.Trim();
                         }
                         bool b = dBLL.Update(dModel);
                         if (b)

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

@@ -654,7 +654,7 @@ namespace CallCenterApi.Interface.Controllers.report
                 dicwhere += " and F_GroupCode = '" + userModel.groupcode + "' ";
             }
             string sql = " select F_Name F_Typeof,(select COUNT(1) from T_Bus_WorkOrder where " + where 
-                + " ) Count from dbo.T_Sys_DictionaryValue where F_DictionaryFlag='GDLX' and F_State=1 " ;
+                + "  and  F_Typeof =F_Name ) Count from dbo.T_Sys_DictionaryValue where F_DictionaryFlag='GDLX' and F_State=1 ";
 
             DataTable dt = DbHelperSQL.Query(sql).Tables[0];