diff --git a/EProject/FineUIPro.Web/FineUIPro.Web.csproj b/EProject/FineUIPro.Web/FineUIPro.Web.csproj
index 0fd0a2f..54ad612 100644
--- a/EProject/FineUIPro.Web/FineUIPro.Web.csproj
+++ b/EProject/FineUIPro.Web/FineUIPro.Web.csproj
@@ -40,7 +40,7 @@
bin\
DEBUG;TRACE
prompt
- 5
+ 4
7.3
false
@@ -50,7 +50,7 @@
bin\
TRACE
prompt
- 4
+ 1
7.2
false
@@ -138,6 +138,7 @@
..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll
+
diff --git a/EProject/FineUIPro.Web/FineUIPro.Web.csproj.user b/EProject/FineUIPro.Web/FineUIPro.Web.csproj.user
index 3f55043..dc767e7 100644
--- a/EProject/FineUIPro.Web/FineUIPro.Web.csproj.user
+++ b/EProject/FineUIPro.Web/FineUIPro.Web.csproj.user
@@ -2,7 +2,7 @@
ProjectFiles
- Debug|Any CPU
+ Release|Any CPU
true
true
diff --git a/EProject/FineUIPro.Web/Global.asax.cs b/EProject/FineUIPro.Web/Global.asax.cs
index 3ebdd96..e0dcd3e 100644
--- a/EProject/FineUIPro.Web/Global.asax.cs
+++ b/EProject/FineUIPro.Web/Global.asax.cs
@@ -314,7 +314,7 @@
{
for (int a = 0; a < manHours_Plans.Count; a++)
{
- var manHours_Plan = Funs.DB.ManHours_Plan.FirstOrDefault(x => x.ManHoursPlanId == manHours_Plans[i].ManHoursPlanId);
+ var manHours_Plan = Funs.DB.ManHours_Plan.FirstOrDefault(x => x.ManHoursPlanId == manHours_Plans[a].ManHoursPlanId);
if (manHours_Plan != null)
{
manHours_Plan.AccountDisabled = 1;
@@ -346,24 +346,16 @@
where x.EProjectId == epr.Key && (y.ProjectControl_JobType == "Projects" || y.ProjectControl_JobType == "MOC")
orderby x.CreateDate ascending
select new { x.ResourcePlanId, y.PM_MA_ProjectApproval }).ToList();
- if (planLists.Count() == 2)
+ if (planLists.Count == 2)
{
if (planLists[0].PM_MA_ProjectApproval.HasValue && planLists[0].PM_MA_ProjectApproval.Value.AddMonths(1) <= DateTime.Now)
{
- //var manHours_Plan = Funs.DB.ManHours_Plan.FirstOrDefault(x => x.ResourcePlanId == planLists[0].ResourcePlanId);
- //if (manHours_Plan != null)
- //{
- // manHours_Plan.AccountDisabled = 1;
- // Funs.DB.SubmitChanges();
- //}
- var manHours_Plan = (from x in Funs.DB.ManHours_Plan where x.ResourcePlanId == planLists[0].ResourcePlanId select x).ToList();
- if (manHours_Plan.Count() > 0)
+ string resourcePlanId = planLists[0].ResourcePlanId.ToString();
+ List manHours_Plan = (from x in Funs.DB.ManHours_Plan where x.ResourcePlanId == resourcePlanId && x.AccountDisabled != 1 select x).ToList();
+ foreach (var item in manHours_Plan)
{
- foreach (var item in manHours_Plan)
- {
- item.AccountDisabled = 1;
- Funs.DB.SubmitChanges();
- }
+ item.AccountDisabled = 1;
+ Funs.DB.SubmitChanges();
}
}
}
@@ -376,14 +368,8 @@
select x;
foreach (var ep in epList)
{
- //var manHours_Plan = Funs.DB.ManHours_Plan.FirstOrDefault(x => x.EProjectId == ep.EProjectId);
- //if (manHours_Plan != null)
- //{
- // manHours_Plan.AccountDisabled = 1;
- // Funs.DB.SubmitChanges();
- //}
- var manHours_Plan = (from x in Funs.DB.ManHours_Plan where x.EProjectId == ep.EProjectId select x).ToList();
- if (manHours_Plan.Count() > 0)
+ var manHours_Plan = (from x in Funs.DB.ManHours_Plan where x.EProjectId == ep.EProjectId && x.AccountDisabled != 1 select x).ToList();
+ if (manHours_Plan.Count > 0)
{
foreach (var item in manHours_Plan)
{
diff --git a/EProject/FineUIPro.Web/Web.config b/EProject/FineUIPro.Web/Web.config
index 4f770af..08431ea 100644
--- a/EProject/FineUIPro.Web/Web.config
+++ b/EProject/FineUIPro.Web/Web.config
@@ -53,7 +53,7 @@
-
+
diff --git a/EProject/WebApi/WebApi.csproj.user b/EProject/WebApi/WebApi.csproj.user
index ca0d73e..643f3e5 100644
--- a/EProject/WebApi/WebApi.csproj.user
+++ b/EProject/WebApi/WebApi.csproj.user
@@ -8,7 +8,7 @@
- Debug|Any CPU
+ Release|Any CPU