From 76430b83e28b43122886c1cd8a9fb1cd61040d22 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期一, 28 六月 2021 12:50:50 +0800
Subject: [PATCH] Merge branch 'master' of http://47.108.235.38:8080/r/zhengcaioa
---
zhengcaioa/zhengcaioa/Controllers/admin/SimCostController.cs | 101 +++++++++++++++++++++++++++++++++++++-------------
1 files changed, 74 insertions(+), 27 deletions(-)
diff --git a/zhengcaioa/zhengcaioa/Controllers/admin/SimCostController.cs b/zhengcaioa/zhengcaioa/Controllers/admin/SimCostController.cs
index 507c37a..fad240b 100644
--- a/zhengcaioa/zhengcaioa/Controllers/admin/SimCostController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/admin/SimCostController.cs
@@ -34,24 +34,24 @@
/// 鍒楄〃椤�
/// </summary>
/// <returns></returns>
- public IActionResult Index()
+ public IActionResult Index(int year,string sim)
{
- 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);
+ //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 actionEntity1 = new ActionEntity();
+ //actionEntity1.OpenType = 0;
+ //actionEntity1.ActionUrl = "";
+ //actionEntity1.ActionFun = "Add";
+ //actionEntity1.PageIco = "fa fa-plus";
+ //actionEntity1.ActionName = "鏂板";
+ //actionlist.Add(actionEntity1);
//ActionEntity actionEntity4 = new ActionEntity();
@@ -62,7 +62,10 @@
//actionEntity4.ActionName = "鎵归噺鍒犻櫎";
//actionlist.Add(actionEntity4);
- ViewData["ActionInfo"] = actionlist;
+ //ViewData["ActionInfo"] = actionlist;
+ ViewBag.Year = year;
+ ViewBag.Sim = sim;
+ //var js= _simService.SearchSimCostByPage(sim, year)
return View();
}
@@ -71,9 +74,17 @@
/// </summary>
/// <param name="search"></param>
/// <returns></returns>
- public IActionResult GetList(SimCostDTOSearch search)
+ public IActionResult GetList(int year, string sim)
{
- return new JsonResult(_simService.SearchSimCostByPage(search));
+ var list = _simService.SearchSimCostByPage(sim, year);
+ //var result = new
+ //{
+ // total:"1",
+ // page: 1,
+ // records: list.Count,
+ // rows: list
+ //};
+ return Json(list);
}
/// <summary>
@@ -81,15 +92,18 @@
/// </summary>
/// <param name="id"></param>
/// <returns></returns>
- public IActionResult Edit(string id=null)
- {
- ViewBag.SimCard = _simService.GetBindSim();
+ public IActionResult Edit(string id,decimal money,int year, int month,string sim)
+ {
SimCost dto = new SimCost();
- dto.accounted_time = DateTime.Now;
- if (!string.IsNullOrEmpty(id))
- {
- dto = _simService.GetSimCost(int.Parse(id));
- }
+ dto.bill_month = month;
+ dto.bill_amount = money;
+ dto.sim_id = id;
+ dto.sub_userid = sim;
+ dto.bill_year = year;
+ //if (!string.IsNullOrEmpty(id))
+ //{
+ // dto = _simService.GetSimCost(int.Parse(id));
+ //}
ViewData.Model = dto;
return View();
}
@@ -113,6 +127,39 @@
return new JsonResult(resultEntity);
}
+ /// <summary>
+ /// 鍒楄〃椤�
+ /// </summary>
+ /// <returns></returns>
+ public IActionResult SimYear()
+ {
+ return View();
+ }
+
+ /// <summary>
+ /// 鍒楄〃鍐呭
+ /// </summary>
+ /// <param name="search"></param>
+ /// <returns></returns>
+ public IActionResult GetSimYearList(SimCostDTOSearch search)
+ {
+ return new JsonResult(_simService.SearchSimCostYearByPage(search));
+ }
+
+ [HttpPost]
+ public IActionResult SaveSimYearCost(object data)
+ {
+ var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
+ ResultEntity resultEntity = new ResultEntity();
+ //using (TransactionScope scope = new TransactionScope())
+ //{
+ // data.sub_userid = curentuser.Id;
+ // resultEntity = _simService.SaveCost(data);
+ // scope.Complete();
+ //}
+ return new JsonResult(resultEntity);
+ }
+
///// <summary>
///// 瑙ｇ粦
///// </summary>
--
Gitblit v1.9.1