知识库

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

@@ -264,11 +264,19 @@ namespace CallCenterApi.Interface.Controllers.knowledge
             return Content(obj.ToJson());
         }
 
-        public ActionResult GetDeductLsit(int infoid = 0)
+        public ActionResult GetDeductLsit(int infoid = 0,int deptid=0)
         {
-            if (infoid <= 0)
-                return Error("请选择知识库");
-            List<Model.T_RepositoryLog> logList = new BLL.T_RepositoryLog().GetModelList(" 1=1 and F_Action=4 and F_RepositoryId= " + infoid);
+            string sql = "";
+             if (infoid>0)
+            {
+                sql += "and F_RepositoryId= '" + infoid+"'";
+            }
+            if (User .F_RoleCode =="WLDW")
+            {
+                sql += "and F_Expand1= '" + User .F_DeptId  + "'";
+            }
+          
+            List<Model.T_RepositoryLog> logList = new BLL.T_RepositoryLog().GetModelList(" 1=1 and F_Action=4 ");
 
             return Success("获取成功", logList);
         }
@@ -555,17 +563,42 @@ namespace CallCenterApi.Interface.Controllers.knowledge
 
             if(action==4)
             {
-                logModel.F_Title = "扣分";
+                logModel.F_Title = rmodel.F_Title;
                 logModel.F_Content = User.F_UserCode +"扣分"+Math .Abs ((float )rmodel.F_Score )+
                     ",扣分原因:"+ rmodel.F_Reason ;
+                var demandsModel = new BLL.T_Repository_List_Demands().GetModelList
+                     ("F_RepositoryId='" + rmodel.F_RepositoryId + "' and F_IsDelete=0");
+                try
+                {
+                    if (demandsModel != null && demandsModel.Count > 0)
+                    {
+                        if (demandsModel.LastOrDefault().F_Deptid > 0)
+                        {
+                            var dapt = new BLL.T_Sys_Department().GetModel((int)demandsModel.LastOrDefault().F_Deptid);
+                            if (dapt != null)
+                            {
+                                logModel.F_KeyWords = dapt.F_DeptName;
+                                logModel.F_Expand1 = dapt.F_DeptId.ToString ();
+                            }
+                               
+                        }
+
+                    }
+                }
+                catch
+                {
+
+                }
+               
+               
             }
             else
             {
                 logModel.F_Title = rmodel.F_Title;
                 logModel.F_Content = rmodel.F_Content;
-
+                logModel.F_KeyWords = rmodel.F_KeyWords;
             }
-            logModel.F_KeyWords = rmodel.F_KeyWords;
+           
             logModel.F_RepositoryId = rmodel.F_RepositoryId;
             logModel.F_Url = rmodel.F_Url;
             logModel.F_CreateBy = User.F_UserId;

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/knowledge/RepositoryController.cs

@@ -541,9 +541,10 @@ namespace CallCenterApi.Interface.Controllers.knowledge
 
             int recordCount = 0;
             dt = BLL.PagerBLL.GetListPager(
-                "T_Repository_List_Demands",
+                "T_Repository_List_Demands a",
                 "F_DemandsId",
-                "*,dbo.GetDeptName(F_Deptid) F_DeptName,dbo.GetUserName(F_CreateUser) as F_CreateUserName,dbo.GetUserName(F_SubmitUser) as F_SubmitUserName",
+                "*,dbo.GetDeptName(F_Deptid) F_DeptName,dbo.GetUserName(F_CreateUser) as F_CreateUserName,dbo.GetUserName(F_SubmitUser) as F_SubmitUserName" +
+                ",(select F_Score from T_RepositoryInformation where F_RepositoryId=a.F_RepositoryId) as F_Score",
                 sql,
                 "ORDER BY F_CreateTime desc",
                 pagesize,

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

@@ -433,7 +433,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
 
             if (deptid != 0)
             {
-                sql += " and  F_MainDeptId in (select F_DeptId from  GetDeptId ('"+ deptid + "'))";
+                sql += " and  (F_MainDeptId in (select F_DeptId from  GetDeptId ('" + deptid + "')) or F_MainDeptID3='" + deptid + "')";
             }
 
 

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/workorder/hb_affairsController.cs

@@ -429,11 +429,11 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         else
                         {
                             type = "拒绝";
-                            if (modelT_Bus_AssignedInfo != null && modelT_Bus_DelayTime.F_AssignedId != 0)
-                            {
-                                modelT_Bus_AssignedInfo.F_IsSure = 5;
-                                assignBLL.Update(modelT_Bus_AssignedInfo);
-                            }
+                            //if (modelT_Bus_AssignedInfo != null && modelT_Bus_DelayTime.F_AssignedId != 0)
+                            //{
+                            //    modelT_Bus_AssignedInfo.F_IsSure = 1;
+                            //    assignBLL.Update(modelT_Bus_AssignedInfo);
+                            //}
 
                             modelT_Bus_DelayTime.F_IsAudit = 2;//审核
                             modelT_Bus_DelayTime.F_AuditUser = result["AUDIT_NAME"] == null ? "" : result["AUDIT_NAME"].ToString();

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Models/Common/ButtonGroup.cs

@@ -873,7 +873,7 @@ namespace CallCenterApi.Interface.Models.Common
                     if (code == "WLDW" || code == "DDZG")
                     {
                         buttons.Add(feedback());
-                        buttons.Add(delay());
+                      
                         if (InfoSource == "2580")
                             buttons.Add(ejdelay());
                         else
@@ -982,6 +982,8 @@ namespace CallCenterApi.Interface.Models.Common
                     if (code == "SPZ" || code == "SPZJZ")
                     {
                         buttons.Add(reload()); buttons.Add(reject());
+                        buttons.Add(edit());
+                        buttons.Add(back());
                     }
                     break;
                 case "14":