|
@@ -15,6 +15,7 @@ using Microsoft.Extensions.Options;
|
|
using MySystem.Models;
|
|
using MySystem.Models;
|
|
using Library;
|
|
using Library;
|
|
using LitJson;
|
|
using LitJson;
|
|
|
|
+using MySystem;
|
|
using MySystemLib;
|
|
using MySystemLib;
|
|
|
|
|
|
namespace MySystem.Areas.Admin.Controllers
|
|
namespace MySystem.Areas.Admin.Controllers
|
|
@@ -25,6 +26,7 @@ namespace MySystem.Areas.Admin.Controllers
|
|
{
|
|
{
|
|
public ProjectVersionController(IHttpContextAccessor accessor, ILogger<BaseController> logger, IOptions<Setting> setting) : base(accessor, logger, setting)
|
|
public ProjectVersionController(IHttpContextAccessor accessor, ILogger<BaseController> logger, IOptions<Setting> setting) : base(accessor, logger, setting)
|
|
{
|
|
{
|
|
|
|
+ OtherMySqlConn.connstr = ConfigurationManager.AppSettings["SqlConnStr"].ToString();
|
|
}
|
|
}
|
|
|
|
|
|
#region 小程序版本列表
|
|
#region 小程序版本列表
|
|
@@ -37,8 +39,8 @@ namespace MySystem.Areas.Admin.Controllers
|
|
{
|
|
{
|
|
ViewBag.RightInfo = RightInfo;
|
|
ViewBag.RightInfo = RightInfo;
|
|
ViewBag.right = right;
|
|
ViewBag.right = right;
|
|
-
|
|
|
|
-
|
|
|
|
|
|
+
|
|
|
|
+
|
|
return View();
|
|
return View();
|
|
}
|
|
}
|
|
|
|
|
|
@@ -52,64 +54,64 @@ namespace MySystem.Areas.Admin.Controllers
|
|
/// <returns></returns>
|
|
/// <returns></returns>
|
|
public JsonResult IndexData(ProjectVersion data, string ProjectIdSelect, string UserIdRealName, string UserIdMobile, string DeveloperIdNickName, string DeveloperIdRealName, string DeveloperIdMobile, int page = 1, int limit = 30)
|
|
public JsonResult IndexData(ProjectVersion data, string ProjectIdSelect, string UserIdRealName, string UserIdMobile, string DeveloperIdNickName, string DeveloperIdRealName, string DeveloperIdMobile, int page = 1, int limit = 30)
|
|
{
|
|
{
|
|
-
|
|
|
|
|
|
+
|
|
Dictionary<string, string> Fields = new Dictionary<string, string>();
|
|
Dictionary<string, string> Fields = new Dictionary<string, string>();
|
|
-
|
|
|
|
|
|
+
|
|
Fields.Add("CreateDate", "3"); //时间
|
|
Fields.Add("CreateDate", "3"); //时间
|
|
|
|
|
|
|
|
|
|
string condition = " and Status>-1";
|
|
string condition = " and Status>-1";
|
|
//小程序项目
|
|
//小程序项目
|
|
-if (!string.IsNullOrEmpty(ProjectIdSelect))
|
|
|
|
-{
|
|
|
|
-condition += " and ProjectId=" + ProjectIdSelect;
|
|
|
|
-}
|
|
|
|
-//所属用户真实姓名
|
|
|
|
-if (!string.IsNullOrEmpty(UserIdRealName))
|
|
|
|
-{
|
|
|
|
-condition += " and UserId in (select UserId from UsersForRealName where RealName='" + UserIdRealName + "')";
|
|
|
|
-}
|
|
|
|
-//所属用户手机号
|
|
|
|
-if (!string.IsNullOrEmpty(UserIdMobile))
|
|
|
|
-{
|
|
|
|
-condition += " and UserId in (select UserId from UsersForMobile where Mobile='" + UserIdMobile + "')";
|
|
|
|
-}
|
|
|
|
-//开发者昵称
|
|
|
|
-if (!string.IsNullOrEmpty(DeveloperIdNickName))
|
|
|
|
-{
|
|
|
|
-condition += " and DeveloperId in (select DeveloperId from DevelopersForNickName where NickName='" + DeveloperIdNickName + "')";
|
|
|
|
-}
|
|
|
|
-//开发者真实姓名
|
|
|
|
-if (!string.IsNullOrEmpty(DeveloperIdRealName))
|
|
|
|
-{
|
|
|
|
-condition += " and DeveloperId in (select DeveloperId from DevelopersForRealName where RealName='" + DeveloperIdRealName + "')";
|
|
|
|
-}
|
|
|
|
-//开发者手机号
|
|
|
|
-if (!string.IsNullOrEmpty(DeveloperIdMobile))
|
|
|
|
-{
|
|
|
|
-condition += " and DeveloperId in (select DeveloperId from DevelopersForMobile where Mobile='" + DeveloperIdMobile + "')";
|
|
|
|
-}
|
|
|
|
|
|
+ if (!string.IsNullOrEmpty(ProjectIdSelect))
|
|
|
|
+ {
|
|
|
|
+ condition += " and ProjectId=" + ProjectIdSelect;
|
|
|
|
+ }
|
|
|
|
+ //所属用户真实姓名
|
|
|
|
+ if (!string.IsNullOrEmpty(UserIdRealName))
|
|
|
|
+ {
|
|
|
|
+ condition += " and UserId in (select UserId from UsersForRealName where RealName='" + UserIdRealName + "')";
|
|
|
|
+ }
|
|
|
|
+ //所属用户手机号
|
|
|
|
+ if (!string.IsNullOrEmpty(UserIdMobile))
|
|
|
|
+ {
|
|
|
|
+ condition += " and UserId in (select UserId from UsersForMobile where Mobile='" + UserIdMobile + "')";
|
|
|
|
+ }
|
|
|
|
+ //开发者昵称
|
|
|
|
+ if (!string.IsNullOrEmpty(DeveloperIdNickName))
|
|
|
|
+ {
|
|
|
|
+ condition += " and DeveloperId in (select DeveloperId from DevelopersForNickName where NickName='" + DeveloperIdNickName + "')";
|
|
|
|
+ }
|
|
|
|
+ //开发者真实姓名
|
|
|
|
+ if (!string.IsNullOrEmpty(DeveloperIdRealName))
|
|
|
|
+ {
|
|
|
|
+ condition += " and DeveloperId in (select DeveloperId from DevelopersForRealName where RealName='" + DeveloperIdRealName + "')";
|
|
|
|
+ }
|
|
|
|
+ //开发者手机号
|
|
|
|
+ if (!string.IsNullOrEmpty(DeveloperIdMobile))
|
|
|
|
+ {
|
|
|
|
+ condition += " and DeveloperId in (select DeveloperId from DevelopersForMobile where Mobile='" + DeveloperIdMobile + "')";
|
|
|
|
+ }
|
|
|
|
|
|
|
|
|
|
- Dictionary<string, object> obj = new AdminContent(_accessor.HttpContext, SystemPublicFuction.dbtables).IndexData("ProjectVersion", Fields, "Id desc", "0", page, limit, condition);
|
|
|
|
|
|
+ Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).IndexData("ProjectVersion", Fields, "Id desc", "0", page, limit, condition);
|
|
List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
|
|
List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
|
|
foreach (Dictionary<string, object> dic in diclist)
|
|
foreach (Dictionary<string, object> dic in diclist)
|
|
{
|
|
{
|
|
//小程序项目
|
|
//小程序项目
|
|
-// dic["ProjectId"] = RelationClass.GetProjectsInfo(int.Parse(dic["ProjectId"].ToString()));
|
|
|
|
-//所属用户
|
|
|
|
-int UserId = int.Parse(function.CheckInt(dic["UserId"].ToString()));
|
|
|
|
-Users userid_Users = db.Users.FirstOrDefault(m => m.Id == UserId) ?? new Users();
|
|
|
|
-dic["UserIdRealName"] = userid_Users.RealName;
|
|
|
|
-dic["UserIdMobile"] = userid_Users.Mobile;
|
|
|
|
-dic.Remove("UserId");
|
|
|
|
-//开发者
|
|
|
|
-int DeveloperId = int.Parse(function.CheckInt(dic["DeveloperId"].ToString()));
|
|
|
|
-Developers developerid_Developers = db.Developers.FirstOrDefault(m => m.Id == DeveloperId) ?? new Developers();
|
|
|
|
-dic["DeveloperIdNickName"] = developerid_Developers.NickName;
|
|
|
|
-dic["DeveloperIdRealName"] = developerid_Developers.RealName;
|
|
|
|
-dic["DeveloperIdMobile"] = developerid_Developers.Mobile;
|
|
|
|
-dic.Remove("DeveloperId");
|
|
|
|
|
|
+ // dic["ProjectId"] = RelationClass.GetProjectsInfo(int.Parse(dic["ProjectId"].ToString()));
|
|
|
|
+ //所属用户
|
|
|
|
+ int UserId = int.Parse(function.CheckInt(dic["UserId"].ToString()));
|
|
|
|
+ Users userid_Users = db.Users.FirstOrDefault(m => m.Id == UserId) ?? new Users();
|
|
|
|
+ dic["UserIdRealName"] = userid_Users.RealName;
|
|
|
|
+ dic["UserIdMobile"] = userid_Users.Mobile;
|
|
|
|
+ dic.Remove("UserId");
|
|
|
|
+ //开发者
|
|
|
|
+ int DeveloperId = int.Parse(function.CheckInt(dic["DeveloperId"].ToString()));
|
|
|
|
+ Developers developerid_Developers = db.Developers.FirstOrDefault(m => m.Id == DeveloperId) ?? new Developers();
|
|
|
|
+ dic["DeveloperIdNickName"] = developerid_Developers.NickName;
|
|
|
|
+ dic["DeveloperIdRealName"] = developerid_Developers.RealName;
|
|
|
|
+ dic["DeveloperIdMobile"] = developerid_Developers.Mobile;
|
|
|
|
+ dic.Remove("DeveloperId");
|
|
|
|
|
|
}
|
|
}
|
|
return Json(obj);
|
|
return Json(obj);
|
|
@@ -127,7 +129,7 @@ dic.Remove("DeveloperId");
|
|
{
|
|
{
|
|
ViewBag.RightInfo = RightInfo;
|
|
ViewBag.RightInfo = RightInfo;
|
|
ViewBag.right = right;
|
|
ViewBag.right = right;
|
|
-
|
|
|
|
|
|
+
|
|
|
|
|
|
return View();
|
|
return View();
|
|
}
|
|
}
|
|
@@ -144,22 +146,22 @@ dic.Remove("DeveloperId");
|
|
public string Add(ProjectVersion data)
|
|
public string Add(ProjectVersion data)
|
|
{
|
|
{
|
|
Dictionary<string, object> Fields = new Dictionary<string, object>();
|
|
Dictionary<string, object> Fields = new Dictionary<string, object>();
|
|
-
|
|
|
|
|
|
+
|
|
Fields.Add("ProjectId", data.ProjectId); //小程序项目
|
|
Fields.Add("ProjectId", data.ProjectId); //小程序项目
|
|
-Fields.Add("UserId", data.UserId); //所属用户
|
|
|
|
-Fields.Add("DeveloperId", data.DeveloperId); //开发者
|
|
|
|
-Fields.Add("VerNum", data.VerNum); //版本号
|
|
|
|
-Fields.Add("UpdateNote", data.UpdateNote); //更新说明
|
|
|
|
-Fields.Add("ReturnNote", data.ReturnNote); //反馈意见
|
|
|
|
-Fields.Add("FilePath", data.FilePath); //模板文件路径
|
|
|
|
|
|
+ Fields.Add("UserId", data.UserId); //所属用户
|
|
|
|
+ Fields.Add("DeveloperId", data.DeveloperId); //开发者
|
|
|
|
+ Fields.Add("VerNum", data.VerNum); //版本号
|
|
|
|
+ Fields.Add("UpdateNote", data.UpdateNote); //更新说明
|
|
|
|
+ Fields.Add("ReturnNote", data.ReturnNote); //反馈意见
|
|
|
|
+ Fields.Add("FilePath", data.FilePath); //模板文件路径
|
|
|
|
|
|
Fields.Add("SeoTitle", data.SeoTitle);
|
|
Fields.Add("SeoTitle", data.SeoTitle);
|
|
Fields.Add("SeoKeyword", data.SeoKeyword);
|
|
Fields.Add("SeoKeyword", data.SeoKeyword);
|
|
Fields.Add("SeoDescription", data.SeoDescription);
|
|
Fields.Add("SeoDescription", data.SeoDescription);
|
|
- int Id = new AdminContent(_accessor.HttpContext, SystemPublicFuction.dbtables).Add("ProjectVersion", Fields, 0);
|
|
|
|
|
|
+ int Id = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Add("ProjectVersion", Fields, 0);
|
|
AddSysLog(data.Id.ToString(), "ProjectVersion", "add");
|
|
AddSysLog(data.Id.ToString(), "ProjectVersion", "add");
|
|
db.SaveChanges();
|
|
db.SaveChanges();
|
|
-
|
|
|
|
|
|
+
|
|
return "success";
|
|
return "success";
|
|
}
|
|
}
|
|
|
|
|
|
@@ -175,7 +177,7 @@ Fields.Add("FilePath", data.FilePath); //模板文件路径
|
|
{
|
|
{
|
|
ViewBag.RightInfo = RightInfo;
|
|
ViewBag.RightInfo = RightInfo;
|
|
ViewBag.right = right;
|
|
ViewBag.right = right;
|
|
-
|
|
|
|
|
|
+
|
|
|
|
|
|
ProjectVersion editData = db.ProjectVersion.FirstOrDefault(m => m.Id == Id) ?? new ProjectVersion();
|
|
ProjectVersion editData = db.ProjectVersion.FirstOrDefault(m => m.Id == Id) ?? new ProjectVersion();
|
|
ViewBag.data = editData;
|
|
ViewBag.data = editData;
|
|
@@ -194,22 +196,22 @@ Fields.Add("FilePath", data.FilePath); //模板文件路径
|
|
public string Edit(ProjectVersion data)
|
|
public string Edit(ProjectVersion data)
|
|
{
|
|
{
|
|
Dictionary<string, object> Fields = new Dictionary<string, object>();
|
|
Dictionary<string, object> Fields = new Dictionary<string, object>();
|
|
-
|
|
|
|
|
|
+
|
|
Fields.Add("ProjectId", data.ProjectId); //小程序项目
|
|
Fields.Add("ProjectId", data.ProjectId); //小程序项目
|
|
-Fields.Add("UserId", data.UserId); //所属用户
|
|
|
|
-Fields.Add("DeveloperId", data.DeveloperId); //开发者
|
|
|
|
-Fields.Add("VerNum", data.VerNum); //版本号
|
|
|
|
-Fields.Add("UpdateNote", data.UpdateNote); //更新说明
|
|
|
|
-Fields.Add("ReturnNote", data.ReturnNote); //反馈意见
|
|
|
|
-Fields.Add("FilePath", data.FilePath); //模板文件路径
|
|
|
|
|
|
+ Fields.Add("UserId", data.UserId); //所属用户
|
|
|
|
+ Fields.Add("DeveloperId", data.DeveloperId); //开发者
|
|
|
|
+ Fields.Add("VerNum", data.VerNum); //版本号
|
|
|
|
+ Fields.Add("UpdateNote", data.UpdateNote); //更新说明
|
|
|
|
+ Fields.Add("ReturnNote", data.ReturnNote); //反馈意见
|
|
|
|
+ Fields.Add("FilePath", data.FilePath); //模板文件路径
|
|
|
|
|
|
Fields.Add("SeoTitle", data.SeoTitle);
|
|
Fields.Add("SeoTitle", data.SeoTitle);
|
|
Fields.Add("SeoKeyword", data.SeoKeyword);
|
|
Fields.Add("SeoKeyword", data.SeoKeyword);
|
|
Fields.Add("SeoDescription", data.SeoDescription);
|
|
Fields.Add("SeoDescription", data.SeoDescription);
|
|
- new AdminContent(_accessor.HttpContext, SystemPublicFuction.dbtables).Edit("ProjectVersion", Fields, data.Id);
|
|
|
|
- AddSysLog(data.Id.ToString(),"ProjectVersion","update");
|
|
|
|
|
|
+ new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Edit("ProjectVersion", Fields, data.Id);
|
|
|
|
+ AddSysLog(data.Id.ToString(), "ProjectVersion", "update");
|
|
db.SaveChanges();
|
|
db.SaveChanges();
|
|
-
|
|
|
|
|
|
+
|
|
return "success";
|
|
return "success";
|
|
}
|
|
}
|
|
|
|
|
|
@@ -224,16 +226,16 @@ Fields.Add("FilePath", data.FilePath); //模板文件路径
|
|
public string Delete(string Id)
|
|
public string Delete(string Id)
|
|
{
|
|
{
|
|
string[] idlist = Id.Split(new char[] { ',' });
|
|
string[] idlist = Id.Split(new char[] { ',' });
|
|
- AddSysLog(Id,"ProjectVersion","del");
|
|
|
|
|
|
+ AddSysLog(Id, "ProjectVersion", "del");
|
|
foreach (string subid in idlist)
|
|
foreach (string subid in idlist)
|
|
{
|
|
{
|
|
int id = int.Parse(subid);
|
|
int id = int.Parse(subid);
|
|
Dictionary<string, object> Fields = new Dictionary<string, object>();
|
|
Dictionary<string, object> Fields = new Dictionary<string, object>();
|
|
Fields.Add("Status", -1);
|
|
Fields.Add("Status", -1);
|
|
- new AdminContent(_accessor.HttpContext, SystemPublicFuction.dbtables).Edit("ProjectVersion", Fields, id);
|
|
|
|
|
|
+ new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Edit("ProjectVersion", Fields, id);
|
|
}
|
|
}
|
|
db.SaveChanges();
|
|
db.SaveChanges();
|
|
-
|
|
|
|
|
|
+
|
|
return "success";
|
|
return "success";
|
|
}
|
|
}
|
|
|
|
|
|
@@ -248,13 +250,13 @@ Fields.Add("FilePath", data.FilePath); //模板文件路径
|
|
public string Open(string Id)
|
|
public string Open(string Id)
|
|
{
|
|
{
|
|
string[] idlist = Id.Split(new char[] { ',' });
|
|
string[] idlist = Id.Split(new char[] { ',' });
|
|
- AddSysLog(Id,"ProjectVersion","open");
|
|
|
|
|
|
+ AddSysLog(Id, "ProjectVersion", "open");
|
|
foreach (string subid in idlist)
|
|
foreach (string subid in idlist)
|
|
{
|
|
{
|
|
int id = int.Parse(subid);
|
|
int id = int.Parse(subid);
|
|
Dictionary<string, object> Fields = new Dictionary<string, object>();
|
|
Dictionary<string, object> Fields = new Dictionary<string, object>();
|
|
Fields.Add("Status", 1);
|
|
Fields.Add("Status", 1);
|
|
- new AdminContent(_accessor.HttpContext, SystemPublicFuction.dbtables).Edit("ProjectVersion", Fields, id);
|
|
|
|
|
|
+ new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Edit("ProjectVersion", Fields, id);
|
|
}
|
|
}
|
|
db.SaveChanges();
|
|
db.SaveChanges();
|
|
return "success";
|
|
return "success";
|
|
@@ -271,13 +273,13 @@ Fields.Add("FilePath", data.FilePath); //模板文件路径
|
|
public string Close(string Id)
|
|
public string Close(string Id)
|
|
{
|
|
{
|
|
string[] idlist = Id.Split(new char[] { ',' });
|
|
string[] idlist = Id.Split(new char[] { ',' });
|
|
- AddSysLog(Id,"ProjectVersion","close");
|
|
|
|
|
|
+ AddSysLog(Id, "ProjectVersion", "close");
|
|
foreach (string subid in idlist)
|
|
foreach (string subid in idlist)
|
|
{
|
|
{
|
|
int id = int.Parse(subid);
|
|
int id = int.Parse(subid);
|
|
Dictionary<string, object> Fields = new Dictionary<string, object>();
|
|
Dictionary<string, object> Fields = new Dictionary<string, object>();
|
|
Fields.Add("Status", 0);
|
|
Fields.Add("Status", 0);
|
|
- new AdminContent(_accessor.HttpContext, SystemPublicFuction.dbtables).Edit("ProjectVersion", Fields, id);
|
|
|
|
|
|
+ new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Edit("ProjectVersion", Fields, id);
|
|
}
|
|
}
|
|
db.SaveChanges();
|
|
db.SaveChanges();
|
|
return "success";
|
|
return "success";
|
|
@@ -292,8 +294,8 @@ Fields.Add("FilePath", data.FilePath); //模板文件路径
|
|
/// <param name="Id"></param>
|
|
/// <param name="Id"></param>
|
|
public string Sort(int Id, int Sort)
|
|
public string Sort(int Id, int Sort)
|
|
{
|
|
{
|
|
- new AdminContent(_accessor.HttpContext, SystemPublicFuction.dbtables).Sort("ProjectVersion", Sort, Id);
|
|
|
|
-
|
|
|
|
|
|
+ new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Sort("ProjectVersion", Sort, Id);
|
|
|
|
+
|
|
AddSysLog(Id.ToString(), "ProjectVersion", "sort");
|
|
AddSysLog(Id.ToString(), "ProjectVersion", "sort");
|
|
return "success";
|
|
return "success";
|
|
}
|
|
}
|
|
@@ -308,15 +310,15 @@ Fields.Add("FilePath", data.FilePath); //模板文件路径
|
|
{
|
|
{
|
|
ExcelData = HttpUtility.UrlDecode(ExcelData);
|
|
ExcelData = HttpUtility.UrlDecode(ExcelData);
|
|
JsonData list = JsonMapper.ToObject(ExcelData);
|
|
JsonData list = JsonMapper.ToObject(ExcelData);
|
|
- for (int i = 1; i < list.Count;i++ )
|
|
|
|
|
|
+ for (int i = 1; i < list.Count; i++)
|
|
{
|
|
{
|
|
JsonData dr = list[i];
|
|
JsonData dr = list[i];
|
|
-
|
|
|
|
|
|
+
|
|
db.ProjectVersion.Add(new ProjectVersion()
|
|
db.ProjectVersion.Add(new ProjectVersion()
|
|
{
|
|
{
|
|
CreateDate = DateTime.Now,
|
|
CreateDate = DateTime.Now,
|
|
UpdateDate = DateTime.Now,
|
|
UpdateDate = DateTime.Now,
|
|
-
|
|
|
|
|
|
+
|
|
});
|
|
});
|
|
db.SaveChanges();
|
|
db.SaveChanges();
|
|
}
|
|
}
|
|
@@ -339,56 +341,56 @@ Fields.Add("FilePath", data.FilePath); //模板文件路径
|
|
|
|
|
|
string condition = " and Status>-1";
|
|
string condition = " and Status>-1";
|
|
//小程序项目
|
|
//小程序项目
|
|
-if (!string.IsNullOrEmpty(ProjectIdSelect))
|
|
|
|
-{
|
|
|
|
-condition += " and ProjectId=" + ProjectIdSelect;
|
|
|
|
-}
|
|
|
|
-//所属用户真实姓名
|
|
|
|
-if (!string.IsNullOrEmpty(UserIdRealName))
|
|
|
|
-{
|
|
|
|
-condition += " and UserId in (select UserId from UsersForRealName where RealName='" + UserIdRealName + "')";
|
|
|
|
-}
|
|
|
|
-//所属用户手机号
|
|
|
|
-if (!string.IsNullOrEmpty(UserIdMobile))
|
|
|
|
-{
|
|
|
|
-condition += " and UserId in (select UserId from UsersForMobile where Mobile='" + UserIdMobile + "')";
|
|
|
|
-}
|
|
|
|
-//开发者昵称
|
|
|
|
-if (!string.IsNullOrEmpty(DeveloperIdNickName))
|
|
|
|
-{
|
|
|
|
-condition += " and DeveloperId in (select DeveloperId from DevelopersForNickName where NickName='" + DeveloperIdNickName + "')";
|
|
|
|
-}
|
|
|
|
-//开发者真实姓名
|
|
|
|
-if (!string.IsNullOrEmpty(DeveloperIdRealName))
|
|
|
|
-{
|
|
|
|
-condition += " and DeveloperId in (select DeveloperId from DevelopersForRealName where RealName='" + DeveloperIdRealName + "')";
|
|
|
|
-}
|
|
|
|
-//开发者手机号
|
|
|
|
-if (!string.IsNullOrEmpty(DeveloperIdMobile))
|
|
|
|
-{
|
|
|
|
-condition += " and DeveloperId in (select DeveloperId from DevelopersForMobile where Mobile='" + DeveloperIdMobile + "')";
|
|
|
|
-}
|
|
|
|
|
|
+ if (!string.IsNullOrEmpty(ProjectIdSelect))
|
|
|
|
+ {
|
|
|
|
+ condition += " and ProjectId=" + ProjectIdSelect;
|
|
|
|
+ }
|
|
|
|
+ //所属用户真实姓名
|
|
|
|
+ if (!string.IsNullOrEmpty(UserIdRealName))
|
|
|
|
+ {
|
|
|
|
+ condition += " and UserId in (select UserId from UsersForRealName where RealName='" + UserIdRealName + "')";
|
|
|
|
+ }
|
|
|
|
+ //所属用户手机号
|
|
|
|
+ if (!string.IsNullOrEmpty(UserIdMobile))
|
|
|
|
+ {
|
|
|
|
+ condition += " and UserId in (select UserId from UsersForMobile where Mobile='" + UserIdMobile + "')";
|
|
|
|
+ }
|
|
|
|
+ //开发者昵称
|
|
|
|
+ if (!string.IsNullOrEmpty(DeveloperIdNickName))
|
|
|
|
+ {
|
|
|
|
+ condition += " and DeveloperId in (select DeveloperId from DevelopersForNickName where NickName='" + DeveloperIdNickName + "')";
|
|
|
|
+ }
|
|
|
|
+ //开发者真实姓名
|
|
|
|
+ if (!string.IsNullOrEmpty(DeveloperIdRealName))
|
|
|
|
+ {
|
|
|
|
+ condition += " and DeveloperId in (select DeveloperId from DevelopersForRealName where RealName='" + DeveloperIdRealName + "')";
|
|
|
|
+ }
|
|
|
|
+ //开发者手机号
|
|
|
|
+ if (!string.IsNullOrEmpty(DeveloperIdMobile))
|
|
|
|
+ {
|
|
|
|
+ condition += " and DeveloperId in (select DeveloperId from DevelopersForMobile where Mobile='" + DeveloperIdMobile + "')";
|
|
|
|
+ }
|
|
|
|
|
|
|
|
|
|
- Dictionary<string, object> obj = new AdminContent(_accessor.HttpContext, SystemPublicFuction.dbtables).IndexData("ProjectVersion", Fields, "Id desc", "0", 1, 20000, condition, "", false);
|
|
|
|
|
|
+ Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).IndexData("ProjectVersion", Fields, "Id desc", "0", 1, 20000, condition, "", false);
|
|
List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
|
|
List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
|
|
foreach (Dictionary<string, object> dic in diclist)
|
|
foreach (Dictionary<string, object> dic in diclist)
|
|
{
|
|
{
|
|
//小程序项目
|
|
//小程序项目
|
|
-// dic["ProjectId"] = RelationClass.GetProjectsInfo(int.Parse(dic["ProjectId"].ToString()));
|
|
|
|
-//所属用户
|
|
|
|
-int UserId = int.Parse(function.CheckInt(dic["UserId"].ToString()));
|
|
|
|
-Users userid_Users = db.Users.FirstOrDefault(m => m.Id == UserId) ?? new Users();
|
|
|
|
-dic["UserIdRealName"] = userid_Users.RealName;
|
|
|
|
-dic["UserIdMobile"] = userid_Users.Mobile;
|
|
|
|
-dic.Remove("UserId");
|
|
|
|
-//开发者
|
|
|
|
-int DeveloperId = int.Parse(function.CheckInt(dic["DeveloperId"].ToString()));
|
|
|
|
-Developers developerid_Developers = db.Developers.FirstOrDefault(m => m.Id == DeveloperId) ?? new Developers();
|
|
|
|
-dic["DeveloperIdNickName"] = developerid_Developers.NickName;
|
|
|
|
-dic["DeveloperIdRealName"] = developerid_Developers.RealName;
|
|
|
|
-dic["DeveloperIdMobile"] = developerid_Developers.Mobile;
|
|
|
|
-dic.Remove("DeveloperId");
|
|
|
|
|
|
+ // dic["ProjectId"] = RelationClass.GetProjectsInfo(int.Parse(dic["ProjectId"].ToString()));
|
|
|
|
+ //所属用户
|
|
|
|
+ int UserId = int.Parse(function.CheckInt(dic["UserId"].ToString()));
|
|
|
|
+ Users userid_Users = db.Users.FirstOrDefault(m => m.Id == UserId) ?? new Users();
|
|
|
|
+ dic["UserIdRealName"] = userid_Users.RealName;
|
|
|
|
+ dic["UserIdMobile"] = userid_Users.Mobile;
|
|
|
|
+ dic.Remove("UserId");
|
|
|
|
+ //开发者
|
|
|
|
+ int DeveloperId = int.Parse(function.CheckInt(dic["DeveloperId"].ToString()));
|
|
|
|
+ Developers developerid_Developers = db.Developers.FirstOrDefault(m => m.Id == DeveloperId) ?? new Developers();
|
|
|
|
+ dic["DeveloperIdNickName"] = developerid_Developers.NickName;
|
|
|
|
+ dic["DeveloperIdRealName"] = developerid_Developers.RealName;
|
|
|
|
+ dic["DeveloperIdMobile"] = developerid_Developers.Mobile;
|
|
|
|
+ dic.Remove("DeveloperId");
|
|
|
|
|
|
}
|
|
}
|
|
|
|
|
|
@@ -397,7 +399,7 @@ dic.Remove("DeveloperId");
|
|
result.Add("Info", "Excel报表-" + DateTime.Now.ToString("yyyy-MM-ddTHH:mm:ss") + ".xlsx");
|
|
result.Add("Info", "Excel报表-" + DateTime.Now.ToString("yyyy-MM-ddTHH:mm:ss") + ".xlsx");
|
|
result.Add("Obj", diclist);
|
|
result.Add("Obj", diclist);
|
|
Dictionary<string, object> ReturnFields = new Dictionary<string, object>();
|
|
Dictionary<string, object> ReturnFields = new Dictionary<string, object>();
|
|
-
|
|
|
|
|
|
+
|
|
result.Add("Fields", ReturnFields);
|
|
result.Add("Fields", ReturnFields);
|
|
AddSysLog("0", "ProjectVersion", "ExportExcel");
|
|
AddSysLog("0", "ProjectVersion", "ExportExcel");
|
|
return Json(result);
|
|
return Json(result);
|