修改bug

API/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/InfoController.cs

@@ -89,7 +89,7 @@ namespace CallCenterApi.Interface.Controllers
         private object GetSourceCount()
         {
             string sql = " select F_Value Source,(select COUNT(1) from T_Bus_WorkOrder where datediff(day,F_RegDate,getdate())=0 and F_IsDelete=0 "
-                + " and isnull(F_InfoConSmallType,0)!=0 and F_InfoSource=F_ValueId) Count from  dbo.T_Sys_DictionaryValue where F_ItemId=6 ";
+                + " and datalength(F_ComContent) >0 and F_InfoSource=F_ValueId) Count from  dbo.T_Sys_DictionaryValue where F_ItemId=6 ";
             DataTable dt = DbHelperSQL.Query(sql).Tables[0];
 
             return dt;
@@ -98,7 +98,7 @@ namespace CallCenterApi.Interface.Controllers
         private object GetAreaCount()
         {
             string sql = " select F_AreaName AreaName,(select COUNT(1) from T_Bus_WorkOrder where datediff(day,F_RegDate,getdate())=0 and F_IsDelete=0 "
-                + "and isnull(F_InfoConSmallType,0)!=0 and F_SourceArea=F_AreaId) Count from dbo.T_Sys_Area ";
+                + "and datalength(F_ComContent) >0 and F_SourceArea=F_AreaId) Count from dbo.T_Sys_Area ";
             DataTable dt = DbHelperSQL.Query(sql).Tables[0];
 
             return dt;
@@ -115,7 +115,7 @@ namespace CallCenterApi.Interface.Controllers
                 cols = areaList.Select(p => p.F_AreaName),
                 counts = new List<int[]>()
             };
-            //string sql = " select datepart(hh, F_RegDate) as h,COUNT(1) as n from dbo.T_Bus_WorkOrder where F_IsDelete = 0 and isnull(F_InfoConSmallType,0)!=0  "
+            //string sql = " select datepart(hh, F_RegDate) as h,COUNT(1) as n from dbo.T_Bus_WorkOrder where F_IsDelete = 0 and datalength(F_ComContent) >0  "
             //    + " and datediff(day, F_RegDate, getdate()) = 0 group by datepart(hh, F_RegDate) ";
             //DataTable dt = DbHelperSQL.Query(sql).Tables[0];
             foreach (var area in areaList)
@@ -123,10 +123,10 @@ namespace CallCenterApi.Interface.Controllers
                 int[] count = new int[24];
                 for (int i = 0; i < hours.Length; i++)
                 {
-                    string sql = " select count(1) from dbo.T_Bus_WorkOrder where F_IsDelete = 0 and isnull(F_InfoConSmallType,0)!=0 "
+                    string sql = " select count(1) from dbo.T_Bus_WorkOrder where F_IsDelete = 0 and datalength(F_ComContent) >0 "
                         + " and datediff(day, F_RegDate, getdate()) = 0 and datepart(hh, F_RegDate)=" + hours[i];
                     count[i] = Int32.Parse(DbHelperSQL.Query(sql).Tables[0].Rows[0][0].ToString());
-                    //var list = workOrderBLL.GetModelList("F_IsDelete = 0 and isnull(F_InfoConSmallType,0)!=0 "
+                    //var list = workOrderBLL.GetModelList("F_IsDelete = 0 and datalength(F_ComContent) >0 "
                     //    + " and datediff(day, F_RegDate, getdate()) = 0 and datepart(hh, F_RegDate)=" + hours[i]);
                     //count[i] = list.Count;
                     //var n = dt.Select(" h=" + hours[i])[0]["n"].ToString();
@@ -171,11 +171,11 @@ namespace CallCenterApi.Interface.Controllers
                 int[] count = new int[12];
                 for (int i = 0; i < ints.Length; i++)
                 {
-                    string sql = " select count(1) from dbo.T_Bus_WorkOrder where F_IsDelete = 0 and isnull(F_InfoConSmallType,0)!=0 "
+                    string sql = " select count(1) from dbo.T_Bus_WorkOrder where F_IsDelete = 0 and datalength(F_ComContent) >0 "
                         + " and datediff(month,F_RegDate,getdate())<=12 and datepart(month, F_RegDate)=" + ints[i];
                     count[i] = Int32.Parse(DbHelperSQL.Query(sql).Tables[0].Rows[0][0].ToString());
 
-                    //var list = workOrderBLL.GetModelList("F_IsDelete = 0 and isnull(F_InfoConSmallType,0)!=0 and "
+                    //var list = workOrderBLL.GetModelList("F_IsDelete = 0 and datalength(F_ComContent) >0 and "
                     //    + "datediff(month,F_RegDate,getdate())<=12 and datepart(month, F_RegDate)=" + ints[i]);
                     //count[i] = list.Count;
                 }
@@ -203,19 +203,19 @@ namespace CallCenterApi.Interface.Controllers
 
             //for (int i = 0; i < list.Count; i++)
             //{
-            //    string sql = " select count(1) from dbo.T_Bus_WorkOrder where F_IsDelete = 0 and isnull(F_InfoConSmallType,0)!=0 "
+            //    string sql = " select count(1) from dbo.T_Bus_WorkOrder where F_IsDelete = 0 and datalength(F_ComContent) >0 "
             //            + " and F_WorkOrderID in (select F_WorkOrderID from T_Bus_AssignedInfo where 1=1 "
             //            + " and F_DeptId=" + list[i].F_DeptId + ")";
             //    var tl = Int32.Parse(DbHelperSQL.Query(sql).Tables[0].Rows[0][0].ToString());
-            //    sql = " select count(1) from dbo.T_Bus_WorkOrder where F_IsDelete = 0 and isnull(F_InfoConSmallType,0)!=0 "
+            //    sql = " select count(1) from dbo.T_Bus_WorkOrder where F_IsDelete = 0 and datalength(F_ComContent) >0 "
             //            + " and F_WorkOrderID in (select F_WorkOrderID from T_Bus_AssignedInfo where 1=1 "
             //            + " and F_State=1 and F_DeptId=" + list[i].F_DeptId + ")";
             //    var cl = Int32.Parse(DbHelperSQL.Query(sql).Tables[0].Rows[0][0].ToString());
-            //    //var tl = workOrderBLL.GetModelList("F_IsDelete=0 and isnull(F_InfoConSmallType,0)!=0 "
+            //    //var tl = workOrderBLL.GetModelList("F_IsDelete=0 and datalength(F_ComContent) >0 "
             //    ////+ " and F_WorkOrderID in (select F_WorkOrderID from T_Bus_AssignedInfo where datediff(day,F_SubmitDate,getdate())=0 "
             //    //+ " and F_WorkOrderID in (select F_WorkOrderID from T_Bus_AssignedInfo where 1=1 "
             //    //+ " and F_DeptId=" + list[i].F_DeptId + ")");
-            //    //var cl = workOrderBLL.GetModelList("F_IsDelete=0 and isnull(F_InfoConSmallType,0)!=0 "
+            //    //var cl = workOrderBLL.GetModelList("F_IsDelete=0 and datalength(F_ComContent) >0 "
             //    ////+ " and F_WorkOrderID in (select F_WorkOrderID from T_Bus_AssignedInfo where datediff(day,F_SubmitDate,getdate())=0 "
             //    //+ " and F_WorkOrderID in (select F_WorkOrderID from T_Bus_AssignedInfo where 1=1 "
             //    //+ " and F_State=1 and F_DeptId=" + list[i].F_DeptId + ")");
@@ -230,11 +230,11 @@ namespace CallCenterApi.Interface.Controllers
             //obj.percents.Add(percent);
 
             var obj = list.Select(p => {
-                string sql = " select count(1) from dbo.T_Bus_WorkOrder where F_IsDelete = 0 and isnull(F_InfoConSmallType,0)!=0 "
+                string sql = " select count(1) from dbo.T_Bus_WorkOrder where F_IsDelete = 0 and datalength(F_ComContent) >0 "
                         + " and F_WorkOrderID in (select F_WorkOrderID from T_Bus_AssignedInfo where 1=1 "
                         + " and F_DeptId=" + p.F_DeptId + ")";
                 var tl = Int32.Parse(DbHelperSQL.Query(sql).Tables[0].Rows[0][0].ToString());
-                sql = " select count(1) from dbo.T_Bus_WorkOrder where F_IsDelete = 0 and isnull(F_InfoConSmallType,0)!=0 "
+                sql = " select count(1) from dbo.T_Bus_WorkOrder where F_IsDelete = 0 and datalength(F_ComContent) >0 "
                         + " and F_WorkOrderID in (select F_WorkOrderID from T_Bus_AssignedInfo where 1=1 "
                         + " and F_State=1 and F_DeptId=" + p.F_DeptId + ")";
                 var cl = Int32.Parse(DbHelperSQL.Query(sql).Tables[0].Rows[0][0].ToString());
@@ -257,18 +257,18 @@ namespace CallCenterApi.Interface.Controllers
 
             for (int i = 0; i < hours.Count(); i++)
             {
-                string sql = " select count(1) from dbo.T_Bus_WorkOrder where F_IsDelete = 0 and isnull(F_InfoConSmallType,0)!=0 "
+                string sql = " select count(1) from dbo.T_Bus_WorkOrder where F_IsDelete = 0 and datalength(F_ComContent) >0 "
                         + " and F_WorkOrderID in (select F_WorkOrderID from T_Bus_AssignedInfo where datediff(day,F_SubmitDate,getdate())=0 "
                         + " and datepart(hh, F_SubmitDate)=" + hours[i] + ")";
                 var al = Int32.Parse(DbHelperSQL.Query(sql).Tables[0].Rows[0][0].ToString());
-                sql = " select count(1) from dbo.T_Bus_WorkOrder where F_IsDelete = 0 and isnull(F_InfoConSmallType,0)!=0 "
+                sql = " select count(1) from dbo.T_Bus_WorkOrder where F_IsDelete = 0 and datalength(F_ComContent) >0 "
                         + " and F_WorkOrderID in (select F_WorkOrderID from T_Bus_AssignedInfo where datediff(day,F_EndDate,getdate())=0 "
                         + " and F_State=1 and datepart(hh, F_EndDate)=" + hours[i] + ")";
                 var fl = Int32.Parse(DbHelperSQL.Query(sql).Tables[0].Rows[0][0].ToString());
-                //var al = workOrderBLL.GetModelList("F_IsDelete=0 and isnull(F_InfoConSmallType,0)!=0 "
+                //var al = workOrderBLL.GetModelList("F_IsDelete=0 and datalength(F_ComContent) >0 "
                 //    + " and F_WorkOrderID in (select F_WorkOrderID from T_Bus_AssignedInfo where datediff(day,F_SubmitDate,getdate())=0 "
                 //    + " and datepart(hh, F_SubmitDate)=" + hours[i] + ")");
-                //var fl = workOrderBLL.GetModelList("F_IsDelete=0 and isnull(F_InfoConSmallType,0)!=0 "
+                //var fl = workOrderBLL.GetModelList("F_IsDelete=0 and datalength(F_ComContent) >0 "
                 //    + " and F_WorkOrderID in (select F_WorkOrderID from T_Bus_AssignedInfo where datediff(day,F_EndDate,getdate())=0 "
                 //    + " and F_State=1 and datepart(hh, F_EndDate)=" + hours[i] + ")");
                 acounts[i] = al;
@@ -294,7 +294,7 @@ namespace CallCenterApi.Interface.Controllers
 
             var obj = list.Select(p =>
             {
-                string sql = " select count(1) from dbo.T_Bus_WorkOrder where F_IsDelete = 0 and isnull(F_InfoConSmallType,0)!=0 "
+                string sql = " select count(1) from dbo.T_Bus_WorkOrder where F_IsDelete = 0 and datalength(F_ComContent) >0 "
                         + " and F_InfoType=" + p.F_ValueId;
                 var tl = Int32.Parse(DbHelperSQL.Query(sql).Tables[0].Rows[0][0].ToString());
                 return new
@@ -332,10 +332,10 @@ namespace CallCenterApi.Interface.Controllers
                 int[] count = new int[12];
                 for (int i = 0; i < ints.Length; i++)
                 {
-                    string sql = " select count(1) from dbo.T_Bus_WorkOrder where F_IsDelete = 0 and isnull(F_InfoConSmallType,0)!=0 and F_InfoType=" + l.F_ValueId
+                    string sql = " select count(1) from dbo.T_Bus_WorkOrder where F_IsDelete = 0 and datalength(F_ComContent) >0 and F_InfoType=" + l.F_ValueId
                         + " and datediff(month,F_RegDate,getdate())<=12 and datepart(month, F_RegDate)=" + ints[i];
                     count[i] = Int32.Parse(DbHelperSQL.Query(sql).Tables[0].Rows[0][0].ToString());
-                    //var list = workOrderBLL.GetModelList("F_IsDelete = 0 and isnull(F_InfoConSmallType,0)!=0 and F_InfoType="+l.F_ValueId
+                    //var list = workOrderBLL.GetModelList("F_IsDelete = 0 and datalength(F_ComContent) >0 and F_InfoType="+l.F_ValueId
                     //    + " and datediff(month,F_RegDate,getdate())<=12 and datepart(month, F_RegDate)=" + ints[i]);
                     //count[i] = list.Count;
                 }
@@ -361,10 +361,10 @@ namespace CallCenterApi.Interface.Controllers
                 int[] count = new int[24];
                 for (int i = 0; i < hours.Length; i++)
                 {
-                    string sql = " select count(1) from dbo.T_Bus_WorkOrder where F_IsDelete = 0 and isnull(F_InfoConSmallType,0)!=0 and F_InfoType=" + l.F_ValueId
+                    string sql = " select count(1) from dbo.T_Bus_WorkOrder where F_IsDelete = 0 and datalength(F_ComContent) >0 and F_InfoType=" + l.F_ValueId
                        + " and datediff(day,F_RegDate,getdate())=0 and datepart(hh, F_RegDate)=" + hours[i];
                     count[i] = Int32.Parse(DbHelperSQL.Query(sql).Tables[0].Rows[0][0].ToString());
-                    //var list = workOrderBLL.GetModelList("F_IsDelete = 0 and isnull(F_InfoConSmallType,0)!=0 and F_InfoType=" + l.F_ValueId
+                    //var list = workOrderBLL.GetModelList("F_IsDelete = 0 and datalength(F_ComContent) >0 and F_InfoType=" + l.F_ValueId
                     //    + " and datediff(day,F_RegDate,getdate())=0 and datepart(hh, F_RegDate)=" + hours[i]);
                     //count[i] = list.Count;
                 }
@@ -394,7 +394,7 @@ namespace CallCenterApi.Interface.Controllers
                 }
             }
 
-            string sqltotal = " select count(1) from dbo.T_Bus_WorkOrder where F_IsDelete = 0 and isnull(F_InfoConSmallType,0)!=0 and F_InfoType=6";
+            string sqltotal = " select count(1) from dbo.T_Bus_WorkOrder where F_IsDelete = 0 and datalength(F_ComContent) >0 and F_InfoType=6";
             var t = Int32.Parse(DbHelperSQL.Query(sqltotal).Tables[0].Rows[0][0].ToString());
 
             var typelist = dicValueBLL.GetModelList(" F_ValueId in (" + ids + ") ");
@@ -420,7 +420,7 @@ namespace CallCenterApi.Interface.Controllers
 
             var obj = list.Select(p =>
             {
-                string sql = " select count(1) from dbo.T_Bus_WorkOrder where F_IsDelete = 0 and isnull(F_InfoConSmallType,0)!=0 "
+                string sql = " select count(1) from dbo.T_Bus_WorkOrder where F_IsDelete = 0 and datalength(F_ComContent) >0 "
                         + " and F_WorkOrderID in (select F_WorkOrderID from T_Bus_AssignedInfo where 1=1 "
                         + " and F_DeptId=" + p.F_DeptId + ")";
                 var tl = Int32.Parse(DbHelperSQL.Query(sql).Tables[0].Rows[0][0].ToString());
@@ -583,10 +583,10 @@ namespace CallCenterApi.Interface.Controllers
 
         //    for (int i = 0; i < typelist.Count; i++)
         //    {
-        //        string sql = " select count(1) from dbo.T_Bus_WorkOrder where F_IsDelete = 0 and isnull(F_InfoConSmallType,0)!=0 "
+        //        string sql = " select count(1) from dbo.T_Bus_WorkOrder where F_IsDelete = 0 and datalength(F_ComContent) >0 "
         //                + " and F_InfoType=" + typelist[i].F_ValueId;
         //        counts[i] = Int32.Parse(DbHelperSQL.Query(sql).Tables[0].Rows[0][0].ToString());
-        //        //var list = workOrderBLL.GetModelList("F_IsDelete = 0 and isnull(F_InfoConSmallType,0)!=0 and F_InfoType=" + typelist[i].F_ValueId);
+        //        //var list = workOrderBLL.GetModelList("F_IsDelete = 0 and datalength(F_ComContent) >0 and F_InfoType=" + typelist[i].F_ValueId);
         //        //counts[i] = list.Count;
         //    }
         //    var obj = new

API/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/WebController.cs

@@ -183,6 +183,54 @@ namespace CallCenterApi.Interface.Controllers
         #region 新闻
 
         /// <summary>
+        /// 上传图片
+        /// </summary>
+        /// <returns></returns>
+        public ActionResult UploadImage()
+        {
+            ActionResult res = Error("上传失败");
+            string path = string.Empty;
+            HttpPostedFile _upfile = RequestString.GetFile("upFile");
+            string dataurl = HttpUtility.UrlDecode(RequestString.GetFormString("dataurl"));
+            if (_upfile != null)
+            {
+                path = "/Upload/News/" + DateTime.Now.ToString("yyyy") + "/" + DateTime.Now.ToString("MM") + "/" + DateTime.Now.ToString("dd") + "/";
+                ImageUpload iu = new ImageUpload();
+                iu.SavePath = path;
+                iu.DataUrl = dataurl;
+                iu.Upload64();
+
+                int n = iu.Error;
+                if (n == 0)
+                {
+                    var obj = new {
+                        imgurl = path + iu.OutFileName,
+                        smallimgurl= path + iu.OutThumbFileName
+                    };
+
+                    res = Success("成功", obj);
+                }
+                else
+                {
+                    string msg = string.Empty;
+                    switch (n)
+                    {
+                        case 1: msg = "请选择要上传的文件"; break;
+                        case 2: msg = "上传的文件类型不支持"; break;
+                        case 3: msg = "上传的文件过大"; break;
+                        case 4: msg = "未知错误"; break;
+                    }
+                    res = Error(msg);
+                }
+            }
+            else
+            {
+                res = Error("请选择要上传的文件");
+            }
+            return res;
+        }
+
+        /// <summary>
         /// 获取新闻列表
         /// </summary>
         /// <returns></returns>
@@ -723,6 +771,12 @@ namespace CallCenterApi.Interface.Controllers
                 {
                     baseModel.img = configfj.F_ParamValue + baseModel.img;
                 }
+                if (!string.IsNullOrEmpty(baseModel.nr) && configfj != null)
+                {
+                    Uri uri = new Uri(configfj.F_ParamValue);
+
+                    baseModel.nr = baseModel.nr.Replace("/js/kindeditor", uri.Scheme + "://" + uri.Authority + "/js/kindeditor");
+                }
                 res = Success("加载成功", baseModel);
             }
             else

API/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/workorder/WorkOrderController.cs

@@ -80,7 +80,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     if (userModel != null)
                     {
                         res = Error("查询失败");
-                        string sql = " and F_IsDelete=0 and isnull(F_InfoConSmallType,0)!=0 ";
+                        string sql = " and F_IsDelete=0 and datalength(F_ComContent) >0 ";
                         string strstate = HttpUtility.UrlDecode(RequestString.GetQueryString("state"));
                         string strname = HttpUtility.UrlDecode(RequestString.GetQueryString("name"));
                         string strtel = HttpUtility.UrlDecode(RequestString.GetQueryString("tel"));
@@ -320,7 +320,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                 break;
                             case "1"://当天处理的工单
                                 sql += "  and F_WorkOrderID in(select F_WorkOrderID from T_Bus_SubmitSuper where DATEDIFF(d,F_SubmitDate,'" + DateTime.Now + "')=0 ";//查询呈批人为当前登录人，呈批时间为今天的数据
-                                if (userModel.F_UserCode != "99")
+                                if (userModel.F_RoleId != 4)
                                 {
                                     sql += " and F_SubmitUserCode='" + userModel.F_UserCode + "')";
                                 }
@@ -331,7 +331,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                 break;
                             case "2"://历史记录
                                 sql += "  and F_WorkOrderID in(select F_WorkOrderID from T_Bus_SubmitSuper where 1=1 ";//查询当前登录人的审批记录
-                                if (userModel.F_UserCode != "99")
+                                if (userModel.F_RoleId != 4)
                                 {
                                     sql += " and F_SubmitUserCode='" + userModel.F_UserCode + "')";
                                 }
@@ -524,7 +524,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                 break;
                             case "1"://当天处理的工单
                                 sql += "  and F_WorkOrderID in(select F_WorkOrderID from T_Bus_SubmitSuper where DATEDIFF(d,F_ApprovalDate,'" + DateTime.Now + "')=0 ";//查询呈批人为当前登录人，呈批时间为今天的数据
-                                if (userModel.F_UserCode != "99")
+                                if (userModel.F_RoleId != 4)
                                 {
                                     sql += " and F_ApprovalUserCode='" + userModel.F_UserCode + "')";
                                 }
@@ -535,7 +535,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                 break;
                             case "2"://历史记录
                                 sql += "  and F_WorkOrderID in(select F_WorkOrderID from T_Bus_SubmitSuper where 1=1 ";//查询当前登录人的审批记录
-                                if (userModel.F_UserCode != "99")
+                                if (userModel.F_RoleId != 4)
                                 {
                                     sql += " and F_ApprovalUserCode='" + userModel.F_UserCode + "')";
                                 }
@@ -872,7 +872,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             }
                             else
                             {
-                                if (userModel.F_UserCode != "99")
+                                if (userModel.F_RoleId != 4)
                                 {
                                     sql += " and F_DeptId='" + userModel.F_DeptId + "')";
                                 }
@@ -1029,7 +1029,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         if (dept != null) { deptname = dept.F_DeptName; }
 
                         sql += " and F_WorkOrderId in (select F_WorkOrderId from T_Bus_RemindRecord where 1=1 ";
-                        if (userModel.F_UserCode != "99")
+                        if (userModel.F_RoleId != 4)
                         {
                             sql += " and F_DeptName ='" + deptname + "') ";
                         }
@@ -1273,14 +1273,14 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                 break;
                             case "1"://当天处理的工单
                                 sql += " and F_InfoSource=30 and F_IsEnabled=1 and (F_IsDelete=0 or (F_IsDelete=1 and F_IsEnabled=1)) and  DATEDIFF(d,F_EnableTime,'" + DateTime.Now + "')=0 ";//查询呈批人为当前登录人，呈批时间为今天的数据
-                                if (userModel.F_UserCode != "99")
+                                if (userModel.F_RoleId != 4)
                                 {
                                     sql = " and F_UserCode='" + userModel.F_UserCode + "' ";
                                 }
                                 break;
                             case "2"://历史记录
                                 sql += "  and F_InfoSource=30 and (F_IsDelete=0 or (F_IsDelete=1 and F_IsEnabled=1)) ";//查询当前登录人的审批记录
-                                if (userModel.F_UserCode != "99")
+                                if (userModel.F_RoleId != 4)
                                 {
                                     sql = " and F_UserCode='" + userModel.F_UserCode + "' ";
                                 }