zhengcaioa/zhengcaioa/Controllers/Customer/IntentionCustomerController.cs
@@ -36,10 +36,11 @@
        private readonly IMapper _mapper;
        private readonly IHrDeptService _hrDeptService;
        private readonly IPltPageService _pltPageService;
        private readonly IIntentionVisitService _intentionVisitService;
        public IntentionCustomerController(ILogger<IntentionCustomerController> logger, IProjectService projectService, ILiaotianService liaotianService, IIntentionCustomerService intentionCustomerService, IUserService userService
            , ICooperatecustomCustomerService cooperatecustomCustomerService, IMapper mapper, IHrDeptService hrDeptService, IPltPageService pltPageService)
            , ICooperatecustomCustomerService cooperatecustomCustomerService, IMapper mapper, IHrDeptService hrDeptService, IPltPageService pltPageService
            , IIntentionVisitService intentionVisitService)
        {
            _logger = logger;
            _projectService = projectService;
@@ -50,6 +51,7 @@
            _mapper = mapper;
            _hrDeptService = hrDeptService;
            _pltPageService = pltPageService;
            _intentionVisitService = intentionVisitService;
        }
        public IActionResult Index()
@@ -160,6 +162,81 @@
            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();
            var users = _userService.GetList().Where(x => x.IsYwjl == "A").Select(x => new { code = x.Id, label = x.UserName }).ToList();
            users.Insert(0, new { code = "11111", label = "无业务经理" });
            ViewBag.users = users;
            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();
            var areaDTOs = _projectService.Getsheng().ToList();
            foreach (var areaDTO in areaDTOs)
            {
                if (areaDTO.CodeId == "510000")
                {
                    areaDTOs.Remove(areaDTO);
                    break;
                }
            }
            var areaDTOsic = new Area();
            areaDTOsic.CodeId = "510000";
            areaDTOsic.Name = "四川省";
            areaDTOsic.ParentId = "0     ";
            areaDTOs.Insert(1, areaDTOsic);
            ViewBag.ShengDropDown = areaDTOs.Select(x => new { code = x.CodeId, label = x.Name }).ToList();
            ViewBag.Baomingtimebegin = DateTime.Now.AddMonths(-6).ToString("yyyy-MM-dd");
            ViewBag.Baomingtimeend = DateTime.Now.ToString("yyyy-MM-dd");
            return View();
        }
        public IActionResult GetList(IntentionCustomerDTOSearch search)
        {
            //JsonResult jsonResult =   new JsonResult(_liaotianService.SearchByPaging(search), new Newtonsoft.Json.Serialization.DefaultContractResolver());
            return new JsonResult(_intentionCustomerService.SearchByPaging(search));
        }
        public IActionResult IndexSelect()
        {
            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);
            ActionEntity actionEntity2 = new ActionEntity();
            actionEntity2.OpenType = 0;
            actionEntity2.ActionUrl = "";
            actionEntity2.ActionFun = "Zhuanyi";
            actionEntity2.PageIco = "fa fa-exchange";
            actionEntity2.ActionName = "确认";
            actionlist.Add(actionEntity2);
            ViewData["ActionInfo"] = actionlist;
            //ViewData["ActionInfo2"] = pageEntities2;
            ViewBag.khlx = _liaotianService.GetSYScode("CooperatecustomCustomer", "khlx").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();
@@ -182,15 +259,47 @@
            areaDTOsic.ParentId = "0     ";
            areaDTOs.Insert(1, areaDTOsic);
            ViewBag.ShengDropDown = areaDTOs.Select(x => new { code = x.CodeId, label = x.Name }).ToList();
            ViewBag.Baomingtimebegin = DateTime.Now.AddMonths(-6).ToString("yyyy-MM-dd");
            ViewBag.Baomingtimeend = DateTime.Now.ToString("yyyy-MM-dd");
            ViewBag.Customertype = _liaotianService.GetSYScode("ADM_Askzczbwsydtl", "Customertype").Select(x => new { code = x.CodeSn, label = x.Comments }).ToList();
            return View();
        }
        public IActionResult GetList(IntentionCustomerDTOSearch search)
        public IActionResult GetListSelect(IntentionCustomerDTOSearch search)
        {
            //JsonResult jsonResult =   new JsonResult(_liaotianService.SearchByPaging(search), new Newtonsoft.Json.Serialization.DefaultContractResolver());
            return new JsonResult(_intentionCustomerService.SearchByPaging(search));
            if(search.Customertype == "01")
            {
                CooperatecustomCustomerDTOSearch search1 = new CooperatecustomCustomerDTOSearch();
                search1.page = search.page;
                search1.rows = search.rows;
                search1.Khly = search.Khly;
                search1.Hyfl = search.Hyfl;
                search1.Khlx = search.Khlx;
                search1.Sheng = search.Sheng;
                search1.City = search.City;
                search1.AreaId = search.AreaId;
                search1.Ywjl = search.Ywjl;
                search1.Name = search.Name;
                search1.Createtime = search.Createtime;
                search1.Shifouweixin = search.Shifouweixin;
                return new JsonResult(_cooperatecustomCustomerService.SearchByPaging(search1));
            }
            else
            {
                return new JsonResult(_intentionCustomerService.SearchByPaging(search));
            }
        }
        //[HttpGet("excel")]
@@ -390,6 +499,12 @@
            {
                intentionCustomerDTO = _intentionCustomerService.Get(id);
                IntentionVisitDTOSearch searchEntity = new IntentionVisitDTOSearch();
                searchEntity.page = 1;
                searchEntity.rows = 1000;
                searchEntity.Viscustomer = id;
                var resultDataEntity = _intentionVisitService.SearchByPaging(searchEntity);
                ViewData["visitlishi"] = resultDataEntity.DataList;
            }
            else
            {
@@ -400,6 +515,8 @@
                intentionCustomerDTO.AreaId = "510107";
                intentionCustomerDTO.Name = namecus;
                ViewData["visitlishi"] = new List<IntentionVisitDTO>();
            }
            var areaDTOs = _projectService.Getsheng().ToList();