项目质量月报新

This commit is contained in:
2024-04-08 10:13:37 +08:00
parent be6da14339
commit 281ea157e1
8 changed files with 292 additions and 236 deletions
@@ -493,6 +493,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
u.UnitId,
u.UnitName,
c.ExpertReviewMan,
c.IsReview,
c.CompileDate
};
@@ -506,7 +507,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
model.UnitOrMajor = item.UnitName;
model.Quantity1 = monethCount.Count();
model.Quantity2 = AllList.Count();
model.Quantity3 = AllList.Where(x => x.ExpertReviewMan != "").ToList().Count();
model.Quantity3 = AllList.Where(x => x.IsReview == true).ToList().Count();
model.ReportId = ReportId;
//如果是修改,查询表中数据
if (objType == "1")
@@ -643,6 +644,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
//加载所有专业
var CNProfessionals = from x in Funs.DB.Base_CNProfessional
where x.CNProfessionalId != BLL.Const.CNProfessionalConstructId
&& x.CNProfessionalId != BLL.Const.ComprehensiveId
orderby x.SortIndex
select new
{
@@ -726,6 +728,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
//加载所有专业
var CNProfessionals = from x in Funs.DB.Base_CNProfessional
where x.CNProfessionalId != BLL.Const.CNProfessionalConstructId
&& x.CNProfessionalId != BLL.Const.ComprehensiveId
orderby x.SortIndex
select new
{
@@ -813,7 +816,8 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
}
}
int i = 1;
var cNProfessionals = from x in Funs.DB.Base_CNProfessional where x.CNProfessionalId != BLL.Const.CNProfessionalConstructId orderby x.SortIndex select x;
var cNProfessionals = from x in Funs.DB.Base_CNProfessional where x.CNProfessionalId != BLL.Const.CNProfessionalConstructId
&& x.CNProfessionalId != BLL.Const.ComprehensiveId orderby x.SortIndex select x;
foreach (var item in cNProfessionals)
{
//专业下所有集合
@@ -1254,18 +1258,24 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
list.Add(model);
}
}
if (list.Count == 0)
{
Grid10.Hidden = true;
hidWsjcgl.Hidden = false;
}
else {
Grid10.DataSource = list;
Grid10.DataBind();
Grid10.DataSource = list;
Grid10.DataBind();
//合计
//合计
JObject summary = new JObject();
summary.Add("CreateMan", "合计");
summary.Add("MonthQuantity", totalNum0.ToString());
summary.Add("TotalQuantity", totalNum1.ToString());
//合计
//合计
JObject summary = new JObject();
summary.Add("CreateMan", "合计");
summary.Add("MonthQuantity", totalNum0.ToString());
summary.Add("TotalQuantity", totalNum1.ToString());
Grid10.SummaryData = summary;
Grid10.SummaryData = summary;
}
}
#endregion
@@ -2635,6 +2645,11 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
/// <param name="e"></param>
protected void btnSave_Click(object sender, EventArgs e)
{
if (string.IsNullOrEmpty(this.txtPeriod.Text.Trim()))
{
ShowNotify("周期不能为空!", MessageBoxIcon.Warning);
return;
}
Model.Report_WeekAndMonthReport_New report = new Model.Report_WeekAndMonthReport_New();
report.Id = ReportId;
report.ProjectId = this.CurrUser.LoginProjectId;