zhengcaioa.git - Gitblit

			@@ -24,15 +24,17 @@
			private readonly ILiaotianService _liaotianService;
			private readonly IIntentionCustomerService _intentionCustomerService;
			private readonly IUserService _userService;
			private readonly ICooperatecustomCustomerService _cooperatecustomCustomerService;


			public ProjectController(ILogger<ProjectController> logger, IProjectService projectService, ILiaotianService liaotianService,IIntentionCustomerService intentionCustomerService, IUserService userService)
			public ProjectController(ILogger<ProjectController> logger, IProjectService projectService, ILiaotianService liaotianService,IIntentionCustomerService intentionCustomerService, IUserService userService
			, ICooperatecustomCustomerService cooperatecustomCustomerService)
			{
			_logger = logger;
			_projectService = projectService;
			_liaotianService = liaotianService;
			_intentionCustomerService = intentionCustomerService;
			_userService = userService;
			_cooperatecustomCustomerService = cooperatecustomCustomerService;
			}
			[CheckLogin]
			public IActionResult Index()
			@@ -68,6 +70,7 @@
			{
			projectDTO = _projectService.GetLiaotianEntity(id);
			var intentionCustomerDTOs = _intentionCustomerService.GetList();
			var cooperatecustomCustomerDTOs = _cooperatecustomCustomerService.GetList();

			if (projectDTO.Projectzhongbiaos!=null && projectDTO.Projectzhongbiaos.Count > 0)
			{
			@@ -75,6 +78,11 @@
			{
			var intt = intentionCustomerDTOs.Count(x=>x.Name == projectDTO.Projectzhongbiaos[i].Names);

			if (intt > 0)
			{
			projectDTO.Projectzhongbiaos[i].ProjectId = "yes";
			}
			intt = cooperatecustomCustomerDTOs.Count(x => x.Name == projectDTO.Projectzhongbiaos[i].Names);
			if (intt > 0)
			{
			projectDTO.Projectzhongbiaos[i].ProjectId = "yes";
			@@ -89,12 +97,22 @@
			{
			projectDTO.Drcunzai = "yes";
			}
			intt = cooperatecustomCustomerDTOs.Count(x => x.Name == projectDTO.Drhx);
			if (intt > 0)
			{
			projectDTO.Drcunzai = "yes";
			}
			}

			if (!string.IsNullOrWhiteSpace(projectDTO.Dshx))
			{
			var intt = intentionCustomerDTOs.Count(x => x.Name == projectDTO.Dshx);

			if (intt > 0)
			{
			projectDTO.Dscunzai = "yes";
			}
			intt = cooperatecustomCustomerDTOs.Count(x => x.Name == projectDTO.Dshx);
			if (intt > 0)
			{
			projectDTO.Dscunzai = "yes";
			@@ -106,6 +124,11 @@
			{
			var intt = intentionCustomerDTOs.Count(x => x.Name == projectDTO.projectreasons[i].Reasonname);

			if (intt > 0)
			{
			projectDTO.projectreasons[i].ProjectId = "yes";
			}
			intt = cooperatecustomCustomerDTOs.Count(x => x.Name == projectDTO.projectreasons[i].Reasonname);
			if (intt > 0)
			{
			projectDTO.projectreasons[i].ProjectId = "yes";
			@@ -123,6 +146,41 @@
			{
			projectDTO.Projectyouxiaos[i].ProjectId = "yes";
			}
			intt = cooperatecustomCustomerDTOs.Count(x => x.Name == projectDTO.Projectyouxiaos[i].Namesyouxiao);
			if (intt > 0)
			{
			projectDTO.Projectyouxiaos[i].ProjectId = "yes";
			}
			}
			}

			if (!string.IsNullOrWhiteSpace(projectDTO.Caigourenname))
			{
			var intt = intentionCustomerDTOs.Count(x => x.Name == projectDTO.Caigourenname);

			if (intt > 0)
			{
			projectDTO.Caigourennamecunzai = "yes";
			}
			intt = cooperatecustomCustomerDTOs.Count(x => x.Name == projectDTO.Caigourenname);
			if (intt > 0)
			{
			projectDTO.Caigourennamecunzai = "yes";
			}
			}

			if (!string.IsNullOrWhiteSpace(projectDTO.Dailiname))
			{
			var intt = intentionCustomerDTOs.Count(x => x.Name == projectDTO.Dailiname);

			if (intt > 0)
			{
			projectDTO.Dailinamecunzai = "yes";
			}
			intt = cooperatecustomCustomerDTOs.Count(x => x.Name == projectDTO.Dailiname);
			if (intt > 0)
			{
			projectDTO.Dailinamecunzai = "yes";
			}
			}

			@@ -140,8 +198,8 @@
			Projectyouxiaolist.Add(new Projectyouxiao());
			projectDTO.Projectyouxiaos = Projectyouxiaolist;

			var Projectzhongbiaoslist = new List<Projectzhongbiao>();
			Projectzhongbiaoslist.Add(new Projectzhongbiao());
			var Projectzhongbiaoslist = new List<ProjectzhongbiaoDTO>();
			Projectzhongbiaoslist.Add(new ProjectzhongbiaoDTO());
			projectDTO.Projectzhongbiaos = Projectzhongbiaoslist;
			projectDTO.StartTime = DateTime.Now;
			}
			@@ -329,7 +387,7 @@
			}
			else if (select != null && select.TextContent.IndexOf("中标（成交）信息") >= 0)
			{
			projectDTO.Projectzhongbiaos = new List<Projectzhongbiao>();
			projectDTO.Projectzhongbiaos = new List<ProjectzhongbiaoDTO>();

			if (table[i + 1] != null)
			{
			@@ -342,7 +400,7 @@
			var surpliernames = surpliername.Split(',');
			for(int j = 0;j< surpliernames.Length; j++)
			{
			var projectzhongbiao = new Projectzhongbiao();
			var projectzhongbiao = new ProjectzhongbiaoDTO();
			projectzhongbiao.Names = surpliernames[j].Trim();
			//if (table[i + 2] != null)
			//{