禅道bug调整提交

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/DictionaryController.cs

@@ -97,28 +97,30 @@ namespace CallCenterApi.Interface.Controllers
         public ActionResult AddDic(DictionaryBaseInput input)
         {
             if (Request.IsAuthenticated)
-            {
-                int userId = CurrentUser.UserData.F_UserId;
-                Model.T_Sys_UserAccount userModel = new BLL.T_Sys_UserAccount().GetModel(userId);
+                return NoToken("未知错误，请重新登录");
+            if (string.IsNullOrEmpty(input.DicFlag))
+                return Error("字典标识不允许为空！");
+            if (string.IsNullOrEmpty(input.Name))
+                return Error("字典分类不允许为空！");
+            int userId = CurrentUser.UserData.F_UserId;
+            Model.T_Sys_UserAccount userModel = new BLL.T_Sys_UserAccount().GetModel(userId);
 
-                Model.T_Sys_DictionaryBase orderModel = new Model.T_Sys_DictionaryBase();
-                BLL.T_Sys_DictionaryBase orderBll = new BLL.T_Sys_DictionaryBase();
-                var list = orderBll.GetList(" F_DictionaryFlag='" + input.DicFlag.Trim() + "' and F_GroupCode='" + userModel.groupcode + "'").Tables[0];
-                if (list.Rows.Count >0)
-                    return Error("字典标志已存在");
-                orderModel.F_DictionaryFlag = input.DicFlag;
-                orderModel.F_DictionaryName = input.Name;
-                orderModel.F_Describe = input.Remark;
-                orderModel.F_State = true;
-                orderModel.F_Sort = input.Sort;
-                orderModel.F_GroupCode = userModel.groupcode;
+            Model.T_Sys_DictionaryBase orderModel = new Model.T_Sys_DictionaryBase();
+            BLL.T_Sys_DictionaryBase orderBll = new BLL.T_Sys_DictionaryBase();
+            var list = orderBll.GetList(" F_DictionaryFlag='" + input.DicFlag.Trim() + "' and F_GroupCode='" + userModel.groupcode + "'").Tables[0];
+            if (list.Rows.Count > 0)
+                return Error("字典标志已存在");
+            orderModel.F_DictionaryFlag = input.DicFlag;
+            orderModel.F_DictionaryName = input.Name;
+            orderModel.F_Describe = input.Remark;
+            orderModel.F_State = true;
+            orderModel.F_Sort = input.Sort;
+            orderModel.F_GroupCode = userModel.groupcode;
 
-                if (orderBll.Add(orderModel)>0)
-                    return Success("字典添加成功");
-                else
-                    return Error("字典添加失败");
-            }
-            return NoToken("未知错误，请重新登录");
+            if (orderBll.Add(orderModel) > 0)
+                return Success("字典分类添加成功");
+            else
+                return Error("字典分类添加失败");
         }
 
         //[Authority]
@@ -130,21 +132,25 @@ namespace CallCenterApi.Interface.Controllers
         public ActionResult EditDic(DictionaryBaseInput input)
         {
             if (Request.IsAuthenticated)
-            {
-                BLL.T_Sys_DictionaryBase orderBll = new BLL.T_Sys_DictionaryBase();
-                Model.T_Sys_DictionaryBase orderModel = orderBll.GetModel(input.DicId);
-                if (orderModel == null)
-                    return Error("字典对象不存在");
-                orderModel.F_DictionaryFlag = input.DicFlag;
-                orderModel.F_DictionaryName = input.Name;
-                orderModel.F_Describe = input.Remark;
-                orderModel.F_Sort = input.Sort;
-                if (orderBll.Update(orderModel))
-                    return Success("字典添加成功");
-                else
-                    return Error("字典添加失败");
-            }
-            return NoToken("未知错误，请重新登录");
+                return NoToken("未知错误，请重新登录");
+            if(input.DicId<=0)
+                return Error("请选择要编辑的字典分类");
+            if (string.IsNullOrEmpty(input.DicFlag))
+                return Error("字典标识不允许为空！");
+            if (string.IsNullOrEmpty(input.Name))
+                return Error("字典分类不允许为空！");
+            BLL.T_Sys_DictionaryBase orderBll = new BLL.T_Sys_DictionaryBase();
+            Model.T_Sys_DictionaryBase orderModel = orderBll.GetModel(input.DicId);
+            if (orderModel == null)
+                return Error("字典分类不存在");
+            orderModel.F_DictionaryFlag = input.DicFlag;
+            orderModel.F_DictionaryName = input.Name;
+            orderModel.F_Describe = input.Remark;
+            orderModel.F_Sort = input.Sort;
+            if (orderBll.Update(orderModel))
+                return Success("字典分类编辑成功");
+            else
+                return Error("字典分类编辑失败");
         }
 
         //[Authority]
@@ -278,53 +284,57 @@ namespace CallCenterApi.Interface.Controllers
         //添加字典值
         public ActionResult AddDicValue(DictionaryValueInput input)
         {
-            if (Request.IsAuthenticated)
-            {
+            if (!Request.IsAuthenticated)
+                return NoToken("未知错误，请重新登录");
+            if (string.IsNullOrEmpty(input.DicValue))
+                return Error("字典标识不允许为空！");
+            if (string.IsNullOrEmpty(input.DicVName))
+                return Error("字典值不允许为空！");
 
-                int userId = CurrentUser.UserData.F_UserId;
-                Model.T_Sys_UserAccount userModel = new BLL.T_Sys_UserAccount().GetModel(userId);
+            int userId = CurrentUser.UserData.F_UserId;
+            Model.T_Sys_UserAccount userModel = new BLL.T_Sys_UserAccount().GetModel(userId);
 
-                Model.T_Sys_DictionaryValue orderModel = new Model.T_Sys_DictionaryValue();
-                BLL.T_Sys_DictionaryValue orderBll = new BLL.T_Sys_DictionaryValue();
+            Model.T_Sys_DictionaryValue orderModel = new Model.T_Sys_DictionaryValue();
+            BLL.T_Sys_DictionaryValue orderBll = new BLL.T_Sys_DictionaryValue();
 
-                orderModel.F_Name = input.DicVName;
-                orderModel.F_Describe = input.DicDes;
-                orderModel.F_State = true;
-                orderModel.F_ValueCode = input.DicValue;
-                orderModel.F_DictionaryFlag = input.DicFlag;
-                orderModel.F_Sort = input.Sort;
-                orderModel.F_GroupCode = userModel.groupcode;
+            orderModel.F_Name = input.DicVName;
+            orderModel.F_Describe = input.DicDes;
+            orderModel.F_State = true;
+            orderModel.F_ValueCode = input.DicValue;
+            orderModel.F_DictionaryFlag = input.DicFlag;
+            orderModel.F_Sort = input.Sort;
+            orderModel.F_GroupCode = userModel.groupcode;
 
-                if (orderBll.Add(orderModel) > 0)
-                    return Success("字典值添加成功");
-                else
-                    return Error("字典值添加失败");
-            }
-            return NoToken("未知错误，请重新登录");
+            if (orderBll.Add(orderModel) > 0)
+                return Success("字典值添加成功");
+            else
+                return Error("字典值添加失败");
         }
         ////[Authority]
         //编辑字典值
         public ActionResult EditDicValue(DictionaryValueInput input)
         {
-            if (Request.IsAuthenticated)
-            {
-                if (input.DicVid <= 0)
-                    return Error("字典值id获取失败");
-                BLL.T_Sys_DictionaryValue orderBll = new BLL.T_Sys_DictionaryValue();
-                Model.T_Sys_DictionaryValue orderModel = orderBll.GetModel(input.DicVid);
-                if (orderModel == null)
-                    return Error("字典值对象获取失败");
-                orderModel.F_Name = input.DicVName;
-                orderModel.F_Describe = input.DicDes;
-                orderModel.F_ValueCode = input.DicValue;
-                orderModel.F_DictionaryFlag = input.DicFlag;
-                orderModel.F_Sort = input.Sort;
-                if (orderBll.Update(orderModel))
-                    return Success("字典值编辑成功");
-                else
-                    return Error("字典值编辑失败");
-            }
-            return NoToken("未知错误，请重新登录");
+            if (!Request.IsAuthenticated)
+                return NoToken("未知错误，请重新登录");
+            if (input.DicVid <= 0)
+                return Error("请选择要编辑的字典值");
+            if (string.IsNullOrEmpty(input.DicValue))
+                return Error("字典标识不允许为空！");
+            if (string.IsNullOrEmpty(input.DicVName))
+                return Error("字典值不允许为空！");
+            BLL.T_Sys_DictionaryValue orderBll = new BLL.T_Sys_DictionaryValue();
+            Model.T_Sys_DictionaryValue orderModel = orderBll.GetModel(input.DicVid);
+            if (orderModel == null)
+                return Error("字典值对象获取失败");
+            orderModel.F_Name = input.DicVName;
+            orderModel.F_Describe = input.DicDes;
+            orderModel.F_ValueCode = input.DicValue;
+            orderModel.F_DictionaryFlag = input.DicFlag;
+            orderModel.F_Sort = input.Sort;
+            if (orderBll.Update(orderModel))
+                return Success("字典值编辑成功");
+            else
+                return Error("字典值编辑失败");
         }
         //[Authority]
         //删除字典值

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

@@ -381,7 +381,7 @@ namespace CallCenterApi.Interface.Controllers
         ///// <returns></returns>
         //public ActionResult GetTelRecordsTotal()
         //{
-            
+
         //    if (Request.IsAuthenticated)
         //    {
         //        int userId = CurrentUser.UserData.F_UserId;
@@ -397,7 +397,7 @@ namespace CallCenterApi.Interface.Controllers
         //            {
         //                uwhere += " and UserCode='" + userModel.F_UserCode + "' ";
         //            }
-                   
+
         //            if (!string.IsNullOrEmpty(userModel.groupcode))
         //            {
         //                uwhere += " and groupcode = '" + userModel.groupcode + "' ";
@@ -450,7 +450,7 @@ namespace CallCenterApi.Interface.Controllers
         //                daynocon = daynocon
         //            };
         //            return Success("成功", obj);
-                
+
         //    }
         //    }
         //    return NoToken("未知错误，请重新登录");
@@ -462,95 +462,40 @@ namespace CallCenterApi.Interface.Controllers
         /// <returns></returns>
         public ActionResult GetWorkTotal()
         {
-            
-            if (Request.IsAuthenticated)
-            {
-                int userId = CurrentUser.UserData.F_UserId;
-                if (userId != 0)
-                {
-                    Model.T_Sys_UserAccount userModel = new BLL.T_Sys_UserAccount().GetModel(userId);
-                    if (userModel != null)
-                    {
-                        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 F_State !=11 and F_Duplicate!=5 AND CONVERT(char(7),F_CreateTime,20) = '" + strMonth + "'"; ;
-                        if (userModel.rolecode != "XTGLY")
-                        {
-                            uwhere += " and F_CreateUser='" + userModel.F_UserCode + "' ";
-                        }
+            if (!Request.IsAuthenticated)
+                return NoToken("未知错误，请重新登录");
+            int userId = CurrentUser.UserData.F_UserId;
+            if (userId <= 0)
+                return Error("登陆信息失效");
+            Model.T_Sys_UserAccount userModel = new BLL.T_Sys_UserAccount().GetModel(userId);
+            if (userModel == null)
+                return Error("当前用户信息不存在，请联系管理员！");
 
+            var date = DateTime.Now;
+            string strDate = date.ToString("yyyy-MM-dd");
+            string strMonth = date.ToString("yyyy-MM");
+            BLL.T_Rec_RegRecords bll = new BLL.T_Rec_RegRecords();
 
-                        //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];
-
-                        //DataTable dtConnect = DbHelperSQL.Query("select CONVERT(varchar(10),F_CreateTime, 23) AS yearmonthdays,CONVERT(char(7),F_CreateTime,20) AS yearmonths,F_State,F_IsDelete,F_CreateTime,F_CreateUser FROM T_Bus_WorkOrder WITH(NOLOCK) where " + uwhere + "").Tables[0];
-
-                        //日已完成
-                        //int list1_count = dtConnect.Select(" yearmonthdays = '" + strDate + "' and F_State = 10 and F_IsDelete = 0").Count();
-                        ////日未完成
-                        //int list2_count = dtConnect.Select(" yearmonthdays = '" + strDate + "' and F_State<>10 and F_IsDelete=0 ").Count();
-                        ////月已完成
-                        //var list3_count = dtConnect.Select(" yearmonths = '" + strMonth + "' and F_State =10 and F_IsDelete=0 ").Count();
-                        ////月未完成
-                        //var list4_count = dtConnect.Select(" yearmonths = '" + strMonth + "' and F_State<>10 and F_IsDelete=0").Count();
-
-                        //BLL.T_Bus_WorkOrder bll = new BLL.T_Bus_WorkOrder();
-                        //var modellist = bll.GetModelList (uwhere + " and F_IsDelete = 0  and F_State !=11 and F_Duplicate!=5");
-                        //int list1 = 0, list2 = 0, list3 = 0, list4 = 0;
-                        //if (modellist!=null )
-                        //{
-                        //   foreach (var it in modellist)
-                        //    {
-                        //        if (it .F_State ==10)
-                        //        {
-                        //            list3++;
-                        //            if (DateTime .Parse (it.F_CreateTime.ToString ()).ToString("yyyy-MM-dd")== strDate)
-                        //            {
-                        //                list1++;
-                        //            }
-                        //        }
-                        //        else
-                        //        {
-                        //            list4++;
-                        //            if (DateTime.Parse(it.F_CreateTime.ToString()).ToString("yyyy-MM-dd") == strDate)
-                        //            {
-                        //                list2++;
-                        //            }
-                        //        }
-                        //    }
-                        //}
-
-                     //   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 obj = new
-                        {
-                            //daywc = list1,
-                            //daywwc = list2,
-                            //monwc = list3,
-                            //monwwc = list4
-                            //daywc = list1_count,
-                            //daywwc = list2_count,
-                            //monwc = list3_count,
-                            //monwwc = list4_count
-                        };
-                        return Success("成功", obj);
-                    }
-                }
+            var daywhere = " and datediff(day,F_CreateOn,getdate())=0 ";
+            var monthwhere = " and datediff(month,F_CreateOn,getdate())=0 ";
+            if (userModel.rolecode != "XTGLY")
+            {
+                daywhere += " and F_CreateBy='" + userModel.F_UserCode + "' ";
+                monthwhere += " and F_CreateBy='" + userModel.F_UserCode + "' ";
             }
-            return NoToken("未知错误，请重新登录");
+
+            var ldCount = bll.GetRecordCount("F_Direction=0 " + daywhere);
+            var qdCount = bll.GetRecordCount("F_Direction=1 " + daywhere);
+            var count = bll.GetRecordCount("1=1 " + monthwhere);
+
+
+            var obj = new
+            {
+                ldCount,
+                qdCount,
+                count
+            };
+            return Success("成功", obj);
         }
 
         /// <summary>
@@ -617,7 +562,7 @@ namespace CallCenterApi.Interface.Controllers
                 Model.T_Sys_UserAccount userModel = new BLL.T_Sys_UserAccount().GetModel(userId);
                 if (userModel != null)
                 {
-                    var date = DateTime.Now;//DateTime.Parse("2015-04-05"); //
+                    var date = DateTime.Now;
                     string strDate = date.ToString("yyyy-MM");
 
                     int days = DateTime.DaysInMonth(date.Year, date.Month);
@@ -628,33 +573,28 @@ namespace CallCenterApi.Interface.Controllers
                     int newcount = 0;
                     List<string> cols = strcols.Take(days).ToList();
                     BLL.T_Call_CallRecords telbll = new BLL.T_Call_CallRecords();
-                    //BLL.T_Wo_WorkOrderBase workbll = new BLL.T_Wo_WorkOrderBase();
-                    //BLL.T_Bus_WorkOrder workbll = new BLL.T_Bus_WorkOrder();
+                    
                     int[] teltotal = new int[days];
                     int[] worktotal = new int[days];
-                    string uwhere = " 1=1  AND CONVERT(char(7),F_CreateTime,20) = '" + strDate + "' ";
+                    string uwhere = " 1=1  AND CONVERT(char(7),F_CreateOn,20) = '" + strDate + "' ";
                     string u1where = " 1=1 and ISNULL(groupcode,'') != '' AND CONVERT(char(7),BeginTime,20) = '" + strDate + "' ";
                     if (userModel.rolecode != "XTGLY")
                     {
-                        uwhere += " and F_CreateUser='" + userModel.F_UserCode + "' ";
+                        uwhere += " and F_CreateBy='" + userModel.F_UserCode + "' ";
                         u1where += " and UserCode='" + userModel.F_UserCode + "' ";
                     }
 
                     DataTable dtConnect = DbHelperSQL.Query("select CONVERT(varchar(10),BeginTime, 23) AS yearmonthdays,CONVERT(char(7),BeginTime,20) AS yearmonths,CallType,BeginTime,groupcode,UserCode FROM T_Call_CallRecords WITH(NOLOCK) where " + u1where + "").Tables[0];
-                    //DataTable dtConnect_Wo = DbHelperSQL.Query("select CONVERT(varchar(10),F_CreateTime, 23) AS yearmonthdays,CONVERT(char(7),F_CreateTime,20) AS yearmonths,F_State,F_IsDelete,F_CreateTime,F_CreateUser FROM T_Bus_WorkOrder WITH(NOLOCK) where " + uwhere + "").Tables[0];
+                    DataTable dtConnect_Wo = DbHelperSQL.Query("select CONVERT(varchar(10),F_CreateOn, 23) AS yearmonthdays,CONVERT(char(7),F_CreateOn,20) AS yearmonths,F_CreateOn,F_CreateBy FROM T_Rec_RegRecords WITH(NOLOCK) where " + uwhere + "").Tables[0];
                     for (int i = 0; i < cols.Count; i++)
                     {
                         int tellist_Count = dtConnect.Select("yearmonthdays = '" + (strDate + "-" + cols[i]) + "'").Count();
                         teltotal[i] = tellist_Count;
                         newcount = newcount + tellist_Count;
 
-                        //var worklist = workbll.GetList(" F_USERID='" + userId + "' and CONVERT(varchar(10),F_CREATEDATE, 23)='" + (strDate + "-" + cols[i]) + "' ").Tables[0];
-                        //var worklist = workbll.GetList(uwhere + " and CONVERT(varchar(10),CreateTime, 23)='" + (strDate + "-" + cols[i]) + "' ").Tables[0];
-                        //int worklist_count = workbll.GetRecordCount(uwhere + " and CONVERT(varchar(10),CreateTime, 23)='" + (strDate + "-" + cols[i]) + "' ");
-                        //int worklist_count = dtConnect_Wo.Select("yearmonthdays = '" + (strDate + "-" + cols[i]) + "'").Count();
-                        //worktotal[i] = worklist.Rows.Count;
-                        //worktotal[i] = worklist_count;
-                        worktotal[i] = 0;
+                        
+                        int worklist_count = dtConnect_Wo.Select("yearmonthdays = '" + (strDate + "-" + cols[i]) + "'").Count();
+                        worktotal[i] = worklist_count;
                     }
 
                     var olddate = date.AddYears(-1);
@@ -707,18 +647,17 @@ namespace CallCenterApi.Interface.Controllers
         /// <returns></returns>
         public ActionResult GetWorkOrderCount()
         {
-            return Success("");
-
-            //if (Request.IsAuthenticated)
-            //{
+            if (!Request.IsAuthenticated)
+                return NoToken("未知错误，请重新登录");
+            int userId = CurrentUser.UserData.F_UserId;
+            if (userId <= 0)
+                return Error("登陆信息失效");
+            Model.T_Sys_UserAccount userModel = new BLL.T_Sys_UserAccount().GetModel(userId);
+            if (userModel == null)
+                return Error("当前用户信息不存在，请联系管理员！");
 
-            //    int userId = CurrentUser.UserData.F_UserId;
-            //    if (userId != 0)
-            //    {
-            //        Model.T_Sys_UserAccount ua = new BLL.T_Sys_UserAccount().GetModel(userId);
+            return Success("");
 
-            //        if (ua != null)
-            //        {
             //            BLL.T_Bus_WorkOrder bll = new BLL.T_Bus_WorkOrder();
 
             //            string uwhere = " 1=1  ";
@@ -733,10 +672,6 @@ namespace CallCenterApi.Interface.Controllers
             //                thdtj = bll.GetList(uwhere + "  AND F_State=6 ").Tables[0].Rows.Count,
             //            };
             //            return Success("成功", obj);
-            //        }
-            //    }
-            //}
-            //return NoToken("未知错误，请重新登录");
         }
 
         /// <summary>

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/MenuManage/ModuleInfoController.cs

@@ -97,6 +97,12 @@ namespace CallCenterApi.Interface.Controllers
         [HttpPost]
         public ActionResult AddModule(ModuleInfoDto input)
         {
+            if (string.IsNullOrEmpty(input.name))
+                return Error("名称不允许为空");
+            if (string.IsNullOrEmpty(input.code))
+                return Error("代码不允许为空");
+            if (string.IsNullOrEmpty(input.url))
+                return Error("菜单连接不允许为空");
             var entity_ModuleInfo = new Model.T_Sys_ModuleInfo();
             entity_ModuleInfo.F_ParentID = input.parentid;
             entity_ModuleInfo.F_ModuleName = input.name;
@@ -156,30 +162,34 @@ namespace CallCenterApi.Interface.Controllers
         [HttpPost]
         public ActionResult EditModule(ModuleInfoDto input)
         {
+            if(input.id<=0)
+                return Error("请选择要编辑的菜单");
+            if (string.IsNullOrEmpty(input.name))
+                return Error("名称不允许为空");
+            if (string.IsNullOrEmpty(input.code))
+                return Error("代码不允许为空");
+            if (string.IsNullOrEmpty(input.url))
+                return Error("菜单连接不允许为空");
+
             var entity_ModuleInfo = moduleInfoBLL.GetModel(input.id);
-            if (entity_ModuleInfo != null)
-            {
-                entity_ModuleInfo.F_ParentID = input.parentid;
-                entity_ModuleInfo.F_ModuleName = input.name;
-                entity_ModuleInfo.F_ModuleCode = input.code;
-                entity_ModuleInfo.F_Remark = input.remark;
-                entity_ModuleInfo.F_Sort = input.sort;
-                entity_ModuleInfo.F_StateFlag = Convert.ToInt32(input.flag);
-                entity_ModuleInfo.F_OptUrl = input.url;
+            if (entity_ModuleInfo == null)
+                return Error("菜单对象获取失败");
+            entity_ModuleInfo.F_ParentID = input.parentid;
+            entity_ModuleInfo.F_ModuleName = input.name;
+            entity_ModuleInfo.F_ModuleCode = input.code;
+            entity_ModuleInfo.F_Remark = input.remark;
+            entity_ModuleInfo.F_Sort = input.sort;
+            entity_ModuleInfo.F_StateFlag = Convert.ToInt32(input.flag);
+            entity_ModuleInfo.F_OptUrl = input.url;
 
 
-                if (moduleInfoBLL.Update(entity_ModuleInfo))
-                {
-                    return Success("菜单修改成功");
-                }
-                else
-                {
-                    return Error("菜单修改失败,请重试！");
-                }
+            if (moduleInfoBLL.Update(entity_ModuleInfo))
+            {
+                return Success("菜单修改成功");
             }
             else
             {
-                return Error("菜单对象获取失败");
+                return Error("菜单修改失败,请重试！");
             }
         }
 

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/knowledge/KnowledgeController.cs

@@ -122,100 +122,85 @@ namespace CallCenterApi.Interface.Controllers.knowledge
         //添加知识库
         public ActionResult AddInfo(string title, string key, string con, string pid)
         {
-            
-            if (Request.IsAuthenticated)
-            {
-
-                    Model.T_RepositoryInformation dModel = new Model.T_RepositoryInformation();
-                    if (pid.Trim() != "")
-                    {
-                        Model.T_RepositoryCategory pModel = new BLL.T_RepositoryCategory().GetModel(int.Parse(pid.Trim()));
-                        dModel.F_CategoryId = int.Parse(pid.Trim());
-                        if (pModel != null)
-                            dModel.F_Expand1 = pModel.F_CategoryName;
-                    }
-                    else
-                        dModel.F_CategoryId = 0;
-
-                    dModel.F_Title = title.Trim();
-                    dModel.F_KeyWords = key.Trim();
-                    dModel.F_Content = WebHelper.UrlDecode(con.Trim());
-                    dModel.F_Description = WebHelper.NoHtml(WebHelper.UrlDecode(con.Trim()));
-
-                    dModel.F_CreateOn = DateTime.Now;
-                    dModel.F_ModifyOn = DateTime.Now;
-                    dModel.F_CreateBy = CurrentUser.UserData.F_UserId;
-                    dModel.F_DeleteFlag = 0;
-                    int b = new BLL.T_RepositoryInformation().Add(dModel);
-                    if (b > 0)
-                    {
-                        return Success("添加成功");
-                    }
-                    else
-                    {
-                        return Success("添加失败");
-                    }
 
+            if (!Request.IsAuthenticated)
+                return NoToken("未知错误，请重新登录");
+            if (string.IsNullOrEmpty(title))
+                return Error("标题不允许为空！");
+            if (string.IsNullOrEmpty(con))
+                return Error("内容不允许为空！");
+            if (string.IsNullOrEmpty(pid))
+                return Error("请选择所属分类！");
+
+            Model.T_RepositoryInformation dModel = new Model.T_RepositoryInformation();
+
+            Model.T_RepositoryCategory pModel = new BLL.T_RepositoryCategory().GetModel(int.Parse(pid.Trim()));
+            dModel.F_CategoryId = int.Parse(pid.Trim());
+            if (pModel != null)
+                dModel.F_Expand1 = pModel.F_CategoryName;
+
+            dModel.F_Title = title.Trim();
+            dModel.F_KeyWords = key.Trim();
+            dModel.F_Content = WebHelper.UrlDecode(con.Trim());
+            dModel.F_Description = WebHelper.NoHtml(WebHelper.UrlDecode(con.Trim()));
+
+            dModel.F_CreateOn = DateTime.Now;
+            dModel.F_ModifyOn = DateTime.Now;
+            dModel.F_CreateBy = CurrentUser.UserData.F_UserId;
+            dModel.F_DeleteFlag = 0;
+            int b = new BLL.T_RepositoryInformation().Add(dModel);
+            if (b > 0)
+            {
+                return Success("添加成功");
             }
-            return NoToken("未知错误，请重新登录");
+            else
+            {
+                return Success("添加失败");
+            }
+
         }
         //[Authority]
         //编辑知识库
         public ActionResult EditInfo(string infoid, string title, string key, string con, string pid)
         {
-            
-            if (Request.IsAuthenticated)
-            {
-
-                    if (infoid != null && infoid.Trim() != "")
-                    {
-                        BLL.T_RepositoryInformation dBLL = new BLL.T_RepositoryInformation();
-                        Model.T_RepositoryInformation dModel = dBLL.GetModel(int.Parse(infoid.Trim()));
-                        if (dModel != null)
-                        {
-                            if (pid.Trim() != "")
-                            {
-                                Model.T_RepositoryCategory pModel = new BLL.T_RepositoryCategory().GetModel(int.Parse(pid.Trim()));
-                                dModel.F_CategoryId = int.Parse(pid.Trim());
-                                if (pModel != null)
-                                    dModel.F_Expand1 = pModel.F_CategoryName;
-                            }
-                            if (title.Trim() != "")
-                            {
-                                dModel.F_Title = title.Trim();
-                            }
-                            if (key.Trim() != "")
-                            {
-                                dModel.F_KeyWords = key.Trim();
-                            }
-                            if (con.Trim() != "")
-                            {
-                                dModel.F_Content = WebHelper.UrlDecode(con.Trim());
-                                dModel.F_Description = WebHelper.NoHtml(WebHelper.UrlDecode(con.Trim()));
-                            }
-
-                            dModel.F_ModifyBy = CurrentUser.UserData.F_UserId;
-                            dModel.F_ModifyOn = DateTime.Now;
-                            bool b = dBLL.Update(dModel);
-                            if (b)
-                            {
-                                return Success("编辑成功");
-                            }
-                            else
-                            {
-                                return Success("编辑失败");
-                            }
-                        }
-                        else
-                            return Error("获取信息失败");
-                    }
-                    else
-                    {
-                        return Error("请选择要编辑的知识库");
-                    }
 
+            if (!Request.IsAuthenticated)
+                return NoToken("未知错误，请重新登录");
+
+            if (infoid == null || infoid.Trim() != "")
+                return Error("请选择要编辑的知识库");
+            if (string.IsNullOrEmpty(title))
+                return Error("标题不允许为空！");
+            if (string.IsNullOrEmpty(con))
+                return Error("内容不允许为空！");
+            if (string.IsNullOrEmpty(pid))
+                return Error("请选择所属分类！");
+            BLL.T_RepositoryInformation dBLL = new BLL.T_RepositoryInformation();
+            Model.T_RepositoryInformation dModel = dBLL.GetModel(int.Parse(infoid.Trim()));
+            if (dModel == null)
+                return Error("获取信息失败");
+
+            Model.T_RepositoryCategory pModel = new BLL.T_RepositoryCategory().GetModel(int.Parse(pid.Trim()));
+            dModel.F_CategoryId = int.Parse(pid.Trim());
+            if (pModel != null)
+                dModel.F_Expand1 = pModel.F_CategoryName;
+
+            dModel.F_Title = title.Trim();
+            dModel.F_KeyWords = key.Trim();
+            dModel.F_Content = WebHelper.UrlDecode(con.Trim());
+            dModel.F_Description = WebHelper.NoHtml(WebHelper.UrlDecode(con.Trim()));
+
+            dModel.F_ModifyBy = CurrentUser.UserData.F_UserId;
+            dModel.F_ModifyOn = DateTime.Now;
+            bool b = dBLL.Update(dModel);
+            if (b)
+            {
+                return Success("编辑成功");
+            }
+            else
+            {
+                return Success("编辑失败");
             }
-            return NoToken("未知错误，请重新登录");
         }
         //[Authority]
         //删除知识库

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

@@ -159,7 +159,7 @@ namespace CallCenterApi.Interface.Controllers.report
                 }
                 if (dt1.Rows[0]["sumshuchu"] == null || dt1.Rows[0]["sumshuchu"].ToString() == "")
                 {
-                    drNew["呼出通话总时长"] = "0";
+                    drNew["呼出通话总时长"] = "0秒";
                 }
                 else
                 {
@@ -182,7 +182,7 @@ namespace CallCenterApi.Interface.Controllers.report
                 }
                 if (dt1.Rows[0]["sumshuru"] == null || dt1.Rows[0]["sumshuru"].ToString() == "")
                 {
-                    drNew["呼入通话总时长"] = "0";
+                    drNew["呼入通话总时长"] = "0秒";
                 }
                 else
                 {
@@ -206,8 +206,8 @@ namespace CallCenterApi.Interface.Controllers.report
                 }
                 if (day == 0)
                 {
-                    drNew["平均日呼入通话时长"] = "0";
-                    drNew["平均日呼出通话时长"] = "0";
+                    drNew["平均日呼入通话时长"] = "0秒";
+                    drNew["平均日呼出通话时长"] = "0秒";
                 }
                 else
                 {
@@ -247,8 +247,8 @@ namespace CallCenterApi.Interface.Controllers.report
             }
             if (day == 0)
             {
-                drzj["平均日呼入通话时长"] = "0";
-                drzj["平均日呼出通话时长"] = "0";
+                drzj["平均日呼入通话时长"] = "0秒";
+                drzj["平均日呼出通话时长"] = "0秒";
             }
             else
             {