zhanghj/ChengDa_English
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

小程序接口修改

Browse Source
This commit is contained in:
李超
2023-07-11 16:32:16 +08:00
parent ca5c3fe9a7
commit 4449a7754f
68 changed files with 4634 additions and 2984 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/HSSE/HiddenInspection/HiddenRectificationList.aspx.cs
+7 -5
View File
@@ -174,12 +174,12 @@ namespace FineUIPro.Web.HSSE.HiddenInspection
}
if (this.drpStates.SelectedValueArray.Contains("2"))
{
strSqlTemp += " ( States in( '2','3') and RectificationPeriod > RectificationTime) OR";
strSqlTemp += " ( States in( '2','3') and datediff(DAY,RectificationPeriod,RectificationTime)>0 ) OR";
}
if (this.drpStates.SelectedValueArray.Contains("3"))
{
strSqlTemp += " (States in( '2','3') and RectificationPeriod < RectificationTime ) OR";
strSqlTemp += " (States in( '2','3') and datediff(DAY,RectificationPeriod,RectificationTime)<=0 ) OR";
}
if (this.drpStates.SelectedValueArray.Contains("4"))
@@ -655,15 +655,17 @@ namespace FineUIPro.Web.HSSE.HiddenInspection
Model.View_Hazard_HazardRegister registration = (from x in Funs.DB.View_Hazard_HazardRegister where x.HazardRegisterId == registrationId.ToString() select x).FirstOrDefault();
if (registration != null)
{
if (registration.States == "1" && registration.RectificationPeriod.Value > DateTime.Now)
DateTime RectificationPeriod = DateTime.Parse(registration.RectificationPeriod.Value.ToString("yyyy-MM-dd")).AddDays(1);
if (registration.States == "1" && RectificationPeriod > DateTime.Now)
{
state += "未整改";
}
else if ((registration.States == "2" || registration.States == "3")&& registration.RectificationPeriod.Value>registration.RectificationTime.Value)
else if ((registration.States == "2" || registration.States == "3")&& RectificationPeriod > registration.RectificationTime.Value)
{
state += "按时整改";
}
else if ((registration.States == "2" || registration.States == "3") && registration.RectificationPeriod.Value < registration.RectificationTime.Value)
else if ((registration.States == "2" || registration.States == "3") && RectificationPeriod <= registration.RectificationTime.Value)
{
state += "超期整改";