Skip to content

M
mall.oytour.com
Commit d1bb566c authored by liudong1993's avatar liudong1993
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/Kui2/mall.oytour.com into sdzq-ld

parents 775e2488 55665ec6
Hide whitespace changes
Inline Side-by-side
Showing with 260 additions and 97 deletions
Mall.Common/Enum/MarketingCenter/FormTypeEnum.cs
View file @ d1bb566c
...@@ -12,10 +12,26 @@ namespace Mall.Common.Enum.MarketingCenter ...@@ -12,10 +12,26 @@ namespace Mall.Common.Enum.MarketingCenter
/// </summary> /// </summary>
[EnumField("用户信息")] [EnumField("用户信息")]
Base = 1, Base = 1,
/// <summary> /// <summary>
/// 问卷信息 /// 问卷信息
/// </summary> /// </summary>
[EnumField("问卷信息")] [EnumField("问卷信息")]
Survey = 2, Survey = 2,
[EnumField("课程安排与设计")]
CourseArrangement = 3,
[EnumField("教师授课情形")]
TeachersSituation = 4,
[EnumField("助教老师")]
TeachingAssistant = 5,
[EnumField("学习环境")]
LearningEnvironment = 6,
[EnumField("意见及建议")]
Opinionandsuggestion = 7
} }
} }
Mall.Common/Plugin/ConvertHelper.cs
View file @ d1bb566c
...@@ -86,7 +86,7 @@ namespace Mall.Common ...@@ -86,7 +86,7 @@ namespace Mall.Common
/// <returns></returns> /// <returns></returns>
public static T ConvertTo<T>(object obj) public static T ConvertTo<T>(object obj)
{ {
if (obj == null) return default(T);//返回默认值 if (obj == null) return default;//返回默认值
Type tp = typeof(T); Type tp = typeof(T);
//泛型Nullable判断，取其中的类型 //泛型Nullable判断，取其中的类型
if (tp.IsGenericType) if (tp.IsGenericType)
...@@ -111,11 +111,11 @@ namespace Mall.Common ...@@ -111,11 +111,11 @@ namespace Mall.Common
{ {
return (T)parameters[1]; return (T)parameters[1];
} }
return default(T); return default;
} }
catch catch
{ {
return default(T); return default;
} }
} }
...@@ -264,7 +264,7 @@ namespace Mall.Common ...@@ -264,7 +264,7 @@ namespace Mall.Common
} }
/// <summary> /// <summary>
/// 格式化时间【yyyy-MM-dd】 /// 格式化时间【yyyy-MM-dd HH:mm】
/// </summary> /// </summary>
/// <param name="time"></param> /// <param name="time"></param>
/// <returns></returns> /// <returns></returns>
......
Mall.Model/Entity/MarketingCenter/Rb_GuestSurvey.cs
View file @ d1bb566c
...@@ -18,9 +18,6 @@ namespace Mall.Model.Entity.MarketingCenter ...@@ -18,9 +18,6 @@ namespace Mall.Model.Entity.MarketingCenter
/// </summary> /// </summary>
public int ID { get; set; } public int ID { get; set; }
/// <summary> /// <summary>
/// 会员id /// 会员id
/// </summary> /// </summary>
...@@ -32,23 +29,14 @@ namespace Mall.Model.Entity.MarketingCenter ...@@ -32,23 +29,14 @@ namespace Mall.Model.Entity.MarketingCenter
public int ActivitySurveyId { get; set; } public int ActivitySurveyId { get; set; }
/// <summary> /// <summary>
/// /// 小程序编号
/// </summary> /// </summary>
public int MallBaseId public int MallBaseId { get; set; }
{
get;
set;
}
/// <summary> /// <summary>
/// /// 商户编号
/// </summary> /// </summary>
public int TenantId public int TenantId { get; set; }
{
get;
set;
}
/// <summary> /// <summary>
/// 创建时间 /// 创建时间
...@@ -60,8 +48,9 @@ namespace Mall.Model.Entity.MarketingCenter ...@@ -60,8 +48,9 @@ namespace Mall.Model.Entity.MarketingCenter
/// </summary> /// </summary>
public DateStateEnum State { get; set; } public DateStateEnum State { get; set; }
/// <summary>
/// 用户类型(1-小程序用户，2-教育学员)
/// </summary>
public int UserType { get; set; }
} }
} }
Mall.Model/Entity/MarketingCenter/Rb_Survey.cs
View file @ d1bb566c
...@@ -25,6 +25,7 @@ namespace Mall.Model.Entity.MarketingCenter ...@@ -25,6 +25,7 @@ namespace Mall.Model.Entity.MarketingCenter
/// 活动id /// 活动id
/// </summary> /// </summary>
public int ActivitySurveyId { get; set; } public int ActivitySurveyId { get; set; }
/// <summary> /// <summary>
///意见调查类型 ///意见调查类型
/// </summary> /// </summary>
......
Mall.Module.MarketingCenter/SurveyModule.cs
View file @ d1bb566c
...@@ -5,7 +5,9 @@ using System.Text; ...@@ -5,7 +5,9 @@ using System.Text;
using Mall.Common.Enum.MarketingCenter; using Mall.Common.Enum.MarketingCenter;
using Mall.Common.Plugin; using Mall.Common.Plugin;
using Mall.Model.Entity.MarketingCenter; using Mall.Model.Entity.MarketingCenter;
using Mall.Model.Extend.Education;
using Mall.Model.Extend.MarketingCenter; using Mall.Model.Extend.MarketingCenter;
using Mall.Repository.Education;
using Mall.Repository.MarketingCenter; using Mall.Repository.MarketingCenter;
using VT.FW.DB; using VT.FW.DB;
...@@ -30,6 +32,11 @@ namespace Mall.Module.MarketingCenter ...@@ -30,6 +32,11 @@ namespace Mall.Module.MarketingCenter
public readonly RB_ActivitySurveyRepository activitySurveyRepository = new RB_ActivitySurveyRepository(); public readonly RB_ActivitySurveyRepository activitySurveyRepository = new RB_ActivitySurveyRepository();
/// <summary>
/// 教育系统用户账号信息
/// </summary>
private readonly RB_AccountRepository accountRepository = new RB_AccountRepository();
#region 问卷调查活动管理 #region 问卷调查活动管理
/// <summary> /// <summary>
/// 获取列表 /// 获取列表
...@@ -424,7 +431,7 @@ namespace Mall.Module.MarketingCenter ...@@ -424,7 +431,7 @@ namespace Mall.Module.MarketingCenter
public int SetGuestSurvey(Rb_GuestSurvey_Extend model) public int SetGuestSurvey(Rb_GuestSurvey_Extend model)
{ {
var trans = guestSurveyRepository.DbTransaction; var trans = guestSurveyRepository.DbTransaction;
int surveyId = 0; int surveyId;
try try
{ {
...@@ -460,7 +467,7 @@ namespace Mall.Module.MarketingCenter ...@@ -460,7 +467,7 @@ namespace Mall.Module.MarketingCenter
public bool SetBbatchGuestSurvey(List<Rb_GuestSurvey_Extend> list) public bool SetBbatchGuestSurvey(List<Rb_GuestSurvey_Extend> list)
{ {
var trans = guestSurveyRepository.DbTransaction; var trans = guestSurveyRepository.DbTransaction;
int surveyId = 0; int surveyId;
try try
{ {
foreach (var itemModel in list) foreach (var itemModel in list)
...@@ -496,9 +503,9 @@ namespace Mall.Module.MarketingCenter ...@@ -496,9 +503,9 @@ namespace Mall.Module.MarketingCenter
/// </summary> /// </summary>
/// <param name="where"></param> /// <param name="where"></param>
/// <returns></returns> /// <returns></returns>
public List<Rb_GuestSurvey_Extend> GetGuestSurveyList(Rb_GuestSurvey_Extend where) public List<Rb_GuestSurvey_Extend> GetGuestSurveyListModule(Rb_GuestSurvey_Extend where)
{ {
return guestSurveyRepository.GetList(where); return guestSurveyRepository.GetGuestSurveyListRepository(where);
} }
...@@ -510,9 +517,49 @@ namespace Mall.Module.MarketingCenter ...@@ -510,9 +517,49 @@ namespace Mall.Module.MarketingCenter
/// <param name="rowsCount"></param> /// <param name="rowsCount"></param>
/// <param name="where"></param> /// <param name="where"></param>
/// <returns></returns> /// <returns></returns>
public List<Rb_GuestSurvey_Extend> GetResultPageList(int pageIndex, int pageSize, out long rowsCount, Rb_GuestSurvey_Extend where) public List<Rb_GuestSurvey_Extend> GetResultPageListModule(int pageIndex, int pageSize, out long rowsCount, Rb_GuestSurvey_Extend where)
{ {
return guestSurveyRepository.GetResultPageList(pageIndex, pageSize, out rowsCount, where); var list= guestSurveyRepository.GetResultPageListRepository(pageIndex, pageSize, out rowsCount, where);
if (list != null && list.Count > 0)
{
string stuIds = string.Join(",", list.Where(qitem => qitem.UserType == 2).Select(qitem => qitem.UserId));
List<RB_Account_ViewModel> StuList = new List<RB_Account_ViewModel>();
if (!string.IsNullOrEmpty(stuIds))
{
StuList= accountRepository.GetStudentExt(new RB_Account_ViewModel()
{
QIds = stuIds
});
}
foreach (var item in list)
{
if (item.UserType == 2)
{
var tempModel = StuList?.FirstOrDefault(qitem => qitem.Id == item.UserId);
item.AliasName = tempModel?.AccountName ?? "";
item.Photo = tempModel?.UserIcon ?? "";
}
}
}
return list;
}
/// <summary>
/// 获取教育学员信息
/// </summary>
/// <param name="stuIds"></param>
/// <returns></returns>
public RB_Account_ViewModel GetEduStudentModule(string stuIds)
{
List<RB_Account_ViewModel> StuList = new List<RB_Account_ViewModel>();
if (!string.IsNullOrEmpty(stuIds))
{
StuList = accountRepository.GetStudentExt(new RB_Account_ViewModel()
{
QIds = stuIds
});
}
return StuList.FirstOrDefault();
} }
#endregion #endregion
} }
......
Mall.Repository/MarketingCenter/Rb_GuestSurveyRepository.cs
View file @ d1bb566c
...@@ -7,7 +7,7 @@ using Mall.Model.Extend.MarketingCenter; ...@@ -7,7 +7,7 @@ using Mall.Model.Extend.MarketingCenter;
namespace Mall.Repository.MarketingCenter namespace Mall.Repository.MarketingCenter
{ {
public class Rb_GuestSurveyRepository:BaseRepository<Rb_GuestSurvey> public class Rb_GuestSurveyRepository : BaseRepository<Rb_GuestSurvey>
{ {
/// <summary> /// <summary>
/// 表名称 /// 表名称
...@@ -20,7 +20,7 @@ namespace Mall.Repository.MarketingCenter ...@@ -20,7 +20,7 @@ namespace Mall.Repository.MarketingCenter
/// </summary> /// </summary>
/// <param name="where"></param> /// <param name="where"></param>
/// <returns></returns> /// <returns></returns>
public List<Rb_GuestSurvey_Extend> GetList(Rb_GuestSurvey_Extend where) public List<Rb_GuestSurvey_Extend> GetGuestSurveyListRepository(Rb_GuestSurvey_Extend where)
{ {
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
sb.Append($@"SELECT * from Rb_GuestSurvey where state=0"); sb.Append($@"SELECT * from Rb_GuestSurvey where state=0");
...@@ -42,6 +42,10 @@ namespace Mall.Repository.MarketingCenter ...@@ -42,6 +42,10 @@ namespace Mall.Repository.MarketingCenter
{ {
sb.AppendFormat(" and ActivitySurveyId={0}", where.ActivitySurveyId); sb.AppendFormat(" and ActivitySurveyId={0}", where.ActivitySurveyId);
} }
if (where.UserType > 0)
{
sb.AppendFormat(" and UserType={0}", where.UserType);
}
} }
return Get<Rb_GuestSurvey_Extend>(sb.ToString()).ToList(); return Get<Rb_GuestSurvey_Extend>(sb.ToString()).ToList();
} }
...@@ -82,7 +86,7 @@ LEFT JOIN (SELECT GuestSurveyId , SUM(ScoreNum) as ScoreNum,COUNT(GuestSurveyId) ...@@ -82,7 +86,7 @@ LEFT JOIN (SELECT GuestSurveyId , SUM(ScoreNum) as ScoreNum,COUNT(GuestSurveyId)
} }
/// <summary> /// <summary>
/// 分页列表 /// 分页列表
...@@ -92,11 +96,14 @@ LEFT JOIN (SELECT GuestSurveyId , SUM(ScoreNum) as ScoreNum,COUNT(GuestSurveyId) ...@@ -92,11 +96,14 @@ LEFT JOIN (SELECT GuestSurveyId , SUM(ScoreNum) as ScoreNum,COUNT(GuestSurveyId)
/// <param name="rowsCount"></param> /// <param name="rowsCount"></param>
/// <param name="where"></param> /// <param name="where"></param>
/// <returns></returns> /// <returns></returns>
public List<Rb_GuestSurvey_Extend> GetResultPageList(int pageIndex, int pageSize, out long rowsCount, Rb_GuestSurvey_Extend where) public List<Rb_GuestSurvey_Extend> GetResultPageListRepository(int pageIndex, int pageSize, out long rowsCount, Rb_GuestSurvey_Extend where)
{ {
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
sb.Append($@"SELECT a.*,b.Name as AliasName,b.Photo,c.Title as ActiveSurveyName from Rb_GuestSurvey as a LEFT JOIN rb_member_user as b on a.UserId=b.Id sb.Append($@"
LEFT JOIN rb_activitysurvey as c on c.ID=a.ActivitySurveyId where a.state=0"); SELECT a.*,b.Name as AliasName,b.Photo,c.Title as ActiveSurveyName
FROM Rb_GuestSurvey as a LEFT JOIN rb_member_user as b on (a.UserId=b.Id AND A.UserType=1)
LEFT JOIN rb_activitysurvey as c on c.ID=a.ActivitySurveyId
WHERE a.state=0");
if (where != null) if (where != null)
{ {
if (where.MallBaseId > 0) if (where.MallBaseId > 0)
...@@ -128,6 +135,7 @@ LEFT JOIN rb_activitysurvey as c on c.ID=a.ActivitySurveyId where a.state=0"); ...@@ -128,6 +135,7 @@ LEFT JOIN rb_activitysurvey as c on c.ID=a.ActivitySurveyId where a.state=0");
sb.AppendFormat(" and DATE_FORMAT(a.CreateDate,'%Y-%m-%d' )<= DATE_FORMAT('{0}','%Y-%m-%d' ) ", where.EndDate); sb.AppendFormat(" and DATE_FORMAT(a.CreateDate,'%Y-%m-%d' )<= DATE_FORMAT('{0}','%Y-%m-%d' ) ", where.EndDate);
} }
} }
sb.AppendFormat(" ORDER BY A.{0} DESC ", nameof(Rb_GuestSurvey_Extend.ID));
return GetPage<Rb_GuestSurvey_Extend>(pageIndex, pageSize, out rowsCount, sb.ToString()).ToList(); return GetPage<Rb_GuestSurvey_Extend>(pageIndex, pageSize, out rowsCount, sb.ToString()).ToList();
} }
......
Mall.Repository/Product/RB_Goods_OrderRepository.cs
View file @ d1bb566c
...@@ -1027,7 +1027,7 @@ SELECT 0 as Total,0 as MemberNum, 0 as GoodsNum,0 as OrderNum, ...@@ -1027,7 +1027,7 @@ SELECT 0 as Total,0 as MemberNum, 0 as GoodsNum,0 as OrderNum,
//string payMemerNumWhere = $" and (OrderStatus in(2,3,4,6,5) or( {nameof(RB_Goods_Order.OrderStatus)}=7 and {nameof(RB_Goods_Order.PaymentTime)} is not NULL)) "; //string payMemerNumWhere = $" and (OrderStatus in(2,3,4,6,5) or( {nameof(RB_Goods_Order.OrderStatus)}=7 and {nameof(RB_Goods_Order.PaymentTime)} is not NULL)) ";
string payMemerNumWhere = " and (OrderStatus in(2,3,4,5,6) or (OrderStatus=7 and PaymentTime is not NULL and CancelTime is not NULL and DATE_FORMAT(PaymentTime,'%Y-%m-%d' )<DATE_FORMAT(CancelTime,'%Y-%m-%d' ) ) ) "; string payMemerNumWhere = " and (OrderStatus in(2,3,4,5,6) or (OrderStatus=7 and PaymentTime is not NULL and CancelTime is not NULL and DATE_FORMAT(PaymentTime,'%Y-%m-%d' )<DATE_FORMAT(CancelTime,'%Y-%m-%d' ) ) ) ";
string orderTypeWhere = ""; string orderTypeWhere = "";
string sql = ""; string sql;
if (dmodel.TenantId > 0) if (dmodel.TenantId > 0)
{ {
where += $@" and a.{nameof(RB_Goods_Order.TenantId)}={dmodel.TenantId}"; where += $@" and a.{nameof(RB_Goods_Order.TenantId)}={dmodel.TenantId}";
...@@ -2136,7 +2136,7 @@ GROUP BY od.GoodsId,o.OrderId ...@@ -2136,7 +2136,7 @@ GROUP BY od.GoodsId,o.OrderId
/// <returns></returns> /// <returns></returns>
public List<RB_Goods_Order_Extend> GetCanCancelOrderList(int cancelTime, int t, int m) public List<RB_Goods_Order_Extend> GetCanCancelOrderList(int cancelTime, int t, int m)
{ {
string sql = $@"SELECT OrderId,UserId,OrderNo,OrderSource,CouponsIds FROM rb_goods_order where TenantId ={t} and MallBaseId ={m} and `Status`=0 and OrderStatus =1 and DATE_ADD(CreateDate,INTERVAL {cancelTime} MINUTE) < '{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}'"; string sql = $@"SELECT OrderId,UserId,OrderNo,OrderSource,CouponsIds FROM rb_goods_order where TenantId ={t} and MallBaseId ={m} and `Status`=0 and OrderStatus =1 and DATE_ADD(CreateDate,INTERVAL {cancelTime} MINUTE) < '{Common.ConvertHelper.FormatTime(DateTime.Now)}'";
return Get<RB_Goods_Order_Extend>(sql).ToList(); return Get<RB_Goods_Order_Extend>(sql).ToList();
} }
...@@ -2149,7 +2149,7 @@ GROUP BY od.GoodsId,o.OrderId ...@@ -2149,7 +2149,7 @@ GROUP BY od.GoodsId,o.OrderId
/// <returns></returns> /// <returns></returns>
public List<RB_Goods_Order_Extend> GetCanReceivingOrderList(int day, int t, int m) public List<RB_Goods_Order_Extend> GetCanReceivingOrderList(int day, int t, int m)
{ {
string sql = $@"SELECT OrderId,UserId,OrderNo,OrderSource,CouponsIds FROM rb_goods_order where TenantId ={t} and MallBaseId ={m} and `Status`=0 and OrderStatus =3 and OrderClassify=0 and DATE_ADD(DeliveryTime,INTERVAL {day} DAY) < '{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}'"; string sql = $@"SELECT OrderId,UserId,OrderNo,OrderSource,CouponsIds FROM rb_goods_order where TenantId ={t} and MallBaseId ={m} and `Status`=0 and OrderStatus =3 and OrderClassify=0 and DATE_ADD(DeliveryTime,INTERVAL {day} DAY) < '{Common.ConvertHelper.FormatTime(DateTime.Now)}'";
return Get<RB_Goods_Order_Extend>(sql).ToList(); return Get<RB_Goods_Order_Extend>(sql).ToList();
} }
#endregion #endregion
...@@ -2385,7 +2385,7 @@ where {where} group by o.OrderId order by o.CreateDate desc"; ...@@ -2385,7 +2385,7 @@ where {where} group by o.OrderId order by o.CreateDate desc";
string sql = $@" string sql = $@"
SELECT o.* FROM rb_goods_order o SELECT o.* FROM rb_goods_order o
INNER JOIN rb_goods_orderdetail od on o.OrderId = od.OrderId INNER JOIN rb_goods_orderdetail od on o.OrderId = od.OrderId
WHERE o.TenantId={tenantId} AND o.MallBaseId={mallBaseId} AND o.`Status`=0 AND o.Recycled=2 AND o.OrderStatus =4 AND o.OrderClassify =1 AND od.TripETime < '{DateTime.Now.ToString("yyyy-MM-dd")}' WHERE o.TenantId={tenantId} AND o.MallBaseId={mallBaseId} AND o.`Status`=0 AND o.Recycled=2 AND o.OrderStatus =4 AND o.OrderClassify =1 AND od.TripETime < '{Common.ConvertHelper.FormatDate(DateTime.Now)}'
GROUP BY o.OrderId GROUP BY o.OrderId
"; ";
return Get<RB_Goods_Order_Extend>(sql).ToList(); return Get<RB_Goods_Order_Extend>(sql).ToList();
...@@ -2665,8 +2665,8 @@ WHERE {where} GROUP BY o.OrderId ORDER BY o.CreateDate DESC "; ...@@ -2665,8 +2665,8 @@ WHERE {where} GROUP BY o.OrderId ORDER BY o.CreateDate DESC ";
public List<RB_Goods_Activity_Extend> GetGoodsNumForCategoryOrGoods(RB_Goods_Activity_Extend dmodel, int UserId, int AfterTime) public List<RB_Goods_Activity_Extend> GetGoodsNumForCategoryOrGoods(RB_Goods_Activity_Extend dmodel, int UserId, int AfterTime)
{ {
string where = @$"AND o.`Status` =0 AND o.Recycled=2 AND o.OrderStatus =5 and oa.ReOrderId is null string where = @$"AND o.`Status` =0 AND o.Recycled=2 AND o.OrderStatus =5 and oa.ReOrderId is null
AND o.CreateDate >='{dmodel.StartTime.ToString("yyyy-MM-dd")}' AND o.CreateDate <='{dmodel.EndTime.ToString("yyyy-MM-dd HH:mm:ss")}' AND o.CreateDate >='{Common.ConvertHelper.FormatDate(dmodel.StartTime)}' AND o.CreateDate <='{Common.ConvertHelper.FormatTime(dmodel.EndTime)}'
AND o.ReceivingTime <='{DateTime.Now.AddDays(0 - AfterTime).ToString("yyyy-MM-dd HH:mm:ss")}' AND o.ReceivingTime <='{Common.ConvertHelper.FormatTime(DateTime.Now.AddDays(0 - AfterTime))}'
AND IFNULL(o.{(dmodel.ActiveObject == 1 ? "DistributorTree" : "UserTree")},'') <> '' "; AND IFNULL(o.{(dmodel.ActiveObject == 1 ? "DistributorTree" : "UserTree")},'') <> '' ";
if (UserId > 0) if (UserId > 0)
{ {
...@@ -2707,7 +2707,7 @@ GROUP BY od.Id "; ...@@ -2707,7 +2707,7 @@ GROUP BY od.Id ";
public List<RB_Goods_Activity_Extend> GetGoodsNumForCategoryOrGoods_V2(RB_Goods_Activity_Extend dmodel, int UserId, int AfterTime) public List<RB_Goods_Activity_Extend> GetGoodsNumForCategoryOrGoods_V2(RB_Goods_Activity_Extend dmodel, int UserId, int AfterTime)
{ {
string where = @$"AND o.`Status` =0 AND o.Recycled=2 AND o.OrderStatus in(2,3,4,5,6) and oa.ReOrderId is null string where = @$"AND o.`Status` =0 AND o.Recycled=2 AND o.OrderStatus in(2,3,4,5,6) and oa.ReOrderId is null
AND o.CreateDate >='{dmodel.StartTime.ToString("yyyy-MM-dd")}' AND o.CreateDate <='{dmodel.EndTime.ToString("yyyy-MM-dd HH:mm:ss")}' AND o.CreateDate >='{Common.ConvertHelper.FormatDate(dmodel.StartTime)}' AND o.CreateDate <='{Common.ConvertHelper.FormatTime(dmodel.EndTime)}'
AND IFNULL(o.{(dmodel.ActiveObject == 1 ? "DistributorTree" : "UserTree")},'') <> '' "; AND IFNULL(o.{(dmodel.ActiveObject == 1 ? "DistributorTree" : "UserTree")},'') <> '' ";
if (UserId > 0) if (UserId > 0)
{ {
......
Mall.WebApi/Controllers/Education/AppletEducationController.cs
View file @ d1bb566c
...@@ -1138,17 +1138,69 @@ namespace Mall.WebApi.Controllers.Education ...@@ -1138,17 +1138,69 @@ namespace Mall.WebApi.Controllers.Education
/// <param name="request"></param> /// <param name="request"></param>
/// <returns></returns> /// <returns></returns>
[HttpPost] [HttpPost]
[AllowAnonymous]
public ApiResult SetGuestSurvey() public ApiResult SetGuestSurvey()
{ {
var req = RequestParm; JObject jObj = JObject.Parse(RequestParm.msg.ToString());
var userInfo = AppletUserInfo; var userInfo = new AppletUserInfo();
List<Rb_Survey_Extend> modelSurvey = JsonConvert.DeserializeObject<List<Rb_Survey_Extend>>(req.msg.ToString()); if (base.AppletUserInfo != null)
{
userInfo = base.AppletUserInfo;
}
else
{
userInfo = new AppletUserInfo()
{
TenantId = RequestParm.TenantId,
MallBaseId = RequestParm.MallBaseId,
EduStudentId = RequestParm.EduStudentId,
};
}
List<Rb_Survey_Extend> modelSurvey = new List<Rb_Survey_Extend>();
string baseListStr = jObj.GetStringValue("BaseList");
if (!string.IsNullOrEmpty(baseListStr))
{
modelSurvey.AddRange(JsonHelper.DeserializeObject<List<Rb_Survey_Extend>>(baseListStr));
}
string courseArrangementListStr = jObj.GetStringValue("CourseArrangementList");
if (!string.IsNullOrEmpty(courseArrangementListStr))
{
modelSurvey.AddRange(JsonHelper.DeserializeObject<List<Rb_Survey_Extend>>(courseArrangementListStr));
}
string learningEnvironmentListStr = jObj.GetStringValue("LearningEnvironmentList");
if (!string.IsNullOrEmpty(learningEnvironmentListStr))
{
modelSurvey.AddRange(JsonHelper.DeserializeObject<List<Rb_Survey_Extend>>(learningEnvironmentListStr));
}
string opinionandsuggestionListStr = jObj.GetStringValue("OpinionandsuggestionList");
if (!string.IsNullOrEmpty(opinionandsuggestionListStr))
{
modelSurvey.AddRange(JsonHelper.DeserializeObject<List<Rb_Survey_Extend>>(opinionandsuggestionListStr));
}
string teachersSituationListStr = jObj.GetStringValue("TeachersSituationList");
if (!string.IsNullOrEmpty(teachersSituationListStr))
{
modelSurvey.AddRange(JsonHelper.DeserializeObject<List<Rb_Survey_Extend>>(teachersSituationListStr));
}
string teachingAssistantListStr = jObj.GetStringValue("TeachingAssistantList");
if (!string.IsNullOrEmpty(teachingAssistantListStr))
{
modelSurvey.AddRange(JsonHelper.DeserializeObject<List<Rb_Survey_Extend>>(teachingAssistantListStr));
}
if (modelSurvey == null || !modelSurvey.Any()) if (modelSurvey == null || !modelSurvey.Any())
{ {
return ApiResult.Failed("选项信息不能空"); return ApiResult.Failed("选项信息不能空");
} }
Rb_GuestSurvey_Extend model = new Rb_GuestSurvey_Extend(); Rb_GuestSurvey_Extend model = new Rb_GuestSurvey_Extend()
{
UserType = jObj.GetInt("UserType"),
};
if ((modelSurvey.FirstOrDefault()?.ActivitySurveyId ?? 0) == 0) if ((modelSurvey.FirstOrDefault()?.ActivitySurveyId ?? 0) == 0)
{ {
return ApiResult.Failed("请选择活动对应的问卷信息"); return ApiResult.Failed("请选择活动对应的问卷信息");
...@@ -1161,7 +1213,13 @@ namespace Mall.WebApi.Controllers.Education ...@@ -1161,7 +1213,13 @@ namespace Mall.WebApi.Controllers.Education
} }
//先判断是否已添加 //先判断是否已添加
var GuestSurvey = surveyModule.GetGuestSurveyList(new Rb_GuestSurvey_Extend { ActivitySurveyId = modelSurvey.FirstOrDefault()?.ActivitySurveyId ?? 0, TenantId = userInfo.TenantId, MallBaseId = userInfo.MallBaseId }); var GuestSurvey = surveyModule.GetGuestSurveyListModule(new Rb_GuestSurvey_Extend
{
ActivitySurveyId = modelSurvey.FirstOrDefault()?.ActivitySurveyId ?? 0,
TenantId = userInfo.TenantId,
MallBaseId = userInfo.MallBaseId,
UserType = model.UserType,
});
if (activeSurueyModel.StartDate.HasValue && activeSurueyModel.EndDate.HasValue) if (activeSurueyModel.StartDate.HasValue && activeSurueyModel.EndDate.HasValue)
{ {
...@@ -1174,16 +1232,24 @@ namespace Mall.WebApi.Controllers.Education ...@@ -1174,16 +1232,24 @@ namespace Mall.WebApi.Controllers.Education
return ApiResult.Failed("问卷调查活动已结束"); return ApiResult.Failed("问卷调查活动已结束");
} }
} }
//if (activeSurueyModel.SurveyNum != -1 && activeSurueyModel.SurveyNum <= GuestSurvey.Count())
//{
// return ApiResult.Failed(activeSurueyModel.SurveyNum + "份问卷调查已填写完"); if (base.AppletUserInfo != null)
//}
if (GuestSurvey.Where(x => x.UserId == userInfo.UserId).Count() > 0)
{ {
return ApiResult.Failed("请勿重复参与问卷调查"); if (GuestSurvey.Where(x => x.UserId == userInfo.UserId && x.UserType == 1).Count() > 0)
{
return ApiResult.Failed("请勿重复参与问卷调查");
}
model.UserId = userInfo.UserId;
}
else
{
if (GuestSurvey.Where(x => x.UserId == userInfo.EduStudentId && x.UserType == 2).Count() > 0)
{
return ApiResult.Failed("请勿重复参与问卷调查");
}
model.UserId = userInfo.EduStudentId;
} }
model.UserId = userInfo.UserId;
model.TenantId = userInfo.TenantId; model.TenantId = userInfo.TenantId;
model.MallBaseId = userInfo.MallBaseId; model.MallBaseId = userInfo.MallBaseId;
model.CreateDate = System.DateTime.Now; model.CreateDate = System.DateTime.Now;
...@@ -1250,29 +1316,35 @@ namespace Mall.WebApi.Controllers.Education ...@@ -1250,29 +1316,35 @@ namespace Mall.WebApi.Controllers.Education
} }
model.SurveyOptionsList.Add(modelSurveyOptions); model.SurveyOptionsList.Add(modelSurveyOptions);
} }
int flag = surveyModule.SetGuestSurvey(model); int flag = surveyModule.SetGuestSurvey(model);
if (flag > 0) return flag > 0 ? ApiResult.Success() : ApiResult.Failed("问卷调查提交失败");
{
return ApiResult.Success();
}
else
return ApiResult.Failed("问卷调查提交失败");
} }
/// <summary> /// <summary>
/// 获取会员调查问题列表 /// 获取会员调查问题列表
/// </summary> /// </summary>
/// <param name="request"></param> /// <param name="request"></param>
/// <returns></returns> /// <returns></returns>
[HttpPost] [HttpPost]
[AllowAnonymous]
public ApiResult GetSurveyShowList() public ApiResult GetSurveyShowList()
{ {
var req = RequestParm; var req = RequestParm;
var userInfo = AppletUserInfo; var userInfo = new AppletUserInfo();
JObject jobj = JObject.Parse(req.msg.ToString());
if (base.AppletUserInfo != null)
{
userInfo = base.AppletUserInfo;
}
else
{
userInfo = new AppletUserInfo()
{
TenantId = req.TenantId,
MallBaseId = req.MallBaseId,
UserId = req.EduStudentId
};
}
Rb_Survey_Extend model = JsonConvert.DeserializeObject<Rb_Survey_Extend>(req.msg.ToString()); Rb_Survey_Extend model = JsonConvert.DeserializeObject<Rb_Survey_Extend>(req.msg.ToString());
var activeSurueyModel = surveyModule.GetActivitySurveyList(new RB_ActivitySurvey_Extend { TenantId = userInfo.TenantId, MallBaseId = userInfo.MallBaseId, ID = model.ActivitySurveyId }).FirstOrDefault(); var activeSurueyModel = surveyModule.GetActivitySurveyList(new RB_ActivitySurvey_Extend { TenantId = userInfo.TenantId, MallBaseId = userInfo.MallBaseId, ID = model.ActivitySurveyId }).FirstOrDefault();
if (activeSurueyModel == null || activeSurueyModel.ID == 0) if (activeSurueyModel == null || activeSurueyModel.ID == 0)
...@@ -1280,7 +1352,7 @@ namespace Mall.WebApi.Controllers.Education ...@@ -1280,7 +1352,7 @@ namespace Mall.WebApi.Controllers.Education
return ApiResult.Failed("问卷调查活动不存在"); return ApiResult.Failed("问卷调查活动不存在");
} }
//先判断是否已添加 //先判断是否已添加
var GuestSurvey = surveyModule.GetGuestSurveyList(new Rb_GuestSurvey_Extend { ActivitySurveyId = model.ActivitySurveyId, TenantId = userInfo.TenantId, MallBaseId = userInfo.MallBaseId }); var GuestSurvey = surveyModule.GetGuestSurveyListModule(new Rb_GuestSurvey_Extend { ActivitySurveyId = model.ActivitySurveyId, TenantId = userInfo.TenantId, MallBaseId = userInfo.MallBaseId });
int isEnd = 0; int isEnd = 0;
if (activeSurueyModel.StartDate.HasValue && activeSurueyModel.EndDate.HasValue) if (activeSurueyModel.StartDate.HasValue && activeSurueyModel.EndDate.HasValue)
...@@ -1313,8 +1385,16 @@ namespace Mall.WebApi.Controllers.Education ...@@ -1313,8 +1385,16 @@ namespace Mall.WebApi.Controllers.Education
activeSurueyModel.PrizeType, activeSurueyModel.PrizeType,
activeSurueyModel.ID, activeSurueyModel.ID,
FillInNum = GuestSurvey.Where(x => x.UserId == userInfo.UserId).Count(), FillInNum = GuestSurvey.Where(x => x.UserId == userInfo.UserId).Count(),
BaseList = list.Where(x => x.FormType == FormTypeEnum.Base).OrderBy(x => x.Sort).Select(x => new { x.ID, x.IsRequired, x.ActivitySurveyId, SurveyType = (int)x.SurveyType, x.FormType, x.Title, x.Sort, SurveyTypeStr = EnumHelper.GetEnumName(x.SurveyType), FormTypeStr = EnumHelper.GetEnumName(x.FormType), x.SurveyOptionsList, ScoreNum = (x.SurveyType.HasValue && x.SurveyType == SurveyTypeEnum.Score) ? 5 : 0, TextContent = "" }).ToList(), BaseList = list.Where(x => x.FormType == FormTypeEnum.Base)
SurveyList = list.Where(x => x.FormType == FormTypeEnum.Survey).OrderBy(x => x.Sort).Select(x => new { x.ID, x.IsRequired, x.ActivitySurveyId, SurveyType = (int)x.SurveyType, x.FormType, x.Title, x.Sort, SurveyTypeStr = EnumHelper.GetEnumName(x.SurveyType), FormTypeStr = EnumHelper.GetEnumName(x.FormType), x.SurveyOptionsList, ScoreNum = (x.SurveyType.HasValue && x.SurveyType == SurveyTypeEnum.Score) ? 5 : 0, TextContent = "" }).ToList() .OrderBy(x => x.Sort)
.Select(x =>
new { x.ID, x.IsRequired, x.ActivitySurveyId, SurveyType = (int)x.SurveyType, x.FormType, x.Title, x.Sort, SurveyTypeStr = EnumHelper.GetEnumName(x.SurveyType), FormTypeStr = EnumHelper.GetEnumName(x.FormType), x.SurveyOptionsList, ScoreNum = (x.SurveyType.HasValue && x.SurveyType == SurveyTypeEnum.Score) ? 5 : 0, TextContent = "" }).ToList(),
SurveyList = list.Where(x => x.FormType == FormTypeEnum.Survey).OrderBy(x => x.Sort).Select(x => new { x.ID, x.IsRequired, x.ActivitySurveyId, SurveyType = (int)x.SurveyType, x.FormType, x.Title, x.Sort, SurveyTypeStr = EnumHelper.GetEnumName(x.SurveyType), FormTypeStr = EnumHelper.GetEnumName(x.FormType), x.SurveyOptionsList, ScoreNum = (x.SurveyType.HasValue && x.SurveyType == SurveyTypeEnum.Score) ? 3 : 0, TextContent = "" }).ToList(),
CourseArrangementList = list.Where(x => x.FormType == FormTypeEnum.CourseArrangement).OrderBy(x => x.Sort).Select(x => new { x.ID, x.IsRequired, x.ActivitySurveyId, SurveyType = (int)x.SurveyType, x.FormType, x.Title, x.Sort, SurveyTypeStr = EnumHelper.GetEnumName(x.SurveyType), FormTypeStr = EnumHelper.GetEnumName(x.FormType), x.SurveyOptionsList, ScoreNum = (x.SurveyType.HasValue && x.SurveyType == SurveyTypeEnum.Score) ? 3 : 0, TextContent = "" }).ToList(),
TeachersSituationList = list.Where(x => x.FormType == FormTypeEnum.TeachersSituation).OrderBy(x => x.Sort).Select(x => new { x.ID, x.IsRequired, x.ActivitySurveyId, SurveyType = (int)x.SurveyType, x.FormType, x.Title, x.Sort, SurveyTypeStr = EnumHelper.GetEnumName(x.SurveyType), FormTypeStr = EnumHelper.GetEnumName(x.FormType), x.SurveyOptionsList, ScoreNum = (x.SurveyType.HasValue && x.SurveyType == SurveyTypeEnum.Score) ? 3 : 0, TextContent = "" }).ToList(),
TeachingAssistantList = list.Where(x => x.FormType == FormTypeEnum.TeachingAssistant).OrderBy(x => x.Sort).Select(x => new { x.ID, x.IsRequired, x.ActivitySurveyId, SurveyType = (int)x.SurveyType, x.FormType, x.Title, x.Sort, SurveyTypeStr = EnumHelper.GetEnumName(x.SurveyType), FormTypeStr = EnumHelper.GetEnumName(x.FormType), x.SurveyOptionsList, ScoreNum = (x.SurveyType.HasValue && x.SurveyType == SurveyTypeEnum.Score) ? 3 : 0, TextContent = "" }).ToList(),
LearningEnvironmentList = list.Where(x => x.FormType == FormTypeEnum.LearningEnvironment).OrderBy(x => x.Sort).Select(x => new { x.ID, x.IsRequired, x.ActivitySurveyId, SurveyType = (int)x.SurveyType, x.FormType, x.Title, x.Sort, SurveyTypeStr = EnumHelper.GetEnumName(x.SurveyType), FormTypeStr = EnumHelper.GetEnumName(x.FormType), x.SurveyOptionsList, ScoreNum = (x.SurveyType.HasValue && x.SurveyType == SurveyTypeEnum.Score) ? 3 : 0, TextContent = "" }).ToList(),
OpinionandsuggestionList = list.Where(x => x.FormType == FormTypeEnum.Opinionandsuggestion).OrderBy(x => x.Sort).Select(x => new { x.ID, x.IsRequired, x.ActivitySurveyId, SurveyType = (int)x.SurveyType, x.FormType, x.Title, x.Sort, SurveyTypeStr = EnumHelper.GetEnumName(x.SurveyType), FormTypeStr = EnumHelper.GetEnumName(x.FormType), x.SurveyOptionsList, ScoreNum = (x.SurveyType.HasValue && x.SurveyType == SurveyTypeEnum.Score) ? 3 : 0, TextContent = "" }).ToList(),
}; };
return ApiResult.Success("", result); return ApiResult.Success("", result);
} }
...@@ -1974,15 +2054,13 @@ namespace Mall.WebApi.Controllers.Education ...@@ -1974,15 +2054,13 @@ namespace Mall.WebApi.Controllers.Education
} }
} }
/// <summary> /// <summary>
/// 取消报名 /// 取消报名
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
public ApiResult CancelCommerceConsult() public ApiResult CancelCommerceConsult()
{ {
bool flag = false; bool flag;
JObject jObj = JObject.Parse(RequestParm.msg.ToString()); JObject jObj = JObject.Parse(RequestParm.msg.ToString());
var ActivityId = jObj.GetInt("ActivityId"); var ActivityId = jObj.GetInt("ActivityId");
var Id = jObj.GetInt("Id"); var Id = jObj.GetInt("Id");
...@@ -2381,7 +2459,8 @@ namespace Mall.WebApi.Controllers.Education ...@@ -2381,7 +2459,8 @@ namespace Mall.WebApi.Controllers.Education
{ {
return ApiResult.Failed("未查询到您正在学习的课程，无法绑定信息"); return ApiResult.Failed("未查询到您正在学习的课程，无法绑定信息");
} }
if (courseId == 1) { if (courseId == 1)
{
StuIsEmp = 1;//内部人员 StuIsEmp = 1;//内部人员
} }
} }
...@@ -2764,7 +2843,7 @@ namespace Mall.WebApi.Controllers.Education ...@@ -2764,7 +2843,7 @@ namespace Mall.WebApi.Controllers.Education
[RateValve(Policy = Policy.Ip, Limit = 10, Duration = 60)] [RateValve(Policy = Policy.Ip, Limit = 10, Duration = 60)]
public ApiResult CancelCommerceConsultJXH() public ApiResult CancelCommerceConsultJXH()
{ {
bool flag = false; bool flag;
JObject jObj = JObject.Parse(RequestParm.msg.ToString()); JObject jObj = JObject.Parse(RequestParm.msg.ToString());
var ActivityId = jObj.GetInt("ActivityId"); var ActivityId = jObj.GetInt("ActivityId");
var Id = jObj.GetInt("Id"); var Id = jObj.GetInt("Id");
......
Mall.WebApi/Controllers/MarketingCenter/SurveyController.cs
View file @ d1bb566c
...@@ -28,13 +28,15 @@ namespace Mall.WebApi.Controllers.MarketingCenter ...@@ -28,13 +28,15 @@ namespace Mall.WebApi.Controllers.MarketingCenter
/// <summary> /// <summary>
/// 处理类对象 /// 处理类对象
/// </summary> /// </summary>
private SurveyModule module = new SurveyModule(); private readonly SurveyModule module = new SurveyModule();
/// <summary> /// <summary>
/// 处理类对象 /// 处理类对象
/// </summary> /// </summary>
private Module.User.UserModule userModule = new Module.User.UserModule(); private readonly Module.User.UserModule userModule = new Module.User.UserModule();
#region 问卷活动调查 #region 问卷活动调查
/// <summary> /// <summary>
/// 获取基础信息列表 /// 获取基础信息列表
/// </summary> /// </summary>
...@@ -160,6 +162,7 @@ namespace Mall.WebApi.Controllers.MarketingCenter ...@@ -160,6 +162,7 @@ namespace Mall.WebApi.Controllers.MarketingCenter
} }
#endregion #endregion
#region 问卷调查 #region 问卷调查
/// <summary> /// <summary>
/// 获取基础信息列表 /// 获取基础信息列表
...@@ -174,7 +177,7 @@ namespace Mall.WebApi.Controllers.MarketingCenter ...@@ -174,7 +177,7 @@ namespace Mall.WebApi.Controllers.MarketingCenter
demodel.TenantId = UserInfo.TenantId; demodel.TenantId = UserInfo.TenantId;
demodel.MallBaseId = parms.MallBaseId; demodel.MallBaseId = parms.MallBaseId;
var data = module.GetPageList(pagelist.pageIndex, pagelist.pageSize, out long count, demodel); var data = module.GetPageList(pagelist.pageIndex, pagelist.pageSize, out long count, demodel);
var list = data.Select(x => new { x.ID, x.SurveyType,x.IsRequired, x.FormType, x.Title, x.IsShow, x.Sort, SurveyTypeStr = EnumHelper.GetEnumName(x.SurveyType), FormTypeStr = EnumHelper.GetEnumName(x.FormType) }).ToList(); var list = data.Select(x => new { x.ID, x.SurveyType, x.IsRequired, x.FormType, x.Title, x.IsShow, x.Sort, SurveyTypeStr = EnumHelper.GetEnumName(x.SurveyType), FormTypeStr = EnumHelper.GetEnumName(x.FormType) }).ToList();
pagelist.count = int.Parse(count.ToString()); pagelist.count = int.Parse(count.ToString());
pagelist.pageData = list; pagelist.pageData = list;
return ApiResult.Success("", pagelist); return ApiResult.Success("", pagelist);
...@@ -227,7 +230,7 @@ namespace Mall.WebApi.Controllers.MarketingCenter ...@@ -227,7 +230,7 @@ namespace Mall.WebApi.Controllers.MarketingCenter
model.SurveyOptionsList = module.GetSurveyOptionsList(new Rb_SurveyOptions_Extend { SurveyID = model.ID }); model.SurveyOptionsList = module.GetSurveyOptionsList(new Rb_SurveyOptions_Extend { SurveyID = model.ID });
bool result = module.DelSurvey(model); bool result = module.DelSurvey(model);
return ApiResult.Success("删除成功"); return result ? ApiResult.Success("删除成功!") : ApiResult.Failed("删除失败!");
} }
return ApiResult.Failed("未找到此调查信息"); return ApiResult.Failed("未找到此调查信息");
} }
...@@ -306,7 +309,8 @@ namespace Mall.WebApi.Controllers.MarketingCenter ...@@ -306,7 +309,8 @@ namespace Mall.WebApi.Controllers.MarketingCenter
/// <param name="request"></param> /// <param name="request"></param>
/// <returns></returns> /// <returns></returns>
[HttpPost] [HttpPost]
[AllowAnonymous] [RateValve(Policy = Policy.Ip, Limit = 10, Duration = 60)] [AllowAnonymous]
[RateValve(Policy = Policy.Ip, Limit = 10, Duration = 60)]
public ApiResult GetGuestSurveyDetails() public ApiResult GetGuestSurveyDetails()
{ {
var parms = RequestParm; var parms = RequestParm;
...@@ -360,19 +364,43 @@ namespace Mall.WebApi.Controllers.MarketingCenter ...@@ -360,19 +364,43 @@ namespace Mall.WebApi.Controllers.MarketingCenter
} }
} }
var obj = new object();
var userModel = userModule.GetMemberUserInfo(model.UserId ?? 0); if (model.UserType == 1)
if (userModel == null) {
var userModel = userModule.GetMemberUserInfo(model.UserId ?? 0);
if (userModel == null)
{
userModel = new Model.Extend.User.RB_Member_User_Extend();
}
obj = new
{
userModel.Name,
userModel.Photo,
CreateDateStr = model.CreateDate.HasValue ? model.CreateDate.Value.ToString("yyyy-MM-dd HH:mm:ss") : ""
};
}
else
{ {
userModel = new Model.Extend.User.RB_Member_User_Extend(); var studentModel = module.GetEduStudentModule(model.UserId.ToString());
obj = new
{
Name = studentModel?.AccountName ?? "",
Photo = studentModel?.UserIcon ?? "",
CreateDateStr = model.CreateDate.HasValue ? model.CreateDate.Value.ToString("yyyy-MM-dd HH:mm:ss") : ""
};
} }
var obj = new
return ApiResult.Success("请求成功！", new
{ {
userModel.Name, surverList = surverList.Where(x => x.FormType == FormTypeEnum.Survey),
userModel.Photo, baseList = surverList.Where(x => x.FormType == FormTypeEnum.Base),
CreateDateStr = model.CreateDate.HasValue ? model.CreateDate.Value.ToString("yyyy-MM-dd HH:mm:ss") : "" courseArrangementList = surverList.Where(x => x.FormType == FormTypeEnum.CourseArrangement),
}; teachersSituationList = surverList.Where(x => x.FormType == FormTypeEnum.TeachersSituation),
return ApiResult.Success("请求成功！", new { surverList= surverList.Where(x=>x.FormType==FormTypeEnum.Survey), baseList = surverList.Where(x => x.FormType == FormTypeEnum.Base), obj }); teachingAssistantList = surverList.Where(x => x.FormType == FormTypeEnum.TeachingAssistant),
learningEnvironmentList = surverList.Where(x => x.FormType == FormTypeEnum.LearningEnvironment),
opinionandsuggestionList = surverList.Where(x => x.FormType == FormTypeEnum.Opinionandsuggestion),
obj
});
} }
return ApiResult.Failed("未找到调查信息！"); return ApiResult.Failed("未找到调查信息！");
} }
...@@ -392,17 +420,12 @@ namespace Mall.WebApi.Controllers.MarketingCenter ...@@ -392,17 +420,12 @@ namespace Mall.WebApi.Controllers.MarketingCenter
Rb_GuestSurvey_Extend demodel = JsonConvert.DeserializeObject<Rb_GuestSurvey_Extend>(RequestParm.msg.ToString()); Rb_GuestSurvey_Extend demodel = JsonConvert.DeserializeObject<Rb_GuestSurvey_Extend>(RequestParm.msg.ToString());
demodel.TenantId = UserInfo.TenantId; demodel.TenantId = UserInfo.TenantId;
demodel.MallBaseId = parms.MallBaseId; demodel.MallBaseId = parms.MallBaseId;
var data = module.GetResultPageList(pagelist.pageIndex, pagelist.pageSize, out long count, demodel); var data = module.GetResultPageListModule(pagelist.pageIndex, pagelist.pageSize, out long count, demodel);
var list = data.Select(x => new { x.ID, x.ActiveSurveyName, x.AliasName, CreateDateStr = x.CreateDate.HasValue ? x.CreateDate.Value.ToString("yyyy-MM-dd HH:mm:ss") : "",x.Photo }).ToList(); var list = data.Select(x => new { x.ID, x.ActiveSurveyName, x.AliasName, CreateDateStr = x.CreateDate.HasValue ? x.CreateDate.Value.ToString("yyyy-MM-dd HH:mm:ss") : "", x.Photo }).ToList();
pagelist.count = int.Parse(count.ToString()); pagelist.count = int.Parse(count.ToString());
pagelist.pageData = list; pagelist.pageData = list;
return ApiResult.Success("", pagelist); return ApiResult.Success("", pagelist);
} }
#endregion #endregion
} }
} }
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