From 836b306db8799e957ed9cff5144687a139b67f23 Mon Sep 17 00:00:00 2001
From: PC-201906131823\Administrator <zyyao>
Date: 星期二, 23 八月 2022 14:28:13 +0800
Subject: [PATCH] 提交修改角色
---
zhengcaioa/zhengcaioa/Controllers/Finance/FiAccountIncomeController.cs | 55 +++++++++++++++++++++++++++++++++++++------------------
1 files changed, 37 insertions(+), 18 deletions(-)
diff --git a/zhengcaioa/zhengcaioa/Controllers/Finance/FiAccountIncomeController.cs b/zhengcaioa/zhengcaioa/Controllers/Finance/FiAccountIncomeController.cs
index 24b5206..f96dc4a 100644
--- a/zhengcaioa/zhengcaioa/Controllers/Finance/FiAccountIncomeController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/Finance/FiAccountIncomeController.cs
@@ -23,15 +23,17 @@
private readonly IFiAccountRecordService _iFiAccountRecordService;
private readonly IFiSubjectService _ifiSubjectService;
+ private readonly IPltPageService _pltPageService;
-
- public FiAccountIncomeController(ILogger<FiAccountIncomeController> logger, IFiAccountService fiAccountService, ILiaotianService liaotianService, IFiAccountRecordService iFiAccountRecordService, IFiSubjectService ifiSubjectService)
+ public FiAccountIncomeController(ILogger<FiAccountIncomeController> logger, IFiAccountService fiAccountService, ILiaotianService liaotianService, IFiAccountRecordService iFiAccountRecordService, IFiSubjectService ifiSubjectService
+ , IPltPageService pltPageService)
{
_logger = logger;
_fiAccountService = fiAccountService;
_liaotianService = liaotianService;
_iFiAccountRecordService = iFiAccountRecordService;
_ifiSubjectService = ifiSubjectService;
+ _pltPageService = pltPageService;
}
@@ -47,20 +49,34 @@
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 actionEntity2 = new ActionEntity();
- actionEntity2.OpenType = 0;
- actionEntity2.ActionUrl = "";
- actionEntity2.ActionFun = "PrintDetail";
- actionEntity2.PageIco = "fa fa-plus";
- actionEntity2.ActionName = "鎵撳嵃鏄庣粏";
- actionlist.Add(actionEntity2);
+ //ActionEntity actionEntity1 = new ActionEntity();
+ //actionEntity1.OpenType = 0;
+ //actionEntity1.ActionUrl = "";
+ //actionEntity1.ActionFun = "Add";
+ //actionEntity1.PageIco = "fa fa-plus";
+ //actionEntity1.ActionName = "鏂板";
+ //actionlist.Add(actionEntity1);
+ //ActionEntity actionEntity2 = new ActionEntity();
+ //actionEntity2.OpenType = 0;
+ //actionEntity2.ActionUrl = "";
+ //actionEntity2.ActionFun = "PrintDetail";
+ //actionEntity2.PageIco = "fa fa-plus";
+ //actionEntity2.ActionName = "鎵撳嵃鏄庣粏";
+ //actionlist.Add(actionEntity2);
+ var pageEntities = _pltPageService.GetUserPage(curentuser.Id, "/FiAccountIncome/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;
ViewBag.accounttype = _liaotianService.GetSYScode("fi_account", "accounttype").Select(x => new { code = x.CodeSn, label = x.Comments }).ToList();
@@ -143,12 +159,15 @@
data.RecordTypeId = "1";//鏀跺叆
data.Department = "";
-
- resultEntity = _iFiAccountRecordService.save(data);
+
firmAccount.AllIncome = (firmAccount.AllIncome ?? 0) + data.Money ;
firmAccount.Balance = (firmAccount.Balance??0) + data.Money;
+ data.AccountMoney = firmAccount.Balance;
+
+ resultEntity = _iFiAccountRecordService.save(data);
+
resultEntity = _fiAccountService.save(firmAccount);
scope.Complete();
}
--
Gitblit v1.9.1