username@email.com
2022-07-06 1aa53fde5eb18a39c53daf910d69cb857913b08d
zhengcaioa/zhengcaioa/Controllers/LiaotianController.cs
@@ -54,7 +54,7 @@
            List<LiaotianElasticsearchDTO> liaotianElasticsearchDTOs = new List<LiaotianElasticsearchDTO>();
            string api_domain = _configuration.GetSection("Elasticsearchurl").Value;
            string url = $"{api_domain}/liaotian/person/_search";
            string url = $"{api_domain}/liaotian/_doc/_search";
            string question = info;
@@ -180,7 +180,7 @@
                foreach (var liaotianDTO in liaotianDTOs)
                {
                    string api_domain = _configuration.GetSection("Elasticsearchurl").Value;
                    string url = $"{api_domain}/liaotian/person/" + liaotianDTO.Id;
                    string url = $"{api_domain}/liaotian/_doc/" + liaotianDTO.Id;
                    LiaotianElasticsearchDTO liaotianElasticsearchDTO = new LiaotianElasticsearchDTO();
                    liaotianElasticsearchDTO.id = liaotianDTO.Id;
@@ -261,7 +261,9 @@
        [CheckLogin]
        public string GetLiaotianList(LiaotianDTOSearch search)
        {
            var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
            ViewData["curentuser"] = curentuser;
            search.ShouCangCreater = curentuser.Id;
            //JsonResult jsonResult =   new JsonResult(_liaotianService.SearchByPaging(search), new Newtonsoft.Json.Serialization.DefaultContractResolver());
            return  JsonConvert.SerializeObject(_liaotianService.SearchByPaging(search)); 
        }
@@ -276,6 +278,16 @@
            if (!String.IsNullOrEmpty(id))
            {
                liaotianDTO = _liaotianService.GetLiaotianEntity(id);
                var liaotianShoucangDTOs = _liaotianService.getListLiaotianShoucang(curentuser.Id, id);
                if(liaotianShoucangDTOs!=null&& liaotianShoucangDTOs.Count > 0)
                {
                    liaotianDTO.ShouCangStatus = "A";
                }
                else
                {
                    liaotianDTO.ShouCangStatus = "D";
                }
            }
            ViewData.Model = liaotianDTO;
@@ -287,6 +299,7 @@
            ViewData["questiontype"] = _liaotianService.GetSYScode("Liaotian", "questiontype");
            ViewData["problemtype"] = _liaotianService.GetSYScode("Liaotian", "problemtype").Where(x=>x.Contents == liaotianDTO.Questiontype).ToList();
            return View();
        }
@@ -314,12 +327,16 @@
        [CheckLogin]
        public async Task<string> SaveAsync(LiaotianDTO data)
        {
            ResultEntity resultEntity = new ResultEntity();
            resultEntity.Result = false;
            var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
            ViewData["curentuser"] = curentuser;
            data.RecStatus = "A";
            data.Clientid = "D";
            data.Shenheer = null;
            data.Shenhetime = null;
            if (String.IsNullOrEmpty(data.Id))
            {
                data.Creater= curentuser.Id;
@@ -331,7 +348,7 @@
            {
                string api_domain = _configuration.GetSection("Elasticsearchurl").Value;
                string url = $"{api_domain}/liaotian/person/" + data.Id;
                string url = $"{api_domain}/liaotian/_doc/" + data.Id;
                //string requestJson = "{\"id\": \"" + Id + "\",\"question\": \"" + data.Question + "\",\"anwser\": \"" + data.Anwser + "\"}";
                try
                {
@@ -370,9 +387,11 @@
              resultEntity = _liaotianService.saveLiaotian(data);
            //string api_domain = _configuration.GetSection("Elasticsearchurl").Value;
            //string url = $"{api_domain}/liaotian/person/"+ data.Id;
            //string url = $"{api_domain}/liaotian/_doc/"+ data.Id;
            //LiaotianElasticsearchDTO liaotianElasticsearchDTO = new LiaotianElasticsearchDTO();
            //liaotianElasticsearchDTO.id = data.Id;
            //liaotianElasticsearchDTO.question = data.Question;
@@ -427,6 +446,49 @@
            return JsonConvert.SerializeObject(resultEntity);
        }
        /// <summary>
        /// 提交并审核
        /// </summary>
        /// <param name="data">岗位实体类对象</param>
        /// <returns></returns>
        [HttpPost]
        [CheckLogin]
        public IActionResult  ShouCang(LiaotianDTO data)
        {
            ResultEntity resultEntity = new ResultEntity();
            resultEntity.Result = false;
            var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
            ViewData["curentuser"] = curentuser;
            var liaotianShoucangDTOs = _liaotianService.getListLiaotianShoucang(curentuser.Id, data.Id);
            if (data.ShouCangStatus == "A")
            {
                if (liaotianShoucangDTOs == null || liaotianShoucangDTOs.Count == 0)
                {
                    LiaotianShoucangDTO liaotianShoucangDTO = new LiaotianShoucangDTO();
                    liaotianShoucangDTO.LiaotianId = data.Id;
                    liaotianShoucangDTO.RecStatus = "A";
                    liaotianShoucangDTO.Creater = curentuser.Id;
                    liaotianShoucangDTO.Createtime = DateTime.Now;
                    liaotianShoucangDTO.Modifier = curentuser.Id;
                    liaotianShoucangDTO.Modifytime = DateTime.Now;
                    resultEntity =  _liaotianService.saveLiaotianShoucang(liaotianShoucangDTO);
                }
            }
            else
            {
                if (liaotianShoucangDTOs != null || liaotianShoucangDTOs.Count > 0)
                {
                    foreach (var liaotianShoucangDTO in liaotianShoucangDTOs)
                    {
                        resultEntity = _liaotianService.ModifyStatusLiaotianShoucang(liaotianShoucangDTO.Id, curentuser.Id);
                    }
                }
            }
            return new JsonResult(resultEntity); ;
        }
        /// <summary>
        /// 提交并审核
@@ -437,12 +499,15 @@
        [CheckLogin]
        public async Task<string> TijiaobingshenheAsync(LiaotianDTO data)
        {
            ResultEntity resultEntity = new ResultEntity();
            resultEntity.Result = false;
            var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
            ViewData["curentuser"] = curentuser;
            data.RecStatus = "A";
            data.Clientid = "A";
            data.Shenheer = curentuser.Id;
            data.Shenhetime = DateTime.Now;
            if (String.IsNullOrEmpty(data.Id))
            {
                data.Creater = curentuser.Id;
@@ -455,8 +520,10 @@
            resultEntity = _liaotianService.saveLiaotian(data);
            string api_domain = _configuration.GetSection("Elasticsearchurl").Value;
            string url = $"{api_domain}/liaotian/person/" + data.Id;
            string url = $"{api_domain}/liaotian/_doc/" + data.Id;
            LiaotianElasticsearchDTO liaotianElasticsearchDTO = new LiaotianElasticsearchDTO();
            liaotianElasticsearchDTO.id = data.Id;
            liaotianElasticsearchDTO.question = data.Question;
@@ -527,13 +594,16 @@
            LiaotianDTO data = _liaotianService.GetLiaotianEntity(Id);
            data.Shenheer = curentuser.Id;
            data.Shenhetime = DateTime.Now;
            data.Clientid = "A";
            data.Modifier = curentuser.Id;
            data.Modifytime = DateTime.Now;
            resultEntity =  _liaotianService.saveLiaotian(data);
            string api_domain = _configuration.GetSection("Elasticsearchurl").Value;
            string url = $"{api_domain}/liaotian/person/" + data.Id;
            string url = $"{api_domain}/liaotian/_doc/" + data.Id;
            LiaotianElasticsearchDTO liaotianElasticsearchDTO = new LiaotianElasticsearchDTO();
            liaotianElasticsearchDTO.id = data.Id;
            liaotianElasticsearchDTO.question = data.Question;
@@ -605,7 +675,7 @@
            ResultEntity resultEntity = _liaotianService.ModifyStatus(Id, curentuser.Id);
            string api_domain = _configuration.GetSection("Elasticsearchurl").Value;
            string url = $"{api_domain}/liaotian/person/" + Id;
            string url = $"{api_domain}/liaotian/_doc/" + Id;
            //string requestJson = "{\"id\": \"" + Id + "\",\"question\": \"" + data.Question + "\",\"anwser\": \"" + data.Anwser + "\"}";
            try
            {