zhengcaioa/zhengcaioa/Controllers/Customer/IntentionCustomerController.cs
@@ -114,14 +114,14 @@
            ViewBag.khlx = _liaotianService.GetSYScode("CooperatecustomCustomer", "khlx").Select(x => new { code = x.CodeSn, label = x.Comments }).ToList();
            ViewBag.khly = _liaotianService.GetSYScode("CooperatecustomCustomer", "khly").Select(x => new { code = x.CodeSn, label = x.Comments }).ToList();
            ViewBag.khly = _liaotianService.GetSYScode("IntentionCustomer", "khly").Select(x => new { code = x.CodeSn, label = x.Comments }).ToList();
            ViewBag.hyfl = _liaotianService.GetSYScode("CooperatecustomCustomer", "hyfl").Select(x => new { code = x.CodeSn, label = x.Comments }).ToList();
            ViewBag.users = _userService.GetList().Where(x => x.IsYwjl == "A").Select(x => new { code = x.Id, label = x.UserName }).ToList();
            ViewBag.Creater = _userService.GetList().Select(x => new { code = x.Id, label = x.UserName }).ToList();
            ViewBag.shifou = _liaotianService.GetSYScode("system", "shifou").Select(x => new { code = x.CodeSn, label = x.Comments }).ToList();
            ViewBag.ShengDropDown = _projectService.Getsheng().Select(x => new { code = x.CodeId, label = x.Name }).ToList();
@@ -133,6 +133,41 @@
        {
            //JsonResult jsonResult =   new JsonResult(_liaotianService.SearchByPaging(search), new Newtonsoft.Json.Serialization.DefaultContractResolver());
            return new JsonResult(_intentionCustomerService.SearchByPaging(search));
        }
        public IActionResult IndexYiXiang()
        {
            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.khly = _liaotianService.GetSYScode("IntentionCustomer", "khly").Select(x => new { code = x.CodeSn, label = x.Comments }).ToList();
            ViewBag.ywjl = _userService.GetList().Where(x => x.IsYwjl == "A").Select(x => new { code = x.Id, label = x.UserName }).ToList();
            ViewBag.Dianxiaozhuanyuan = _userService.GetList().Select(x => new { code = x.Id, label = x.UserName }).ToList();
            ViewBag.ywjlId = curentuser.Id;
            //ViewBag.khlx = _liaotianService.GetSYScode("CooperatecustomCustomer", "khlx").Select(x => new { code = x.CodeSn, label = x.Comments }).ToList();
            //ViewBag.hyfl = _liaotianService.GetSYScode("CooperatecustomCustomer", "hyfl").Select(x => new { code = x.CodeSn, label = x.Comments }).ToList();
            //ViewBag.ShengDropDown = _projectService.Getsheng().Select(x => new { code = x.CodeId, label = x.Name }).ToList();
            return View();
        }
        public IActionResult Edit(string id = null,string namecus = null)
@@ -163,7 +198,7 @@
            var users = _userService.GetList().Where(x => x.IsYwjl == "A").ToList(); ;
            ViewData["khlx"] = _liaotianService.GetSYScode("CooperatecustomCustomer", "khlx");
            ViewData["khly"] = _liaotianService.GetSYScode("CooperatecustomCustomer", "khly");
            ViewData["khly"] = _liaotianService.GetSYScode("IntentionCustomer", "khly");
            ViewData["hyfl"] = _liaotianService.GetSYScode("CooperatecustomCustomer", "hyfl");
            ViewData["users"] = users;
@@ -196,7 +231,7 @@
            var users = _userService.GetList().Where(x => x.IsYwjl == "A").ToList(); ;
            ViewData["khlx"] = _liaotianService.GetSYScode("CooperatecustomCustomer", "khlx");
            ViewData["khly"] = _liaotianService.GetSYScode("CooperatecustomCustomer", "khly");
            ViewData["khly"] = _liaotianService.GetSYScode("IntentionCustomer", "khly");
            ViewData["hyfl"] = _liaotianService.GetSYScode("CooperatecustomCustomer", "hyfl");
            ViewData["users"] = users;
@@ -223,6 +258,10 @@
            var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
            ViewData["curentuser"] = curentuser;
            data.RecStatus = "A";
            if (string.IsNullOrEmpty(data.Shifoutianjiaweixin))
            {
                data.Shifoutianjiaweixin = "D";
            }
            if (String.IsNullOrEmpty(data.Id))
            {
                data.Creater = curentuser.Id;
@@ -282,11 +321,11 @@
                    for (int i = 0; i < result.Count; i++)
                    {
                        resultEntity = _intentionCustomerService.ModifyStatus(result[i].Id, curentuser.Id);
                        if (!resultEntity.Result)
                        {
                            return new JsonResult(resultEntity);
                        }
                        //resultEntity = _intentionCustomerService.ModifyStatus(result[i].Id, curentuser.Id);
                        //if (!resultEntity.Result)
                        //{
                        //    return new JsonResult(resultEntity);
                        //}
                        var dto = _mapper.Map<CooperatecustomCustomerDTO>(result[i]);
                        dto.Id = "";