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

LR-20210131IOQH\Administrator

2021-08-10 d4a6d65f5e449c3e5464aa18ae97bf8953987217

 zhengcaioa/zhengcaioa/Controllers/Customer/CooperatecustomCustomerController.cs

@@ -100,7 +100,7 @@
            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.hyfl = _liaotianService.GetSYScode("CooperatecustomCustomer", "hyfl").Select(x => new { code = x.CodeSn, label = x.Comments }).ToList();

            ViewBag.shifou = _liaotianService.GetSYScode("system", "shifou").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();


@@ -158,6 +158,23 @@
        }



        public IActionResult GetCustomer(string id)
        {
            var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
            ViewData["curentuser"] = curentuser;

             
            
              var  cooperatecustomCustomerDTO = _cooperatecustomCustomerService.Get(id);



            return new JsonResult(cooperatecustomCustomerDTO);
        }



        /// <summary>
        /// 保存
        /// </summary>
@@ -170,6 +187,30 @@
            var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
            ViewData["curentuser"] = curentuser;
            data.RecStatus = "A";
            if (string.IsNullOrEmpty(data.Shifoutianjiaweixin))
            {
                data.Shifoutianjiaweixin = "D";
                data.Weixiner = null;
                data.Weixintime = null;
            }
            else
            {
                if (String.IsNullOrEmpty(data.Id))
                {
                    data.Weixiner = curentuser.Id;
                    data.Weixintime = DateTime.Now;
                }
                else
                {
                 var cooperatecustomCustomerDTO    =   _cooperatecustomCustomerService.Get(data.Id);
                    if (string.IsNullOrEmpty(cooperatecustomCustomerDTO.Weixiner) )
                    {
                        data.Weixiner = curentuser.Id;
                        data.Weixintime = DateTime.Now;
                    }

                }
            }
            if (String.IsNullOrEmpty(data.Id))
            {
                data.Creater = curentuser.Id;