lpf/CNCEC_SUBQHSE_WUHUAN
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

提交试车代码

Browse Source
This commit is contained in:
高飞
2023-11-06 11:16:46 +08:00
parent 5a130a619b
commit 0b84177640
30 changed files with 2021 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/TestRun/BeforeTestRun/InspectTailTermEdit.aspx.cs
+32 -24
View File
@@ -14,7 +14,7 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
public partial class InspectTailTermEdit : PageBase
{
/// <summary>
/// 主键
/// 检查表尾项主键
/// </summary>
public string TailTermId
{
@@ -23,7 +23,7 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
}
/// <summary>
/// 主键
/// 检查项主键
/// </summary>
public string TermItemId
{
@@ -196,16 +196,18 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
//绑定检查项
if (!string.IsNullOrWhiteSpace(ddlSubInspectId.SelectedValue))
{
var TermItemIds = Funs.DB.PreRun_InspectTailTerm.Where(x => x.ProjectId == this.CurrUser.LoginProjectId && x.TailTermId != this.TailTermId).Select(a => a.TermItemId).ToList();
var list = new List<PreRun_SubInspectTermItem>();
if (TermItemIds.Count > 0)
{
list = Funs.DB.PreRun_SubInspectTermItem.Where(x => x.InspectionResults == 0 && x.SubInspectId == ddlSubInspectId.SelectedValue && !TermItemIds.Contains(x.TermItemId)).ToList();
}
else
{
list = Funs.DB.PreRun_SubInspectTermItem.Where(x => x.InspectionResults == 0 && x.SubInspectId == ddlSubInspectId.SelectedValue).ToList();
}
//var TermItemIds = Funs.DB.PreRun_InspectTailTerm.Where(x => x.ProjectId == this.CurrUser.LoginProjectId && x.TailTermId != this.TailTermId).Select(a => a.TermItemId).ToList();
//var list = new List<PreRun_SubInspectTermItem>();
//if (TermItemIds.Count > 0)
//{
// list = Funs.DB.PreRun_SubInspectTermItem.Where(x => x.InspectionResults == 0 && x.SubInspectId == ddlSubInspectId.SelectedValue && !TermItemIds.Contains(x.TermItemId)).ToList();
//}
//else
//{
// list = Funs.DB.PreRun_SubInspectTermItem.Where(x => x.InspectionResults == 0 && x.SubInspectId == ddlSubInspectId.SelectedValue).ToList();
//}
var list = Funs.DB.PreRun_SubInspectTermItem.Where(x => x.InspectionResults == 0 && x.SubInspectId == ddlSubInspectId.SelectedValue).ToList();
if (list.Count() > 0)
{
ddlTermItemId.DataTextField = "WorkInspectName";
@@ -287,7 +289,7 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
/// </summary>
public void gvRecordBrid()
{
string strSql = @"select a.InspectTermId,a.ApproveOpinion,a.ApproveTime,a.ApproveType,a.ApproveState,(case a.ApproveType when 0 then (case a.ApproveState when 0 then '处理退回' when 1 then '处理通过' else '' end) else (case a.ApproveState when 0 then '审批退回' when 1 then '审批通过' else '' end) end) as ApproveStateName,a.AddUser,a.AddTime from PreRun_InspectTermApproveRecords as a inner join PreRun_InspectTailTerm as b on a.TailTermId=b.TailTermId inner join PreRun_SubInspectTermItem as c on c.TermItemId=a.TermItemId where 1=1 and a.ProjectId=@ProjectId and a.TailTermId=@TailTermId ";
string strSql = @"select a.InspectTermId,a.ApproveOpinion,a.ApproveTime,a.ApproveType,a.ApproveState,(case a.ApproveType when 0 then (case a.ApproveState when 0 then '处理退回' when 1 then '处理通过' else '' end) else (case a.ApproveState when 0 then '审批退回' when 1 then '审批通过' else '' end) end) as ApproveStateName,b.ConstructionUnit,d.UnitName as ConstructionUnitName,a.AddUser,a.AddTime from PreRun_InspectTermApproveRecords as a inner join PreRun_InspectTailTerm as b on a.TailTermId=b.TailTermId inner join PreRun_SubInspectTermItem as c on c.TermItemId=a.TermItemId inner join Base_Unit as d on d.UnitId=b.ConstructionUnit where 1=1 and a.ProjectId=@ProjectId and a.TailTermId=@TailTermId ";
List<SqlParameter> listStr = new List<SqlParameter>();
listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
listStr.Add(new SqlParameter("@TailTermId", this.TailTermId));
@@ -375,6 +377,9 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
{
Funs.DB.PreRun_InspectTailTerm.InsertOnSubmit(model);
}
//判断尾项是否保存
var itemModel = Funs.DB.PreRun_SubInspectTermItem.FirstOrDefault(x => x.TermItemId == this.TermItemId);
if (itemModel != null) itemModel.InspectionResults = 0;
Funs.DB.SubmitChanges();
ShowNotify("操作成功!", MessageBoxIcon.Success);
PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
@@ -483,7 +488,8 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
{
var selectList = new List<SelectPropertyTechnology>();
var wtype = int.Parse(ddlProblemType.SelectedValue);
var list = Funs.DB.PreRun_SubInspectTermItem.Where(x => x.InspectionResults == 0 && x.WorkPackType == wtype).GroupBy(x => new { x.SubInspectId, x.InspectionResults, x.PropertyTechnologyId, x.WorkPackType });
//var list = Funs.DB.PreRun_SubInspectTermItem.Where(x => x.InspectionResults == 0 && x.WorkPackType == wtype).GroupBy(x => new { x.SubInspectId, x.InspectionResults, x.PropertyTechnologyId, x.WorkPackType });
var list = Funs.DB.PreRun_SubInspectTermItem.Where(x => (x.InspectionResults == 0 && x.WorkPackType == wtype) || x.TermItemId == this.TermItemId).GroupBy(x => new { x.SubInspectId, x.InspectionResults, x.PropertyTechnologyId, x.WorkPackType });
if (list.Count() > 0)
{
var ids = string.Join(",", list.Select(x => x.Key.PropertyTechnologyId)).Split(',');
@@ -546,16 +552,18 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
protected void ddlSubInspectId_SelectedIndexChanged(object sender, EventArgs e)
{
if (string.IsNullOrWhiteSpace(ddlSubInspectId.SelectedValue)) return;
var TermItemIds = Funs.DB.PreRun_InspectTailTerm.Where(x => x.ProjectId == this.CurrUser.LoginProjectId && x.TailTermId != this.TailTermId).Select(a => a.TermItemId).ToList();
var list = new List<PreRun_SubInspectTermItem>();
if (TermItemIds.Count > 0)
{
list = Funs.DB.PreRun_SubInspectTermItem.Where(x => x.InspectionResults == 0 && x.SubInspectId == ddlSubInspectId.SelectedValue && !TermItemIds.Contains(x.TermItemId)).ToList();
}
else
{
list = Funs.DB.PreRun_SubInspectTermItem.Where(x => x.InspectionResults == 0 && x.SubInspectId == ddlSubInspectId.SelectedValue).ToList();
}
//var TermItemIds = Funs.DB.PreRun_InspectTailTerm.Where(x => x.ProjectId == this.CurrUser.LoginProjectId && x.TailTermId != this.TailTermId).Select(a => a.TermItemId).ToList();
//var list = new List<PreRun_SubInspectTermItem>();
//if (TermItemIds.Count > 0)
//{
// list = Funs.DB.PreRun_SubInspectTermItem.Where(x => x.InspectionResults == 0 && x.SubInspectId == ddlSubInspectId.SelectedValue && !TermItemIds.Contains(x.TermItemId)).ToList();
//}
//else
//{
// list = Funs.DB.PreRun_SubInspectTermItem.Where(x => x.InspectionResults == 0 && x.SubInspectId == ddlSubInspectId.SelectedValue).ToList();
//}
var list = Funs.DB.PreRun_SubInspectTermItem.Where(x => (x.InspectionResults == 0 && x.SubInspectId == ddlSubInspectId.SelectedValue) || x.TermItemId == this.TermItemId).ToList();
ddlTermItemId.Items.Clear();
if (list.Count() > 0)
{