修改前内容，修改后内容对比详情接口

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

@@ -1,4 +1,5 @@
 using CallCenter.Utility;
+using CallCenterApi.DB;
 using CallCenterApi.Interface.Controllers.Base;
 using System;
 using System.Collections.Generic;
@@ -75,7 +76,7 @@ namespace CallCenterApi.Interface.Controllers.knowledge
             #region 获取分类信息
             dt.Columns.Add("CategoryId", typeof(string));   //分类id
             dt.Columns.Add("CategoryName", typeof(string)); //分类名称
-            dt.Columns.Add("isfavorites", typeof(string));   //是否收藏0未收藏，1收藏
+            dt.Columns.Add("favoritesid", typeof(string));   //是否收藏0未收藏，>0收藏
             var list = bllcategory.DataTableToList(bllcategory.GetList(" 1=1 ").Tables[0]);
             var listFavorites = bllfavorites.DataTableToList(bllfavorites.GetList($" 1=1 and UserId = {userid} ").Tables[0]);
             foreach (DataRow dr in dt.Rows)
@@ -87,11 +88,11 @@ namespace CallCenterApi.Interface.Controllers.knowledge
                     dr["CategoryName"] = modelcategory.F_CategoryName;
                 }
                 //添加是否收藏
-                dr["isfavorites"] = 0;
+                dr["favoritesid"] = 0;
                 var modeFavorites = listFavorites.FirstOrDefault(x => x.F_RepositoryId == Convert.ToInt32(dr["F_RepositoryId"].ToString()));
                 if (modeFavorites != null)
                 {
-                    dr["isfavorites"] = 1;
+                    dr["favoritesid"] = modeFavorites.Id;
                 }
             }
             #endregion
@@ -270,6 +271,81 @@ namespace CallCenterApi.Interface.Controllers.knowledge
             return Content(obj.ToJson());
         }
 
+        /// <summary>
+        /// 获取审核列表 修改前修改后对比
+        /// </summary>
+        /// <param name="auditid">id</param>
+        /// <returns></returns>
+        public ActionResult GetAuditCompareInfo(int auditid = 0, int ispass = 0)
+        {
+            DataTable dt = new DataTable();
+
+            string sql = ""; string sqlLog = "";
+            sql += " and isnull(F_ISPass,0)=" + ispass;
+            if (ispass == 0)
+                sql += " and F_RepositoryId in (select F_RepositoryId from T_RepositoryInformation where F_ISSubmitAudit=1)";
+
+            string sqllist = $"SELECT * FROM dbo.T_RepositoryAudit WHERE 1=1 {sql} "
+                    + " ORDER BY F_AuditId desc ";
+            dt = DbHelperSQL.Query(sqllist).Tables[0];
+            List<Model.T_RepositoryAudit> auditList = new BLL.T_RepositoryAudit().DataTableToList(dt);
+            var model = auditList.SingleOrDefault(x => x.F_AuditId == auditid);
+
+            List<Model.T_RepositoryLog> logList = new BLL.T_RepositoryLog().GetModelList(" 1=1 " + sqlLog);
+            var listcategory = bllcategory.DataTableToList(bllcategory.GetList(" 1=1 ").Tables[0]);
+            if (model != null)
+            {
+                var preContent = ""; var afterContent = "";
+                var predis = ""; var afterdis = "";
+                var title = ""; var ptitle = ""; var atitle = "";
+                int categoryid = 0, aftercategoryid = 0;
+                if (model.F_PreLogID != null)
+                {
+                    Model.T_RepositoryLog logModel = logList.Where(y => y.F_LogId == model.F_PreLogID.Value).FirstOrDefault();
+                    if (logModel != null)
+                    {
+                        preContent = logModel.F_Content;
+                        predis = logModel.F_Description;
+                        ptitle = logModel.F_Title;
+                        categoryid = logModel.F_IntExpand1 ?? 0;
+                    }
+                }
+                if (model.F_AfterLogID != null)
+                {
+                    Model.T_RepositoryLog logModel = logList.Where(y => y.F_LogId == model.F_AfterLogID.Value).FirstOrDefault();
+                    if (logModel != null)
+                    {
+                        afterContent = logModel.F_Content;
+                        afterdis = logModel.F_Description;
+                        atitle = logModel.F_Title;
+                        aftercategoryid = logModel.F_IntExpand1 ?? 0;
+                    }
+                }
+                //分类
+                var modelcategory= listcategory.FirstOrDefault(x=>x.F_CategoryId == model.)
+                //if (ptitle != "")
+                //{ title = ptitle; }
+                //else { title = atitle; }
+                var obj = new
+                {
+                    F_AuditId = model.F_AuditId,
+                    F_Action = model.F_Action,
+                    F_CategoryId = categoryid,
+                    F_Title = ptitle,
+                    F_PreContent = preContent,
+                    F_PreDescription = predis,
+                    F_AfterCategoryId = aftercategoryid,
+                    F_AfterTitle = atitle,
+                    F_AfterContent = afterContent,
+                    F_AfterDescription = afterdis,
+                    F_ISPass = model.F_ISPass,
+                    F_AuditRemark = model.F_AuditRemark
+                };
+                return Success("获取成功", obj);
+            }
+            return Error("获取失败");
+        }
+
         [Authority]
         //添加知识库
         public ActionResult AddInfo(string title, string con, string pid, int issub)

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/knowledge/KnowledgeFavoritesController.cs

@@ -39,7 +39,7 @@ namespace CallCenterApi.Interface.Controllers.knowledge
             }
             if (!string.IsNullOrEmpty(keywords))
             {
-                sql += " and (a.F_Title like '%" + keywords.Trim() + "%' or a.F_Content like '%" + keywords.Trim() + "%')";
+                sql += " and (b.F_Title like '%" + keywords.Trim() + "%' or b.F_Content like '%" + keywords.Trim() + "%')";
             }
             if (strpageindex.Trim() != "")
             {
@@ -54,7 +54,7 @@ namespace CallCenterApi.Interface.Controllers.knowledge
             dt = BLL.PagerBLL.GetListPager(
                 "dbo.T_RepositoryFavorites a LEFT JOIN dbo.T_RepositoryInformation b ON b.F_RepositoryId = a.F_RepositoryId LEFT JOIN dbo.T_RepositoryCategory c ON c.F_CategoryId = b.F_CategoryId ",
                 "a.Id",
-                "a.*,b.F_Title,b.F_Content,c.F_CategoryId,c.F_CategoryName",
+                "a.*,b.F_Title,b.F_Description,b.F_Content,c.F_CategoryId,c.F_CategoryName",
                 sql,
                 "ORDER BY a.F_CreateTime asc",
                 pagesize,
@@ -76,8 +76,10 @@ namespace CallCenterApi.Interface.Controllers.knowledge
         /// </summary>
         /// <param name="repositoryid">知识库id</param>
         /// <returns></returns>
-        public ActionResult AddFavoritesInfo(int repositoryid)
+        public ActionResult AddFavoritesInfo(int repositoryid = 0)
         {
+            if (repositoryid <= 0)
+                return Error("参数错误");
             int userid = int.Parse(User.UserData["F_UserID"]);
             Model.T_RepositoryFavorites model = new Model.T_RepositoryFavorites();
 
@@ -105,7 +107,7 @@ namespace CallCenterApi.Interface.Controllers.knowledge
         {
             if (ids != null && ids.Length > 0)
             {
-                string idd = " ";
+                string idd = "";
                 foreach (string str in ids)
                 {
                     idd += str + ",";