From 6e2b929cf381e2320ba6e7dec56c0371124d2b51 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期六, 27 八月 2022 15:03:00 +0800
Subject: [PATCH] 提交
---
zhengcaioa/zhengcaioa/Controllers/admin/AdmDocDocController.cs | 70 ++++++++++++++++++++++++++++++-----
1 files changed, 60 insertions(+), 10 deletions(-)
diff --git a/zhengcaioa/zhengcaioa/Controllers/admin/AdmDocDocController.cs b/zhengcaioa/zhengcaioa/Controllers/admin/AdmDocDocController.cs
index 610db16..92da09d 100644
--- a/zhengcaioa/zhengcaioa/Controllers/admin/AdmDocDocController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/admin/AdmDocDocController.cs
@@ -29,15 +29,17 @@
private readonly IAdmDocDocService _admDocDocService;
private readonly IHrDeptService _hrDeptService;
private readonly IAdmDocBaseService _admDocBaseService;
+ private readonly IPltPageService _pltPageService;
-
- public AdmDocDocController(ILogger<AdmDocDocController> logger, ILiaotianService liaotianService, IAdmDocDocService admDocDocService, IHrDeptService hrDeptService, IAdmDocBaseService admDocBaseService)
+ public AdmDocDocController(ILogger<AdmDocDocController> logger, ILiaotianService liaotianService, IAdmDocDocService admDocDocService, IHrDeptService hrDeptService, IAdmDocBaseService admDocBaseService
+ , IPltPageService pltPageService)
{
_logger = logger;
_liaotianService = liaotianService;
_admDocDocService = admDocDocService;
_hrDeptService = hrDeptService;
_admDocBaseService = admDocBaseService;
+ _pltPageService = pltPageService;
}
@@ -53,14 +55,30 @@
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, "/AdmDocDoc/Index/");
+ var pageEntities1 = pageEntities.Where(x => x.PageMethod == "01").ToList();
+
+ var pageEntities2 = pageEntities.Where(x => x.PageMethod == "02").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;
+ ViewData["ActionInfo2"] = pageEntities2;
@@ -90,7 +108,9 @@
{
var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
ViewData["curentuser"] = curentuser;
-
+ var pageEntities = _pltPageService.GetUserPage(curentuser.Id, "/AdmDocDoc/Index/");
+ var pageEntities2 = pageEntities.Where(x => x.PageMethod == "02").ToList();
+ ViewData["ActionInfo2"] = pageEntities2;
AdmDocDocDTO dto = new AdmDocDocDTO();
if (!String.IsNullOrEmpty(id))
{
@@ -170,5 +190,35 @@
ViewData["curentuser"] = curentuser;
return new JsonResult(_admDocDocService.ModifyStatus(Id, curentuser.Id));
}
+
+
+ public IActionResult Print(string id)
+ {
+ var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
+ ViewData["curentuser"] = curentuser;
+
+ AdmDocDocDTO dto = _admDocDocService.Get(id);
+
+ if (!String.IsNullOrEmpty(dto.DocDept))
+ {
+
+ dto.DocDeptName = _hrDeptService.Get(dto.DocDept).DeptName;
+
+ }
+
+ if (!String.IsNullOrEmpty(dto.DocType))
+ {
+ var docBaseDTO = _admDocBaseService.Get(dto.DocType);
+
+ dto.DocTypeName = docBaseDTO.DocName;
+ dto.DocTypeNameName = docBaseDTO.DocLuokuan;
+ }
+
+ dto.PublishTimeName = dto.PublishTime.ToString("yyyy-MM-dd");
+
+
+ ViewData.Model = dto;
+ return View();
+ }
}
}
--
Gitblit v1.9.1