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/ProjectController.cs | 115 ++++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 97 insertions(+), 18 deletions(-)
diff --git a/zhengcaioa/zhengcaioa/Controllers/ProjectController.cs b/zhengcaioa/zhengcaioa/Controllers/ProjectController.cs
index b24828f..e23b9a9 100644
--- a/zhengcaioa/zhengcaioa/Controllers/ProjectController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/ProjectController.cs
@@ -29,11 +29,15 @@
private readonly ICooperatecustomCustomerService _cooperatecustomCustomerService;
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)
+ , IFiOrderrecievemoneyService fiOrderrecievemoneyService
+ , IAreaService areaService
+ , IPltPageService pltPageService)
{
_logger = logger;
_projectService = projectService;
@@ -43,6 +47,8 @@
_cooperatecustomCustomerService = cooperatecustomCustomerService;
_sysBaimingdanService = sysBaimingdanService;
_fiOrderrecievemoneyService = fiOrderrecievemoneyService;
+ _areaService = areaService;
+ _pltPageService = pltPageService;
}
[CheckLogin]
public IActionResult Index()
@@ -72,7 +78,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))
{
@@ -302,20 +310,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();
@@ -903,7 +936,7 @@
//if (resultDataEntitys.DataList.Count > 0)
{
string token = key1.Length > 100 ? key1.Substring(key1.Length - 100) : key1;
- if (ruleCollection.ZXDSFXLS > 0)
+ if (ruleCollection.PrivilegeService.Count(x=>x== "ZXDSFXLS")>0)
//if (ruleCollection.ZXDSFXLS == 0)
{
DateTime yuechu = new DateTime(DateTime.Now.Year, DateTime.Now.Month, 1);
@@ -974,7 +1007,7 @@
return new JsonResult(returnMsg);
}
}
- if ( token != zxdsfxlDTOsnowdate[0].Token)
+ if (zxdsfxlDTOsnowdate.Count == 0 || token != zxdsfxlDTOsnowdate[0].Token)
{
//瀛樺偍鏈鐨勮闂俊鎭�
ZxdsfxlDTO zxdsfxlDTO = new ZxdsfxlDTO();
@@ -1034,5 +1067,51 @@
}
return new JsonResult(returnMsg);
}
+
+
+
+ //鑾峰彇椤圭洰璇︾粏淇℃伅
+ public IActionResult GetProjectFenxiDtl(string id = null)
+ {
+ ReturnMsg<ProjectDTO> returnMsg = new ReturnMsg<ProjectDTO>();
+ returnMsg.code = 2;
+
+ var projectDTO = _projectService.GetLiaotianEntity(id);
+ var cgfs = _projectService.GetCgfs().Where(x=>x.Id == projectDTO.Cgfs).FirstOrDefault();
+ var areaDTOs = _areaService.GetList();
+ var flbx = _liaotianService.GetSYScode("Project", "flbx").Where(x => x.Id == projectDTO.Fblx).FirstOrDefault();
+
+
+ projectDTO.StartTimestr = projectDTO.StartTime.ToString("yyyy-MM-dd HH:mm:ss");
+ var shengname = areaDTOs.Where(x => x.CodeId == projectDTO.Sheng).FirstOrDefault();
+ if (shengname != null)
+ {
+ projectDTO.ShengName = shengname.Name;
+ }
+ var cityname = areaDTOs.Where(x => x.CodeId == projectDTO.City).FirstOrDefault();
+ if (cityname != null)
+ {
+ projectDTO.CityName = cityname.Name;
+ }
+ var areaIdName = areaDTOs.Where(x => x.CodeId == projectDTO.AreaId).FirstOrDefault();
+ if (areaIdName != null)
+ {
+ projectDTO.AreaIdName = areaIdName.Name;
+ }
+ if (cgfs != null)
+ {
+ projectDTO.CgfsName = cgfs.Name;
+ }
+ if (flbx != null)
+ {
+ projectDTO.FblxName = flbx.Comments;
+ }
+
+ returnMsg.code = 1;
+ returnMsg.count = 1;
+ returnMsg.returnObj = projectDTO;
+
+ return new JsonResult(returnMsg);
+ }
}
}
--
Gitblit v1.9.1