From 6131316db2e61c717a6fbd1db774b41b60c933e9 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期三, 21 九月 2022 09:45:32 +0800
Subject: [PATCH] 优化查询
---
zhengcaioa/zhengcaioa/Controllers/ProjectController.cs | 82 ++++++++++++++++++++++++++++++++--------
1 files changed, 65 insertions(+), 17 deletions(-)
diff --git a/zhengcaioa/zhengcaioa/Controllers/ProjectController.cs b/zhengcaioa/zhengcaioa/Controllers/ProjectController.cs
index 3f77fd8..7f7a075 100644
--- a/zhengcaioa/zhengcaioa/Controllers/ProjectController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/ProjectController.cs
@@ -16,6 +16,7 @@
using zhengcaioa.Models;
using System.IdentityModel.Tokens.Jwt;
using CommonToolsCore;
+using System.Transactions;
namespace zhengcaioa.Controllers
{
@@ -30,12 +31,14 @@
private readonly ISysBaimingdanService _sysBaimingdanService;
private readonly IFiOrderrecievemoneyService _fiOrderrecievemoneyService;
private readonly IAreaService _areaService;
+ private readonly IPltPageService _pltPageService;
public ProjectController(ILogger<ProjectController> logger, IProjectService projectService, ILiaotianService liaotianService,IIntentionCustomerService intentionCustomerService, IUserService userService
, ICooperatecustomCustomerService cooperatecustomCustomerService
, ISysBaimingdanService sysBaimingdanService
, IFiOrderrecievemoneyService fiOrderrecievemoneyService
- , IAreaService areaService)
+ , IAreaService areaService
+ , IPltPageService pltPageService)
{
_logger = logger;
_projectService = projectService;
@@ -46,6 +49,7 @@
_sysBaimingdanService = sysBaimingdanService;
_fiOrderrecievemoneyService = fiOrderrecievemoneyService;
_areaService = areaService;
+ _pltPageService = pltPageService;
}
[CheckLogin]
public IActionResult Index()
@@ -75,7 +79,9 @@
{
var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
ViewData["curentuser"] = curentuser;
-
+ var pageEntities = _pltPageService.GetUserPage(curentuser.Id, "/Project/Select");
+ var pageEntities2 = pageEntities.Where(x => x.PageMethod == "02").ToList();
+ ViewData["ActionInfo2"] = pageEntities2;
ProjectDTO projectDTO = new ProjectDTO();
if (!String.IsNullOrEmpty(id))
{
@@ -294,8 +300,21 @@
}
data.Modifier = curentuser.Id;
data.Modifytime = DateTime.Now;
+ ResultEntity resultEntity = new ResultEntity();
+ resultEntity.Result = false;
+ using (TransactionScope scope = new TransactionScope(TransactionScopeOption.Required,
+ new TransactionOptions
+ {
+ IsolationLevel = IsolationLevel.ReadCommitted,
+ Timeout = TransactionManager.MaximumTimeout
+ }
+ ))
+ {
+ resultEntity = _projectService.saveLiaotian(data);
+ scope.Complete();
+ }
- ResultEntity resultEntity = _projectService.saveLiaotian(data);
+
return JsonConvert.SerializeObject(resultEntity);
}
@@ -305,20 +324,45 @@
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);
- ActionEntity actionEntity1 = new ActionEntity();
- actionEntity1.OpenType = 0;
- actionEntity1.ActionUrl = "";
- actionEntity1.ActionFun = "Add";
- actionEntity1.PageIco = "fa fa-plus";
- actionEntity1.ActionName = "鏂板";
- actionlist.Add(actionEntity1);
+ //ActionEntity actionEntity = new ActionEntity();
+ //actionEntity.OpenType = 0;
+ //actionEntity.ActionUrl = "";
+ //actionEntity.ActionFun = "Search";
+ //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);
+ var pageEntities = _pltPageService.GetUserPage(curentuser.Id, "/Project/Select");
+ var pageEntities1 = pageEntities.Where(x => x.PageMethod == "01").ToList();
+ if (pageEntities1.Count(x => x.PageShortcut == "Search") <= 0)
+ {
+ ActionEntity actionEntity = new ActionEntity();
+ actionEntity.OpenType = 0;
+ actionEntity.ActionUrl = "";
+ actionEntity.ActionFun = "Search";
+ actionEntity.PageIco = "fa fa-search";
+ actionEntity.ActionName = "鏌ヨ";
+ actionlist.Add(actionEntity);
+
+ ViewData["Creater11"] = curentuser.Id;
+ }
+ 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;
ViewBag.ProjectDropDown = _projectService.AllcgfsDropDown().Select(x => new { code = x.Value, label = x.Text }).ToList();
//ViewBag.flbx = _liaotianService.GetSYScode("Project", "flbx").Select(x => new { code = x.CodeSn, label = x.Comments }).ToList();
@@ -341,6 +385,10 @@
ViewBag.Creater = _userService.GetList().Select(x => new { code = x.Id, label = x.UserName }).ToList();
ViewBag.flbx = _liaotianService.GetSYScode("system", "shifou").Select(x => new { code = x.CodeSn, label = x.Comments }).ToList();
ViewBag.ShiFouyReasonname = _liaotianService.GetSYScode("Project", "ShiFouyReasonname").Select(x => new { code = x.CodeSn, label = x.Comments }).ToList();
+
+ ViewBag.Baomingtimebegin = DateTime.Now.AddYears(-1).ToString("yyyy-MM-dd");
+ ViewBag.Baomingtimeend = DateTime.Now.ToString("yyyy-MM-dd");
+
return View();
}
--
Gitblit v1.9.1