Commit 445f837d authored by 黄奎's avatar 黄奎

页面修改

parent cce26af2
......@@ -107,6 +107,32 @@ namespace Edu.Common
return timeStr;
}
/// <summary>
/// 格式化时间【yyyy-MM-dd】
/// </summary>
/// <param name="time"></param>
/// <returns></returns>
public static string FormatDate2(this object time)
{
string timeStr = "";
if (time != null)
{
try
{
timeStr = Convert.ToDateTime(time.ToString()).ToString("yyyy年MM月dd日");
if (timeStr == "0001-01-01")
{
timeStr = "";
}
}
catch
{
}
}
return timeStr;
}
/// <summary>
/// 字符串转List
/// </summary>
......
......@@ -87,6 +87,11 @@ namespace Edu.Model.CacheModel
/// </summary>
public string UserIcon { get; set; }
/// <summary>
/// 用户手机号码
/// </summary>
public string UserMobile { get; set; }
/// <summary>
/// 部门编号
/// </summary>
......
......@@ -15,6 +15,11 @@ namespace Edu.Model.ViewModel.Course
/// </summary>
public string CourseName { get; set; }
/// <summary>
/// 售价
/// </summary>
public decimal SellPrice { get; set; }
/// <summary>
/// 报价单编号【查询使用】
/// </summary>
......
......@@ -23,7 +23,7 @@ namespace Edu.Repository.Course
var parameters = new DynamicParameters();
StringBuilder builder = new StringBuilder();
builder.AppendFormat(@"
SELECT A.*,IFNULL(B.CourseName,'') AS CourseName
SELECT A.*,IFNULL(B.CourseName,'') AS CourseName,IFNULL(B.SellPrice,0) AS SellPrice
FROM RB_Course_OfferDetails AS A LEFT JOIN rb_course AS B ON A.CourseId=B.CourseId
WHERE 1=1
");
......
......@@ -154,7 +154,7 @@ namespace Edu.WebApi.Controllers.Course
extModel.School_Id = this.UserInfo.School_Id;
extModel.Status = Common.Enum.DateStateEnum.Normal;
bool flag = courseOfferModule.SetCourseOfferModule(extModel);
return flag ? ApiResult.Success() : ApiResult.Failed();
return flag ? ApiResult.Success(data:extModel.Id) : ApiResult.Failed();
}
/// <summary>
......@@ -166,6 +166,16 @@ namespace Edu.WebApi.Controllers.Course
{
var Id = base.ParmJObj.GetInt("Id", 0);
var extModel = courseOfferModule.GetCourseOfferModule(Id);
string CreateByName = "";
string CreateTel = "";
string CreateWeChatNo = "";
if (extModel != null && extModel.CreateBy > 0)
{
var user = UserReidsCache.GetUserLoginInfo(extModel.CreateBy);
CreateByName = user?.AccountName??"";
CreateTel = user?.UserMobile??"";
}
var obj = new
{
extModel?.Id,
......@@ -183,9 +193,12 @@ namespace Edu.WebApi.Controllers.Course
extModel?.CustomerTel,
extModel?.CustomerName,
extModel?.JoinNum,
CreateByName = extModel.CreateBy>0 ? UserReidsCache.GetUserLoginInfo(extModel.CreateBy)?.AccountName ?? "":"",
extModel?.SerialNum,
OfferDetails = extModel?.OfferDetails ?? new List<RB_Course_OfferDetails_ViewModel>()
OfferDetails = extModel?.OfferDetails ?? new List<RB_Course_OfferDetails_ViewModel>(),
CreateTime=Common.ConvertHelper.FormatDate2(extModel.CreateTime),
CreateByName,
CreateTel,
CreateWeChatNo
};
return ApiResult.Success(data: obj);
}
......
......@@ -116,6 +116,7 @@ namespace Edu.WebApi.Controllers.User
{
Id = model.Id,
AccountId = model.AccountId,
UserMobile=model.Account,
AccountType = model.AccountType,
Group_Id = model.Group_Id,
GroupName = model.GroupName,
......
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