From 6e2b929cf381e2320ba6e7dec56c0371124d2b51 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期六, 27 八月 2022 15:03:00 +0800
Subject: [PATCH] 提交

---
 zhengcaioa/zhengcaioa/Controllers/Customer/IntentionCustomerController.cs |  502 +++++++++++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 425 insertions(+), 77 deletions(-)

diff --git a/zhengcaioa/zhengcaioa/Controllers/Customer/IntentionCustomerController.cs b/zhengcaioa/zhengcaioa/Controllers/Customer/IntentionCustomerController.cs
index 1c317d5..11d978b 100644
--- a/zhengcaioa/zhengcaioa/Controllers/Customer/IntentionCustomerController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/Customer/IntentionCustomerController.cs
@@ -15,6 +15,12 @@
 using System.Threading.Tasks;
 using zhengcaioa.Models;
 using zhengcaioa.IService;
+using System.Transactions;
+using OfficeOpenXml;
+using OfficeOpenXml.Drawing;
+using OfficeOpenXml.Drawing.Chart;
+using OfficeOpenXml.Style;
+using System.IO;
 
 namespace zhengcaioa.Controllers.Customer
 {
@@ -29,9 +35,11 @@
         private readonly ICooperatecustomCustomerService _cooperatecustomCustomerService;
         private readonly IMapper _mapper;
         private readonly IHrDeptService _hrDeptService;
+        private readonly IPltPageService _pltPageService;
 
 
-        public IntentionCustomerController(ILogger<IntentionCustomerController> logger, IProjectService projectService, ILiaotianService liaotianService, IIntentionCustomerService intentionCustomerService, IUserService userService, ICooperatecustomCustomerService cooperatecustomCustomerService, IMapper mapper, IHrDeptService hrDeptService)
+        public IntentionCustomerController(ILogger<IntentionCustomerController> logger, IProjectService projectService, ILiaotianService liaotianService, IIntentionCustomerService intentionCustomerService, IUserService userService
+            , ICooperatecustomCustomerService cooperatecustomCustomerService, IMapper mapper, IHrDeptService hrDeptService, IPltPageService pltPageService)
         {
             _logger = logger;
             _projectService = projectService;
@@ -41,6 +49,7 @@
             _cooperatecustomCustomerService = cooperatecustomCustomerService;
             _mapper = mapper;
             _hrDeptService = hrDeptService;
+            _pltPageService = pltPageService;
         }
 
         public IActionResult Index()
@@ -48,82 +57,131 @@
             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 actionEntity1 = new ActionEntity();
-            actionEntity1.OpenType = 0;
-            actionEntity1.ActionUrl = "";
-            actionEntity1.ActionFun = "Add";
-            actionEntity1.PageIco = "fa fa-plus";
-            actionEntity1.ActionName = "鏂板";
-            actionlist.Add(actionEntity1);
+            //ActionEntity actionEntity = new ActionEntity();
+            //actionEntity.OpenType = 0;
+            //actionEntity.ActionUrl = "";
+            //actionEntity.ActionFun = "Search";
+            //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 actionEntity2 = new ActionEntity();
-            actionEntity2.OpenType = 0;
-            actionEntity2.ActionUrl = "";
-            actionEntity2.ActionFun = "Zhuanyi";
-            actionEntity2.PageIco = "fa fa-exchange";
-            actionEntity2.ActionName = "杞Щ瀹㈡埛";
-            actionlist.Add(actionEntity2);
+            //ActionEntity actionEntity2 = new ActionEntity();
+            //actionEntity2.OpenType = 0;
+            //actionEntity2.ActionUrl = "";
+            //actionEntity2.ActionFun = "Zhuanyi";
+            //actionEntity2.PageIco = "fa fa-exchange";
+            //actionEntity2.ActionName = "杞Щ瀹㈡埛";
+            //actionlist.Add(actionEntity2);
 
-            ActionEntity actionEntity3 = new ActionEntity();
-            actionEntity3.OpenType = 0;
-            actionEntity3.ActionUrl = "";
-            actionEntity3.ActionFun = "Print";
-            actionEntity3.PageIco = "fa fa-print";
-            actionEntity3.ActionName = "鎵撳嵃璧勬枡";
-            actionlist.Add(actionEntity3);
+            //ActionEntity actionEntity3 = new ActionEntity();
+            //actionEntity3.OpenType = 0;
+            //actionEntity3.ActionUrl = "";
+            //actionEntity3.ActionFun = "Print";
+            //actionEntity3.PageIco = "fa fa-print";
+            //actionEntity3.ActionName = "鎵撳嵃璧勬枡";
+            //actionlist.Add(actionEntity3);
 
 
 
-            ActionEntity actionEntity4 = new ActionEntity();
-            actionEntity4.OpenType = 0;
-            actionEntity4.ActionUrl = "";
-            actionEntity4.ActionFun = "Duanxin";
-            actionEntity4.PageIco = "";
-            actionEntity4.ActionName = "缇ゅ彂鐭俊";
-            actionlist.Add(actionEntity4);
+            //ActionEntity actionEntity4 = new ActionEntity();
+            //actionEntity4.OpenType = 0;
+            //actionEntity4.ActionUrl = "";
+            //actionEntity4.ActionFun = "Duanxin";
+            //actionEntity4.PageIco = "";
+            //actionEntity4.ActionName = "缇ゅ彂鐭俊";
+            //actionlist.Add(actionEntity4);
 
 
-            ActionEntity actionEntity5 = new ActionEntity();
-            actionEntity5.OpenType = 0;
-            actionEntity5.ActionUrl = "";
-            actionEntity5.ActionFun = "Youjian";
-            actionEntity5.PageIco = "";
-            actionEntity5.ActionName = "缇ゅ彂閭欢";
-            actionlist.Add(actionEntity5);
+            //ActionEntity actionEntity5 = new ActionEntity();
+            //actionEntity5.OpenType = 0;
+            //actionEntity5.ActionUrl = "";
+            //actionEntity5.ActionFun = "Youjian";
+            //actionEntity5.PageIco = "";
+            //actionEntity5.ActionName = "缇ゅ彂閭欢";
+            //actionlist.Add(actionEntity5);
 
 
 
-            ActionEntity actionEntity6 = new ActionEntity();
-            actionEntity6.OpenType = 0;
-            actionEntity6.ActionUrl = "";
-            actionEntity6.ActionFun = "Xinhan";
-            actionEntity6.PageIco = "";
-            actionEntity6.ActionName = "鍟嗕笟淇″嚱";
-            actionlist.Add(actionEntity6);
+            //ActionEntity actionEntity6 = new ActionEntity();
+            //actionEntity6.OpenType = 0;
+            //actionEntity6.ActionUrl = "";
+            //actionEntity6.ActionFun = "Xinhan";
+            //actionEntity6.PageIco = "";
+            //actionEntity6.ActionName = "鍟嗕笟淇″嚱";
+            //actionlist.Add(actionEntity6);
 
 
+            //ActionEntity actionEntity7 = new ActionEntity();
+            //actionEntity7.OpenType = 0;
+            //actionEntity7.ActionUrl = "";
+            //actionEntity7.ActionFun = "Daochu";
+            //actionEntity7.PageIco = "";
+            //actionEntity7.ActionName = "瀵煎嚭";
+            //actionlist.Add(actionEntity7);
+
+
+            var pageEntities = _pltPageService.GetUserPage(curentuser.Id, "/IntentionCustomer/Index/");
+            var pageEntities1 = pageEntities.Where(x => x.PageMethod == "01").ToList();
+            if (pageEntities1.Count(x => x.PageShortcut == "Search") <= 0)
+            {
+                ActionEntity actionEntity = new ActionEntity();
+                actionEntity.OpenType = 0;
+                actionEntity.ActionUrl = "";
+                actionEntity.ActionFun = "Search";
+                actionEntity.PageIco = "fa fa-search";
+                actionEntity.ActionName = "鏌ヨ";
+                actionlist.Add(actionEntity);
+
+                ViewData["Creater11"] = curentuser.Id;
+            }
+            var pageEntities2 = pageEntities.Where(x => x.PageMethod == "02").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;
-
+            ViewData["ActionInfo2"] = pageEntities2;
 
             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();
+            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();
             return View();
 
         }
@@ -134,11 +192,199 @@
             return new JsonResult(_intentionCustomerService.SearchByPaging(search));
         }
 
+
+        //[HttpGet("excel")]
+        public IActionResult GetDaochu(IntentionCustomerDTOSearch search)
+        {
+          
+            search.page = 1;
+            search.rows = 10000;
+         var aaa =    _intentionCustomerService.SearchByPaging(search);
+          var data1 =   aaa.DataList;
+
+            ExcelPackage.LicenseContext = OfficeOpenXml.LicenseContext.NonCommercial;
+            using var ep = new ExcelPackage();
+
+            //娣诲姞sheet
+            using var worksheet = ep.Workbook.Worksheets.Add("妗f瀹㈡埛璧勬枡");
+
+           
+
+            int x = 1;
+            int y = 1;
+            var columnTitles = new List<string>()
+            {
+                "寤烘。鏃堕棿","瀹㈡埛鏉ユ簮","琛屼笟鍒嗙被","瀹㈡埛绫诲瀷","瀹㈡埛鍚嶇О","瀹㈡埛鍗曚綅","鑱旂郴浜哄井淇�"
+                ,"瀹㈡埛鍦板潃","缃戝潃","鑱旂郴浜哄骇鏈�","鑱旂郴浜烘墜鏈�","鑱旂郴浜篞Q","鑱旂郴浜洪偖绠�",
+
+                "鑱旂郴浜�2濮撳悕","鑱旂郴浜�2鎵嬫満","鑱旂郴浜�2QQ"
+
+            };
+            foreach(var columnTitle in columnTitles)
+            {
+                //璁剧疆鏍峰紡
+                var cell = worksheet.Cells[x, y++];
+                cell.Style.Font.Bold = true;
+                cell.Style.HorizontalAlignment = ExcelHorizontalAlignment.Center;
+                cell.Style.VerticalAlignment = ExcelVerticalAlignment.Center;
+                cell.Value = columnTitle;
+            }
+            foreach (var item in data1)
+            {
+                x++;
+                y = 1;
+                var cell = worksheet.Cells[x, y++];
+                cell.Value = item.CreatetimeName;
+
+                cell = worksheet.Cells[x, y++];
+                cell.Value = item.KhlyName;
+                cell = worksheet.Cells[x, y++];
+                cell.Value = item.HyflName;
+                cell = worksheet.Cells[x, y++];
+                cell.Value = item.KhlxName;
+                cell = worksheet.Cells[x, y++];
+                cell.Value = item.Name;
+                cell = worksheet.Cells[x, y++];
+                cell.Value = item.Name;
+                cell = worksheet.Cells[x, y++];
+                cell.Value = item.Weixin;
+                cell = worksheet.Cells[x, y++];
+                cell.Value = item.Address;
+                cell = worksheet.Cells[x, y++];
+                cell.Value = item.Url;
+                cell = worksheet.Cells[x, y++];
+                cell.Value = item.Tel;
+                cell = worksheet.Cells[x, y++];
+                cell.Value = item.Phone;
+                cell = worksheet.Cells[x, y++];
+                cell.Value = item.Qq;
+                cell = worksheet.Cells[x, y++];
+                cell.Value = item.Email;
+                cell = worksheet.Cells[x, y++];
+                cell.Value = item.YwName;
+                cell = worksheet.Cells[x, y++];
+                cell.Value = item.YwTel;
+                cell = worksheet.Cells[x, y++];
+                cell.Value = item.YwQq;
+
+
+
+            }
+
+            worksheet.Cells[worksheet.Dimension.Address].AutoFitColumns();
+
+            using (var stream = new MemoryStream())
+            {
+                ep.SaveAs(stream);
+                return new FileContentResult(stream.ToArray(),
+                "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet")
+                {
+                    FileDownloadName = "瀵煎嚭妗f瀹㈡埛璧勬枡" + DateTime.Now.ToString("yyyyMMdd") + ".xlsx"
+                };
+            }
+
+
+
+
+        }
+
+
+        public IActionResult IndexYiXiang()
+        {
+            var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
+            ViewData["curentuser"] = curentuser;
+            List<ActionEntity> actionlist = new List<ActionEntity>();
+
+
+
+
+
+
+            var pageEntities = _pltPageService.GetUserPage(curentuser.Id, "/IntentionCustomer/IndexYiXiang/");
+            var pageEntities1 = pageEntities.Where(x => x.PageMethod == "01").ToList();
+            if (pageEntities1.Count(x => x.PageShortcut == "Search") <= 0)
+            {
+                ActionEntity actionEntity = new ActionEntity();
+                actionEntity.OpenType = 0;
+                actionEntity.ActionUrl = "";
+                actionEntity.ActionFun = "Search";
+                actionEntity.PageIco = "fa fa-search";
+                actionEntity.ActionName = "鏌ヨ";
+                actionlist.Add(actionEntity);
+
+                
+            }
+            var pageEntities2 = pageEntities.Where(x => x.PageMethod == "02").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;
+            ViewData["ActionInfo2"] = pageEntities2;
+
+
+            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();
+            return View();
+
+        }
+
+        /// <summary>
+        /// 瑙g粦
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        [HttpPost]
+        public JsonResult UnBind(string id)
+        {
+            var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
+            ResultEntity resultEntity = new ResultEntity();
+            using (TransactionScope scope = new TransactionScope())
+            {
+                string[] ids = id.Split(',');
+                foreach (var iddd in ids)
+                {
+                    var intentionCustomerDTO = _intentionCustomerService.Get(iddd);
+                    intentionCustomerDTO.Yixiang = null;
+                    intentionCustomerDTO.Yixiangtime = null;
+                    resultEntity =  _intentionCustomerService.save(intentionCustomerDTO);
+                    if (!resultEntity.Result)
+                    {
+                        return new JsonResult(resultEntity);
+                    }
+                }
+
+                  
+                
+                scope.Complete();
+            }
+            return new JsonResult(resultEntity);
+        }
+
         public IActionResult Edit(string id = null,string namecus = null)
         {
             var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
             ViewData["curentuser"] = curentuser;
-
+            var pageEntities = _pltPageService.GetUserPage(curentuser.Id, "/IntentionCustomer/Index/");
+            var pageEntities2 = pageEntities.Where(x => x.PageMethod == "02").ToList();
+            ViewData["ActionInfo2"] = pageEntities2;
             IntentionCustomerDTO intentionCustomerDTO = new IntentionCustomerDTO();
             if (!String.IsNullOrEmpty(id))
             {
@@ -156,13 +402,27 @@
 
             }
 
-            var sheng = _projectService.Getsheng();
+            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);
+            var sheng = areaDTOs;
             var shi = _projectService.Getshi(intentionCustomerDTO.Sheng);
             var quxian = _projectService.Getquxian(intentionCustomerDTO.City);
             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;
@@ -174,6 +434,54 @@
             ViewData.Model = intentionCustomerDTO;
             return View();
         }
+
+
+
+
+        public IActionResult EditByName( string name)
+        {
+            var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
+            ViewData["curentuser"] = curentuser;
+
+            IntentionCustomerDTO intentionCustomerDTO = new IntentionCustomerDTO();
+             
+                intentionCustomerDTO = _intentionCustomerService.GetByName(name);
+
+
+
+            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);
+            var sheng = areaDTOs;
+            var shi = _projectService.Getshi(intentionCustomerDTO.Sheng);
+            var quxian = _projectService.Getquxian(intentionCustomerDTO.City);
+            var users = _userService.GetList().Where(x => x.IsYwjl == "A").ToList(); ;
+
+            ViewData["khlx"] = _liaotianService.GetSYScode("CooperatecustomCustomer", "khlx");
+            ViewData["khly"] = _liaotianService.GetSYScode("IntentionCustomer", "khly");
+            ViewData["hyfl"] = _liaotianService.GetSYScode("CooperatecustomCustomer", "hyfl");
+
+            ViewData["users"] = users;
+
+            ViewData["sheng"] = sheng;
+            ViewData["shi"] = shi;
+            ViewData["quxian"] = quxian;
+            ViewData["DeptId"] = _hrDeptService.GetList();
+            ViewData.Model = intentionCustomerDTO;
+            return View();
+        }
+
 
 
         /// <summary>
@@ -188,10 +496,42 @@
             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 = _intentionCustomerService.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;
                 data.Createtime = DateTime.Now;
+            }
+            else
+            {
+                var intentionCustomerDTO = _intentionCustomerService.Get(data.Id);
+                data.Yixiangtime = intentionCustomerDTO.Yixiangtime;
+                data.Yixiang = intentionCustomerDTO.Yixiang;
+                data.Dianxiaozhuanyuan = intentionCustomerDTO.Dianxiaozhuanyuan;
+                data.Zuijinzhuizongtime = intentionCustomerDTO.Zuijinzhuizongtime;
             }
             data.Modifier = curentuser.Id;
             data.Modifytime = DateTime.Now;
@@ -240,31 +580,39 @@
                 resultEntity.Result = false;
                 resultEntity.Message = "娌℃湁鎵惧埌瀹㈡埛!";
             }
-          
-         
-            if (result != null && result.Count > 0)
+             using(TransactionScope scope = new TransactionScope())
             {
-                for (int i = 0; i < result.Count; i++)
+                if (result != null && result.Count > 0)
                 {
-                    var dto = _mapper.Map<CooperatecustomCustomerDTO>(result[i]);
-                    dto.Id = "";
-                    dto.Creater = curentuser.Id;
-                    dto.Modifier = curentuser.Id;
-                    dto.Createtime = DateTime.Now;
-                    dto.Modifytime = dto.Createtime;
-                    dto.zhuanyi = true;
-                    resultEntity =  _cooperatecustomCustomerService.save(dto);
-                    if (!resultEntity.Result)
+                    for (int i = 0; i < result.Count; i++)
                     {
-                        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 = "";
+                        dto.Creater = curentuser.Id;
+                        dto.Modifier = curentuser.Id;
+                        dto.Createtime = DateTime.Now;
+                        dto.Modifytime = dto.Createtime;
+                        dto.zhuanyi = true;
+                        resultEntity = _cooperatecustomCustomerService.save(dto);
+                        if (!resultEntity.Result)
+                        {
+                            return new JsonResult(resultEntity);
+                        }
                     }
                 }
+                
+
+                scope.Complete();
             }
-            else
-            {
-                resultEntity.Result = false;
-                resultEntity.Message = "鏃犺仈绯讳汉鍙风爜";
-            }
+         
+            
 
             
 
@@ -278,7 +626,7 @@
         public IActionResult print(IntentionCustomerDTOSearch search)
         {
             //JsonResult jsonResult =   new JsonResult(_liaotianService.SearchByPaging(search), new Newtonsoft.Json.Serialization.DefaultContractResolver());
-            search.rows = 1000;
+            search.rows = 10000;
             search.page = 1;
             ViewBag.listLiaotianDTO = _intentionCustomerService.SearchByPaging(search).DataList as List<IntentionCustomerDTO>;
 

--
Gitblit v1.9.1