知识库bug调整

通话记录字段调整

CallCenterApi/CallCenterApi.DAL/T_Call_CallRecords.cs

@@ -1023,7 +1023,7 @@ namespace CallCenterApi.DAL
             strSql.Append(" select callnumber,");
             strSql.Append(" case calltype when 1 then '呼出' else '呼入' end calltypes, ");
             strSql.Append(" case callstate when 1 then '已接通' else '未接通' end callstates, ");
-            strSql.Append(" case isdeal when 0 then '未处理' when 1 then '已处理' else '注销' end isdeals, ");
+            //strSql.Append(" case isdeal when 0 then '未处理' when 1 then '已处理' else '注销' end isdeals, ");
             strSql.Append(" usercode, (select F_UserName from T_Sys_UserAccount where F_UserCode= c.UserCode) username, ");
             strSql.Append(" begintime, talkstarttime, talkendtime, endtime, talklongtime");
             strSql.Append(" FROM T_Call_CallRecords c   WITH(NOLOCK) ");

CallCenterApi/CallCenterApi.DAL/T_RepositoryInformation.cs

@@ -145,7 +145,10 @@ namespace CallCenterApi.DAL
             strSql.Append("F_ModifyOn=@F_ModifyOn,");
             strSql.Append("F_ModifyBy=@F_ModifyBy,");
             strSql.Append("F_ModifyName=@F_ModifyName,");
-            strSql.Append("F_DeleteFlag=@F_DeleteFlag");
+            strSql.Append("F_DeleteFlag=@F_DeleteFlag,");
+            strSql.Append("F_CanLastLong=@F_CanLastLong,");
+            strSql.Append("F_StartTime=@F_StartTime,");
+            strSql.Append("F_EndTime=@F_EndTime ");
             strSql.Append(" where F_RepositoryId=@F_RepositoryId");
             SqlParameter[] parameters = {
                     new SqlParameter("@F_CategoryId", SqlDbType.Int,4),

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/CallCenterApi.Interface.csproj

@@ -288,6 +288,7 @@
     <Compile Include="Models\Dto\CallRecordDto.cs" />
     <Compile Include="Models\Dto\CategoryDto.cs" />
     <Compile Include="Models\Dto\CustomerDto.cs" />
+    <Compile Include="Models\Dto\KnowledegDto.cs" />
     <Compile Include="Models\Dto\ModuleInfoDto.cs" />
     <Compile Include="Models\Dto\OrderDto.cs" />
     <Compile Include="Models\Dto\ProductDto.cs" />

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

@@ -1,5 +1,6 @@
 using CallCenter.Utility;
 using CallCenterApi.Interface.Controllers.Base;
+using CallCenterApi.Interface.Models.Dto;
 using System;
 using System.Collections.Generic;
 using System.Data;
@@ -36,7 +37,7 @@ namespace CallCenterApi.Interface.Controllers.knowledge
                 sql += " and (F_Content like '%" + keywords.Trim() + "%' or F_Title like '%"
                     + keywords.Trim() + "%' or F_KeyWords like '%" + keywords.Trim() + "%')";
             }
-            sql += $" and  ( F_CanLastLong>0 or (DateDiff(s,F_StartTime,'{DateTime.Now}')>0  and DateDiff(s,'{DateTime.Now}',F_EndTime)>0)  )";
+
             if (strpageindex.Trim() != "")
             {
                 pageindex = Convert.ToInt32(strpageindex);
@@ -61,21 +62,41 @@ namespace CallCenterApi.Interface.Controllers.knowledge
             System.Collections.Generic.List<Model.T_RepositoryInformation> modelList = new BLL.T_RepositoryInformation().DataTableToList(dt);
 
             var userList = userAccountBLL.DataTableToList(userAccountBLL.GetList("").Tables[0]);
+            List<KnowledegDto> list = new List<KnowledegDto>();
             modelList.ForEach(x =>
             {
-                x.F_CreateName = userList.SingleOrDefault(m => m.F_UserId == x.F_CreateBy)?.F_UserName ?? "";
-            });
-
-            //if (modelList.Count > 0)
-            //{
-            //    res = Success("加载成功", modelList);
-            //}
-            //else
-            //    res = Error("加载失败");
+                var time = "<span style='color:red;'>已失效</span>";
+                if (x.F_CanLastLong > 0)
+                {
+                    time = "永久有效";
+                }
+                else
+                {
+                    if (x.F_StartTime == null || x.F_EndTime == null)
+                    {
+                        time = "<span style='color:red;'>已失效</span>";
+                    }
+                    else if (DateTime.Now > x.F_StartTime && DateTime.Now < x.F_EndTime)
+                    {
+                        time = $"{x.F_StartTime?.ToString("yyyy-MM-dd HH:mm:ss") ?? ""} 至 {x.F_EndTime?.ToString("yyyy-MM-dd HH:mm:ss")}";
+                    }
+                }
 
+                list.Add(new Models.Dto.KnowledegDto
+                {
+                    F_RepositoryId = x.F_RepositoryId.ToString(),
+                    F_CustomerName = userList.SingleOrDefault(m => m.F_UserId == x.F_CreateBy)?.F_UserName ?? "",
+                    F_Title = x.F_Title,
+                    F_KeyWords = x.F_KeyWords,
+                    F_CreateOn = x.F_CreateOn?.ToString("yyyy-MM-dd HH:mm:ss") ?? "",
+                    F_CreateName = userList.SingleOrDefault(m => m.F_UserId == x.F_CreateBy)?.F_UserName ?? "",
+                    F_CanLastLong = x.F_CanLastLong.ToString(),
+                    F_Time = time
+                });
+            });
             var obj = new
             {
-                rows = modelList,
+                rows = list,
                 total = recordCount
             };
 
@@ -119,8 +140,8 @@ namespace CallCenterApi.Interface.Controllers.knowledge
             {
                 if (canlastlong <= 0)
                 {
-                    start = start ?? DateTime.Now.Date;
-                    end = end ?? DateTime.Now.Date.AddDays(8).AddSeconds(-1);
+                    if (start == null || end == null)
+                        return Error("非永久有效的知识库必须填写有效时间段");
                 }
 
 
@@ -200,8 +221,8 @@ namespace CallCenterApi.Interface.Controllers.knowledge
                         dModel.F_ModifyOn = DateTime.Now;
                         if (canlastlong <= 0)
                         {
-                            start = start ?? DateTime.Now.Date;
-                            end = end ?? DateTime.Now.Date.AddDays(8).AddSeconds(-1);
+                            if (start == null || end == null)
+                                return Error("非永久有效的知识库必须填写有效时间段");
                         }
                         dModel.F_CanLastLong = canlastlong;
                         dModel.F_StartTime = start;

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Models/Dto/KnowledegDto.cs

@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+
+namespace CallCenterApi.Interface.Models.Dto
+{
+    public class KnowledegDto
+    {
+        public string F_RepositoryId { get; set; }
+        public string F_CustomerName { get; set; }
+        public string F_Title { get; set; }
+        public string F_KeyWords { get; set; }
+        public string F_CreateOn { get; set; }
+        public string F_CreateName { get; set; }
+        public string F_CanLastLong { get; set; }
+        public string F_Time { get; set; }
+    }
+}