Skip to content

M
mall.oytour.com
Commit 31663ab6 authored by 黄奎's avatar 黄奎
Browse files
Options

新增字段

parent 2a17035c
Hide whitespace changes
Inline Side-by-side
Showing with 389 additions and 15 deletions
Mall.Model/Entity/TradePavilion/RB_Commerce_Consult.cs
View file @ 31663ab6
......@@ -97,7 +97,6 @@ namespace Mall.Model.Entity.TradePavilion
/// </summary>
public string RejectRemark { get; set; }
/// <summary>
/// 活动ids
/// </summary>
......@@ -118,11 +117,94 @@ namespace Mall.Model.Entity.TradePavilion
/// </summary>
public string Post { get; set; }
/// <summary>
/// 所属国籍/省/市
/// </summary>
public string CountryInfo { get; set; }
/// <summary>
/// 年龄
/// </summary>
public int Age { get; set; }
/// <summary>
/// 身份证号码
/// </summary>
public string IdCard { get; set; }
/// <summary>
/// 是否完成新冠病毒疫苗全程接种【1是/0否】
/// </summary>
public int IsInoculate { get; set; }
/// <summary>
/// 活动前21天有港台地区和国外旅居史。【1是/0否】
/// </summary>
public int IsGATLJ { get; set; }
/// <summary>
/// 活动前21天有港台地区和国外旅居史【备注】
/// </summary>
public string GATLJRemark { get; set; }
/// <summary>
/// 活动前14天内有境内中高风险地区及所在县（市、区）旅居史【1是/0否】
/// </summary>
public int IsZGFX { get; set; }
/// <summary>
/// 活动前14天内有境内中高风险地区及所在县（市、区）旅居史【备注】
/// </summary>
public string ZGFXRemark { get; set; }
/// <summary>
/// 活动前14天有来自新冠肺炎确诊病例、无症状感染者报告社区的发热和/或有呼吸道症状患者接触史【1是/0否】
/// </summary>
public int IsQZJC { get; set; }
/// <summary>
/// 活动前14天有来自新冠肺炎确诊病例、无症状感染者报告社区的发热和/或有呼吸道症状患者接触史【备注】
/// </summary>
public string QZJCRemark { get; set; }
/// <summary>
/// 活动前14天有居家隔离医学观察人员接触史【1是/0否】
/// </summary>
public int IsJJGLGX { get; set; }
/// <summary>
/// 活动前14天有居家隔离医学观察人员接触史【备注】
/// </summary>
public string JJGLGXRemark { get; set; }
/// <summary>
/// 已治愈出院的确诊病例和已解除集中隔离医学观察的无症状感染者，尚在随访或医学观察期内【1是/0否】
/// </summary>
public int IsZYCYJCGL { get; set; }
/// <summary>
/// 已治愈出院的确诊病例和已解除集中隔离医学观察的无症状感染者，尚在随访或医学观察期内【备注】
/// </summary>
public string ZYCYJCGLRemark { get; set; }
/// <summary>
/// 被判定为新冠肺炎病毒感染者（确诊病例或无症状感染者）的密切接触者和密接的密接【1是/0否】
/// </summary>
public int IsMJ { get; set; }
/// <summary>
/// 被判定为新冠肺炎病毒感染者（确诊病例或无症状感染者）的密切接触者和密接的密接【备注】
/// </summary>
public string MJRemark { get; set; }
/// <summary>
/// 有发热、干咳、乏力、咽痛、嗅（味）觉减退、腹泻等症状，且未排除传染病感染者【1是/0否】
/// </summary>
public int IsFRGK { get; set; }
/// <summary>
/// 有发热、干咳、乏力、咽痛、嗅（味）觉减退、腹泻等症状，且未排除传染病感染者【备注】
/// </summary>
public string FRGKRemark { get; set; }
}
}
Mall.Model/Extend/TradePavilion/RB_Commerce_Consult_Extend.cs
View file @ 31663ab6
......@@ -126,6 +126,91 @@ namespace Mall.Model.Extend.TradePavilion
/// 所属国籍/省/市
/// </summary>
public string CountryInfo { get; set; }
/// <summary>
/// 年龄
/// </summary>
public int Age { get; set; }
/// <summary>
/// 身份证号码
/// </summary>
public string IdCard { get; set; }
/// <summary>
/// 是否完成新冠病毒疫苗全程接种【1是/0否】
/// </summary>
public int IsInoculate { get; set; }
/// <summary>
/// 活动前21天有港台地区和国外旅居史。【1是/0否】
/// </summary>
public int IsGATLJ { get; set; }
/// <summary>
/// 活动前21天有港台地区和国外旅居史【备注】
/// </summary>
public string GATLJRemark { get; set; }
/// <summary>
/// 活动前14天内有境内中高风险地区及所在县（市、区）旅居史【1是/0否】
/// </summary>
public int IsZGFX { get; set; }
/// <summary>
/// 活动前14天内有境内中高风险地区及所在县（市、区）旅居史【备注】
/// </summary>
public string ZGFXRemark { get; set; }
/// <summary>
/// 活动前14天有来自新冠肺炎确诊病例、无症状感染者报告社区的发热和/或有呼吸道症状患者接触史【1是/0否】
/// </summary>
public int IsQZJC { get; set; }
/// <summary>
/// 活动前14天有来自新冠肺炎确诊病例、无症状感染者报告社区的发热和/或有呼吸道症状患者接触史【备注】
/// </summary>
public string QZJCRemark { get; set; }
/// <summary>
/// 活动前14天有居家隔离医学观察人员接触史【1是/0否】
/// </summary>
public int IsJJGLGX { get; set; }
/// <summary>
/// 活动前14天有居家隔离医学观察人员接触史【备注】
/// </summary>
public string JJGLGXRemark { get; set; }
/// <summary>
/// 已治愈出院的确诊病例和已解除集中隔离医学观察的无症状感染者，尚在随访或医学观察期内【1是/0否】
/// </summary>
public int IsZYCYJCGL { get; set; }
/// <summary>
/// 已治愈出院的确诊病例和已解除集中隔离医学观察的无症状感染者，尚在随访或医学观察期内【备注】
/// </summary>
public string ZYCYJCGLRemark { get; set; }
/// <summary>
/// 被判定为新冠肺炎病毒感染者（确诊病例或无症状感染者）的密切接触者和密接的密接【1是/0否】
/// </summary>
public int IsMJ { get; set; }
/// <summary>
/// 被判定为新冠肺炎病毒感染者（确诊病例或无症状感染者）的密切接触者和密接的密接【备注】
/// </summary>
public string MJRemark { get; set; }
/// <summary>
/// 有发热、干咳、乏力、咽痛、嗅（味）觉减退、腹泻等症状，且未排除传染病感染者【1是/0否】
/// </summary>
public int IsFRGK { get; set; }
/// <summary>
/// 有发热、干咳、乏力、咽痛、嗅（味）觉减退、腹泻等症状，且未排除传染病感染者【备注】
/// </summary>
public string FRGKRemark { get; set; }
}
/// <summary>
......@@ -218,5 +303,90 @@ namespace Mall.Model.Extend.TradePavilion
/// 性质
/// </summary>
public string Nature { get; set; }
/// <summary>
/// 年龄
/// </summary>
public int Age { get; set; }
/// <summary>
/// 身份证号码
/// </summary>
public string IdCard { get; set; }
/// <summary>
/// 是否完成新冠病毒疫苗全程接种【1是/0否】
/// </summary>
public int IsInoculate { get; set; }
/// <summary>
/// 活动前21天有港台地区和国外旅居史。【1是/0否】
/// </summary>
public int IsGATLJ { get; set; }
/// <summary>
/// 活动前21天有港台地区和国外旅居史【备注】
/// </summary>
public string GATLJRemark { get; set; }
/// <summary>
/// 活动前14天内有境内中高风险地区及所在县（市、区）旅居史【1是/0否】
/// </summary>
public int IsZGFX { get; set; }
/// <summary>
/// 活动前14天内有境内中高风险地区及所在县（市、区）旅居史【备注】
/// </summary>
public string ZGFXRemark { get; set; }
/// <summary>
/// 活动前14天有来自新冠肺炎确诊病例、无症状感染者报告社区的发热和/或有呼吸道症状患者接触史【1是/0否】
/// </summary>
public int IsQZJC { get; set; }
/// <summary>
/// 活动前14天有来自新冠肺炎确诊病例、无症状感染者报告社区的发热和/或有呼吸道症状患者接触史【备注】
/// </summary>
public string QZJCRemark { get; set; }
/// <summary>
/// 活动前14天有居家隔离医学观察人员接触史【1是/0否】
/// </summary>
public int IsJJGLGX { get; set; }
/// <summary>
/// 活动前14天有居家隔离医学观察人员接触史【备注】
/// </summary>
public string JJGLGXRemark { get; set; }
/// <summary>
/// 已治愈出院的确诊病例和已解除集中隔离医学观察的无症状感染者，尚在随访或医学观察期内【1是/0否】
/// </summary>
public int IsZYCYJCGL { get; set; }
/// <summary>
/// 已治愈出院的确诊病例和已解除集中隔离医学观察的无症状感染者，尚在随访或医学观察期内【备注】
/// </summary>
public string ZYCYJCGLRemark { get; set; }
/// <summary>
/// 被判定为新冠肺炎病毒感染者（确诊病例或无症状感染者）的密切接触者和密接的密接【1是/0否】
/// </summary>
public int IsMJ { get; set; }
/// <summary>
/// 被判定为新冠肺炎病毒感染者（确诊病例或无症状感染者）的密切接触者和密接的密接【备注】
/// </summary>
public string MJRemark { get; set; }
/// <summary>
/// 有发热、干咳、乏力、咽痛、嗅（味）觉减退、腹泻等症状，且未排除传染病感染者【1是/0否】
/// </summary>
public int IsFRGK { get; set; }
/// <summary>
/// 有发热、干咳、乏力、咽痛、嗅（味）觉减退、腹泻等症状，且未排除传染病感染者【备注】
/// </summary>
public string FRGKRemark { get; set; }
}
}
Mall.Module.TradePavilion/CommerceConsultModule.cs
View file @ 31663ab6
......@@ -143,7 +143,24 @@ namespace Mall.Module.TradePavilion
Post = sItem.Post,
CountryInfo = sItem.CountryInfo,
CompanyName = sItem.CompanyName,
Nature = sItem.Nature.GetEnumName()
Nature = sItem.Nature.GetEnumName(),
Age=sItem.Age,
IdCard=sItem.IdCard,
IsInoculate=sItem.IsInoculate,
IsGATLJ=sItem.IsGATLJ,
GATLJRemark=sItem.GATLJRemark,
IsZGFX=sItem.IsZGFX,
ZGFXRemark=sItem.ZGFXRemark,
IsQZJC=sItem.IsQZJC,
QZJCRemark=sItem.QZJCRemark,
IsJJGLGX=sItem.IsJJGLGX,
JJGLGXRemark=sItem.JJGLGXRemark,
IsZYCYJCGL=sItem.IsZYCYJCGL,
ZYCYJCGLRemark=sItem.ZYCYJCGLRemark,
IsMJ=sItem.IsMJ,
MJRemark=sItem.MJRemark,
IsFRGK=sItem.IsFRGK,
FRGKRemark=sItem.FRGKRemark,
};
activity.SignUserList.Add(signUser);
}
......@@ -364,6 +381,23 @@ namespace Mall.Module.TradePavilion
{nameof(RB_Commerce_Consult_Extend.LinkTel),model.LinkTel },
{nameof(RB_Commerce_Consult_Extend.Post),model.Post },
{nameof(RB_Commerce_Consult_Extend.CountryInfo),model.CountryInfo },
{nameof(RB_Commerce_Consult_Extend.Age),model.Age },
{nameof(RB_Commerce_Consult_Extend.IdCard),model.IdCard },
{nameof(RB_Commerce_Consult_Extend.IsInoculate),model.IsInoculate },
{nameof(RB_Commerce_Consult_Extend.IsGATLJ),model.IsGATLJ },
{nameof(RB_Commerce_Consult_Extend.GATLJRemark),model.GATLJRemark },
{nameof(RB_Commerce_Consult_Extend.IsZGFX),model.IsZGFX },
{nameof(RB_Commerce_Consult_Extend.ZGFXRemark),model.ZGFXRemark },
{nameof(RB_Commerce_Consult_Extend.IsQZJC),model.IsQZJC },
{nameof(RB_Commerce_Consult_Extend.QZJCRemark),model.QZJCRemark },
{nameof(RB_Commerce_Consult_Extend.IsJJGLGX),model.IsJJGLGX },
{nameof(RB_Commerce_Consult_Extend.JJGLGXRemark),model.JJGLGXRemark },
{nameof(RB_Commerce_Consult_Extend.IsZYCYJCGL),model.IsZYCYJCGL },
{nameof(RB_Commerce_Consult_Extend.ZYCYJCGLRemark),model.ZYCYJCGLRemark },
{nameof(RB_Commerce_Consult_Extend.IsMJ),model.IsMJ },
{nameof(RB_Commerce_Consult_Extend.MJRemark),model.MJRemark },
{nameof(RB_Commerce_Consult_Extend.IsFRGK),model.IsFRGK },
{nameof(RB_Commerce_Consult_Extend.FRGKRemark),model.FRGKRemark },
};
flag = consultRepository.Update(fileds, new WhereHelper(nameof(RB_Commerce_Consult_Extend.Id), model.Id));
}
......
Mall.Repository/TradePavilion/RB_FirstShop_ListRepository.cs
View file @ 31663ab6
......@@ -88,7 +88,9 @@ namespace Mall.Repository.TradePavilion
orderBy = " order by w.EndDate desc,w.Sort asc";//根据报名截止日期
}
string sql = $@"select w.* from RB_FirstShop_List w
string sql = $@"
select w.*
from RB_FirstShop_List w
where {where} {orderBy}
";
return GetPage<RB_FirstShop_List_Extend>(pageIndex, pageSize, out count, sql, parameters).ToList();
......
Mall.WebApi/Controllers/TradePavilion/AppletTradeController.cs
View file @ 31663ab6
......@@ -89,8 +89,6 @@ namespace Mall.WebApi.Controllers.TradePavilion
/// </summary>
private readonly FirstShopWishModule firstShopWishModule = new FirstShopWishModule();
#region 公司信息管理
/// <summary>
......@@ -946,7 +944,8 @@ namespace Mall.WebApi.Controllers.TradePavilion
/// 获取商会活动类型列表
/// </summary>
/// <returns></returns>
[AllowAnonymous] [RateValve(Policy = Policy.Ip, Limit = 10, Duration = 60)]
[AllowAnonymous]
[RateValve(Policy = Policy.Ip, Limit = 10, Duration = 60)]
public ApiResult GetCommerceActivityTypeList()
{
var query = new RB_Commerce_ActivityType_Extend();
......@@ -961,7 +960,8 @@ namespace Mall.WebApi.Controllers.TradePavilion
/// 获取商会活动分页列表
/// </summary>
/// <returns></returns>
[AllowAnonymous] [RateValve(Policy = Policy.Ip, Limit = 10, Duration = 60)]
[AllowAnonymous]
[RateValve(Policy = Policy.Ip, Limit = 10, Duration = 60)]
public ApiResult GetCommerceActivityPage()
{
ResultPageModel pageModel = JsonConvert.DeserializeObject<ResultPageModel>(RequestParm.msg.ToString());
......@@ -982,7 +982,8 @@ namespace Mall.WebApi.Controllers.TradePavilion
/// 获取商会活动详情
/// </summary>
/// <returns></returns>
[AllowAnonymous] [RateValve(Policy = Policy.Ip, Limit = 10, Duration = 60)]
[AllowAnonymous]
[RateValve(Policy = Policy.Ip, Limit = 10, Duration = 60)]
public ApiResult GetCommerceActivity()
{
JObject parms = JObject.Parse(RequestParm.msg.ToString());
......@@ -1047,6 +1048,23 @@ namespace Mall.WebApi.Controllers.TradePavilion
LinkTel = parms.GetStringValue("LinkTel"),
Post = parms.GetStringValue("Post"),
CountryInfo = parms.GetStringValue("CountryInfo"),
Age = parms.GetInt("Age"),
IdCard = parms.GetStringValue("IdCard"),
IsInoculate = parms.GetInt("IsInoculate"),
IsGATLJ = parms.GetInt("IsGATLJ"),
GATLJRemark = parms.GetStringValue("GATLJRemark"),
IsZGFX = parms.GetInt("IsZGFX"),
ZGFXRemark = parms.GetStringValue("ZGFXRemark"),
IsQZJC = parms.GetInt("IsQZJC"),
QZJCRemark = parms.GetStringValue("QZJCRemark"),
IsJJGLGX = parms.GetInt("IsJJGLGX"),
JJGLGXRemark = parms.GetStringValue("JJGLGXRemark"),
IsZYCYJCGL = parms.GetInt("IsZYCYJCGL"),
ZYCYJCGLRemark = parms.GetStringValue("ZYCYJCGLRemark"),
IsMJ = parms.GetInt("IsMJ"),
MJRemark = parms.GetStringValue("MJRemark"),
IsFRGK = parms.GetInt("IsFRGK"),
FRGKRemark = parms.GetStringValue("FRGKRemark"),
};
var userInfo = AppletUserInfo;
if (userInfo == null)
......@@ -1148,6 +1166,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
UnitPrice = jObj.GetInt("UnitPrice", 0),
Money = jObj.GetInt("Money", 0),
Remark = jObj.GetStringValue("Remark"),
};
var userInfo = AppletUserInfo;
extModel.Status = Common.Enum.DateStateEnum.Normal;
......@@ -1211,15 +1230,64 @@ namespace Mall.WebApi.Controllers.TradePavilion
/// <returns></returns>
public ApiResult SetFirstShopActivityEnroll()
{
var request = RequestParm;
var userInfo = AppletUserInfo;
if (userInfo == null)
{
return ApiResult.Failed("请登录");
}
Model.Extend.TradePavilion.FirstShopConsult firstShopModel = JsonConvert.DeserializeObject<Model.Extend.TradePavilion.FirstShopConsult>(request.msg.ToString());
var activityList = activityModule.GetCommerceActivityListModule(new RB_Commerce_Activity_Extend { TenantId = userInfo.TenantId, MallBaseId = userInfo.MallBaseId, ActivityIds = firstShopModel.ActivityIds });
JObject jobj = JObject.Parse(request.msg.ToString());
Model.Extend.TradePavilion.FirstShopConsult firstShopModel = new FirstShopConsult()
{
ActivityIds=jobj.GetStringValue("ActivityIds"),
CompanyName=jobj.GetStringValue("CompanyName"),
Nature=(NatureEnum)jobj.GetInt("Nature"),
Remark=jobj.GetStringValue("Remark"),
FirstShopLinkManList=new List<FirstShopLinkManModel> (),
};
var linkManStr = jobj.GetStringValue("FirstShopLinkManList");
if (!string.IsNullOrEmpty(linkManStr))
{
JArray linkManArray = JArray.Parse(linkManStr);
if (linkManArray != null && linkManArray.Count > 0)
{
foreach (var jItem in linkManArray)
{
JObject sobj = JObject.Parse(JsonHelper.Serialize(jItem));
var linkModel = new FirstShopLinkManModel()
{
LinkMan=sobj.GetStringValue("LinkMan"),
LinkTel=sobj.GetStringValue("LinkTel"),
Post=sobj.GetStringValue("Post"),
CountryInfo = sobj.GetStringValue("CountryInfo"),
Age=sobj.GetInt("Age"),
IdCard=sobj.GetStringValue("IdCard"),
IsInoculate=sobj.GetInt("IsInoculate"),
IsGATLJ=sobj.GetInt("IsGATLJ"),
GATLJRemark=sobj.GetStringValue("GATLJRemark"),
IsZGFX=sobj.GetInt("IsZGFX"),
ZGFXRemark=sobj.GetStringValue("ZGFXRemark"),
IsQZJC=sobj.GetInt("IsQZJC"),
QZJCRemark=sobj.GetStringValue("QZJCRemark"),
IsJJGLGX=sobj.GetInt("IsJJGLGX"),
JJGLGXRemark=sobj.GetStringValue("JJGLGXRemark"),
IsZYCYJCGL=sobj.GetInt("IsZYCYJCGL"),
ZYCYJCGLRemark=sobj.GetStringValue("ZYCYJCGLRemark"),
IsMJ=sobj.GetInt("IsMJ"),
MJRemark=sobj.GetStringValue("MJRemark"),
IsFRGK=sobj.GetInt("IsFRGK"),
FRGKRemark=sobj.GetStringValue("FRGKRemark"),
};
firstShopModel.FirstShopLinkManList.Add(linkModel);
}
}
}
var activityList = activityModule.GetCommerceActivityListModule(new RB_Commerce_Activity_Extend
{
TenantId = userInfo.TenantId,
MallBaseId = userInfo.MallBaseId,
ActivityIds = firstShopModel.ActivityIds
});
List<RB_Commerce_Consult_Extend> consultList = new List<RB_Commerce_Consult_Extend>();
foreach (var model in activityList)
......@@ -1245,7 +1313,24 @@ namespace Mall.WebApi.Controllers.TradePavilion
CompanyName = firstShopModel.CompanyName,
ActivityIds = firstShopModel.ActivityIds,
CountryInfo = item.CountryInfo,
Nature = firstShopModel.Nature
Nature = firstShopModel.Nature,
Age=item.Age,
IdCard=item.IdCard,
IsInoculate=item.IsInoculate,
IsGATLJ=item.IsGATLJ,
GATLJRemark=item.GATLJRemark,
IsZGFX=item.IsZGFX,
ZGFXRemark=item.ZGFXRemark,
IsQZJC=item.IsQZJC,
QZJCRemark=item.QZJCRemark,
IsJJGLGX=item.IsJJGLGX,
JJGLGXRemark=item.JJGLGXRemark,
IsZYCYJCGL=item.IsZYCYJCGL,
ZYCYJCGLRemark=item.ZYCYJCGLRemark,
IsMJ=item.IsMJ,
MJRemark=item.MJRemark,
IsFRGK=item.IsFRGK,
FRGKRemark=item.FRGKRemark,
};
demodel.ActivityId = model.Id;
demodel.Remark = firstShopModel.Remark;
......@@ -2372,7 +2457,8 @@ namespace Mall.WebApi.Controllers.TradePavilion
/// </summary>
/// <returns></returns>
[HttpPost]
[AllowAnonymous] [RateValve(Policy = Policy.Ip, Limit = 10, Duration = 60)]
[AllowAnonymous]
[RateValve(Policy = Policy.Ip, Limit = 10, Duration = 60)]
public ApiResult GetAppletFirstShopListPageList()
{
var req = base.RequestParm;
......
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