From 039f5d5938ef314618182df28ab34f76061404ad Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期五, 07 一月 2022 10:16:30 +0800
Subject: [PATCH] 订单收款改造
---
zhengcaioa/zhengcaioa/Controllers/Finance/FiAccountController.cs | 49 ++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 48 insertions(+), 1 deletions(-)
diff --git a/zhengcaioa/zhengcaioa/Controllers/Finance/FiAccountController.cs b/zhengcaioa/zhengcaioa/Controllers/Finance/FiAccountController.cs
index a73818b..233c683 100644
--- a/zhengcaioa/zhengcaioa/Controllers/Finance/FiAccountController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/Finance/FiAccountController.cs
@@ -20,15 +20,20 @@
private readonly ILogger<FiAccountController> _logger;
private readonly IFiAccountService _fiAccountService;
private readonly ILiaotianService _liaotianService;
+ private readonly IFiSubjectService _ifiSubjectService;
+ private readonly IFiAccountRecordService _iFiAccountRecordService;
- public FiAccountController(ILogger<FiAccountController> logger, IFiAccountService fiAccountService, ILiaotianService liaotianService)
+ public FiAccountController(ILogger<FiAccountController> logger, IFiAccountService fiAccountService, ILiaotianService liaotianService, IFiSubjectService ifiSubjectService
+ , IFiAccountRecordService iFiAccountRecordService)
{
_logger = logger;
_fiAccountService = fiAccountService;
_liaotianService = liaotianService;
+ _ifiSubjectService = ifiSubjectService;
+ _iFiAccountRecordService = iFiAccountRecordService;
}
public IActionResult Index()
@@ -127,8 +132,19 @@
data.RecStatus = "A";
if (String.IsNullOrEmpty(data.Id))
{
+
data.Creater = curentuser.Id;
data.Createtime = DateTime.Now;
+
+
+ }
+ else
+ {
+ var sss = _fiAccountService.Get(data.Id);
+ data.Balance = sss.Balance;
+
+ data.AllIncome = sss.AllIncome;
+ data.AllExpenses = sss.AllExpenses;
}
data.Modifier = curentuser.Id;
data.Modifytime = DateTime.Now;
@@ -152,5 +168,36 @@
ViewData["curentuser"] = curentuser;
return new JsonResult(_fiAccountService.ModifyStatus(Id, curentuser.Id));
}
+
+
+
+
+ public IActionResult Liushuizhang(string id)
+ {
+ 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);
+
+ ViewData["ActionInfo"] = actionlist;
+ ViewBag.FiSubject = _ifiSubjectService.GetList()/*.Where(x => x.Subjecttype == "02")*/.Select(x => new { code = x.Id, label = x.Subjectname }).ToList();
+ ViewBag.id = id;
+ return View();
+ }
+
+
+ public IActionResult GetListLiushuizhang(FiAccountRecordDTOSearch search)
+ {
+ var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
+ ViewData["curentuser"] = curentuser;
+ //search.RecordTypeId = "2";
+ return new JsonResult(_iFiAccountRecordService.SearchByPaging(search));
+ }
}
}
--
Gitblit v1.9.1