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

合并最新

Browse Source
This commit is contained in:
李超
2022-12-20 09:32:32 +08:00
parent 844e9f1488
commit 1abdaa9476
654 changed files with 73563 additions and 9746 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionManagement.aspx.cs
+37 -3
View File
@@ -23,6 +23,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl
GetButtonPower();
BLL.CNProfessionalService.InitCNProfessionalDownList(this.drpCNProfessional, true);//专业
UnitWorkService.InitUnitWorkDownList(drpUnitWork, this.CurrUser.LoginProjectId, true);
Funs.FineUIPleaseSelect(this.drpState);
BindGrid();
}
}
@@ -46,7 +47,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl
BP.Class,
P.AcceptanceSite,
P.AcceptanceCheckMan,
(CASE WHEN IsOnceQualified='True' THEN '是' ELSE '否' END)AS IsOnceQualified,
(CASE WHEN IsOnceQualified=1 THEN '是' ELSE '否' END) AS IsOnceQualified,
P.InspectionCode,
P.InspectionDate"
+ @" FROM ProcessControl_InspectionManagementDetail AS D"
@@ -73,6 +74,23 @@ namespace FineUIPro.Web.CQMS.ProcessControl
strSql += " AND P.CNProfessionalId=@CNProfessionalId";
listStr.Add(new SqlParameter("@CNProfessionalId", drpCNProfessional.SelectedValue));
}
if (drpState.SelectedValue != BLL.Const._Null)
{
if (drpState.SelectedValue == BLL.Const.InspectionManagement_Compile)
{
strSql += " AND (select top 1 ApproveType from ProcessControl_InspectionManagementApprove ap where ap.InspectionId=P.InspectionId and ap.ApproveType!='S' order by ap.ApproveDate desc) is null";
}
else if(drpState.SelectedValue == BLL.Const.InspectionManagement_Audit)
{
strSql += " AND (select top 1 ApproveType from ProcessControl_InspectionManagementApprove ap where ap.InspectionId=P.InspectionId and ap.ApproveType!='S' and ap.ApproveDate is null order by ap.ApproveDate desc)=@Sta";
listStr.Add(new SqlParameter("@Sta", drpState.SelectedValue));
}
else if (drpState.SelectedValue == BLL.Const.InspectionManagement_Complete)
{
strSql += " AND (select top 1 ApproveType from ProcessControl_InspectionManagementApprove ap where ap.InspectionId=P.InspectionId and ap.ApproveType!='S' and ap.ApproveDate is not null order by ap.ApproveDate desc)=@Sta";
listStr.Add(new SqlParameter("@Sta", drpState.SelectedValue));
}
}
if (!string.IsNullOrEmpty(txtStarTime.Text.Trim()))
{
strSql += " AND P.InspectionDate >= @InspectionDate";
@@ -244,7 +262,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl
{
if (state != null)
{
var res = InspectionManagementApproveService.GetState(state.ToString());
var res = InspectionManagementApproveService.GetState(state.ToString());
if (res != null)
{
if (res.ApproveType == BLL.Const.InspectionManagement_ReCompile)
@@ -268,6 +286,22 @@ namespace FineUIPro.Web.CQMS.ProcessControl
return "编制";
}
public static string ConvertUserName(object InspectionId)
{
string userName = string.Empty;
if (InspectionId != null)
{
var approve = Funs.DB.ProcessControl_InspectionManagementApprove.FirstOrDefault(x => x.InspectionId == InspectionId.ToString() && x.ApproveType == BLL.Const.InspectionManagement_Audit);
if (approve != null)
{
var user = BLL.UserService.GetUserByUserId(approve.ApproveMan);
if (user != null)
{
userName = user.UserName;
}
}
}
return userName;
}
}
}