This commit is contained in:
2023-07-10 18:10:50 +08:00
parent bfa693d306
commit a873d6c064
14 changed files with 175 additions and 269 deletions
@@ -46,27 +46,26 @@ namespace FineUIPro.Web.OfficeCheck.Check
if (checkInfo != null)
{
this.drpSubjectProject.SelectedValue = checkInfo.SubjectProjectId;
this.txtCheckLeader.Text = Person_PersonsService.GetPersonsNameById(checkInfo.CheckTeamLeader);
this. txtSubjectUnitMan.Text= Person_PersonsService.GetPersonsNameById(checkInfo.SubjectUnitMan);
}
this.txtCheckMan.Text = this.CurrUser.PersonName;
this.txtCheckDate.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now);
this.txtSubjectUnitDate.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now);
var table1 = BLL.CheckTable1Service.GetCheckTable1ByCheckNoticeId(this.CheckNoticeId);
var table1 = BLL.CheckTable1Service.GetCheckTable1ByCheckNoticeId(this.CheckNoticeId);
if (table1 != null)
{
if (!string.IsNullOrEmpty(table1.SubjectProjectId))
{
this.drpSubjectProject.SelectedValue = table1.SubjectProjectId;
}
if (!string.IsNullOrEmpty(table1.CheckMan))
{
this.txtCheckMan.Text = table1.CheckMan;
}
else
{
this.txtCheckMan.Text = this.CurrUser.PersonName;
}
this.txtCheckMan.Text = table1.CheckMan;
this.txtCheckLeader.Text = table1.CheckLeader;
this.txtSubjectUnitMan.Text = table1.SubjectUnitMan;
this.txtCheckDate.Text = string.Format("{0:yyyy-MM-dd}", table1.CheckDate);
this.txtSubjectUnitDate.Text = string.Format("{0:yyyy-MM-dd}", table1.SubjectUnitDate);
if (table1.Total100Score.HasValue)
{
this.lbTotal100Score.Text = "本表百分制得分 = (实查项实得分之和/实查项应得满分之和*100) " + table1.Total100Score + " 分";
@@ -76,14 +75,14 @@ namespace FineUIPro.Web.OfficeCheck.Check
this.lbTotal100Score.Text = "本表百分制得分 = (实查项实得分之和/实查项应得满分之和*100) 分";
}
if (table1.TotalLastScore.HasValue)
{
this.lbTotalLastScore.Text = "综合评定得分 = 本表得分 - 负面清单罚分 = " + table1.TotalLastScore + " 分";
}
else
{
this.lbTotalLastScore.Text = "综合评定得分 = 本表得分 - 负面清单罚分 = 分";
}
//if (table1.TotalLastScore.HasValue)
//{
// this.lbTotalLastScore.Text = "综合评定得分 = 本表得分 - 负面清单罚分 = " + table1.TotalLastScore + " 分";
//}
//else
//{
// this.lbTotalLastScore.Text = "综合评定得分 = 本表得分 - 负面清单罚分 = 分";
//}
this.lbEvaluationResult.Text = table1.EvaluationResult;
}
@@ -142,6 +141,7 @@ namespace FineUIPro.Web.OfficeCheck.Check
}
this.Grid1.DataBind();
}
/// <summary>
/// 合计值
/// </summary>
@@ -229,7 +229,7 @@ namespace FineUIPro.Web.OfficeCheck.Check
if (checks == null)
{
Model.ProjectSupervision_Check1 newCheck = new Model.ProjectSupervision_Check1();
newCheck.ID = SQLHelper.GetNewID(typeof(Model.ProjectSupervision_Check1));
newCheck.ID = SQLHelper.GetNewID();
newCheck.SortIndex = Funs.GetNewInt(values.Value<string>("SortIndex"));
newCheck.CheckItem = values.Value<string>("CheckItem");
newCheck.CheckStandard = values.Value<string>("CheckStandard");
@@ -245,7 +245,7 @@ namespace FineUIPro.Web.OfficeCheck.Check
else
{
Model.ProjectSupervision_Check1 newCheck = new Model.ProjectSupervision_Check1();
newCheck.ID = SQLHelper.GetNewID(typeof(Model.ProjectSupervision_Check1));
newCheck.ID = SQLHelper.GetNewID();
newCheck.SortIndex = checks.SortIndex;
newCheck.CheckItem = checks.CheckItem;
newCheck.CheckStandard = values.Value<string>("CheckStandard");
@@ -286,7 +286,7 @@ namespace FineUIPro.Web.OfficeCheck.Check
totalGetScore = totalBaseScore - totalDeletScore;
decimal sS = (totalGetScore / totalBaseScore) * 100;
total100Score = Math.Round(sS, 2);
totalLastScore = (total100Score - Funs.GetNewDecimalOrZero(this.hdTotalDeletScore6_7.Text));
totalLastScore = total100Score; //total100Score - Funs.GetNewDecimalOrZero(this.hdTotalDeletScore6_7.Text));
}
}
@@ -309,7 +309,7 @@ namespace FineUIPro.Web.OfficeCheck.Check
table1.TotalLastScore = totalLastScore;
table1.EvaluationResult = Funs.ReturnEvaluationResultByScore(table1.TotalLastScore);
table1.CheckNoticeId = this.CheckNoticeId;
table1.CheckItemId = SQLHelper.GetNewID(typeof(Model.ProjectSupervision_CheckTable1));
table1.CheckItemId = SQLHelper.GetNewID();
BLL.CheckTable1Service.AddCheckTable1(table1);
ShowNotify("保存成功!", MessageBoxIcon.Success);