zhengcaioa.git - Gitblit

			@@ -23,15 +23,18 @@

			private readonly IFiAccountRecordService _iFiAccountRecordService;
			private readonly IFiSubjectService _ifiSubjectService;
			private readonly IPltPageService _pltPageService;


			public FiAccountExpensesController(ILogger<FiAccountExpensesController> logger, IFiAccountService fiAccountService, ILiaotianService liaotianService, IFiAccountRecordService iFiAccountRecordService, IFiSubjectService ifiSubjectService)
			public FiAccountExpensesController(ILogger<FiAccountExpensesController> logger, IFiAccountService fiAccountService, ILiaotianService liaotianService, IFiAccountRecordService iFiAccountRecordService, IFiSubjectService ifiSubjectService
			, IPltPageService pltPageService)
			{
			_logger = logger;
			_fiAccountService = fiAccountService;
			_liaotianService = liaotianService;
			_iFiAccountRecordService = iFiAccountRecordService;
			_ifiSubjectService = ifiSubjectService;
			_pltPageService = pltPageService;
			}


			@@ -48,20 +51,32 @@
			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, "/FiAccountExpenses/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();
			@@ -75,6 +90,7 @@
			var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
			ViewData["curentuser"] = curentuser;
			search.RecordTypeId = "2";
			search.Creater = "1111";
			return new JsonResult(_iFiAccountRecordService.SearchByPaging(search));
			}

			@@ -132,12 +148,14 @@
			data.RecordTypeId = "2";//支出
			//data.Department = "";

			resultEntity = _iFiAccountRecordService.save(data);
			//resultEntity = _iFiAccountRecordService.save(data);

			firmAccount.AllExpenses = (firmAccount.AllExpenses ?? 0) + data.Money;
			firmAccount.Balance = (firmAccount.Balance ?? 0) - data.Money;


			data.AccountMoney = firmAccount.Balance;

			resultEntity = _iFiAccountRecordService.save(data);

			resultEntity = _fiAccountService.save(firmAccount);
			scope.Complete();