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/BusinessOrder/CooperOrderController.cs | 145 ++++++++++++++++++++++++++++++++++--------------
1 files changed, 102 insertions(+), 43 deletions(-)
diff --git a/zhengcaioa/zhengcaioa/Controllers/BusinessOrder/CooperOrderController.cs b/zhengcaioa/zhengcaioa/Controllers/BusinessOrder/CooperOrderController.cs
index 7eee552..b99a74f 100644
--- a/zhengcaioa/zhengcaioa/Controllers/BusinessOrder/CooperOrderController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/BusinessOrder/CooperOrderController.cs
@@ -91,34 +91,62 @@
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);
- ActionEntity actionEntity3 = new ActionEntity();
- actionEntity3.OpenType = 0;
- actionEntity3.ActionUrl = "";
- actionEntity3.ActionFun = "Print";
- actionEntity3.PageIco = "fa fa-print";
- actionEntity3.ActionName = "鎵撳嵃";
- actionlist.Add(actionEntity3);
+ //ActionEntity actionEntity3 = new ActionEntity();
+ //actionEntity3.OpenType = 0;
+ //actionEntity3.ActionUrl = "";
+ //actionEntity3.ActionFun = "Print";
+ //actionEntity3.PageIco = "fa fa-print";
+ //actionEntity3.ActionName = "鎵撳嵃";
+ //actionlist.Add(actionEntity3);
- ViewData["ActionInfo"] = actionlist;
+ //ViewData["ActionInfo"] = actionlist;
List<PageEntity> pageEntities = _pltPageService.GetUserPage(curentuser.Id, "/CooperOrder/Index/");
ViewBag.pageEntities = pageEntities;
+
+ 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["Creater"] = curentuser.Id;
+ }
+ 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;
ViewBag.OrderType = _liaotianService.GetSYScode("CooperVisit", "jtype").Select(x => new { code = x.CodeSn, label = x.Comments }).ToList();
ViewBag.users = _userService.GetList().Where(x => x.IsYwjl == "A").Select(x => new { code = x.Id, label = x.UserName }).ToList();
@@ -422,7 +450,9 @@
{
var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
ViewData["curentuser"] = curentuser;
-
+ var pageEntities = _pltPageService.GetUserPage(curentuser.Id, "/CooperOrder/Index/");
+ var pageEntities2 = pageEntities.Where(x => x.PageMethod == "02").ToList();
+ ViewData["ActionInfo2"] = pageEntities2;
CooperOrderDTO dto = new CooperOrderDTO();
if(dingdantype == "0")
{
@@ -1294,9 +1324,10 @@
//dto.Id = id;
dto.Wangonger = curentuser.Id;
dto.Wangongtime = DateTime.Now;
+ dto.WangongStatus = "A";
dto.ShouliStatus = "4";
- ResultEntity resultEntity = _cooperOrderService.save(dto);
+ ResultEntity resultEntity = _cooperOrderService.Wangong(dto);
return new JsonResult(resultEntity);
}
@@ -1307,14 +1338,15 @@
{
var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
ViewData["curentuser"] = curentuser;
+ var cooperOrderDTO = _cooperOrderService.Get(id);
ViewData["Chedanid"] = id;
-
+ ViewData["Money"] = cooperOrderDTO.Money.Value.ToString();
return View();
}
[CheckLogin]
- public IActionResult chedantuihuan(string Chedanid, decimal Price=0)
+ public IActionResult chedantuihuan(string Chedanid, decimal Price=0,string Chedanyuany="")
{
var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
ViewData["curentuser"] = curentuser;
@@ -1381,15 +1413,18 @@
dto.ChedanStatus = "A";
dto.Chedan = Price;
dto.ShouliStatus = "0";
-
+ if (!string.IsNullOrWhiteSpace(Chedanyuany))
+ dto.Remark += " " + Chedanyuany;
resultEntity = _cooperOrderService.chedan(dto);
- var fiAccountRecordDTOs = _iFiAccountRecordService.GetList("璁㈠崟鏀舵"+dto.OrderNo);
- if (fiAccountRecordDTOs!= null && fiAccountRecordDTOs.Count > 0)
+ var fiAccountRecordDTOs = _iFiAccountRecordService.GetList("璁㈠崟鏀舵"+dto.OrderNo, dto.OrderNo);
+ if ( Price>0 && fiAccountRecordDTOs != null && fiAccountRecordDTOs.Count > 0)
{
- foreach (var fiAccountRecordDTO in fiAccountRecordDTOs)
- {
+ var sysCodeDtls = _liaotianService.GetSYScode("CooperVisit", "jtype");
+ //foreach (var fiAccountRecordDTO in fiAccountRecordDTOs)
+ //{
+
CooperatecustomCustomerDTO cooperatecustomCustomerDTO = _cooperatecustomCustomerService.Get(dto.Khdw);
FiAccountRecordDTO data1 = new FiAccountRecordDTO();
data1.RecStatus = "A";
@@ -1397,13 +1432,28 @@
data1.Createtime = DateTime.Now;
data1.Modifier = curentuser.Id;
data1.Modifytime = DateTime.Now;
- data1.SubjectId = fiAccountRecordDTO.SubjectId;
+ data1.SubjectId = fiAccountRecordDTOs[0].SubjectId;
- data1.AccountId = fiAccountRecordDTO.AccountId;
- data1.Money = fiAccountRecordDTO.Money;
+ data1.AccountId = fiAccountRecordDTOs[0].AccountId;
+ data1.Money = Price;
data1.PaymentUnit = cooperatecustomCustomerDTO.Name;
- data1.OperationalMatters = "璁㈠崟鎾ゅ崟" + dto.OrderNo;
-
+ var ssss = sysCodeDtls.Where(x => x.CodeSn == dto.OrderType).FirstOrDefault();
+ if (ssss!=null)
+ {
+ dto.OrderTypeName = ssss.Comments;
+ }
+ var book = _fiBookService.Get(dto.OrderType1);
+ var member = _fiMemberService.Get(dto.OrderType1);
+ if (book != null)
+ {
+ dto.OrderType1 = book.BookName;
+ }
+ if (member != null)
+ {
+ dto.OrderType1 = member.MemberType;
+ }
+ data1.OperationalMatters = dto.OrderTypeName + dto.OrderType1 + dto.OrderType2 + " 璁㈠崟鎾ゅ崟閫�娆�" ;
+ data1.Remark = dto.OrderNo;
FiAccountDTO firmAccount = _fiAccountService.Get(data1.AccountId);
@@ -1414,13 +1464,13 @@
- firmAccount.AllExpenses = (firmAccount.AllExpenses ?? 0) + fiAccountRecordDTO.Money;
- firmAccount.Balance = (firmAccount.Balance ?? 0) - fiAccountRecordDTO.Money;
+ firmAccount.AllIncome = (firmAccount.AllIncome ?? 0) - Price;
+ firmAccount.Balance = (firmAccount.Balance ?? 0) - Price;
data1.AccountMoney = firmAccount.Balance;
resultEntity = _iFiAccountRecordService.save(data1);
resultEntity = _fiAccountService.save(firmAccount);
- }
+ //}
}
scope.Complete();
}
@@ -1719,7 +1769,7 @@
{
//string SecurityKey = _configuration.GetSection("SecurityKey").Value;
var keyId = headers["Authorization"].FirstOrDefault();
- if (string.IsNullOrEmpty("keyId"))
+ if (string.IsNullOrEmpty(keyId))
{
returnMsg.code = 2;
returnMsg.error = "娌℃湁鑾峰彇鍒皌oken";
@@ -1840,7 +1890,9 @@
actionlist.Add(actionEntity);
ViewData["ActionInfo"] = actionlist;
-
+ var pageEntities = _pltPageService.GetUserPage(curentuser.Id, "/CooperOrder/selectWenshu");
+ var pageEntities2 = pageEntities.Where(x => x.PageMethod == "02").ToList();
+ ViewData["ActionInfo2"] = pageEntities2;
ViewBag.Wenshuleixing = _liaotianService.GetSYScode("t_challengeletter", "Wenshuleixing").Select(x => new { code = x.CodeSn, label = x.Comments }).ToList();
ViewBag.status = _liaotianService.GetSYScode("t_challengeletter", "status").Select(x => new { code = x.CodeSn, label = x.Comments }).ToList();
@@ -1950,7 +2002,10 @@
ViewBag.law = sysCodeDtls1;//娉曞緥渚濇嵁
-
+ if (!challengeletterDTO.PrintNum.HasValue)
+ {
+ challengeletterDTO.PrintNum = 1;
+ }
ViewData.Model = challengeletterDTO;
@@ -2684,6 +2739,10 @@
ViewBag.ChallengeletterChosen = _cooperOrderService.GetListChallengeletterChosen().Where(x => x.Createtime >= DateTime.Now.AddMonths(-2)).ToList(); ;
+ if (!complaintletterDTO.PrintNum.HasValue)
+ {
+ complaintletterDTO.PrintNum = 1;
+ }
ViewData.Model = complaintletterDTO;
return View();
}
@@ -3086,7 +3145,7 @@
foreach (var complaintItemDTO in complaintletterDTO.complaintItemDTOs)
{
- complaintletterDTO.SqdbId += complaintItemDTO.QuestionName + ";";
+ complaintletterDTO.SqdbId += complaintItemDTO.QuestionName ;
}
}
--
Gitblit v1.9.1