Commit ab252366 authored by 黄奎's avatar 黄奎

页面修改

parent 2dcb0a80
...@@ -28,6 +28,10 @@ namespace Edu.Common ...@@ -28,6 +28,10 @@ namespace Edu.Common
try try
{ {
timeStr = Convert.ToDateTime(time.ToString()).ToString("yyyy-MM-dd HH:mm:ss"); timeStr = Convert.ToDateTime(time.ToString()).ToString("yyyy-MM-dd HH:mm:ss");
if (timeStr == "0001-01-01 00:00:00")
{
timeStr = "";
}
} }
catch catch
{ {
......
...@@ -42,6 +42,9 @@ namespace Edu.Model.ViewModel.Web ...@@ -42,6 +42,9 @@ namespace Edu.Model.ViewModel.Web
public string DealTimeStr { get { return Common.ConvertHelper.FormatTime(this.DealTime); } } public string DealTimeStr { get { return Common.ConvertHelper.FormatTime(this.DealTime); } }
/// <summary>
/// 咨询时间
/// </summary>
public string CreateTimeStr { get { return Common.ConvertHelper.FormatTime(this.CreateDate); } }
} }
} }
...@@ -2,6 +2,8 @@ ...@@ -2,6 +2,8 @@
using Edu.Repository.Web; using Edu.Repository.Web;
using System.Collections.Generic; using System.Collections.Generic;
using VT.FW.DB; using VT.FW.DB;
using System.Linq;
using Edu.Common.Enum;
namespace Edu.Module.Web namespace Edu.Module.Web
{ {
...@@ -65,9 +67,14 @@ namespace Edu.Module.Web ...@@ -65,9 +67,14 @@ namespace Edu.Module.Web
/// </summary> /// </summary>
/// <param name="Id"></param> /// <param name="Id"></param>
/// <returns></returns> /// <returns></returns>
public RB_Web_Advisory_ViewModel GetWebAdvisoryModule(object Id) public RB_Web_Advisory_ViewModel GetWebAdvisoryModule(int Id)
{ {
return web_AdvisoryRepository.GetEntity<RB_Web_Advisory_ViewModel>(Id); var query = new RB_Web_Advisory_ViewModel()
{
Id = Id,
Status = (DateStateEnum)(-1)
};
return GetWebAdvisoryPageModule(1, 1, out long rowsCount, query)?.FirstOrDefault();
} }
/// <summary> /// <summary>
......
...@@ -63,7 +63,12 @@ WHERE 1=1 ...@@ -63,7 +63,12 @@ WHERE 1=1
{ {
builder.AppendFormat(@" AND A.{0}={1} ", nameof(RB_Web_Advisory_ViewModel.DealStatus), query.DealStatus); builder.AppendFormat(@" AND A.{0}={1} ", nameof(RB_Web_Advisory_ViewModel.DealStatus), query.DealStatus);
} }
if (query.Id > 0)
{
builder.AppendFormat(@" AND A.{0}={1} ", nameof(RB_Web_Advisory_ViewModel.Id), query.Id);
}
} }
builder.AppendFormat(" ORDER BY A.{0} DESC ", nameof(RB_Web_Advisory_ViewModel.Id));
return GetPage<RB_Web_Advisory_ViewModel>(pageIndex, pageSize, out rowsCount, builder.ToString(), parameters).ToList(); return GetPage<RB_Web_Advisory_ViewModel>(pageIndex, pageSize, out rowsCount, builder.ToString(), parameters).ToList();
} }
......
using Edu.Common.API; using Edu.Cache.User;
using Edu.Common.API;
using Edu.Common.Enum; using Edu.Common.Enum;
using Edu.Common.Enum.Web; using Edu.Common.Enum.Web;
using Edu.Common.Plugin; using Edu.Common.Plugin;
...@@ -522,6 +523,13 @@ namespace Edu.WebApi.Controllers.Web ...@@ -522,6 +523,13 @@ namespace Edu.WebApi.Controllers.Web
}; };
query.Group_Id = base.UserInfo.Group_Id; query.Group_Id = base.UserInfo.Group_Id;
var list = advisoryModule.GetWebAdvisoryPageModule(pageModel.PageIndex, pageModel.PageSize, out long rowsCount, query); var list = advisoryModule.GetWebAdvisoryPageModule(pageModel.PageIndex, pageModel.PageSize, out long rowsCount, query);
foreach (var item in list)
{
if (item.DealBy > 0)
{
item.DealByName = UserReidsCache.GetUserLoginInfo(item.DealBy)?.AccountName ?? "";
}
}
pageModel.Count = rowsCount; pageModel.Count = rowsCount;
pageModel.PageData = list; pageModel.PageData = list;
return ApiResult.Success(data: pageModel); return ApiResult.Success(data: pageModel);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment