Skip to content

E
Education
Commit 821f1d41 authored by 黄奎's avatar 黄奎
Browse files
Options

页面修改

parent 90bb36e6
Hide whitespace changes
Inline Side-by-side
Showing with 184 additions and 51 deletions
Edu.Model/Entity/Customer/RB_Customer_Task.cs
View file @ 821f1d41
......@@ -31,16 +31,6 @@ namespace Edu.Model.Entity.Customer
/// </summary>
public string TaskImage { get; set; }
/// <summary>
/// 任务奖品
/// </summary>
public string TaskKudo { get; set; }
/// <summary>
/// 奖品图片
/// </summary>
public string TaskKudoImg { get; set; }
/// <summary>
/// 任务描述
/// </summary>
......
Edu.Model/Entity/Customer/RB_Customer_TaskDetails.cs
View file @ 821f1d41
......@@ -23,6 +23,11 @@ namespace Edu.Model.Entity.Customer
/// </summary>
public int TaskId { get; set; }
/// <summary>
/// 条件名称
/// </summary>
public string DetailsName { get; set; }
/// <summary>
/// 任务类型(见枚举)
/// </summary>
......@@ -42,5 +47,20 @@ namespace Edu.Model.Entity.Customer
/// 任务完成值
/// </summary>
public decimal TaskFinishValue { get; set; }
/// <summary>
/// 任务奖品
/// </summary>
public string TaskKudo { get; set; }
/// <summary>
/// 奖品图片
/// </summary>
public string TaskKudoImg { get; set; }
/// <summary>
/// 奖品描述
/// </summary>
public string KudoDescription { get; set; }
}
}
Edu.Model/ViewModel/Customer/RB_Customer_TaskDetails_Extend.cs
View file @ 821f1d41
......@@ -33,6 +33,22 @@ namespace Edu.Model.ViewModel.Customer
}
}
/// <summary>
/// 奖品图片数组
/// </summary>
public List<string> TaskKudoImgList
{
get
{
List<string> list = new List<string>();
if (!string.IsNullOrEmpty(this.TaskKudoImg))
{
list = JsonHelper.DeserializeObject<List<string>>(this.TaskKudoImg);
}
return list;
}
}
/// <summary>
/// 目标列表
/// </summary>
......
Edu.Model/ViewModel/Customer/RB_Customer_Task_Extend.cs
View file @ 821f1d41
......@@ -51,21 +51,7 @@ namespace Edu.Model.ViewModel.Customer
}
}
/// <summary>
/// 奖品图片数组
/// </summary>
public List<string> TaskKudoImgList
{
get
{
List<string> list = new List<string>();
if (!string.IsNullOrEmpty(this.TaskKudoImg))
{
list = Common.Plugin.JsonHelper.DeserializeObject<List<string>>(this.TaskKudoImg);
}
return list;
}
}
/// <summary>
/// 兑换截止日期
......
Edu.Model/ViewModel/System/RB_Destination_ViewModel.cs
View file @ 821f1d41
......@@ -14,5 +14,20 @@
/// 多个编号【逗号分割】
/// </summary>
public string Ids { get; set; }
/// <summary>
/// 国家名称
/// </summary>
public string CountryName { get; set; }
/// <summary>
/// 省份名称
/// </summary>
public string ProvinceName { get; set; }
/// <summary>
/// 城市名称
/// </summary>
public string CityName { get; set; }
}
}
\ No newline at end of file
Edu.Module.Customer/CustomerTaskModule.cs
View file @ 821f1d41
......@@ -173,8 +173,6 @@ namespace Edu.Module.Customer
{nameof(RB_Customer_Task_Extend.TaskName),model.TaskName },
{nameof(RB_Customer_Task_Extend.TaskSubTitle),model.TaskSubTitle },
{nameof(RB_Customer_Task_Extend.TaskImage),model.TaskImage },
{nameof(RB_Customer_Task_Extend.TaskKudo),model.TaskKudo },
{nameof(RB_Customer_Task_Extend.TaskKudoImg),model.TaskKudoImg },
{nameof(RB_Customer_Task_Extend.TaskStartTime),model.TaskStartTime },
{nameof(RB_Customer_Task_Extend.TaskEndTime),model.TaskEndTime },
{nameof(RB_Customer_Task_Extend.TaskDesc),model.TaskDesc },
......@@ -234,7 +232,19 @@ namespace Edu.Module.Customer
}
else
{
detailsRepository.Update(item);
Dictionary<string, object> subFileds = new Dictionary<string, object>()
{
{nameof(RB_Customer_TaskDetails_Extend.TaskId),item.TaskId },
{nameof(RB_Customer_TaskDetails_Extend.DetailsName),item.DetailsName },
{nameof(RB_Customer_TaskDetails_Extend.TaskType),item.TaskType },
{nameof(RB_Customer_TaskDetails_Extend.TargetId),item.TargetId },
{nameof(RB_Customer_TaskDetails_Extend.TaskFinishType),item.TaskFinishType },
{nameof(RB_Customer_TaskDetails_Extend.TaskFinishValue),item.TaskFinishValue },
{nameof(RB_Customer_TaskDetails_Extend.TaskKudo),item.TaskKudo },
{nameof(RB_Customer_TaskDetails_Extend.TaskKudoImg),item.TaskKudoImg },
{nameof(RB_Customer_TaskDetails_Extend.KudoDescription),item.KudoDescription },
};
detailsRepository.Update(subFileds,new WhereHelper(nameof(RB_Customer_TaskDetails_Extend.DetailId),item.DetailId));
}
}
}
......
Edu.Module.System/DestinationModule.cs
View file @ 821f1d41
using Edu.Model.ViewModel.System;
using Edu.Model.Entity.System;
using Edu.Model.ViewModel.System;
using Edu.Repository.System;
using System.Collections.Generic;
using System.Linq;
......@@ -15,6 +16,58 @@ namespace Edu.Module.System
/// </summary>
private readonly RB_DestinationRepository destinationRepository = new RB_DestinationRepository();
/// <summary>
/// 获取地区分页列表
/// </summary>
/// <param name="pageIndex"></param>
/// <param name="pageSize"></param>
/// <param name="where"></param>
/// <param name="count"></param>
/// <returns></returns>
public List<RB_Destination_ViewModel> GetDestinationPageModule(int pageIndex, int pageSize, RB_Destination_ViewModel where, out long count)
{
var list = destinationRepository.GetDestinationPageRepository(pageIndex, pageSize, where, out count);
if (list != null && list.Count > 0)
{
string ids = string.Join(",", list.Select(qitem => qitem.ParentID));
var detailsList = destinationRepository.GetDestinationListRepository(new RB_Destination_ViewModel()
{
Ids = ids
});
foreach (var item in list)
{
RB_Destination_ViewModel country = null;
RB_Destination_ViewModel provice = null;
RB_Destination_ViewModel city = null;
switch (item.CodeLevel)
{
//省份
case 2:
country = detailsList.Where(qitem => qitem.ID == item.ParentID)?.FirstOrDefault();
item.CountryName = country?.Name;
break;
//市
case 3:
provice = detailsList.Where(qitem => qitem.ID == item.ParentID)?.FirstOrDefault();
item.ProvinceName = provice?.Name;
country = destinationRepository.GetEntity<RB_Destination_ViewModel>(provice?.ParentID);
item.CountryName = country?.Name;
break;
//区
case 4:
city = detailsList.Where(qitem => qitem.ID == item.ParentID)?.FirstOrDefault();
item.CityName = city?.Name;
provice = destinationRepository.GetEntity<RB_Destination_ViewModel>(city?.ParentID);
item.ProvinceName = provice?.Name;
country = destinationRepository.GetEntity<RB_Destination_ViewModel>(provice?.ParentID);
item.CountryName = country?.Name;
break;
}
}
}
return list;
}
/// <summary>
/// 省市区树形列表
/// </summary>
......
Edu.Repository/System/RB_DestinationRepository.cs
View file @ 821f1d41
......@@ -11,6 +11,32 @@ namespace Edu.Repository.System
/// </summary>
public class RB_DestinationRepository:BaseRepository<Model.Entity.System.RB_Destination>
{
/// <summary>
/// 获取地区分页列表
/// </summary>
/// <param name="pageIndex"></param>
/// <param name="pageSize"></param>
/// <param name="where"></param>
/// <param name="count"></param>
/// <returns></returns>
public List<RB_Destination_ViewModel> GetDestinationPageRepository(int pageIndex, int pageSize, RB_Destination_ViewModel where, out long count)
{
StringBuilder sb = new StringBuilder();
sb.AppendFormat(" SELECT * FROM RB_Destination WHERE 1=1 ");
sb.AppendFormat(" AND {0}={1} ", nameof(RB_Destination_ViewModel.Status), (int)Common.Enum.DateStateEnum.Normal);
if (where != null)
{
if (where.Name != null && !string.IsNullOrEmpty(where.Name.Trim()))
{
sb.AppendFormat(" AND {0} LIKE '%{1}%' ", nameof(RB_Destination_ViewModel.Name), where.Name.Trim());
}
}
sb.AppendFormat(" ORDER BY {0} ASC ", nameof(RB_Destination_ViewModel.ID));
return GetPage<RB_Destination_ViewModel>(pageIndex, pageSize, out count, sb.ToString()).ToList();
}
/// <summary>
/// 获取所有的地区数据列表
/// </summary>
......
Edu.WebApi/Controllers/Customer/B2BCustomerController.cs
View file @ 821f1d41
......@@ -202,7 +202,6 @@ namespace Edu.WebApi.Controllers.Customer
Id = base.ParmJObj.GetInt("Id"),
TaskName = base.ParmJObj.GetStringValue("TaskName"),
TaskSubTitle = base.ParmJObj.GetStringValue("TaskSubTitle"),
TaskKudo = base.ParmJObj.GetStringValue("TaskKudo"),
TaskStartTime = base.ParmJObj.GetDateTime("TaskStartTime"),
TaskEndTime = base.ParmJObj.GetDateTime("TaskEndTime"),
TaskDesc = base.ParmJObj.GetStringValue("TaskDesc"),
......@@ -216,14 +215,6 @@ namespace Edu.WebApi.Controllers.Customer
}
model.TaskImage = JsonHelper.Serialize(imgList);
string taskKudoImgList = base.ParmJObj.GetStringValue("TaskKudoImgList");
List<string> KudoImgList = new List<string>();
if (!string.IsNullOrEmpty(taskKudoImgList))
{
KudoImgList = JsonHelper.DeserializeObject<List<string>>(taskKudoImgList);
}
model.TaskKudoImg = JsonHelper.Serialize(KudoImgList);
model.Status = Common.Enum.DateStateEnum.Normal;
model.CreateBy = base.UserInfo.Id;
model.CreateTime = DateTime.Now;
......@@ -246,14 +237,24 @@ namespace Edu.WebApi.Controllers.Customer
{
targetIds = JsonHelper.DeserializeObject<List<string>>(targetIdList);
}
string taskKudoImageList = jobj.GetStringValue("TaskKudoImgList");
List<string> imgKudoList = new List<string>();
if (!string.IsNullOrEmpty(taskKudoImageList))
{
imgKudoList = JsonHelper.DeserializeObject<List<string>>(taskKudoImageList);
}
model.DetailsList.Add(new RB_Customer_TaskDetails_Extend()
{
DetailId = jobj.GetInt("DetailId"),
TaskId = jobj.GetInt("TaskId"),
DetailsName=jobj.GetStringValue("DetailsName"),
TaskType = (TaskTypeEnum)jobj.GetInt("TaskType"),
TargetId = string.Join(",", targetIds),
TaskFinishType = jobj.GetInt("TaskFinishType"),
TaskFinishValue = jobj.GetDecimal("TaskFinishValue"),
TaskKudo=jobj.GetStringValue("TaskKudo"),
TaskKudoImg= JsonHelper.Serialize(imgKudoList),
KudoDescription=jobj.GetStringValue("KudoDescription")
});
}
}
......@@ -262,18 +263,18 @@ namespace Edu.WebApi.Controllers.Customer
{
return ApiResult.ParamIsNull(message: "请添加任务类型!");
}
if (model.DetailsList != null)
{
var groupList = model.DetailsList.GroupBy(qitem => new { qitem.TaskType })
.Select(qitem => new { qitem.Key.TaskType, TaskTypeCount = qitem.Count() });
foreach (var item in groupList)
{
if (item.TaskTypeCount > 1)
{
return ApiResult.ParamIsNull(message: $"已经存在【{item.TaskType.ToName()}】类型，请重新选择!");
}
}
}
//if (model.DetailsList != null)
//{
// var groupList = model.DetailsList.GroupBy(qitem => new { qitem.TaskType })
// .Select(qitem => new { qitem.Key.TaskType, TaskTypeCount = qitem.Count() });
// foreach (var item in groupList)
// {
// if (item.TaskTypeCount > 1)
// {
// return ApiResult.ParamIsNull(message: $"已经存在【{item.TaskType.ToName()}】类型，请重新选择!");
// }
// }
//}
foreach (var item in model.DetailsList)
{
switch (item.TaskType)
......
Edu.WebApi/Controllers/Public/PublicController.cs
View file @ 821f1d41
......@@ -58,6 +58,20 @@ namespace Edu.WebApi.Controllers.Public
#region 省市区
[HttpPost]
public ApiResult GetAreaPage()
{
var pageModel = JsonHelper.DeserializeObject<ResultPageModel>(RequestParm.Msg.ToString());
var query = new RB_Destination_ViewModel()
{
Name = base.ParmJObj.GetStringValue("Name"),
};
var list = destinationModule.GetDestinationPageModule(pageModel.PageIndex, pageModel.PageSize, query, out long rowsCount);
pageModel.Count = rowsCount;
pageModel.PageData = list;
return ApiResult.Success(data: pageModel);
}
/// <summary>
/// 获取省市区树形列表
/// </summary>
......@@ -78,7 +92,8 @@ namespace Edu.WebApi.Controllers.Public
{
var query = new RB_Destination_ViewModel()
{
ParentID=0,
ParentID = 0,
CodeLevel = 1,
};
var list = destinationModule.GetAreaListModule(query);
return ApiResult.Success(data: list);
......
Edu.WebApi/Controllers/StudyAbroad/StudyAbroadController.cs
View file @ 821f1d41
......@@ -280,6 +280,7 @@ namespace Edu.WebApi.Controllers.StudyAbroad
item.ProductType,
ProductTypeName=item.ProductType.ToName(),
item.StudyFeature,
item.StudyCountryId
});
}
pageModel.Count = rowsCount;
......
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