From ea037964dba48654bdaf7169517c64508984841e Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期一, 19 七月 2021 14:53:45 +0800
Subject: [PATCH] 今日开发： 工作考评 按部门排序。不显示离职员工 工作统计，去掉标题 所有查询，只选择开始或者结束日期，自动补充另外一个日期 工作统计增加根据日期查询，只显示有数据的项 增加全员工作统计菜单，可以查询每个每个在职员工的工作统计
---
zhengcaioa/zhengcaioa/Controllers/BusinessOrder/CooperOrderController.cs | 145 ++++++++++++++++++++++++++++++++++++++----------
1 files changed, 115 insertions(+), 30 deletions(-)
diff --git a/zhengcaioa/zhengcaioa/Controllers/BusinessOrder/CooperOrderController.cs b/zhengcaioa/zhengcaioa/Controllers/BusinessOrder/CooperOrderController.cs
index e9c3bbd..3c67038 100644
--- a/zhengcaioa/zhengcaioa/Controllers/BusinessOrder/CooperOrderController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/BusinessOrder/CooperOrderController.cs
@@ -18,10 +18,11 @@
using CommonToolsCore;
using Services;
using System.Transactions;
+using System.IdentityModel.Tokens.Jwt;
namespace zhengcaioa.Controllers.BusinessOrder
{
- [CheckLogin]
+
public class CooperOrderController : Controller
{
private readonly ILogger<CooperOrderController> _logger;
@@ -52,7 +53,7 @@
_fiMemberService = fiMemberService;
}
-
+ [CheckLogin]
public IActionResult Index()
{
var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
@@ -102,18 +103,18 @@
}
-
+ [CheckLogin]
public IActionResult GetList(CooperOrderDTOSearch search)
{
var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
ViewData["curentuser"] = curentuser;
- search.Creater = curentuser.Id;
+ //search.Creater = curentuser.Id;
//JsonResult jsonResult = new JsonResult(_liaotianService.SearchByPaging(search), new Newtonsoft.Json.Serialization.DefaultContractResolver());
return new JsonResult(_cooperOrderService.SearchByPaging(search));
}
-
+ [CheckLogin]
public IActionResult ShouliList()
{
var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
@@ -141,7 +142,7 @@
return View();
}
-
+ [CheckLogin]
public IActionResult GetListshouli(CooperOrderDTOSearch search)
{
var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
@@ -152,7 +153,7 @@
}
-
+ [CheckLogin]
public IActionResult ChedanList()
{
var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
@@ -180,7 +181,7 @@
return View();
}
-
+ [CheckLogin]
public IActionResult GetListchedan(CooperOrderDTOSearch search)
{
var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
@@ -190,7 +191,7 @@
return new JsonResult(_cooperOrderService.SearchByPaging(search));
}
-
+ [CheckLogin]
public IActionResult WangongList()
{
var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
@@ -218,7 +219,7 @@
return View();
}
-
+ [CheckLogin]
public IActionResult GetListwangong(CooperOrderDTOSearch search)
{
var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
@@ -228,7 +229,7 @@
//JsonResult jsonResult = new JsonResult(_liaotianService.SearchByPaging(search), new Newtonsoft.Json.Serialization.DefaultContractResolver());
return new JsonResult(_cooperOrderService.SearchByPaging(search));
}
-
+ [CheckLogin]
public IActionResult SonghuoList()
{
var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
@@ -258,7 +259,7 @@
return View();
}
-
+ [CheckLogin]
public IActionResult GetListsonghuo(CooperOrderDTOSearch search)
{
var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
@@ -268,7 +269,7 @@
//JsonResult jsonResult = new JsonResult(_liaotianService.SearchByPaging(search), new Newtonsoft.Json.Serialization.DefaultContractResolver());
return new JsonResult(_cooperOrderService.SearchByPaging(search));
}
-
+ [CheckLogin]
public IActionResult HuifangList()
{
var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
@@ -296,7 +297,7 @@
return View();
}
-
+ [CheckLogin]
public IActionResult GetListHuifang(CooperOrderDTOSearch search)
{
var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
@@ -306,7 +307,7 @@
//JsonResult jsonResult = new JsonResult(_liaotianService.SearchByPaging(search), new Newtonsoft.Json.Serialization.DefaultContractResolver());
return new JsonResult(_cooperOrderService.SearchByPaging(search));
}
-
+ [CheckLogin]
public IActionResult PingjiaList()
{
var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
@@ -334,7 +335,7 @@
return View();
}
-
+ [CheckLogin]
public IActionResult GetListPingjia(CooperOrderDTOSearch search)
{
var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
@@ -374,7 +375,7 @@
return View();
}
-
+ [CheckLogin]
public IActionResult GetListYouhui(CooperOrderDTOSearch search)
{
var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
@@ -384,6 +385,7 @@
//JsonResult jsonResult = new JsonResult(_liaotianService.SearchByPaging(search), new Newtonsoft.Json.Serialization.DefaultContractResolver());
return new JsonResult(_cooperOrderService.SearchByPaging(search));
}
+ [CheckLogin]
public IActionResult Edit(string id = null, string ShouliStatus = "1")
{
var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
@@ -443,6 +445,7 @@
/// <param name="data">宀椾綅瀹炰綋绫诲璞�</param>
/// <returns></returns>
///
+ [CheckLogin]
[HttpPost]
public IActionResult Save(CooperOrderDTO data)
{
@@ -478,6 +481,7 @@
/// <param name="info">瀹炰綋</param>
/// <returns></returns>
///
+ [CheckLogin]
public IActionResult Nullify(string Id = "")
{
var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
@@ -492,7 +496,7 @@
/// <param name="data">宀椾綅瀹炰綋绫诲璞�</param>
/// <returns></returns>
///
-
+ [CheckLogin]
public IActionResult Shouli(string id)
{
var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
@@ -524,7 +528,7 @@
/// <param name="data">宀椾綅瀹炰綋绫诲璞�</param>
/// <returns></returns>
///
-
+ [CheckLogin]
public IActionResult Wangong(string id)
{
var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
@@ -540,8 +544,8 @@
return new JsonResult(resultEntity);
}
-
+ [CheckLogin]
public IActionResult Chedan(string id = null)
{
var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
@@ -552,7 +556,7 @@
return View();
}
-
+ [CheckLogin]
public IActionResult chedantuihuan(decimal Price, string Chedanid)
{
var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
@@ -580,7 +584,7 @@
return new JsonResult(resultEntity);
}
-
+ [CheckLogin]
public IActionResult Huifang(string id = null)
{
var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
@@ -592,7 +596,7 @@
return View();
}
-
+ [CheckLogin]
public IActionResult Huifangtuihuan(CooperOrderDTO dto)
{
ResultEntity resultEntity = new ResultEntity();
@@ -619,7 +623,7 @@
/// <param name="data">宀椾綅瀹炰綋绫诲璞�</param>
/// <returns></returns>
///
-
+ [CheckLogin]
public IActionResult Songhuo(string id)
{
var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
@@ -639,7 +643,7 @@
}
-
+ [CheckLogin]
public IActionResult Songhuotuihuan(CooperOrderDTO dto)
{
ResultEntity resultEntity = new ResultEntity();
@@ -663,7 +667,7 @@
return new JsonResult(resultEntity);
}
-
+ [CheckLogin]
public IActionResult Pingjia(string id = null)
{
var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
@@ -674,7 +678,7 @@
return View();
}
-
+ [CheckLogin]
public IActionResult Pingjiatuihuan(string PingjiaStatus, string Pingjiaid)
{
ResultEntity resultEntity = new ResultEntity();
@@ -695,7 +699,7 @@
}
-
+ [CheckLogin]
public IActionResult Print(string id = null)
{
var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
@@ -724,7 +728,7 @@
return View();
}
-
+ [CheckLogin]
public IActionResult printList(CooperOrderDTOSearch search)
{
//JsonResult jsonResult = new JsonResult(_liaotianService.SearchByPaging(search), new Newtonsoft.Json.Serialization.DefaultContractResolver());
@@ -854,6 +858,87 @@
return result;
}
-
+
+
+
+ //鎻愰棶
+ public IActionResult GetHuiYuanOrder([FromBody]CooperOrderDTOSearch search)
+ {
+ ReturnMsg<List<UserOrders>> returnMsg = new ReturnMsg<List<UserOrders>>();
+ returnMsg.code = 2;
+ try
+ {
+ string userid = "";
+ var headers = Request.Headers;
+ if (headers != null)
+ {
+ //string SecurityKey = _configuration.GetSection("SecurityKey").Value;
+ var keyId = headers["Authorization"].FirstOrDefault();
+ if (string.IsNullOrEmpty("keyId"))
+ {
+ returnMsg.code = 2;
+ returnMsg.error = "娌℃湁鑾峰彇鍒皌oken";
+ returnMsg.count = 0;
+
+ return new JsonResult(returnMsg);
+ }
+
+
+ JwtSecurityToken jwt = null;
+ var handler = new JwtSecurityTokenHandler();
+ var key1 = keyId.Replace("Bearer", "").Trim();
+ jwt = handler.ReadJwtToken(key1);
+ System.Security.Claims.Claim sss = jwt.Claims.Where(x => x.Type == "id").FirstOrDefault();
+ userid = sss.Value;
+
+ }
+ //LZhuanjiahuidumDTOSearch searchEntity = new LZhuanjiahuidumDTOSearch();
+ //searchEntity.Userid = userid;
+ ////searchEntity.HuidaStatus = "A";
+ //searchEntity.page = 1;
+ //searchEntity.rows = 1000;
+ search.HuiyuanId = userid;
+ ResultDataEntity<CooperOrderDTO> resultDataEntity = _cooperOrderService.SearchByPaging(search);
+ List<CooperOrderDTO> cooperOrderDTOs = resultDataEntity.DataList;
+ List<UserOrders> userOrders = new List<UserOrders>();
+ //灏佽璁㈠崟
+ foreach (var cooperOrderDTO in cooperOrderDTOs)
+ {
+ UserOrders userOrder = new UserOrders();
+ userOrder.order_goods = new List<usercart_items>();
+ usercart_items usercart_Item = new usercart_items();
+
+ userOrder.order_type = "offline";
+ userOrder.order_no = cooperOrderDTO.OrderNo;
+ userOrder.accept_name = cooperOrderDTO.Shr;
+ userOrder.mobile = cooperOrderDTO.ShrTel;
+ userOrder.address = cooperOrderDTO.ShrAddress;
+ userOrder.order_amount = cooperOrderDTO.Money.HasValue ? cooperOrderDTO.Money.Value: 0;
+ userOrder.statusChs = cooperOrderDTO.ShouliStatusName;
+ userOrder.add_time = cooperOrderDTO.Createtime;
+
+ usercart_Item.sell_price = cooperOrderDTO.Price.HasValue ? cooperOrderDTO.Price.Value : 0;
+ usercart_Item.quantity = cooperOrderDTO.OrderNum.HasValue ? decimal.ToInt32(cooperOrderDTO.OrderNum.Value) : 0;
+ usercart_Item.name = cooperOrderDTO.OrderTypeName + "-" + cooperOrderDTO.OrderType1Name + (string.IsNullOrEmpty(cooperOrderDTO.OrderType2)?"": "-"+cooperOrderDTO.OrderType2);
+
+
+
+ userOrder.order_goods.Add(usercart_Item);
+ userOrders.Add(userOrder);
+ }
+ returnMsg.code = 1;
+ returnMsg.returnObj = userOrders;
+ returnMsg.count = resultDataEntity.DataList.Count;
+ }
+ catch (Exception ex)
+ {
+ returnMsg.code = 2;
+ returnMsg.error = "娌℃湁鑾峰彇鍒皌oken";
+ returnMsg.count = 0;
+
+ }
+ return new JsonResult(returnMsg);
+ }
+
}
}
--
Gitblit v1.9.1