Skip to content

M
mall.oytour.com
Commit cca0521e authored by 吴春's avatar 吴春
Browse files
Options

提交代码

parent a6b06b03
Hide whitespace changes
Inline Side-by-side
Showing with 556 additions and 80 deletions
Mall.Model/Entity/Education/RB_Education_ActivityPlan.cs 0 → 100644
View file @ cca0521e
using System;
using System.Collections.Generic;
using System.Text;
using VT.FW.DB;
namespace Mall.Model.Entity.Education
{
/// <summary>
/// 活动行程
/// </summary>
[Serializable]
[DB(ConnectionName = "DefaultConnection")]
public class RB_Education_ActivityPlan
{
/// <summary>
/// 活动行程id(主键)
/// </summary>
public int Id { get; set; }
/// <summary>
/// 活动id
/// </summary>
public int ActivityId { get; set; }
/// <summary>
/// 大标题id
/// </summary>
public int TitleId { get; set; }
/// <summary>
/// 排序
/// </summary>
public int TripSort { get; set; }
/// <summary>
/// 开始时间
/// </summary>
public string StartTime { get; set; }
/// <summary>
/// 活动时长
/// </summary>
public int ActivityDuration { get; set; }
/// <summary>
/// 经纬度（逗号分隔）
/// </summary>
public string LonLat { get; set; }
/// <summary>
/// 位置名称
/// </summary>
public string LocationName { get; set; }
/// <summary>
/// 标题
/// </summary>
public string TripTitle { get; set; }
/// <summary>
/// 内容
/// </summary>
public string TripContent { get; set; }
/// <summary>
/// 图片
/// </summary>
public string TripPic { get; set; }
/// <summary>
/// 商户号id
/// </summary>
public int TenantId { get; set; }
/// <summary>
/// 小程序id
/// </summary>
public int MallBaseId { get; set; }
/// <summary>
/// 删除状态
/// </summary>
public Common.Enum.DateStateEnum Status { get; set; }
}
}
Mall.Model/Entity/Education/RB_Education_ActivityTitle.cs 0 → 100644
View file @ cca0521e
using System;
using System.Collections.Generic;
using System.Text;
using VT.FW.DB;
namespace Mall.Model.Entity.Education
{
/// <summary>
/// 活动大标题实体
/// </summary>
[Serializable]
[DB(ConnectionName = "DefaultConnection")]
public class RB_Education_ActivityTitle
{
/// <summary>
/// 活动行程id(主键)
/// </summary>
public int Id { get; set; }
/// <summary>
/// 活动id
/// </summary>
public int ActivityId { get; set; }
/// <summary>
/// 大标题
/// </summary>
public string Title { get; set; }
/// <summary>
/// 排序
/// </summary>
public int TripSort { get; set; }
/// <summary>
/// 商户号id
/// </summary>
public int TenantId { get; set; }
/// <summary>
/// 小程序id
/// </summary>
public int MallBaseId { get; set; }
/// <summary>
/// 删除状态
/// </summary>
public Common.Enum.DateStateEnum Status { get; set; }
}
}
Mall.Model/Extend/Education/RB_Education_ActivityPlan_Extend.cs 0 → 100644
View file @ cca0521e
using System;
using System.Collections.Generic;
using System.Text;
using Mall.Model.Entity.Education;
namespace Mall.Model.Extend.Education
{
public class RB_Education_ActivityPlan_Extend : RB_Education_ActivityPlan
{
/// <summary>
/// 大标题ids
/// </summary>
public string TitleIds { get; set; }
/// <summary>
/// 活动安排图片
/// </summary>
public List<string> TripPicList { get; set; }
}
}
Mall.Model/Extend/Education/RB_Education_ActivityTitle_Extend.cs 0 → 100644
View file @ cca0521e
using System;
using System.Collections.Generic;
using System.Text;
using Mall.Model.Entity.Education;
namespace Mall.Model.Extend.Education
{
public class RB_Education_ActivityTitle_Extend : RB_Education_ActivityTitle
{
/// <summary>
/// 活动安排
/// </summary>
public List<RB_Education_ActivityPlan_Extend> ActivityPlanList { get; set; }
/// <summary>
/// 活动ids
/// </summary>
public string ActivityIds { get; set; }
}
}
Mall.Model/Extend/Education/RB_Education_Activity_Extend.cs
View file @ cca0521e
......@@ -181,9 +181,15 @@ namespace Mall.Model.Extend.Education
public string OrderByStr { get; set; }
/// <summary>
/// 0-即将开始，1-已结束
/// 0-（小程序是即将开始，后台是未开始），1-已结束,1-进行中
/// </summary>
public int SelectIsEnd { get; set; }
#endregion
/// <summary>
/// 活动安排 2021-06-25 Add By:W
/// </summary>
public List<RB_Education_ActivityTitle_Extend> ActivityTitleList { get; set; }
}
}
Mall.Module.Education/ActivityModule.cs
View file @ cca0521e
......@@ -11,6 +11,7 @@ using Mall.Model.Extend.Finance;
using Mall.Model.Extend.User;
using Mall.Repository.Education;
using Mall.Repository.Finance;
using Newtonsoft.Json;
using VT.FW.DB;
namespace Mall.Module.Education
......@@ -112,6 +113,21 @@ namespace Mall.Module.Education
/// 财务单据凭证仓储层对象
/// </summary>
private readonly RB_VoucherRepository voucherRepository = new RB_VoucherRepository();
/// <summary>
/// 活动大标题
/// </summary>
private readonly RB_Education_ActivityTitleRepository education_ActivityTitleRepository = new RB_Education_ActivityTitleRepository();
/// <summary>
/// 活动安排
/// </summary>
private readonly RB_Education_ActivityPlanRepository education_ActivityPlanRepository = new RB_Education_ActivityPlanRepository();
/// <summary>
#region 活动分类
/// <summary>
......@@ -226,6 +242,38 @@ namespace Mall.Module.Education
return list;
}
/// <summary>
/// 获取商会活动分页列表
/// </summary>
/// <param name="pageIndex"></param>
/// <param name="pageSize"></param>
/// <param name="rowsCount"></param>
/// <param name="query"></param>
/// <param name="isQuerySignup">是否查询报名名单</param>
/// <returns></returns>
public List<RB_Education_Activity_Extend> GetActivityPageListModule_V2(int pageIndex, int pageSize, out long rowsCount, RB_Education_Activity_Extend query, bool isQuerySignup = false)
{
var list = education_ActivityRepository.GetCommerceActivityPageListRepository_V2(pageIndex, pageSize, out rowsCount, query);
if (list != null && isQuerySignup)
{
string ids = string.Join(",", list.Select(qitem => qitem.Id));
List<RB_Education_Consult_Extend> joinList = new List<RB_Education_Consult_Extend>();
if (!string.IsNullOrEmpty(ids))
{
joinList = education_ConsultRepository.GetCommerceConsultListRepository(new RB_Education_Consult_Extend() { QActivityIds = ids, OrderStatus = 1, EnrollState = 1 });
}
foreach (var item in list)
{
item.EducationConsultList = joinList?.Where(qitem => qitem.ActivityId == item.Id)?.ToList() ?? new List<RB_Education_Consult_Extend>();
}
}
return list;
}
/// <summary>
/// 获取当前用户参加商会活动分页列表
/// </summary>
......@@ -249,9 +297,12 @@ namespace Mall.Module.Education
public bool SetActivityModule(RB_Education_Activity_Extend model)
{
bool flag;
if (model.Id > 0)
//var trans = education_ActivityRepository.DbTransaction;
try
{
Dictionary<string, object> fileds = new Dictionary<string, object>()
if (model.Id > 0)
{
Dictionary<string, object> fileds = new Dictionary<string, object>()
{
{nameof(RB_Education_Activity_Extend.ActivityName),model.ActivityName },
{nameof(RB_Education_Activity_Extend.StartTime),model.StartTime },
......@@ -270,7 +321,6 @@ namespace Mall.Module.Education
{nameof(RB_Education_Activity_Extend.AgeLimit),model.AgeLimit },
{nameof(RB_Education_Activity_Extend.StartAge),model.StartAge },
{nameof(RB_Education_Activity_Extend.EndAge),model.EndAge },
// {nameof(RB_Education_Activity_Extend.Label),model.Label },
{nameof(RB_Education_Activity_Extend.WoManNum),model.WoManNum },
{nameof(RB_Education_Activity_Extend.ManNum),model.ManNum },
{nameof(RB_Education_Activity_Extend.Distinguish),model.Distinguish },
......@@ -279,62 +329,123 @@ namespace Mall.Module.Education
{nameof(RB_Education_Activity_Extend.LnsideLimit),model.LnsideLimit },
};
flag = education_ActivityRepository.Update(fileds, new WhereHelper(nameof(RB_Education_Activity_Extend.Id), model.Id));
flag = education_ActivityRepository.Update(fileds, new WhereHelper(nameof(RB_Education_Activity_Extend.Id), model.Id));
//if (flag)
//{
// var titleList = education_ActivityTitleRepository.GetActivityTitleList(new RB_Education_ActivityTitle_Extend { ActivityId = model.Id, TenantId = model.TenantId, MallBaseId = model.MallBaseId });
// if (titleList != null && titleList.Any())
// {
// education_ActivityTitleRepository.DeleteBatch(titleList, trans);
// }
// var planList = education_ActivityPlanRepository.GetActivityPlanList(new RB_Education_ActivityPlan_Extend { ActivityId = model.Id, TenantId = model.TenantId, MallBaseId = model.MallBaseId });
// if (planList != null && planList.Any())
// {
// education_ActivityPlanRepository.DeleteBatch(planList, trans);
// }
//}
}
else
{
var newId = education_ActivityRepository.Insert(model);
model.Id = newId;
flag = newId > 0;
}
//if (flag && model.ActivityTitleList != null && model.ActivityTitleList.Any())
//{
// model.ActivityTitleList.ForEach(x => x.TenantId = model.TenantId);
// model.ActivityTitleList.ForEach(x => x.MallBaseId = model.MallBaseId);
// model.ActivityTitleList.ForEach(x => x.ActivityId = model.Id);
// model.ActivityTitleList.ForEach(x => x.Id = 0);
// model.ActivityTitleList.ForEach(x => x.Status = Common.Enum.DateStateEnum.Normal);
// foreach (var item in model.ActivityTitleList)
// {
// var titleId = education_ActivityTitleRepository.Insert(item, trans);
// if (item.ActivityPlanList != null && item.ActivityPlanList.Any())
// {
// item.ActivityPlanList.ForEach(x => x.Id = 0);
// item.ActivityPlanList.ForEach(x => x.TenantId = model.TenantId);
// item.ActivityPlanList.ForEach(x => x.MallBaseId = model.MallBaseId);
// item.ActivityPlanList.ForEach(x => x.ActivityId = model.Id);
// item.ActivityPlanList.ForEach(x => x.TitleId = titleId);
// item.ActivityPlanList.ForEach(x => x.TripPic = (x.TripPicList != null && x.TripPicList.Any()) ? JsonConvert.SerializeObject(x.TripPicList) : "");
// item.ActivityPlanList.ForEach(x => x.Status = Common.Enum.DateStateEnum.Normal);
// education_ActivityPlanRepository.InsertBatch(item.ActivityPlanList, trans);
// }
// }
//}
// education_ActivityRepository.DBSession.Commit();
return flag;
}
else
catch (Exception ex)
{
var newId = education_ActivityRepository.Insert(model);
model.Id = newId;
flag = newId > 0;
// education_ActivityRepository.DBSession.Rollback("SetActivityModule");
return false;
}
}
////原来的活动详情
//var oldDetailsList = GetCommerceDetailsListModule(new RB_Commerce_Details_Extend() { ActivityId = model.Id });
////以前没有活动详情【直接新增】
//if (oldDetailsList == null || (oldDetailsList != null && oldDetailsList.Count == 0))
//{
// if (model.CommerceDetailsList != null && model.CommerceDetailsList.Count > 0)
// {
// foreach (var item in model.CommerceDetailsList)
// {
// item.ActivityId = model.Id;
// detailsRepository.Insert(item);
// }
// }
//}
//else//以前有活动详情
//{
// //现在没有阶梯报价了【直接删除以前的阶梯报价】
// if (model.CommerceDetailsList == null || (model.CommerceDetailsList != null && model.CommerceDetailsList.Count == 0))
// {
// detailsRepository.DeleteCommerceDetailsRepository(model.Id);
// }
// //找出差异的数据
// var deleteList = oldDetailsList.Where(qitem => !model.CommerceDetailsList.Any(oldItem => qitem.ActivityId == oldItem.ActivityId)).ToList();
// foreach (var dItem in deleteList)
// {
// if (dItem.Id > 0)
// {
// detailsRepository.Delete(dItem.Id);
// }
// }
// foreach (var priceItem in model.CommerceDetailsList)
// {
// priceItem.ActivityId = model.Id;
// if (priceItem.Id == 0)
// {
// detailsRepository.Insert(priceItem);
// }
// else
// {
// detailsRepository.Update(priceItem);
// }
// }
//}
return flag;
/// <summary>
/// 新增修改商户活动
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
public bool SetActivityPlanModule(RB_Education_Activity_Extend model)
{
bool flag = false;
var trans = education_ActivityTitleRepository.DbTransaction;
try
{
var titleList = education_ActivityTitleRepository.GetActivityTitleList(new RB_Education_ActivityTitle_Extend { ActivityId = model.Id, TenantId = model.TenantId, MallBaseId = model.MallBaseId });
if (titleList != null && titleList.Any())
{
education_ActivityTitleRepository.DeleteBatch(titleList, trans);
}
var planList = education_ActivityPlanRepository.GetActivityPlanList(new RB_Education_ActivityPlan_Extend { ActivityId = model.Id, TenantId = model.TenantId, MallBaseId = model.MallBaseId });
if (planList != null && planList.Any())
{
education_ActivityPlanRepository.DeleteBatch(planList, trans);
}
if (model.ActivityTitleList != null && model.ActivityTitleList.Any())
{
model.ActivityTitleList.ForEach(x => x.TenantId = model.TenantId);
model.ActivityTitleList.ForEach(x => x.MallBaseId = model.MallBaseId);
model.ActivityTitleList.ForEach(x => x.ActivityId = model.Id);
model.ActivityTitleList.ForEach(x => x.Id = 0);
model.ActivityTitleList.ForEach(x => x.Status = Common.Enum.DateStateEnum.Normal);
foreach (var item in model.ActivityTitleList)
{
var titleId = education_ActivityTitleRepository.Insert(item, trans);
if (item.ActivityPlanList != null && item.ActivityPlanList.Any())
{
item.ActivityPlanList.ForEach(x => x.Id = 0);
item.ActivityPlanList.ForEach(x => x.TenantId = model.TenantId);
item.ActivityPlanList.ForEach(x => x.MallBaseId = model.MallBaseId);
item.ActivityPlanList.ForEach(x => x.ActivityId = model.Id);
item.ActivityPlanList.ForEach(x => x.TitleId = titleId);
item.ActivityPlanList.ForEach(x => x.TripPic = (x.TripPicList != null && x.TripPicList.Any()) ? JsonConvert.SerializeObject(x.TripPicList) : "");
item.ActivityPlanList.ForEach(x => x.Status = Common.Enum.DateStateEnum.Normal);
flag = education_ActivityPlanRepository.InsertBatch(item.ActivityPlanList, trans);
}
}
}
education_ActivityTitleRepository.DBSession.Commit();
return flag;
}
catch (Exception ex)
{
education_ActivityTitleRepository.DBSession.Rollback("SetActivityPlanModule");
return false;
}
}
/// <summary>
/// 获取修改商户活动详情
/// </summary>
......@@ -376,6 +487,34 @@ namespace Mall.Module.Education
return flag;
}
#region 活动安排
/// <summary>
/// 获取列表
/// </summary>
/// <param name="dmodel"></param>
/// <returns></returns>
public List<RB_Education_ActivityTitle_Extend> GetActivityTitleList(RB_Education_ActivityTitle_Extend query)
{
return education_ActivityTitleRepository.GetActivityTitleList(query);
}
/// <summary>
/// 获取列表
/// </summary>
/// <param name="dmodel"></param>
/// <returns></returns>
public List<RB_Education_ActivityPlan_Extend> GetActivityPlanList(RB_Education_ActivityPlan_Extend query)
{
return education_ActivityPlanRepository.GetActivityPlanList(query);
}
#endregion
#endregion
#region 活动报名
......
Mall.Repository/Education/RB_Education_ActivityPlanRepository.cs 0 → 100644
View file @ cca0521e
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using Mall.Common.Enum;
using Mall.Model.Entity.Education;
using Mall.Model.Extend.Education;
namespace Mall.Repository.Education
{
public class RB_Education_ActivityPlanRepository : BaseRepository<RB_Education_ActivityPlan>
{
/// <summary>
/// 获取列表
/// </summary>
/// <param name="dmodel"></param>
/// <returns></returns>
public List<RB_Education_ActivityPlan_Extend> GetActivityPlanList(RB_Education_ActivityPlan_Extend query)
{
StringBuilder builder = new StringBuilder();
builder.AppendFormat(@"
SELECT A.* FROM RB_Education_ActivityPlan AS A
WHERE 1=1
");
builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Education_ActivityPlan_Extend.Status), (int)DateStateEnum.Normal);
if (query == null)
{
return new List<RB_Education_ActivityPlan_Extend>();
}
else
{
if (query.TenantId > 0)
{
builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Education_ActivityPlan_Extend.TenantId), query.TenantId);
}
if (query.MallBaseId > 0)
{
builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Education_ActivityPlan_Extend.MallBaseId), query.MallBaseId);
}
if (query.ActivityId > 0)
{
builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Education_ActivityPlan_Extend.ActivityId), query.ActivityId);
}
if (!string.IsNullOrWhiteSpace(query.TitleIds))
{
builder.AppendFormat(" AND A.{0} in ({1}) ", nameof(RB_Education_ActivityPlan_Extend.TitleId), query.TitleIds);
}
}
return Get<RB_Education_ActivityPlan_Extend>(builder.ToString()).ToList();
}
}
}
Mall.Repository/Education/RB_Education_ActivityTitleRepository.cs 0 → 100644
View file @ cca0521e
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using Mall.Common.Enum;
using Mall.Model.Entity.Education;
using Mall.Model.Extend.Education;
namespace Mall.Repository.Education
{
public class RB_Education_ActivityTitleRepository : BaseRepository<RB_Education_ActivityTitle>
{
/// <summary>
/// 获取列表
/// </summary>
/// <param name="dmodel"></param>
/// <returns></returns>
public List<RB_Education_ActivityTitle_Extend> GetActivityTitleList(RB_Education_ActivityTitle_Extend query)
{
StringBuilder builder = new StringBuilder();
builder.AppendFormat(@"
SELECT A.* FROM RB_Education_ActivityTitle AS A
WHERE 1=1
");
builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Education_ActivityTitle_Extend.Status), (int)DateStateEnum.Normal);
if (query == null)
{
return new List<RB_Education_ActivityTitle_Extend>();
}
else
{
if (query.TenantId > 0)
{
builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Education_ActivityTitle_Extend.TenantId), query.TenantId);
}
if (query.MallBaseId > 0)
{
builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Education_ActivityTitle_Extend.MallBaseId), query.MallBaseId);
}
if (query.ActivityId > 0)
{
builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Education_ActivityTitle_Extend.ActivityId), query.ActivityId);
}
if (!string.IsNullOrWhiteSpace(query.ActivityIds))
{
builder.AppendFormat(" AND A.{0} in ({1}) ", nameof(RB_Education_ActivityTitle_Extend.ActivityId), query.ActivityIds);
}
}
return Get<RB_Education_ActivityTitle_Extend>(builder.ToString()).ToList();
}
}
}
Mall.WebApi/Controllers/Education/AppletEducationController.cs
View file @ cca0521e
......@@ -1890,11 +1890,21 @@ namespace Mall.WebApi.Controllers.Education
groupList = fileObjectList
});
}
//foreach (var item in fileList.GroupBy(x => x.Type))
//{
//}
model.ActivityTitleList = new List<RB_Education_ActivityTitle_Extend>();
model.ActivityTitleList = activityModule.GetActivityTitleList(new RB_Education_ActivityTitle_Extend { ActivityId = model.Id, TenantId = model.TenantId, MallBaseId = model.MallBaseId });
if (model.ActivityTitleList != null && model.ActivityTitleList.Any())
{
var planList = activityModule.GetActivityPlanList(new RB_Education_ActivityPlan_Extend { ActivityId = model.Id, TenantId = model.TenantId, MallBaseId = model.MallBaseId });
if (planList!=null&& planList.Any())
{
planList.ForEach(x => x.TripPicList = !string.IsNullOrWhiteSpace(x.TripPic) ? JsonConvert.DeserializeObject<List<string>>(x.TripPic) : new List<string>());
foreach (var item in model.ActivityTitleList)
{
item.ActivityPlanList = new List<RB_Education_ActivityPlan_Extend>();
item.ActivityPlanList = planList.Where(x => x.TitleId == item.Id).ToList();
}
}
}
var data = new
{
model.ActivityName,
......@@ -1912,7 +1922,7 @@ namespace Mall.WebApi.Controllers.Education
model.IsFree,
BMStart = model.SignStartTime.HasValue ? model.SignStartTime.Value.ToString("MM/dd HH:mm") : "",
BMEnd = model.SignEndTime.HasValue ? model.SignEndTime.Value.ToString("MM/dd HH:mm") : "",
HDStart = model.StartTime.ToString("HH:mm"),
HDStart = model.StartTime.ToString("MM/dd HH:mm"),
HDEnd = model.EndTime.ToString("MM/dd HH:mm"),
model.Id,
model.ActivityStatus,
......@@ -1927,7 +1937,8 @@ namespace Mall.WebApi.Controllers.Education
model.StartAge,
IsJoinActivity = (model.EducationConsultList.Where(x => x.UserId == userInfo.UserId) != null && model.EducationConsultList.Where(x => x.UserId == userInfo.UserId).Any()) ? 1 : 0,
model.Summary,
FileGroup = fileGroup
FileGroup = fileGroup,
ActivityTitleList = (model.ActivityTitleList != null && model.ActivityTitleList.Any()) ? model.ActivityTitleList : new List<RB_Education_ActivityTitle_Extend>()
};
return ApiResult.Success(data: data);
}
......
Mall.WebApi/Controllers/Education/EducationController.cs
View file @ cca0521e
......@@ -2124,6 +2124,33 @@ namespace Mall.WebApi.Controllers.Education
return flag ? ApiResult.Success() : ApiResult.Failed();
}
/// <summary>
/// 新增修改商会活动
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult GetSetActivityPlan()
{
JObject jObj = JObject.Parse(RequestParm.msg.ToString());
var extModel = new RB_Education_Activity_Extend()
{
Id = jObj.GetInt("Id"),
};
try
{
extModel.ActivityTitleList = JsonConvert.DeserializeObject<List<RB_Education_ActivityTitle_Extend>>(jObj.GetStringValue("ActivityTitle"));
}
catch (Exception ex)
{
extModel.ActivityTitleList = new List<RB_Education_ActivityTitle_Extend>();
}
extModel.MallBaseId = RequestParm.MallBaseId;
extModel.TenantId = RequestParm.TenantId;
var flag = activityModule.SetActivityPlanModule(extModel);
return flag ? ApiResult.Success() : ApiResult.Failed();
}
/// <summary>
/// 获取商会活动详情
/// </summary>
......@@ -2135,25 +2162,25 @@ namespace Mall.WebApi.Controllers.Education
var Id = parms.GetInt("Id", 0);
var extModel = activityModule.GetActivityModule(Id);
//if (extModel != null && extModel.Id > 0)
//{
// extModel.ActivityTitleList = new List<RB_Education_ActivityTitle_Extend>();
// extModel.ActivityTitleList = activityModule.GetActivityTitleList(new RB_Education_ActivityTitle_Extend { ActivityId = extModel.Id, TenantId = extModel.TenantId, MallBaseId = extModel.MallBaseId });
// if (extModel.ActivityTitleList != null && extModel.ActivityTitleList.Any())
// {
// var planList = activityModule.GetActivityPlanList(new RB_Education_ActivityPlan_Extend { ActivityId = extModel.Id, TenantId = extModel.TenantId, MallBaseId = extModel.MallBaseId });
// if (planList != null && planList.Any())
// {
// planList.ForEach(x => x.TripPicList = !string.IsNullOrWhiteSpace(x.TripPic) ? JsonConvert.DeserializeObject<List<string>>(x.TripPic) : new List<string>());
// foreach (var item in extModel.ActivityTitleList)
// {
// item.ActivityPlanList = new List<RB_Education_ActivityPlan_Extend>();
// item.ActivityPlanList = planList.Where(x => x.TitleId == item.Id).ToList();
// }
// }
// }
//}
if (extModel != null && extModel.Id > 0)
{
extModel.ActivityTitleList = new List<RB_Education_ActivityTitle_Extend>();
extModel.ActivityTitleList = activityModule.GetActivityTitleList(new RB_Education_ActivityTitle_Extend { ActivityId = extModel.Id, TenantId = extModel.TenantId, MallBaseId = extModel.MallBaseId });
if (extModel.ActivityTitleList != null && extModel.ActivityTitleList.Any())
{
var planList = activityModule.GetActivityPlanList(new RB_Education_ActivityPlan_Extend { ActivityId = extModel.Id, TenantId = extModel.TenantId, MallBaseId = extModel.MallBaseId });
if (planList != null && planList.Any())
{
planList.ForEach(x => x.TripPicList = !string.IsNullOrWhiteSpace(x.TripPic) ? JsonConvert.DeserializeObject<List<string>>(x.TripPic) : new List<string>());
foreach (var item in extModel.ActivityTitleList)
{
item.ActivityPlanList = new List<RB_Education_ActivityPlan_Extend>();
item.ActivityPlanList = planList.Where(x => x.TitleId == item.Id).ToList();
}
}
}
}
return ApiResult.Success(data: extModel);
}
......
Mall.WindowsService/Mall.WindowsService.csproj.user
View file @ cca0521e
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<_LastSelectedProfileId>D:\project\GitProject\Shopping\Mall.WindowsService\Properties\PublishProfiles\FolderProfile.pubxml</_LastSelectedProfileId>
<_LastSelectedProfileId>D:\project\GitProject\Mall\oldMall\Mall.WindowsService\Properties\PublishProfiles\FolderProfile.pubxml</_LastSelectedProfileId>
</PropertyGroup>
<ItemGroup>
<Compile Update="WindowsService.cs">
......
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