From 15eb82df2d6ec539e9d4245bfe08d531e8eb6379 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期日, 27 四月 2025 14:33:26 +0800
Subject: [PATCH] 修改培训订单占多个座位
---
zhengcaioa/zhengcaioa/Controllers/admin/AdmBreakPrecedentController.cs | 94 ++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 85 insertions(+), 9 deletions(-)
diff --git a/zhengcaioa/zhengcaioa/Controllers/admin/AdmBreakPrecedentController.cs b/zhengcaioa/zhengcaioa/Controllers/admin/AdmBreakPrecedentController.cs
index c67cb86..e0eb911 100644
--- a/zhengcaioa/zhengcaioa/Controllers/admin/AdmBreakPrecedentController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/admin/AdmBreakPrecedentController.cs
@@ -29,10 +29,12 @@
private readonly IAdmBreakPrecedentService _admBreakPrecedentService;
private readonly IHrDeptService _hrDeptService;
private readonly IPltRoleService _ltRoleService;
-
+ private readonly IPltPageService _pltPageService;
- public AdmBreakPrecedentController(ILogger<AdmBreakPrecedentController> logger, ILiaotianService liaotianService, IUserService userService, IAdmBreakPrecedentService admBreakPrecedentService, IHrDeptService hrDeptService, IPltRoleService ltRoleService)
+
+ public AdmBreakPrecedentController(ILogger<AdmBreakPrecedentController> logger, ILiaotianService liaotianService, IUserService userService, IAdmBreakPrecedentService admBreakPrecedentService, IHrDeptService hrDeptService, IPltRoleService ltRoleService
+ , IPltPageService pltPageService)
{
_logger = logger;
_liaotianService = liaotianService;
@@ -40,6 +42,8 @@
_admBreakPrecedentService = admBreakPrecedentService;
_hrDeptService = hrDeptService;
_ltRoleService = ltRoleService;
+ _pltPageService = pltPageService;
+
}
public IActionResult Index()
{
@@ -53,13 +57,25 @@
actionEntity.PageIco = "fa fa-search";
actionEntity.ActionName = "鏌ヨ";
actionlist.Add(actionEntity);
- ActionEntity actionEntity1 = new ActionEntity();
- actionEntity1.OpenType = 0;
- actionEntity1.ActionUrl = "";
- actionEntity1.ActionFun = "Add";
- actionEntity1.PageIco = "fa fa-plus";
- actionEntity1.ActionName = "鏂板";
- actionlist.Add(actionEntity1);
+ //ActionEntity actionEntity1 = new ActionEntity();
+ //actionEntity1.OpenType = 0;
+ //actionEntity1.ActionUrl = "";
+ //actionEntity1.ActionFun = "Add";
+ //actionEntity1.PageIco = "fa fa-plus";
+ //actionEntity1.ActionName = "鏂板";
+ //actionlist.Add(actionEntity1);
+ var pageEntities = _pltPageService.GetUserPage(curentuser.Id, "/AdmBreakPrecedent/Index/");
+ var pageEntities1 = pageEntities.Where(x => x.PageMethod == "01").ToList();
+ foreach (var pageEntity in pageEntities1)
+ {
+ ActionEntity actionEntity1 = new ActionEntity();
+ actionEntity1.OpenType = pageEntity.OpenType;
+ actionEntity1.ActionUrl = "";
+ actionEntity1.ActionFun = pageEntity.PageShortcut;
+ actionEntity1.PageIco = pageEntity.PageIco;
+ actionEntity1.ActionName = pageEntity.PageName;
+ actionlist.Add(actionEntity1);
+ }
ViewData["ActionInfo"] = actionlist;
@@ -82,6 +98,9 @@
{
var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
ViewData["curentuser"] = curentuser;
+ var pageEntities = _pltPageService.GetUserPage(curentuser.Id, "/AdmBreakPrecedent/Index/");
+ var pageEntities2 = pageEntities.Where(x => x.PageMethod == "02").ToList();
+ ViewData["ActionInfo2"] = pageEntities2;
AdmBreakPrecedentDTO dto = new AdmBreakPrecedentDTO();
if (!String.IsNullOrEmpty(id))
@@ -173,5 +192,62 @@
return new JsonResult(resultEntity);
}
+
+
+
+ public IActionResult IndexRenshi(string UserId)
+ {
+ var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
+ ViewData["curentuser"] = curentuser;
+ List<ActionEntity> actionlist = new List<ActionEntity>();
+ ActionEntity actionEntity = new ActionEntity();
+ actionEntity.OpenType = 0;
+ actionEntity.ActionUrl = "";
+ actionEntity.ActionFun = "Search";
+ actionEntity.PageIco = "fa fa-search";
+ actionEntity.ActionName = "鏌ヨ";
+ actionlist.Add(actionEntity);
+ ViewData["ActionInfo"] = actionlist;
+
+
+ ViewBag.UserId = UserId;
+
+ return View();
+
+ }
+
+ public IActionResult GetListRenshi(AdmBreakPrecedentDTOSearch search)
+ {
+ //JsonResult jsonResult = new JsonResult(_liaotianService.SearchByPaging(search), new Newtonsoft.Json.Serialization.DefaultContractResolver());
+ return new JsonResult(_admBreakPrecedentService.SearchByPaging(search));
+ }
+
+
+ public IActionResult IndexGoods(string UserId)
+ {
+ var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
+ ViewData["curentuser"] = curentuser;
+ List<ActionEntity> actionlist = new List<ActionEntity>();
+ ActionEntity actionEntity = new ActionEntity();
+ actionEntity.OpenType = 0;
+ actionEntity.ActionUrl = "";
+ actionEntity.ActionFun = "Search";
+ actionEntity.PageIco = "fa fa-search";
+ actionEntity.ActionName = "鏌ヨ";
+ actionlist.Add(actionEntity);
+ ViewData["ActionInfo"] = actionlist;
+
+
+ ViewBag.UserId = UserId;
+
+ return View();
+
+ }
+
+ public IActionResult GetListGoods(AdmBreakPrecedentDTOSearch search)
+ {
+ //JsonResult jsonResult = new JsonResult(_liaotianService.SearchByPaging(search), new Newtonsoft.Json.Serialization.DefaultContractResolver());
+ return new JsonResult(_admBreakPrecedentService.SearchByPagingGoods(search));
+ }
}
}
--
Gitblit v1.9.1