禅道需求

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

@@ -276,10 +276,12 @@ namespace CallCenterApi.Interface.Controllers
                 if (filter.type == 1)
                 {
                     sql += "and F_RoleId=52";
+                    sql += "and F_DeleteFlag=0";
                 }
                 if (filter.type == 2)
                 {
                     sql += "and F_See=3";
+                    sql += "and F_DeleteFlag=0";
                 }
                 sql += "and (F_See!='5' or  F_See is null)";
                 int recordCount = 0;
@@ -394,10 +396,12 @@ namespace CallCenterApi.Interface.Controllers
                 if (filter .type ==1)
                 {
                     sql += "and F_RoleId=52";
+                    sql += "and F_DeleteFlag=0";
                 }
                 if (filter.type == 2)
                 {
                     sql += "and F_See=3";
+                    sql += "and F_DeleteFlag=0";
                 }
                 sql += "and (F_See!='5' or  F_See is null)";
                

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

@@ -52,7 +52,102 @@ namespace CallCenterApi.Interface.Controllers.knowledge
                 else
                     return Error("加载失败");
 
-            return NoToken("未知错误，请重新登录");
+            
+        }
+        public ActionResult GetAPPList()
+        {
+
+
+            DataTable dt = new DataTable();
+            string pid = HttpUtility.UrlDecode(RequestString.GetQueryString("pid"));
+            string sql = " and F_DeleteFlag=0 and F_CategoryType is null";
+            if (pid.Trim() != "")
+            {
+                sql += " and F_ParentId=" + pid.Trim();
+            }
+            else
+                sql += " and F_ParentId=0";
+
+            dt = new BLL.T_RepositoryCategory().GetList(" 1=1 " + sql).Tables[0];
+            List<TreeAPPModel> modelList = BindAPPTree(dt, "0");
+
+            if (modelList.Count > 0)
+            {
+                return Success("加载成功", modelList);
+            }
+            else
+                return Error("加载失败");
+
+
+        }
+        public class TreeAPPModel
+        {
+            private string _value;
+            /// <summary>
+            /// Id
+            /// </summary>
+            public string value
+            {
+                set { _value = value; }
+                get { return _value; }
+            }
+
+            private string iconCls;
+            /// <summary>
+            /// 图标
+            /// </summary>
+            public string IconCls
+            {
+                set { iconCls = value; }
+                get { return iconCls; }
+            }
+            private string _text;
+            /// <summary>
+            /// 树节点显示文本
+            /// </summary>
+            public string text
+            {
+                set { _text = value; }
+                get { return _text; }
+            }
+            private List<TreeAPPModel> _children;
+            public List<TreeAPPModel> children
+            {
+                set { _children = value; }
+                get { return _children; }
+            }
+        }
+        //tree  树形知识库分类
+        private List<TreeAPPModel> BindAPPTree(DataTable tab, string parentid)
+        {
+            DataTable tab2 = new DataTable();
+
+            if (tab != null && tab.Rows.Count > 0)
+            {
+                List<Model.T_RepositoryCategory> categorylist = new BLL.T_RepositoryCategory().DataTableToList(tab);
+                List<TreeAPPModel> modelList = new List<TreeAPPModel>(categorylist.Count);
+                for (int i = 0; i < categorylist.Count; i++)
+                {
+                    TreeAPPModel model = new TreeAPPModel();
+                    string currentID = categorylist[i].F_CategoryId.ToString();//当前功能ID
+                    model.value = currentID;
+                    model.IconCls = "";//图标
+                    model.text = categorylist[i].F_CategoryName;
+                    tab2 = new BLL.T_RepositoryCategory().GetList("F_ParentId=" + currentID + " and F_DeleteFlag=0 and F_CategoryType is null order by F_Sort").Tables[0];
+                    if (tab2 != null && tab2.Rows.Count > 0)
+                    {
+                        model.children = BindAPPTree(tab2, currentID);
+                    }
+                    modelList.Add(model);
+                }
+                return modelList;
+
+            }
+            else
+            {
+                return null;
+            }
+
         }
         //tree  树形知识库分类
         private List<Model.TreeModel> BindTree(DataTable tab, string parentid)

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

@@ -586,7 +586,7 @@ namespace CallCenterApi.Interface.Controllers.report
                                 int t = 12 - timeslot.stime;
                                 if (pronos >= timeslot.stime && pronos <= 12)
                                     date.MonthCount1++;
-                                else if (pronos >= timeslot.etime)
+                                else if (pronos <= timeslot.etime)
                                     date.MonthCount1++;
 
                             }
@@ -756,7 +756,7 @@ namespace CallCenterApi.Interface.Controllers.report
                             int t = 12 - timeslot.stime;
                             if (pronos >= timeslot.stime && pronos <= 12)
                                 date.MonthCount1++;
-                            else if (pronos >= timeslot.etime)
+                            else if (pronos <= timeslot.etime)
                                 date.MonthCount1++;
 
                         }

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

@@ -663,7 +663,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     {
                         var depts = new BLL.T_Bus_WorkOrder().GetModelList(sql + "order by F_Id desc");
                         dt.Columns.Add("序号");
-                        dt.Columns.Add("抽检时间");
+                        dt.Columns.Add("录入时间");
                         dt.Columns.Add("抽检单位");
                         dt.Columns.Add("办事处");
                         dt.Columns.Add("抽检类型");
@@ -685,7 +685,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             {
                                 //  drNew["工单编号"] = it.F_WorkOrderId;//
                                 drNew["序号"] = it.F_SerialNumber;//
-                                drNew["抽检时间"] = DateTime.Parse(it.F_CreateTime.ToString()).ToString("yyyy年MM月dd日HH时mm分");//
+                                drNew["录入时间"] = DateTime.Parse(it.F_CreateTime.ToString()).ToString("yyyy年MM月dd日HH时mm分");//
                                 drNew["抽检单位"] = it.F_Company;
                                 if (!string.IsNullOrEmpty(it.F_Office))
                                 {
@@ -1200,7 +1200,12 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     var user = new BLL.T_Sys_UserAccount().GetModel(it.F_DealUser);
                     if (user != null)
                     {
-                        model.F_DealUser = user.F_UserName; ;//处理人
+                        if (!string.IsNullOrEmpty(user.F_Mobile))
+                        {
+                            model.F_DealUser = user.F_UserName + "(" + user.F_Mobile + ")"; ;//处理人
+                        }
+                        else 
+                         model.F_DealUser = user.F_UserName;
                     }
                 }
                 model.F_DealTime = it.F_DealTime;//处理时间
@@ -1514,16 +1519,19 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                 return Error("请填写催单内容");
                             if (model.F_State == 0)
                                 return Error("工单未提交");
-                            else  if (model.F_State == 10)
-                                return Error("工单已处理");
                             else  
                             {
+
                                 var modellist = new BLL.T_Wo_WorkOrderItem_New().GetModelList("F_WoID='" + model.F_Id + "'and F_IsUsed =0 order by F_Id desc").FirstOrDefault();
                                 if(modellist !=null )
                                 {
-                                    if (!string.IsNullOrEmpty(modellist.F_NextUser ))
+                                    if (!string.IsNullOrEmpty(modellist.F_NextUser) || model.F_State == 10)
                                     {
-                                        var user = new BLL.T_Sys_UserAccount().GetModel(modellist.F_NextUser);
+                                        Model.T_Sys_UserAccount user = new Model.T_Sys_UserAccount();
+                                        if (model.F_State == 10)
+                                            user = new BLL.T_Sys_UserAccount().GetModel(modellist.F_CreateUser);
+                                        else
+                                            user = new BLL.T_Sys_UserAccount().GetModel(modellist.F_NextUser);
                                         string deptname = "";
                                         var dement = new BLL.T_Sys_Department().GetModel(ua.F_DeptId);
                                         if (dement != null)
@@ -1534,13 +1542,33 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                         {
                                             if (!string.IsNullOrEmpty(user.F_Mobile))
                                             {
-                                                bool n = new WorkTypeController().SendReminderSMS("工单催单提醒:", user.F_Mobile, cont);
+                                                bool n = true;
+                                                if (model.F_State == 10)
+                                                {
+                                                    n = new WorkTypeController().SendReminderSMS("完善工单提醒:", user.F_Mobile, cont);
+                                                }
+                                                else
+                                                {
+                                                    n = new WorkTypeController().SendReminderSMS("工单催单提醒:", user.F_Mobile, cont);
+                                                }
+                                            //    bool n = new WorkTypeController().SendReminderSMS("工单催单提醒:", user.F_Mobile, cont);
                                                 //  string msg = new PushMessageController().Push(Title, count, user.F_UserCode);
                                                 if (n)
                                                 {
-                                                    model.F_DealType = 1;
+                                                   
+                                                  
+                                                    if (model.F_State == 10)
+                                                    {
+                                                        model.F_DealState = 1;
+                                                        AddLog(model.F_Id, (int)model.F_State, deptname + ua.F_UserName + "完善工单:" + cont, 13, 13, "", 0, ua, 1);
+                                                    }
+                                                    else
+                                                    {
+                                                        model.F_DealType = 1;
+                                                        AddLog(model.F_Id, (int)model.F_State, deptname + ua.F_UserName + "催单:" + cont, 12, 12, "", 0, ua, 1);
+                                                    }
                                                     workorderBLL.Update(model);
-                                                    AddLog(model.F_Id, (int)model.F_State, deptname + ua.F_UserName + "催单:" + cont, 12, 12, "", 0, ua, 1);
+                                               //     AddLog(model.F_Id, (int)model.F_State, deptname + ua.F_UserName + "催单:" + cont, 12, 12, "", 0, ua, 1);
                                                     return Success("催单成功");
                                                 }
                                                 else

codegit/CallCenterCommon/CallCenter.Utility/NPOI/NPOIHelper.cs

@@ -116,7 +116,7 @@ namespace CallCenter.Utility
         /// <param name="Name"></param>
         /// <param name="dt"></param>
         /// <returns></returns>
-        public string ExportToExcel(string Name, DataTable dt, string[] cols = null)
+        public string ExportToExcel(string Name, DataTable dt, string[] cols = null,int iswork=0)
         {
             try
             {
@@ -134,14 +134,17 @@ namespace CallCenter.Utility
                 HeadercellStyle.FillForegroundColor = NPOI.HSSF.Util.HSSFColor.SkyBlue.Index;
                 HeadercellStyle.FillPattern = FillPattern.SolidForeground;
                 HeadercellStyle.FillBackgroundColor = NPOI.HSSF.Util.HSSFColor.SkyBlue.Index;
-
                 //字体
+               
+                if (iswork>0)
+                {
+                   IDataFormat format = workbook.CreateDataFormat();
+                   HeadercellStyle.DataFormat = format.GetFormat("[DbNum2][$-804]0");
+                }
                 NPOI.SS.UserModel.IFont headerfont = workbook.CreateFont();
                 headerfont.Boldweight = (short)FontBoldWeight.Bold;
                 headerfont.FontHeightInPoints = 12;
                 HeadercellStyle.SetFont(headerfont);
-
-
                 //用column name 作为列名
                 int icolIndex = 0;
                 IRow headerRow = sheet.CreateRow(0);