|
|
@@ -4953,6 +4953,7 @@ namespace MySystem.Areas.Admin.Controllers
|
|
|
{
|
|
|
string conn = Library.ConfigurationManager.AppSettings["SqlConnStr"].ToString();
|
|
|
List<Dictionary<string, object>> dataList = new List<Dictionary<string, object>>();
|
|
|
+ var RealName = "";
|
|
|
string condition = " where 1=1";
|
|
|
var UserId = 0;
|
|
|
var bstart = "";
|
|
|
@@ -4963,6 +4964,7 @@ namespace MySystem.Areas.Admin.Controllers
|
|
|
{
|
|
|
var user = db.Users.FirstOrDefault(m => m.MakerCode == MakerCode) ?? new Users();
|
|
|
UserId = user.Id;
|
|
|
+ RealName = user.RealName;
|
|
|
}
|
|
|
if (!string.IsNullOrEmpty(BindingTime))
|
|
|
{
|
|
|
@@ -4996,7 +4998,7 @@ namespace MySystem.Areas.Admin.Controllers
|
|
|
var Sql = "select wname '伙伴名称',k.`Name` '机具品牌',PosSn '机具Sn',(CASE WHEN tb.SeoKeyword IS NULL AND tb.PrizeParams=0 THEN 0 ELSE tb.SeoKeyword END) '服务费',DATE_FORMAT(BindingTime,'%Y-%m-%d %H:%i:%s') '绑定时间',DATE_FORMAT(ActivationTime,'%Y-%m-%d %H:%i:%s') '激活时间' from (select (select Name from BusinessPartner where Id=(select PartnerId from BusinessPartnerPos where PosId=pos.Id and `Status`>-1 limit 1)) wname,BrandId,PosSnType,PosSn,(CASE WHEN BrandId not in(2,7,10,11) THEN ROUND(CAST(SeoKeyword AS DECIMAL)/100, 2) ELSE SeoKeyword end) SeoKeyword,TransferTime,BindingTime,ActivationTime,PrizeParams from PosMachinesTwo pos where BindingState=1 and `Status`>=-1 and BuyUserId=" + UserId + " and Id in (select PosId from BusinessPartnerPos)) tb left join KqProducts k on tb.BrandId=k.Id" + condition;
|
|
|
|
|
|
var sysAdmin = bsdb.SysAdmin.FirstOrDefault(m => m.AdminName == SysUserName && m.Status > -1);
|
|
|
- var FileName = "直营团队数据记录" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
|
|
|
+ var FileName = MakerCode + RealName + "直营团队数据记录" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
|
|
|
string SendData = "{\"Operater\":\"" + sysAdmin.Id + "\",\"SqlString\":\"" + Sql + "\",\"FileName\":\"" + FileName + "\",\"MaxCount\":\"0\"}";
|
|
|
RedisDbconn.Instance.AddList("ExportQueue", SendData);
|
|
|
return "success";
|
DuGuYang