2

CallCenterApi/CallCenterApi.DAL/T_RepositoryInformation.cs

@@ -38,9 +38,9 @@ namespace CallCenterApi.DAL
         {
             StringBuilder strSql = new StringBuilder();
             strSql.Append("insert into T_RepositoryInformation(");
-            strSql.Append("F_CategoryId,F_Title,F_Content,F_Description,F_Url,F_KeyWords,F_ClickCount,F_ISPass,F_ISSubmitAudit,F_Expand1,F_Expand2,F_IntExpand1,F_CreateOn,F_CreateBy,F_AuditID,F_Key,F_Reason,F_Score,F_DeductUser)");
+            strSql.Append("F_CategoryId,F_Title,F_Content,F_Description,F_Url,F_KeyWords,F_ClickCount,F_ISPass,F_ISSubmitAudit,F_Expand1,F_Expand2,F_IntExpand1,F_CreateOn,F_CreateBy,F_AuditID,F_Key,F_Reason,F_Score,F_DeductUser,F_DeptId)");
             strSql.Append(" values (");
-            strSql.Append("@F_CategoryId,@F_Title,@F_Content,@F_Description,@F_Url,@F_KeyWords,@F_ClickCount,@F_ISPass,@F_ISSubmitAudit,@F_Expand1,@F_Expand2,@F_IntExpand1,@F_CreateOn,@F_CreateBy,@F_AuditID,@F_Key,@F_Reason,@F_Score,@F_DeductUser)");
+            strSql.Append("@F_CategoryId,@F_Title,@F_Content,@F_Description,@F_Url,@F_KeyWords,@F_ClickCount,@F_ISPass,@F_ISSubmitAudit,@F_Expand1,@F_Expand2,@F_IntExpand1,@F_CreateOn,@F_CreateBy,@F_AuditID,@F_Key,@F_Reason,@F_Score,@F_DeductUser,@F_DeptId)");
             strSql.Append(";select @@IDENTITY");
             SqlParameter[] parameters = {
                     new SqlParameter("@F_CategoryId", SqlDbType.Int,4),
@@ -61,7 +61,9 @@ namespace CallCenterApi.DAL
                     new SqlParameter("@F_Key", SqlDbType.Int,4),
                 new SqlParameter("@F_Reason", SqlDbType.NVarChar, -1),
                 new SqlParameter("@F_Score", SqlDbType.Float , 8),
-                new SqlParameter("@F_DeductUser", SqlDbType.NVarChar, 50)};
+                new SqlParameter("@F_DeductUser", SqlDbType.NVarChar, 50),
+                 new SqlParameter("@F_DeptId", SqlDbType.Int,4),
+            };
             parameters[0].Value = model.F_CategoryId;
             parameters[1].Value = model.F_Title;
             parameters[2].Value = model.F_Content;
@@ -81,6 +83,8 @@ namespace CallCenterApi.DAL
             parameters[16].Value = model.F_Reason;
             parameters[17].Value = model.F_Score;
             parameters[18].Value = model.F_DeductUser;
+            parameters[19].Value = model.F_DeptId;
+            
             object obj = DbHelperSQL.GetSingle(strSql.ToString(), parameters);
             if (obj == null)
             {
@@ -116,7 +120,9 @@ namespace CallCenterApi.DAL
             strSql.Append("F_Reason=@F_Reason,"); 
             strSql.Append("F_Key=@F_Key,");
             strSql.Append("F_Score=@F_Score,");
-            strSql.Append("F_DeductUser=@F_DeductUser");
+            strSql.Append("F_DeductUser=@F_DeductUser,");
+            strSql.Append("F_DeptId=@F_DeptId");
+            
             strSql.Append(" where F_RepositoryId=@F_RepositoryId");
             SqlParameter[] parameters = {
                     new SqlParameter("@F_CategoryId", SqlDbType.Int,4),
@@ -138,6 +144,8 @@ namespace CallCenterApi.DAL
                       new SqlParameter("@F_Reason", SqlDbType.NVarChar,-1),
                        new SqlParameter("@F_Score", SqlDbType.Float ,8),
                         new SqlParameter("@F_DeductUser", SqlDbType.NVarChar,50),
+                        new SqlParameter("@F_DeptId", SqlDbType.Int,4),
+                        
                     new SqlParameter("@F_RepositoryId", SqlDbType.Int,4)};
             parameters[0].Value = model.F_CategoryId;
             parameters[1].Value = model.F_Title;
@@ -158,7 +166,9 @@ namespace CallCenterApi.DAL
             parameters[16].Value = model.F_Reason;
             parameters[17].Value = model.F_Score;
             parameters[18].Value = model.F_DeductUser;
-            parameters[19].Value = model.F_RepositoryId;
+            parameters[19].Value = model.F_DeptId;
+            
+            parameters[20].Value = model.F_RepositoryId;
            
             int rows = DbHelperSQL.ExecuteSql(strSql.ToString(), parameters);
             if (rows > 0)
@@ -222,7 +232,7 @@ namespace CallCenterApi.DAL
         {
 
             StringBuilder strSql = new StringBuilder();
-            strSql.Append("select  top 1 F_RepositoryId,F_CategoryId,F_Title,F_Content,F_Description,F_Url,F_KeyWords,F_ClickCount,F_ISPass,F_ISSubmitAudit,F_Expand1,F_Expand2,F_IntExpand1,F_CreateOn,F_CreateBy,F_AuditID,F_Key,F_Reason,F_Score,F_DeductUser from T_RepositoryInformation ");
+            strSql.Append("select  top 1 F_RepositoryId,F_CategoryId,F_DeptId,F_Title,F_Content,F_Description,F_Url,F_KeyWords,F_ClickCount,F_ISPass,F_ISSubmitAudit,F_Expand1,F_Expand2,F_IntExpand1,F_CreateOn,F_CreateBy,F_AuditID,F_Key,F_Reason,F_Score,F_DeductUser from T_RepositoryInformation ");
             strSql.Append(" where F_RepositoryId=@F_RepositoryId");
             SqlParameter[] parameters = {
                     new SqlParameter("@F_RepositoryId", SqlDbType.Int,4)
@@ -330,8 +340,11 @@ namespace CallCenterApi.DAL
                 {
                     model.F_DeductUser = row["F_DeductUser"].ToString();
                 }
-
-              
+                if (row["F_DeptId"] != null && row["F_DeptId"].ToString() != "")
+                {
+                    model.F_DeptId = int.Parse(row["F_DeptId"].ToString());
+                }
+                
             }
             return model;
         }
@@ -342,7 +355,7 @@ namespace CallCenterApi.DAL
         public DataSet GetList(string strWhere)
         {
             StringBuilder strSql = new StringBuilder();
-            strSql.Append("select F_RepositoryId,F_CategoryId,F_Title,F_Content,F_Description,F_Url,F_KeyWords,F_ClickCount,F_ISPass,F_ISSubmitAudit,F_Expand1,F_Expand2,F_IntExpand1,F_CreateOn,F_CreateBy,F_AuditID,F_Key,F_Reason,F_Score,F_DeductUser ");
+            strSql.Append("select F_RepositoryId,F_CategoryId,F_Title,F_DeptId,F_Content,F_Description,F_Url,F_KeyWords,F_ClickCount,F_ISPass,F_ISSubmitAudit,F_Expand1,F_Expand2,F_IntExpand1,F_CreateOn,F_CreateBy,F_AuditID,F_Key,F_Reason,F_Score,F_DeductUser ");
             strSql.Append(" FROM T_RepositoryInformation ");
             if (strWhere.Trim() != "")
             {
@@ -362,7 +375,7 @@ namespace CallCenterApi.DAL
             {
                 strSql.Append(" top " + Top.ToString());
             }
-            strSql.Append(" F_RepositoryId,F_CategoryId,F_Title,F_Content,F_Description,F_Url,F_KeyWords,F_ClickCount,F_ISPass,F_ISSubmitAudit,F_Expand1,F_Expand2,F_IntExpand1,F_CreateOn,F_CreateBy,F_AuditID,F_Key,F_Reason,F_Score,F_DeductUser ");
+            strSql.Append(" F_RepositoryId,F_CategoryId,F_Title,F_Content,F_DeptId,F_Description,F_Url,F_KeyWords,F_ClickCount,F_ISPass,F_ISSubmitAudit,F_Expand1,F_Expand2,F_IntExpand1,F_CreateOn,F_CreateBy,F_AuditID,F_Key,F_Reason,F_Score,F_DeductUser ");
             strSql.Append(" FROM T_RepositoryInformation ");
             if (strWhere.Trim() != "")
             {

CallCenterApi/CallCenterApi.DAL/T_RepositoryLog.cs

@@ -41,9 +41,9 @@ namespace CallCenterApi.DAL
         {
             StringBuilder strSql = new StringBuilder();
             strSql.Append("insert into T_RepositoryLog(");
-            strSql.Append("F_RepositoryId,F_Action,F_Title,F_Content,F_Description,F_Url,F_KeyWords,F_CreateOn,F_CreateBy,F_Expand1,F_Expand2,F_IntExpand1,F_IntExpand2)");
+            strSql.Append("F_RepositoryId,F_Action,F_Title,F_Content,F_Description,F_Url,F_KeyWords,F_CreateOn,F_CreateBy,F_Expand1,F_Expand2,F_IntExpand1,F_IntExpand2,F_DeptId)");
             strSql.Append(" values (");
-            strSql.Append("@F_RepositoryId,@F_Action,@F_Title,@F_Content,@F_Description,@F_Url,@F_KeyWords,@F_CreateOn,@F_CreateBy,@F_Expand1,@F_Expand2,@F_IntExpand1,@F_IntExpand2)");
+            strSql.Append("@F_RepositoryId,@F_Action,@F_Title,@F_Content,@F_Description,@F_Url,@F_KeyWords,@F_CreateOn,@F_CreateBy,@F_Expand1,@F_Expand2,@F_IntExpand1,@F_IntExpand2,@F_DeptId)");
             strSql.Append(";select @@IDENTITY");
             SqlParameter[] parameters = {
                     new SqlParameter("@F_RepositoryId", SqlDbType.Int,4),
@@ -58,7 +58,9 @@ namespace CallCenterApi.DAL
                     new SqlParameter("@F_Expand1", SqlDbType.NVarChar,100),
                     new SqlParameter("@F_Expand2", SqlDbType.NVarChar,200),
                     new SqlParameter("@F_IntExpand1", SqlDbType.SmallInt,2),
-                    new SqlParameter("@F_IntExpand2", SqlDbType.Int ,4)
+                    new SqlParameter("@F_IntExpand2", SqlDbType.Int ,4),
+                     new SqlParameter("@F_DeptId", SqlDbType.Int ,4)
+                    
             };
             parameters[0].Value = model.F_RepositoryId;
             parameters[1].Value = model.F_Action;
@@ -73,6 +75,8 @@ namespace CallCenterApi.DAL
             parameters[10].Value = model.F_Expand2;
             parameters[11].Value = model.F_IntExpand1;
             parameters[12].Value = model.F_IntExpand2;
+            parameters[13].Value = model.F_DeptId;
+            
             object obj = DbHelperSQL.GetSingle(strSql.ToString(), parameters);
             if (obj == null)
             {
@@ -101,7 +105,9 @@ namespace CallCenterApi.DAL
             strSql.Append("F_CreateBy=@F_CreateBy,");
             strSql.Append("F_Expand1=@F_Expand1,");
             strSql.Append("F_Expand2=@F_Expand2,");
-            strSql.Append("F_IntExpand1=@F_IntExpand1");
+            strSql.Append("F_IntExpand1=@F_IntExpand1,");
+            strSql.Append("F_DeptId=@F_DeptId");
+            
             strSql.Append(" where F_LogId=@F_LogId");
             SqlParameter[] parameters = {
                     new SqlParameter("@F_RepositoryId", SqlDbType.Int,4),
@@ -116,6 +122,8 @@ namespace CallCenterApi.DAL
                     new SqlParameter("@F_Expand1", SqlDbType.NVarChar,100),
                     new SqlParameter("@F_Expand2", SqlDbType.NVarChar,200),
                     new SqlParameter("@F_IntExpand1", SqlDbType.SmallInt,2),
+                    new SqlParameter("@F_DeptId", SqlDbType.Int,4),
+                    
                     new SqlParameter("@F_LogId", SqlDbType.Int,4)};
             parameters[0].Value = model.F_RepositoryId;
             parameters[1].Value = model.F_Action;
@@ -129,7 +137,9 @@ namespace CallCenterApi.DAL
             parameters[9].Value = model.F_Expand1;
             parameters[10].Value = model.F_Expand2;
             parameters[11].Value = model.F_IntExpand1;
-            parameters[12].Value = model.F_LogId;
+            parameters[12].Value = model.F_DeptId;
+            
+            parameters[13].Value = model.F_LogId;
 
             int rows = DbHelperSQL.ExecuteSql(strSql.ToString(), parameters);
             if (rows > 0)
@@ -193,7 +203,7 @@ namespace CallCenterApi.DAL
         {
 
             StringBuilder strSql = new StringBuilder();
-            strSql.Append("select  top 1 F_IntExpand2,F_LogId,F_RepositoryId,F_Action,F_Title,F_Content,F_Description,F_Url,F_KeyWords,F_CreateOn,F_CreateBy,F_Expand1,F_Expand2,F_IntExpand1 from T_RepositoryLog ");
+            strSql.Append("select  top 1 F_IntExpand2,F_LogId,F_DeptId,F_RepositoryId,F_Action,F_Title,F_Content,F_Description,F_Url,F_KeyWords,F_CreateOn,F_CreateBy,F_Expand1,F_Expand2,F_IntExpand1 from T_RepositoryLog ");
             strSql.Append(" where F_LogId=@F_LogId");
             SqlParameter[] parameters = {
                     new SqlParameter("@F_LogId", SqlDbType.Int,4)
@@ -277,7 +287,13 @@ namespace CallCenterApi.DAL
                 {
                     model.F_IntExpand2 = int.Parse(row["F_IntExpand2"].ToString());
                 }
+                if (row["F_DeptId"] != null && row["F_DeptId"].ToString() != "")
+                {
+                    model.F_DeptId = int.Parse(row["F_DeptId"].ToString());
+                }
                 
+
+
             }
             return model;
         }
@@ -288,7 +304,7 @@ namespace CallCenterApi.DAL
         public DataSet GetList(string strWhere)
         {
             StringBuilder strSql = new StringBuilder();
-            strSql.Append("select F_LogId,F_RepositoryId,F_IntExpand2,F_Action,F_Title,F_Content,F_Description,F_Url,F_KeyWords,F_CreateOn,F_CreateBy,F_Expand1,F_Expand2,F_IntExpand1 ");
+            strSql.Append("select F_LogId,F_RepositoryId,F_DeptId,F_IntExpand2,F_Action,F_Title,F_Content,F_Description,F_Url,F_KeyWords,F_CreateOn,F_CreateBy,F_Expand1,F_Expand2,F_IntExpand1 ");
             strSql.Append(" FROM T_RepositoryLog ");
             if (strWhere.Trim() != "")
             {
@@ -308,7 +324,7 @@ namespace CallCenterApi.DAL
             {
                 strSql.Append(" top " + Top.ToString());
             }
-            strSql.Append(" F_LogId,F_RepositoryId,F_Action,F_IntExpand2,F_Title,F_Content,F_Description,F_Url,F_KeyWords,F_CreateOn,F_CreateBy,F_Expand1,F_Expand2,F_IntExpand1 ");
+            strSql.Append(" F_LogId,F_RepositoryId,F_DeptId,F_Action,F_IntExpand2,F_Title,F_Content,F_Description,F_Url,F_KeyWords,F_CreateOn,F_CreateBy,F_Expand1,F_Expand2,F_IntExpand1 ");
             strSql.Append(" FROM T_RepositoryLog ");
             if (strWhere.Trim() != "")
             {

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

@@ -59,13 +59,17 @@ namespace CallCenterApi.Interface.Controllers.knowledge
             else
                 sql += " and F_ParentId=0";
 
-            //Model.T_Sys_RoleInfo role = rolebll.GetModel("WLDW");
-            //if (User.F_RoleId == role.F_RoleId)
-            //{
-            //    sql = " and F_ParentId=0 and F_CategoryId in ( select F_CategoryId from T_RepositoryCategory where F_CategoryName ='知识信息分类')"; 
+            Model.T_Sys_RoleInfo role = rolebll.GetModel("WLDW");
+            if (User.F_RoleId == role.F_RoleId)
+            {
+               sql = " and F_ParentId=0 and F_CategoryId not  in " +
+                    "( select F_CategoryId from T_RepositoryCategory where F_CategoryName in('表彰批评类','信息类'))"; 
              
-            //}
-      
+            }
+        
+
+
+
 
             dt = new BLL.T_RepositoryCategory().GetList(" 1=1 " + sql).Tables[0];
             List<Model.TreeModel> modelList = BindTree(dt, "0");

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

@@ -20,7 +20,7 @@ namespace CallCenterApi.Interface.Controllers.knowledge
         private BLL.T_Sys_RoleInfo rolebll = new BLL.T_Sys_RoleInfo();
 
         // 获取知识库列表
-        public ActionResult GetList(string title, string content,string keywords, string pid,int deptid=0)
+        public ActionResult GetList(string title, string content,string keywords, string pid,int deptid=0,int deptids=0)
         {
             string issub = RequestString.GetQueryString("issub");
             string ispass = RequestString.GetQueryString("ispass");
@@ -71,7 +71,12 @@ namespace CallCenterApi.Interface.Controllers.knowledge
 
             if (deptid >0)
             {
-                sql += "and   F_CreateBy in( select F_UserId from T_Sys_UserAccount where F_DeptId ='" + deptid + "')";
+              sql += "and   F_CreateBy in( select F_UserId from T_Sys_UserAccount where F_DeptId ='" + deptid + "')";
+            }
+            if (deptids > 0)
+            {
+                sql += $" and F_DeptId='{deptids}'";
+                // sql += "and   F_CreateBy in( select F_UserId from T_Sys_UserAccount where F_DeptId ='" + deptid + "')";
             }
             if (User .F_RoleCode =="WLDW")
             {
@@ -99,7 +104,7 @@ namespace CallCenterApi.Interface.Controllers.knowledge
                 "T_RepositoryInformation a",
                 "F_RepositoryId",
                 "*,(select F_CategoryName   from T_RepositoryCategory  where F_CategoryId =a.F_CategoryId  )as CategoryName" +
-                ",dbo.GetDeptName(CONVERT (int ,(select F_DeptId  from T_Sys_UserAccount  where F_UserId = a.F_CreateBy)) ) DeptName ",
+                ",dbo.GetDeptName(CONVERT (int ,(select F_DeptId  from T_Sys_UserAccount  where F_UserId = a.F_CreateBy)) ) DeptName,dbo.GetDeptName(F_DeptId) DeptNames ",
                 sql,
                 "ORDER BY F_RepositoryId desc",
                 pagesize,
@@ -239,7 +244,7 @@ namespace CallCenterApi.Interface.Controllers.knowledge
             }
             int recordCount = 0;
             dt = BLL.PagerBLL.GetListPager(
-                "T_RepositoryAudit",
+                "T_RepositoryAudit a ",
                 "F_AuditId",
                 "*",
                 sql,
@@ -256,7 +261,9 @@ namespace CallCenterApi.Interface.Controllers.knowledge
                 {
                     var preContent = ""; var afterContent = "";
                     var predis = ""; var afterdis = "";
-                    var title = ""; var ptitle = ""; var atitle = "";
+                    var title = ""; var ptitle = ""; var atitle = "";string deptname = "";
+                    string CategoryName = "";
+                    
                     if (x.F_PreLogID != null)
                     {
                         Model.T_RepositoryLog logModel = logList.Where(y => y.F_LogId == x.F_PreLogID.Value).FirstOrDefault();
@@ -265,6 +272,19 @@ namespace CallCenterApi.Interface.Controllers.knowledge
                             preContent = logModel.F_Content;
                             predis = logModel.F_Description;
                             ptitle = logModel.F_Title;
+                            if (logModel.F_DeptId >0)
+                            {
+                                var dept = new BLL.T_Sys_Department().GetModel(logModel.F_DeptId.Value);
+                                if (dept != null)
+                                    deptname = dept.F_DeptName;
+                            }
+                            if (logModel.F_IntExpand1 > 0)
+                            {
+                                var Category = new BLL.T_RepositoryCategory().GetModel(logModel.F_IntExpand1.Value);
+                                if (Category != null)
+                                    CategoryName = Category.F_CategoryName ;
+                            }
+
                         }
                     }
                     if (x.F_AfterLogID != null)
@@ -275,6 +295,18 @@ namespace CallCenterApi.Interface.Controllers.knowledge
                             afterContent = logModel.F_Content;
                             afterdis = logModel.F_Description;
                             atitle = logModel.F_Title;
+                            if (logModel.F_DeptId > 0)
+                            {
+                                var dept = new BLL.T_Sys_Department().GetModel(logModel.F_DeptId.Value);
+                                if (dept != null)
+                                    deptname = dept.F_DeptName;
+                            }
+                            if (logModel.F_IntExpand1 > 0)
+                            {
+                                var Category = new BLL.T_RepositoryCategory().GetModel(logModel.F_IntExpand1.Value);
+                                if (Category != null)
+                                    CategoryName = Category.F_CategoryName;
+                            }
                         }
                     }
                     if (ptitle != "")
@@ -291,7 +323,9 @@ namespace CallCenterApi.Interface.Controllers.knowledge
                         F_AfterDescription = afterdis,
                         F_ISPass = x.F_ISPass,
                         F_AuditRemark = x.F_AuditRemark,
-                       
+                        DeptName= deptname,
+                        CategoryName= CategoryName
+
                     };
                 }),
                 total = recordCount
@@ -530,7 +564,7 @@ namespace CallCenterApi.Interface.Controllers.knowledge
 
         [Authority]
         //添加知识库
-        public ActionResult AddInfo(string title, string con, string pid,string key, int issub=1, int keyid = 0,int demandsid=0)
+        public ActionResult AddInfo(string title, string con, string pid,string key, int deptid = 0, int issub=1, int keyid = 0,int demandsid=0)
         {
             Model.T_RepositoryInformation dModel = new Model.T_RepositoryInformation();
             if (string.IsNullOrEmpty(title))
@@ -541,7 +575,14 @@ namespace CallCenterApi.Interface.Controllers.knowledge
             dModel.F_Title = title.Trim();
             dModel.F_Content = WebHelper.UrlDecode(con.Trim());
             dModel.F_CategoryId = int.Parse(pid);
+            dModel.F_DeptId = deptid;
+            
             dModel.F_Description = WebHelper.NoHtml(WebHelper.UrlDecode(con.Trim()));
+            if (User.F_RoleCode=="GLY")
+            {
+                dModel.F_ISPass = 1;
+            }
+            else 
             dModel.F_ISPass = 0;
             dModel.F_ISSubmitAudit = issub;
             dModel.F_CreateOn = DateTime.Now;
@@ -569,8 +610,26 @@ namespace CallCenterApi.Interface.Controllers.knowledge
                 }
                 dModel.F_RepositoryId = b;
                 int logid = addLog(dModel, 1);
-                int auditid = addaudit(b, 1, null, logid);
-                new BLL.T_RepositoryInformation().UpdateAuditID(b, auditid);
+                if (User.F_RoleCode != "GLY")
+                {
+                    int auditid = addaudit(b, 1, null, logid);
+                    new BLL.T_RepositoryInformation().UpdateAuditID(b, auditid);
+                   
+
+                }
+                else
+                {
+                    Task.Run(() =>
+                    {
+                        WebClient web = new WebClient();
+                        web.Encoding = Encoding.UTF8;
+                        string Dataurl = web.DownloadString(FrontUrl + "Affairs/kinfo_add?id=" + b);
+
+                    }).ContinueWith(p =>
+                    {
+                        System.Diagnostics.Debug.WriteLine(DateTime.Now);
+                    });
+                }
                 return Success("添加成功");
             }
             else
@@ -581,7 +640,7 @@ namespace CallCenterApi.Interface.Controllers.knowledge
         }
         [Authority]
         //编辑知识库
-        public ActionResult EditInfo(string infoid, string title, string con, string pid,string key, int? issub, int keyid = 0)
+        public ActionResult EditInfo(string infoid, string title, string con, string pid,string key, int? issub,int deptid=0, int keyid = 0)
         {
             Model.T_RepositoryInformation dModel = infoBLL.GetModel(int.Parse(infoid.Trim()));
             if (dModel != null)
@@ -607,28 +666,32 @@ namespace CallCenterApi.Interface.Controllers.knowledge
                 {
                     dModel.F_ISSubmitAudit = issub;
                 }
+                if (deptid>0)
+                    dModel.F_DeptId  = deptid;
                 dModel.F_KeyWords = key;
-            
-                Model.T_RepositoryAudit audModel = new Model.T_RepositoryAudit();
-                if (dModel.F_AuditID != null)
-                    audModel = new BLL.T_RepositoryAudit().GetModel(dModel.F_AuditID.Value);
 
-                int logid = addLog(dModel, 2);
-                if (logid > 0)
-                {
-                    string content = $"{User.F_UserName}({User.F_UserCode })编辑知识库{  dModel.F_Title }";
-                    string Operation = OperationLogController
-                        .AddOperationList(content, User.F_UserCode, Common.DTRequest.GetIP(), 1, 4594, dModel.F_RepositoryId);
+                    Model.T_RepositoryAudit audModel = new Model.T_RepositoryAudit();
+                    if (dModel.F_AuditID != null)
+                        audModel = new BLL.T_RepositoryAudit().GetModel(dModel.F_AuditID.Value);
 
-                    int auditid = addaudit(int.Parse(infoid.Trim()), 2, audModel.F_AfterLogID, logid);
-                    new BLL.T_RepositoryInformation().UpdateAuditID(int.Parse(infoid.Trim()), auditid);
-                    infoBLL.UpdateSubAudit(int.Parse(infoid.Trim()), 1);
-                    return Success("保存成功");
-                }
-                else
-                {
-                    return Success("保存失败");
-                }
+                    int logid = addLog(dModel, 2);
+                    if (logid > 0)
+                    {
+                        string content = $"{User.F_UserName}({User.F_UserCode })编辑知识库{  dModel.F_Title }";
+                        string Operation = OperationLogController
+                            .AddOperationList(content, User.F_UserCode, Common.DTRequest.GetIP(), 1, 4594, dModel.F_RepositoryId);
+
+                        int auditid = addaudit(int.Parse(infoid.Trim()), 2, audModel.F_AfterLogID, logid);
+                        new BLL.T_RepositoryInformation().UpdateAuditID(int.Parse(infoid.Trim()), auditid);
+                        infoBLL.UpdateSubAudit(int.Parse(infoid.Trim()), 1);
+                        return Success("保存成功");
+                    }
+                    else
+                    {
+                        return Success("保存失败");
+                    }
+                
+               
             }
             else
             {
@@ -647,22 +710,37 @@ namespace CallCenterApi.Interface.Controllers.knowledge
                     Model.T_RepositoryInformation dModel = infoBLL.GetModel(int.Parse(str.Trim()));
                     if (dModel != null)
                     {
-                        Model.T_RepositoryAudit audModel = new Model.T_RepositoryAudit();
-                        if (dModel.F_AuditID != null)
-                            audModel = new BLL.T_RepositoryAudit().GetModel(dModel.F_AuditID.Value);
+                        if (User .F_RoleCode =="GLY")
+                        {
+                           if ( infoBLL.Delete(dModel.F_RepositoryId))
+                            {
+                                string content = $"{User.F_UserName}({User.F_UserCode })删除知识库{  dModel.F_Title }";
+                                string Operation = OperationLogController
+                                    .AddOperationList(content, User.F_UserCode, Common.DTRequest.GetIP(), 2, 4594, dModel.F_RepositoryId);
+                                c++;
+                            }
 
-                        int logid = addLog(dModel, 3);
-                        if (logid > 0)
+                        }
+                        else
                         {
-                            string content = $"{User.F_UserName}({User.F_UserCode })删除知识库{  dModel.F_Title }";
-                            string Operation = OperationLogController
-                                .AddOperationList(content, User.F_UserCode, Common.DTRequest.GetIP(), 2, 4594, dModel.F_RepositoryId);
-
-                            int auditid = addaudit(int.Parse(str.Trim()), 3, audModel.F_AfterLogID, logid);
-                            infoBLL.UpdateSubAudit(int.Parse(str.Trim()), 1);
-                            infoBLL.UpdateAuditID(int.Parse(str.Trim()), auditid);
-                            c++;
+                            Model.T_RepositoryAudit audModel = new Model.T_RepositoryAudit();
+                            if (dModel.F_AuditID != null)
+                                audModel = new BLL.T_RepositoryAudit().GetModel(dModel.F_AuditID.Value);
+
+                            int logid = addLog(dModel, 3);
+                            if (logid > 0)
+                            {
+                                string content = $"{User.F_UserName}({User.F_UserCode })删除知识库{  dModel.F_Title }";
+                                string Operation = OperationLogController
+                                    .AddOperationList(content, User.F_UserCode, Common.DTRequest.GetIP(), 2, 4594, dModel.F_RepositoryId);
+
+                                int auditid = addaudit(int.Parse(str.Trim()), 3, audModel.F_AfterLogID, logid);
+                                infoBLL.UpdateSubAudit(int.Parse(str.Trim()), 1);
+                                infoBLL.UpdateAuditID(int.Parse(str.Trim()), auditid);
+                                c++;
+                            }
                         }
+                       
                     }
                 }
                 if (c == ids.Length)
@@ -768,6 +846,8 @@ namespace CallCenterApi.Interface.Controllers.knowledge
                                 infoModel.F_Content = logModel.F_Content;
                                 infoModel.F_ISPass = ispass;
                                 infoModel.F_KeyWords = logModel.F_KeyWords;
+                                infoModel.F_DeptId = logModel.F_DeptId;
+
                                 infoModel.F_Key = logModel.F_IntExpand2;
                                 string content = $"{User.F_UserName}({User.F_UserCode })审核通过了知识库{  infoModel.F_Title }修改";
                                 string Operation = OperationLogController
@@ -835,8 +915,8 @@ namespace CallCenterApi.Interface.Controllers.knowledge
             logModel.F_Action = action;
             logModel.F_Description = rmodel.F_Description;
             logModel.F_IntExpand1 = rmodel.F_CategoryId;
-
-            if(action==4)
+            logModel.F_DeptId = rmodel.F_DeptId;
+            if (action==4)
             {
                 logModel.F_Title = rmodel.F_Title;
                 logModel.F_Content = User.F_UserCode +"扣分"+Math .Abs ((float )rmodel.F_Score )+

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

@@ -237,7 +237,7 @@ namespace CallCenterApi.Interface.Controllers.report
         /// </summary>
         /// <returns></returns>
         [Authority]
-        public ActionResult GetYQCountList(int isdc = 0, int deptid = 0)
+        public ActionResult GetYQCountList(int isdc = 0, int deptid = 0,int type=0)
         {
             string starttime = RequestString.GetQueryString("starttime");
             string endtime = RequestString.GetQueryString("endtime");
@@ -263,6 +263,11 @@ namespace CallCenterApi.Interface.Controllers.report
                     sqlwhere += "and a.F_MainDeptId='" + deptid + "'";
                 }
             }
+            if (type != 0)
+            {
+                sqlwhere += " and a.F_InfoType = '" + type + "' ";
+            }
+
             string sql = " select* from(select dbo.GetDeptNames(F_MainDeptId) F_DeptName, F_WorkOrderId, F_ComContent, F_AssignTime, F_LimitTime, " +
                 "F_DealTime, (SELECT COUNT(1) FROM T_Sys_WorkOFFDays WITH(NOLOCK) WHERE F_OffState = 1 AND F_OffDate<= CONVERT(varchar(100),(case when" +
                 " a.F_DealTime is null" +

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/workorder/AffairsController.cs

@@ -29,7 +29,7 @@ using System.Web.Mvc;
 
 namespace CallCenterApi.Interface.Controllers.workorder
 {
- //[Authority]
+  //[Authority]
     public class AffairsController : BaseController
     {
 
@@ -1770,7 +1770,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         else
                         {
                             keyValuePairs.Add("F_Administrative", "0");
-                        }
+                        } 
 
                     }
 
@@ -1829,9 +1829,10 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                     }
 
                                 }
-                                catch
+                                catch(Exception e)
                                 {
-
+                                    LogFactory.GetLogger("签收").Error(e.Message );
+                                     return Error("签收失败");
                                 }
 
 

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

@@ -99,6 +99,9 @@ namespace CallCenterApi.Interface.Controllers.workorder
             int pagesize = 10;
             string dealstarttime = HttpUtility.UrlDecode(RequestString.GetQueryString("dealstarttime"));
             string dealstrendtime = HttpUtility.UrlDecode(RequestString.GetQueryString("dealstrendtime"));
+
+            string workroder = HttpUtility.UrlDecode(RequestString.GetQueryString("workroder"));
+
             string Result = HttpUtility.UrlDecode(RequestString.GetQueryString("Result"));
             int isopen = RequestString.GetInt("isopen", -1);//是否公开
 
@@ -137,6 +140,12 @@ namespace CallCenterApi.Interface.Controllers.workorder
 
                 sql += " and F_WorkOrderId in( select F_WorkOrderId   from T_Sys_Affairs  where CASE_SERIAL like'%" + strworkorderid + "%') ";
             }
+            if (!string .IsNullOrEmpty (workroder))
+
+            {
+                sql += $" and F_WorkOrderId in(select col from dbo.SplitToNvarchar('{workroder}',',' )) ";
+            }
+
             if (IsRelease > 0)
             {
                 if (IsRelease == 1)
@@ -4270,6 +4279,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         sql += " and (F_NoResult is null or F_NoResult ='') ";
                     else
                         sql += " and F_NoResult is not  null and  F_NoResult !='' ";
+                   
 
                     sql += "  and F_WorkOrderID in(select F_WorkOrderID from T_Bus_Feedback WITH(NOLOCK) where F_State=1 and F_IsDelete=0 and F_Type in (1,2) ";
                     if (User.F_RoleCode != "GLY" && User.F_RoleCode != "SPZ" && User.F_RoleCode != "SPZJZ" && User.F_RoleCode != "DDZG")
@@ -4444,7 +4454,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
             //string cols = "*,dbo.GetUserName(F_CreateUser) as UserName,dbo.GetDictionaryName(F_InfoType) as TypeName,dbo.GetOverState(F_WorkOrderId) as OverState,"
             //    + "dbo.GetDictionaryName(F_InfoSource) as SourceName,dbo.GetWorkOrderAssign(F_WorkOrderId) as DeptName ,dbo.GetLimitTime(F_WorkOrderId) as LimitTime";
             //string cols = "*,dbo.GetUserName(F_CreateUser) as UserName,dbo.GetDictionaryName(F_InfoType) as TypeName,dbo.GetDictionaryName(F_InfoSource) as SourceName";
-            string cols = "F_WorkOrderId,F_CusName,F_ComTitle,F_WorkState,F_MainDeptId,F_OtherDeptIds,F_DealTime,F_LeaveRecordId,F_CallRecordId,F_IsResult,F_IsProtect,F_IsReturn,F_CreateTime,dbo.GetUserName(F_CreateUser) as UserName,dbo.GetDictionaryName(F_InfoType) as TypeName,dbo.GetDictionaryName(F_InfoSource) as SourceName,dbo.GetDeptNames(F_MainDeptID3) AS EJDeptName,F_CloseTime,F_IsRelease,F_Identification,F_IsRelease,F_InfoSource " +
+            string cols = "F_WorkOrderId,F_CusName,F_ComTitle,F_WorkState,F_MainDeptId,F_OtherDeptIds,F_IsProResultState,F_DealTime,F_LeaveRecordId,F_CallRecordId,F_IsResult,F_IsProtect,F_IsReturn,F_CreateTime,dbo.GetUserName(F_CreateUser) as UserName,dbo.GetDictionaryName(F_InfoType) as TypeName,dbo.GetDictionaryName(F_InfoSource) as SourceName,dbo.GetDeptNames(F_MainDeptID3) AS EJDeptName,F_CloseTime,F_IsRelease,F_Identification,F_IsRelease,F_InfoSource " +
                 " ,(case when PATINDEX('%''" + User.F_DeptId + "''%',a.F_See)= 0  then 0  when  PATINDEX('%''" + User.F_DeptId + "''%',a.F_See) IS NULL then 0 else 1 end) as See,F_UnsuccessfulTime";
             if (isdc > 0)
             {
@@ -4772,8 +4782,16 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     else if (Int32.Parse(strtab) == 18 && User.F_RoleCode == "WLDW")
                     {
                         btns.Add(ButtonGroup.Append());//
-                        btns.Add(ButtonGroup.AssignUnsuccessful());//
+                       
                         btns.Add(ButtonGroup.query());
+                        if(dr["F_IsProResultState"] !=null && dr["F_IsProResultState"].ToString ()=="1")
+                        {
+                            btns.Add(ButtonGroup.AuditUnsuccessful());//
+                        }
+                        else
+                        {
+                            btns.Add(ButtonGroup.AssignUnsuccessful());//
+                        }
                     }
                     else
                         btns.Add(ButtonGroup.query());
@@ -5815,6 +5833,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     sql += " and F_WorkState in(6,7) ";
                     sql += " and F_IsProResult = '" + 2 + "' ";
                     sql += "  and F_NoResult like'%" + User.F_DeptId + "%' ";
+                    sql += " and isnull(F_IsProResultState,0) !=1";
                     //if (User.F_RoleCode != "GLY" && User.F_RoleCode != "SPZ" && User.F_RoleCode != "SPZJZ" && User.F_RoleCode != "DDZG")
                     //{
                     //    sql += " and F_CreateUser='" + User.F_UserCode + "')";
@@ -16147,7 +16166,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
             if (User.F_RoleCode == "WLDW" || User.F_RoleCode == "GLY" || User.F_RoleCode == "DDZG")
             {
                 string workorderid = RequestString.GetFormString("workorderid");
-                int newlimittime = 7;
+                int newlimittime = 5;
                 string resdatetime = "";
                 string reason = RequestString.GetFormString("reason");
                 string files = RequestString.GetFormString("files");
@@ -16161,7 +16180,9 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         return Error("该工单已超时，不能申请延时");
                     }
                 }
-                var Delay = new BLL.T_Bus_DelayTime().GetModelList("F_WorkOrderId='" + modelT_Bus_WorkOrder.F_WorkOrderId + "' and F_IsAudit in (0,1) and F_CreateUser='" + User.F_DeptId + "'and F_AssignedId='" + modelT_Bus_AssignedInfo.F_Id + "'");
+                var Delay = new BLL.T_Bus_DelayTime().GetModelList("F_WorkOrderId='" + 
+                    modelT_Bus_WorkOrder.F_WorkOrderId + "' and F_IsAudit in (0,1) and F_CreateUser='" +
+                    User.F_DeptId + "'and F_AssignedId='" + modelT_Bus_AssignedInfo.F_Id + "'");
 
                 if (Delay != null && Delay.Count > 0)
                 {
@@ -17125,6 +17146,68 @@ namespace CallCenterApi.Interface.Controllers.workorder
             }
         }
         /// <summary>
+        /// 已办未果通过
+        /// </summary>
+        /// <returns></returns>
+        //[Authority]
+        public ActionResult AuditTransfer(string reason, int state=0)
+        {
+
+            string workorderid = RequestString.GetFormString("workorderid");
+
+
+            if (User.F_RoleCode == "WLDW" )
+            {
+                Model.T_Bus_WorkOrder modelT_Bus_WorkOrder = workorderBLL.GetModel(workorderid);
+              
+               
+                if (modelT_Bus_WorkOrder != null)
+                {
+                    #region 插入操作记录
+                    Model.T_Bus_Operation oper = new Model.T_Bus_Operation();
+                    oper.F_WorkOrderId = modelT_Bus_WorkOrder.F_WorkOrderId;
+                    Dictionary<string, object> keyValuePairs = new Dictionary<string, object>();
+                    string message = "";
+                    if (state==0)
+                    {
+                        message = "审核不通过已办未果";
+                        if (!string.IsNullOrEmpty(reason))
+                            message += "原因：" + message;
+                        keyValuePairs.Add("F_IsProResultState", 0);
+                       
+                    }
+                    else
+                    {
+                        message = "审核通过已办未果";
+                        if (!string.IsNullOrEmpty(reason))
+                            message += "原因：" + message;
+                        keyValuePairs.Add("F_IsProResultState", 2);
+                        keyValuePairs.Add("F_IsProResult", 3);
+                    }
+
+                    oper.F_State = modelT_Bus_WorkOrder.F_WorkState;
+                    string userinfo = User.depname + "(" + User.F_UserCode + ")";
+                    oper.F_Message = userinfo +  message + "";
+                    oper.F_CreateUser = User.F_UserCode;
+                    oper.F_CreateTime = DateTime.Now;
+                    oper.F_IsDelete = 0;
+                    operBLL.Add(oper);
+                    #endregion
+                    if (workorderBLL.UpdateWorkOrder(modelT_Bus_WorkOrder.F_Id, keyValuePairs))
+                        return Success("成功");
+                    else
+                        return Error("失败");
+                }
+                else
+                {
+                    return Error("工单不存在");
+                }
+
+            }
+            return Error("权限不足");
+
+        }
+        /// <summary>
         ///追问回复
         /// </summary>
         /// <returns></returns>
@@ -17169,7 +17252,18 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                 keyValuePairs.Add("F_AdditionalReply", modelT_Bus_WorkOrder.F_AdditionalReply + "<br/>" + message);
                             }
 
-                            keyValuePairs.Add("F_IsProResult", 3);
+                           
+                            if (User .F_RoleCode =="EJWLDW")
+                            {
+                                keyValuePairs.Add("F_IsProResultState", 1); 
+                            }
+                            else
+                            {
+                                keyValuePairs.Add("F_IsProResult", 3);
+                            }
+
+
+
                             bool n = workorderBLL.UpdateWorkOrder(modelT_Bus_WorkOrder.F_Id, keyValuePairs);
                             if (!string.IsNullOrEmpty(files))
                             {
@@ -20226,7 +20320,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                 //结案
                                 if (nexttype == 0)
                                 {
-                                    if (issatisfie == 0)
+                                    if (issatisfie <= 0)
                                         keyValuePairs.Add("F_ToBereply", 1);
                                     keyValuePairs.Add("F_IsClosed", 1);
                                     // modelT_Bus_WorkOrder.F_IsClosed = 1;

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

@@ -404,7 +404,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                 {
                                     var obj = new
                                     {
-                                        code = "0",
+                                        code = "1",
                                         message = "已推送过延时结果"
                                     };
                                     return Content(obj.ToJson());
@@ -418,12 +418,12 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                     modelT_Bus_WorkOrder.F_LimitTime.Value
                                      .AddHours(tss);
                                 des = "，原定办结时间" + modelT_Bus_DelayTime.F_OldTime + "，申请延长到" + modelT_Bus_DelayTime.F_NewTime;
-                                int n = DbHelperSQL.ExecuteSql(" update T_Bus_WorkOrder set F_LimitTime='" + modelT_Bus_WorkOrder.F_LimitTime 
+                                int n = DbHelperSQL.ExecuteSql(" update T_Bus_WorkOrder set F_LimitTime='" + modelT_Bus_DelayTime.F_NewTime.Value 
                                     + "'   where F_Id ='" + modelT_Bus_WorkOrder.F_Id + "'");
 
                                 if (modelT_Bus_AssignedInfo != null)
                                 {
-                                    modelT_Bus_AssignedInfo.F_LimitTime = modelT_Bus_WorkOrder.F_LimitTime;
+                                    modelT_Bus_AssignedInfo.F_LimitTime = modelT_Bus_DelayTime.F_NewTime.Value;
                                     assignBLL.Update(modelT_Bus_AssignedInfo);
                                 }
                                 if (!string.IsNullOrEmpty(modelT_Bus_WorkOrder.F_SubWorkorder1))

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

@@ -249,6 +249,10 @@ namespace CallCenterApi.Interface.Models.Common
         {
             return new button(62, "抽查");
         }
+        public static button AuditUnsuccessful()
+        {
+            return new button(68, "已办未果审核");
+        }
         /// <summary>
         /// 已办未果通过
         /// </summary>

CallCenterApi/CallCenterApi.Model/T_RepositoryInformation.cs

@@ -168,6 +168,9 @@ namespace CallCenterApi.Model
         /// </summary>
         public string F_DeductUser { set; get; }
 
+
+        public int? F_DeptId { set; get; }
+
         #endregion Model
 
     }

CallCenterApi/CallCenterApi.Model/T_RepositoryLog.cs

@@ -139,6 +139,8 @@ namespace CallCenterApi.Model
         {
             set;get;
         }
+
+        public int ?F_DeptId { set; get; }
         #endregion Model
     }
 }