Merge branch 'master' of http://47.108.235.38:8080/r/zhengcaioa

username@email.com

2021-06-21 0f5218bb8ed4ad8fa9b8b2f089efd624dc6e9f07

 zhengcaioa/zhengcaioa/Controllers/Expert/ExpertController.cs

@@ -14,7 +14,7 @@

namespace zhengcaioa.Controllers.Expert
{
    [CheckLogin]
  
    public class ExpertController : Controller
    {
        private readonly ILogger<ExpertController> _logger;
@@ -30,6 +30,7 @@
            _liaotianService = liaotianService;
            _userService = userService;
        }
        [CheckLogin]
        public IActionResult Index()
        {
            var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
@@ -55,7 +56,7 @@
            ViewBag.level = _liaotianService.GetSYScode("experts", "level").Select(x => new { code = x.CodeSn, label = x.Comments }).ToList();
            ViewBag.Province = _projectService.Getsheng().Select(x => new { code = x.CodeId, label = x.Name }).ToList();
            //  ViewBag.City = _projectService.Getshi( ).Select(x => new { code = x.CodeId, label = x.Name }).ToList();
            ViewBag.level = _liaotianService.GetSYScode("experts", "level").Select(x => new { code = x.CodeSn, label = x.Comments }).ToList();
            ViewBag.ReviewItem = _liaotianService.GetSYScode("experts", "ReviewItem").Select(x => new { code = x.CodeSn, label = x.Comments }).ToList();
            return View();
        }

@@ -64,6 +65,7 @@
        public string GetList(ExpertDTOSearch search)
        {
            var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
            search.ShenheStatus = "A";
            ViewData["curentuser"] = curentuser;
            return JsonConvert.SerializeObject(_expertService.SearchByPaging(search));
        }
@@ -71,7 +73,7 @@


        #region 编辑

        [CheckLogin]
        public ActionResult Edit(string id = null)
        {

@@ -105,7 +107,7 @@
            ViewBag.sex = _liaotianService.GetSYScode("plt_user", "sex");//.Select(x => new { code = x.CodeSn, label = x.Comments }).ToList();
            ViewBag.expertType = _liaotianService.GetSYScode("experts", "expertType");//.Select(x => new { code = x.CodeSn, label = x.Comments }).ToList();
            ViewBag.level = _liaotianService.GetSYScode("experts", "level");//.Select(x => new { code = x.CodeSn, label = x.Comments }).ToList();

            ViewBag.ReviewItem = _liaotianService.GetSYScode("experts", "ReviewItem");//.Select(x => new { code = x.CodeSn, label = x.Comments }).ToList();


            ViewBag.Province = _projectService.Getsheng();//.Select(x => new { code = x.CodeId, label = x.Name }).ToList();             
@@ -175,11 +177,13 @@
        /// <param name="data">岗位实体类对象</param>
        /// <returns></returns>
        [HttpPost]

        [CheckLogin]
        public string Save(ExpertDTO data)
        {
            var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
            ViewData["curentuser"] = curentuser;
            data.ShenheStatus = "A";
            data.ReviewItem = data.ReviewItemSelect;
            data.RecStatus = "A";
            if (String.IsNullOrEmpty(data.Id))
            {
@@ -206,7 +210,7 @@
        /// <param name="info">实体</param>
        /// <returns></returns>
        /// 

        [CheckLogin]
        public string Nullify(string Id = "")
        {
            var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
@@ -269,6 +273,7 @@
        /// <param name="data">保存推广记录</param>
        /// <returns></returns>
        [HttpPost]
        [CheckLogin]
        public string SavePromte(ExpertPromoteDTO data)
        {
            var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
@@ -289,6 +294,7 @@
        #endregion

        #region 专家派工
        [CheckLogin]
        public IActionResult ExpertOrderDispatch()
        {
            var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
@@ -314,11 +320,12 @@

            return View();
        }

        [CheckLogin]
        public string GetOrderList(ExpertOrderDipatchDTOSearch search)
        {
            return JsonConvert.SerializeObject(_expertService.SearchOrderDispatch(search));
        }
        [CheckLogin]
        public IActionResult Dispatch(string orderid)
        {

@@ -327,6 +334,7 @@
            ViewBag.OrderId = orderid;
            return View();
        }
        [CheckLogin]
        public string SaveDispatch(ExpertOrderDipatchDTO data)
        {
            var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
@@ -346,5 +354,11 @@
        }
        #endregion




       


    }
}