From 98cd7063d9b9a1570dcfbac92f5c2b35d904868b Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期一, 05 七月 2021 15:41:29 +0800
Subject: [PATCH] 修改修改
---
zhengcaioa/zhengcaioa/Controllers/ProjectController.cs | 62 ++++++++++++++++++++++++++++++-
1 files changed, 60 insertions(+), 2 deletions(-)
diff --git a/zhengcaioa/zhengcaioa/Controllers/ProjectController.cs b/zhengcaioa/zhengcaioa/Controllers/ProjectController.cs
index 084e8a4..02a69c9 100644
--- a/zhengcaioa/zhengcaioa/Controllers/ProjectController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/ProjectController.cs
@@ -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";
}
}
--
Gitblit v1.9.1