From 67a0042c5f29e4bb0e0b82f6190f2bc51480b45c Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期二, 28 二月 2023 13:25:09 +0800
Subject: [PATCH] 工资绩效改版
---
zhengcaioa/zhengcaioa/Controllers/BusinessOrder/OrderBanciController.cs | 117 ++++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 105 insertions(+), 12 deletions(-)
diff --git a/zhengcaioa/zhengcaioa/Controllers/BusinessOrder/OrderBanciController.cs b/zhengcaioa/zhengcaioa/Controllers/BusinessOrder/OrderBanciController.cs
index ff76167..f8849fc 100644
--- a/zhengcaioa/zhengcaioa/Controllers/BusinessOrder/OrderBanciController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/BusinessOrder/OrderBanciController.cs
@@ -27,14 +27,16 @@
private readonly ILiaotianService _liaotianService;
private readonly IOrderBanciService _orderBanciService;
private readonly IOrderBanciDtlService _orderBanciDtlService;
+ private readonly IPltPageService _pltPageService;
-
- public OrderBanciController(ILogger<OrderBanciController> logger, ILiaotianService liaotianService, IOrderBanciService orderBanciService, IOrderBanciDtlService orderBanciDtlService)
+ public OrderBanciController(ILogger<OrderBanciController> logger, ILiaotianService liaotianService, IOrderBanciService orderBanciService, IOrderBanciDtlService orderBanciDtlService
+ , IPltPageService pltPageService)
{
_logger = logger;
_liaotianService = liaotianService;
_orderBanciService = orderBanciService;
_orderBanciDtlService = orderBanciDtlService;
+ _pltPageService = pltPageService;
}
[CheckLogin]
@@ -50,18 +52,34 @@
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, "/OrderBanci/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;
-
+
return View();
@@ -77,7 +95,9 @@
{
var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
ViewData["curentuser"] = curentuser;
-
+ var pageEntities = _pltPageService.GetUserPage(curentuser.Id, "/OrderBanci/Index/");
+ var pageEntities2 = pageEntities.Where(x => x.PageMethod == "02").ToList();
+ ViewData["ActionInfo2"] = pageEntities2;
OrderBanciDTO dto = new OrderBanciDTO();
if (!String.IsNullOrEmpty(id))
{
@@ -214,7 +234,7 @@
- ViewData["shangxiawu"] = _liaotianService.GetSYScode("order_banci_dtl", "shangxiawu");
+ ViewData["shangxiawu"] = _liaotianService.GetSYScode("order_banci_order", "kechengleixing_id");
@@ -320,5 +340,78 @@
return new JsonResult(returnMsg);
}
+
+ public IActionResult GetBanciAll(string id)
+ {
+ ReturnMsg<OrderBanciDTO> returnMsg = new ReturnMsg<OrderBanciDTO>();
+ returnMsg.code = 2;
+ try
+ {
+ var orderBanciDTO = _orderBanciService.GetAll(id);
+ if (orderBanciDTO==null)
+ {
+ returnMsg.code = 2;
+ returnMsg.error = "娌℃湁鏌ヨ鍒扮彮娆�";
+ returnMsg.count = 0;
+ }
+ else
+ {
+ OrderBanciDtlDTOSearch searchEntity = new OrderBanciDtlDTOSearch();
+ searchEntity.page = 1;
+ searchEntity.rows = 1000;
+ searchEntity.OrderBanciId = id;
+ orderBanciDTO.orderBanciDtlDTOs = _orderBanciDtlService.SearchByPaging(searchEntity).DataList;
+ returnMsg.code = 1;
+ returnMsg.count = 1;
+ returnMsg.returnObj = orderBanciDTO;
+ }
+
+ }
+ catch (Exception ex)
+ {
+ returnMsg.code = 2;
+ returnMsg.error = "娌℃湁鑾峰彇鍒皌oken";
+ returnMsg.count = 0;
+
+ }
+ return new JsonResult(returnMsg);
+
+
+ }
+
+
+
+
+
+ //鑾峰彇褰撳墠鐨勫煿璁�
+ public IActionResult GetJifenBanciList()
+ {
+ ReturnMsg<List<OrderBanciDTO>> returnMsg = new ReturnMsg<List<OrderBanciDTO>>();
+ returnMsg.code = 2;
+ try
+ {
+
+ List<OrderBanciDTO> orderBanciDTOs = _orderBanciService.GetJifenBanciList();
+
+
+
+ returnMsg.code = 1;
+ returnMsg.count = orderBanciDTOs.Count;
+ returnMsg.returnObj = orderBanciDTOs;
+
+
+
+
+
+ }
+ catch (Exception ex)
+ {
+ returnMsg.code = 2;
+ returnMsg.error = "娌℃湁鑾峰彇鍒皌oken";
+ returnMsg.count = 0;
+
+ }
+ return new JsonResult(returnMsg);
+ }
}
}
--
Gitblit v1.9.1