政采招标oa系统
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
username@email.com
2024-01-12 0e5c4a8e17dcefcc10b2507da61b099be12451d8 
 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;




@@ -122,31 +122,42 @@


            actionEntity.PageIco = "fa fa-search";


            actionEntity.ActionName = "查询";


            actionlist.Add(actionEntity);


            ActionEntity actionEntity1 = new ActionEntity();


            actionEntity1.OpenType = 0;


            actionEntity1.ActionUrl = "";


            actionEntity1.ActionFun = "Add";


            actionEntity1.PageIco = "fa fa-plus";


            actionEntity1.ActionName = "新增";


            actionlist.Add(actionEntity1);


            //ActionEntity actionEntity1 = new ActionEntity();


            //actionEntity1.OpenType = 0;


            //actionEntity1.ActionUrl = "";


            //actionEntity1.ActionFun = "Add";


            //actionEntity1.PageIco = "fa fa-plus";


            //actionEntity1.ActionName = "新增";


            //actionlist.Add(actionEntity1);




            ActionEntity actionEntity2 = new ActionEntity();


            actionEntity2.OpenType = 0;


            actionEntity2.ActionUrl = "";


            actionEntity2.ActionFun = "Print";


            actionEntity2.PageIco = "fa fa-print";


            actionEntity2.ActionName = "打印";


            actionlist.Add(actionEntity2);


            //ActionEntity actionEntity2 = new ActionEntity();


            //actionEntity2.OpenType = 0;


            //actionEntity2.ActionUrl = "";


            //actionEntity2.ActionFun = "Print";


            //actionEntity2.PageIco = "fa fa-print";


            //actionEntity2.ActionName = "打印";


            //actionlist.Add(actionEntity2);






            ActionEntity actionEntity3 = new ActionEntity();


            actionEntity3.OpenType = 0;


            actionEntity3.ActionUrl = "";


            actionEntity3.ActionFun = "Zhuanyi";


            actionEntity3.PageIco = "fa fa-plus";


            actionEntity3.ActionName = "数据转移";


            actionlist.Add(actionEntity3);




            //ActionEntity actionEntity3 = new ActionEntity();


            //actionEntity3.OpenType = 0;


            //actionEntity3.ActionUrl = "";


            //actionEntity3.ActionFun = "Zhuanyi";


            //actionEntity3.PageIco = "fa fa-plus";


            //actionEntity3.ActionName = "数据转移";


            //actionlist.Add(actionEntity3);


            var pageEntities = _pltPageService.GetUserPage(curentuser.Id, "/Liaotian/Indexcheck");


            var pageEntities1 = pageEntities.Where(x => x.PageMethod == "01").ToList();


            foreach (var pageEntity in pageEntities1)


            {


                ActionEntity actionEntity1 = new ActionEntity();


                actionEntity1.OpenType = pageEntity.OpenType;


                actionEntity1.ActionUrl = "";


                actionEntity1.ActionFun = pageEntity.PageShortcut;


                actionEntity1.PageIco = pageEntity.PageIco;


                actionEntity1.ActionName = pageEntity.PageName;


                actionlist.Add(actionEntity1);


            }




            ViewData["ActionInfo"] = actionlist;


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


@@ -172,15 +183,17 @@


            ResultEntity resultEntity = new ResultEntity();


            resultEntity.Result = false;




           List <LiaotianDTO> liaotianDTOs =_liaotianService.SearchForPrint(new LiaotianDTOSearch()).Where(x=>x.Clientid =="A").ToList();


          


           List <LiaotianDTO> liaotianDTOs =_liaotianService.SearchForPrint(new LiaotianDTOSearch()).ToList();//.Where(x=>x.Clientid =="A")






            try


            {


                int i = 0;


                foreach (var liaotianDTO in liaotianDTOs)


                {


                    i = i + 1;


                    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;


@@ -270,10 +283,13 @@




        #region 编辑


        [CheckLogin]


        public ActionResult Edit(string id = null)


        public ActionResult Edit(string id = null, string Questiontype = null, string Problemtype = null)


        {


            var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));


            ViewData["curentuser"] = curentuser;


            var pageEntities = _pltPageService.GetUserPage(curentuser.Id, "/Liaotian/Indexcheck");


            var pageEntities2 = pageEntities.Where(x => x.PageMethod == "02").ToList();


            ViewData["ActionInfo2"] = pageEntities2;


            LiaotianDTO liaotianDTO = new LiaotianDTO();


            if (!String.IsNullOrEmpty(id))


            {


@@ -289,16 +305,32 @@




                }


            }


            else


            {


                if (!string.IsNullOrEmpty(Questiontype))


                {


                    liaotianDTO.Questiontype = Questiontype;


                }




                if (!string.IsNullOrEmpty(Problemtype))


                {


                    liaotianDTO.Problemtype = Problemtype;


                }


            }


            ViewData.Model = liaotianDTO;






            List<PageEntity> pageEntities = _pltPageService.GetUserPage(curentuser.Id, "/Liaotian/Indexcheck");




            ViewData["pageEntities"] = pageEntities;




            ViewData["questiontype"] = _liaotianService.GetSYScode("Liaotian", "questiontype");




            ViewData["problemtype"] = _liaotianService.GetSYScode("Liaotian", "problemtype").Where(x=>x.Contents == liaotianDTO.Questiontype).ToList();






            //ViewData["Questiontypesel"] = Questiontype;






            //ViewData["Problemtypesel"] = Problemtype;






            return View();


@@ -344,11 +376,16 @@


            }


            data.Modifier = curentuser.Id;


            data.Modifytime = DateTime.Now;


      


           




              resultEntity = _liaotianService.saveLiaotian(data);




            if (!string.IsNullOrEmpty(data.Id))


            {




                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


                {


@@ -383,15 +420,12 @@




                }


            }


           




              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;


@@ -420,7 +454,7 @@


            //    }




            //    Newtonsoft.Json.Linq.JObject jobject = (Newtonsoft.Json.Linq.JObject)JsonConvert.DeserializeObject(result);


               




            //    if (jobject["error"]==null&& jobject["_shards"]["successful"].ToString() == "1")


            //    {  


            //        resultEntity.Result = true;


@@ -436,7 +470,7 @@


            //    resultEntity.Result = false;


            //    throw e;




             




            //}






@@ -523,7 +557,7 @@


            




            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;


@@ -603,7 +637,7 @@


            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;


@@ -675,7 +709,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


            {