From 15eb82df2d6ec539e9d4245bfe08d531e8eb6379 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期日, 27 四月 2025 14:33:26 +0800
Subject: [PATCH] 修改培训订单占多个座位
---
zhengcaioa/zhengcaioa/Controllers/Customer/CooperVisitController.cs | 96 ++++++++++++++++++++++++++++++++++++-----------
1 files changed, 73 insertions(+), 23 deletions(-)
diff --git a/zhengcaioa/zhengcaioa/Controllers/Customer/CooperVisitController.cs b/zhengcaioa/zhengcaioa/Controllers/Customer/CooperVisitController.cs
index e7fd1b8..9563382 100644
--- a/zhengcaioa/zhengcaioa/Controllers/Customer/CooperVisitController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/Customer/CooperVisitController.cs
@@ -30,11 +30,13 @@
private readonly ICooperatecustomCustomerService _cooperatecustomCustomerService;
private readonly IUserService _userService;
private readonly ICooperVisitService _cooperVisitService;
- private readonly ICusFangwenjiluService _cusFangwenjiluService;
+ private readonly ICusFangwenjiluService _cusFangwenjiluService;
+ private readonly IPltPageService _pltPageService;
public CooperVisitController(ILogger<CooperVisitController> logger, IProjectService projectService, ILiaotianService liaotianService, ICooperatecustomCustomerService cooperatecustomCustomerService, IUserService userService, ICooperVisitService cooperVisitService
- , ICusFangwenjiluService cusFangwenjiluService)
+ , ICusFangwenjiluService cusFangwenjiluService
+ , IPltPageService pltPageService)
{
_logger = logger;
_projectService = projectService;
@@ -43,9 +45,10 @@
_userService = userService;
_cooperVisitService = cooperVisitService;
_cusFangwenjiluService = cusFangwenjiluService;
+ _pltPageService = pltPageService;
}
- public IActionResult Index()
+ public IActionResult Index(string Viscustomer = "")
{
var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
ViewData["curentuser"] = curentuser;
@@ -57,16 +60,26 @@
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, "/CooperVisit/Index/");
+ var pageEntities1 = pageEntities.Where(x => x.PageMethod == "01").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;
@@ -77,9 +90,23 @@
ViewBag.users = _userService.GetList().Where(x => x.IsYwjl == "A").Select(x => new { code = x.Id, label = x.UserName }).ToList();
+ ViewBag.Viscustomer = Viscustomer;
-
- ViewBag.ShengDropDown = _projectService.Getsheng().Select(x => new { code = x.CodeId, label = x.Name }).ToList();
+ var areaDTOs = _projectService.Getsheng().ToList();
+ foreach (var areaDTO in areaDTOs)
+ {
+ if (areaDTO.CodeId == "510000")
+ {
+ areaDTOs.Remove(areaDTO);
+ break;
+ }
+ }
+ var areaDTOsic = new Area();
+ areaDTOsic.CodeId = "510000";
+ areaDTOsic.Name = "鍥涘窛鐪�";
+ areaDTOsic.ParentId = "0 ";
+ areaDTOs.Insert(1, areaDTOsic);
+ ViewBag.ShengDropDown = areaDTOs.Select(x => new { code = x.CodeId, label = x.Name }).ToList();
return View();
}
@@ -90,23 +117,47 @@
return new JsonResult(_cooperVisitService.SearchByPaging(search));
}
- public IActionResult Edit(string id = null)
+ public IActionResult Edit(string id = null, string Viscustomer = null)
{
var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
ViewData["curentuser"] = curentuser;
-
+ var pageEntities = _pltPageService.GetUserPage(curentuser.Id, "/CooperVisit/Index/");
+ var pageEntities2 = pageEntities.Where(x => x.PageMethod == "02").ToList();
+ ViewData["ActionInfo2"] = pageEntities2;
CooperVisitDTO dto = new CooperVisitDTO();
if (!String.IsNullOrEmpty(id))
{
dto = _cooperVisitService.Get(id);
+ var cooperatecustomCustomerDTO = _cooperatecustomCustomerService.Get(dto.Viscustomer);
+ if (cooperatecustomCustomerDTO != null)
+ {
+ dto.ViscustomerName = cooperatecustomCustomerDTO.Name;
+ }
}
else
{
+ dto.Viscustomer = Viscustomer;
dto.Vistime = DateTime.Now;
+ if (!string.IsNullOrWhiteSpace(Viscustomer))
+ {
+
+ var cooperatecustomCustomerDTO = _cooperatecustomCustomerService.Get(Viscustomer);
+ if (cooperatecustomCustomerDTO != null)
+ {
+ dto.ViscustomerName = cooperatecustomCustomerDTO.Name;
+ }
+ }
}
-
- ViewData["customer"] = _cooperatecustomCustomerService.GetList();
+ if (!string.IsNullOrWhiteSpace(dto.Viscustomer))
+ {
+ ViewData["customer"] = new List<CooperatecustomCustomerDTO>();
+ }
+ else
+ {
+ ViewData["customer"] = _cooperatecustomCustomerService.GetList();
+ }
+
@@ -181,7 +232,6 @@
var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
ViewData["curentuser"] = curentuser;
List<CooperatecustomCustomerDTO> result = new List<CooperatecustomCustomerDTO>();
-
if (baifangid != null)
{
result = _cooperVisitService.GetList(baifangid.Split(","));
@@ -197,7 +247,7 @@
{
for (int i = 0; i < result.Count; i++)
{
- number.Append(result[i].Phone);
+ number.Append(string.IsNullOrEmpty(result[i].Phone) ? result[i].Tel : result[i].Phone);
customename += result[i].Name + ",";
if (i != result.Count - 1)
{
@@ -211,7 +261,7 @@
resultEntity.Message = "鏃犺仈绯讳汉";
}
- string sss = SMSHelper.PushWToUserMES(number.ToString(), neirong);
+ string sss = SMSHelper.PushWToUserMES(number.ToString(), neirong );
if (int.Parse(sss) <= 0)
{
resultEntity.Result = false;
@@ -221,7 +271,7 @@
CusFangwenjiluDTO dto = new CusFangwenjiluDTO();
dto.Fasongfangshi = "01";
dto.Fasongneirong = neirong;
- dto.Jieshouren = baifangid;
+ dto.Jieshouren = baifangid.Length>2000? baifangid.Substring(0,2000): baifangid;
dto.RecStatus = "A";
dto.Creater = curentuser.Id;
dto.Modifytime = DateTime.Now;
@@ -300,7 +350,7 @@
CusFangwenjiluDTO dto = new CusFangwenjiluDTO();
dto.Fasongfangshi = "02";
dto.Fasongneirong = neirong;
- dto.Jieshouren = baifangid;
+ dto.Jieshouren = baifangid.Length > 2000 ? baifangid.Substring(0, 2000) : baifangid; ;
dto.RecStatus = "A";
dto.Creater = curentuser.Id;
dto.Modifytime = DateTime.Now;
--
Gitblit v1.9.1